From b625818eeb46e78fe60f3f052482ccd93cba32bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 3 Dec 2023 16:57:19 +0100
Subject: [PATCH] dex-oidc: clean up overlay

---
 overlays/default.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/overlays/default.nix b/overlays/default.nix
index c78489b9..217556ef 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -18,23 +18,15 @@ with final; {
   ceph_17_2 = assert (lib.versions.majorMinor ceph.version) == "17.2"; prev.ceph;
 
   dex-oidc = prev.dex-oidc.override {
-    buildGoModule = let
-      ver = lib.versions.majorMinor prev.dex-oidc.version;
-    in args: buildGoModule (args // {
-      patches = args.patches or [ ]
+    buildGoModule = args: buildGoModule (args // {
+      patches = args.patches or [ ] ++ [
         # remember session
-        # TODO: remove 2.35 when 23.05 is stable
-        ++ lib.optional (ver == "2.35") (fetchpatch {
-          url = "https://github.com/dexidp/dex/commit/dd0fb05386ce89c74381ce49e903cc10b987459e.patch";
-          hash = "sha256-71py0pysgS3jDkKeqD/K4KJ821bolz/4PTjt2rDdUy8=";
-        })
-        ++ lib.optional (ver == "2.36") (fetchpatch {
+        (fetchpatch {
           url = "https://github.com/dexidp/dex/commit/000004b13b876e04a6f75ec0394f7cabe84fb15e.patch";
           hash = "sha256-u85RnwfhcQt7RK11Ed/fDLUbHOuD+TKJU8UHQslZowM=";
-        });
-    } // lib.optionalAttrs (ver == "2.35") {
-      vendorSha256 = "sha256-BxFiRHOGIJf3jTVtrw/QbnvG5gyfwAKQGd3IiWw5iVc=";
-    } // lib.optionalAttrs (ver == "2.36") {
+        })
+      ];
+
       vendorHash = "sha256-hxq7JPz8uD5WQIPO2anSf9+kzyoQy/BQ0OVTblA8qts=";
     });
   };