Fix dexidp for 23.05

This commit is contained in:
Sandro - 2023-05-23 23:32:03 +02:00
parent 20ad25bf3a
commit 1209812a54
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 13 additions and 6 deletions

View File

@ -16,16 +16,23 @@ with final; {
ceph_16_2 = (callPackage ./ceph.nix { }).ceph;
dex-oidc = prev.dex-oidc.override {
buildGoModule = args: buildGoModule (args // {
patches = args.patches or [ ] ++ [
buildGoModule = let
ver = lib.versions.majorMinor prev.dex-oidc.version;
in args: buildGoModule (args // {
patches = args.patches or [ ]
# remember session
(fetchpatch {
# TODO: remove 2.35 when 23.05 is stable
++ lib.optional (ver == "2.35") (fetchpatch {
url = "https://github.com/dexidp/dex/commit/dd0fb05386ce89c74381ce49e903cc10b987459e.patch";
sha256 = "sha256-71py0pysgS3jDkKeqD/K4KJ821bolz/4PTjt2rDdUy8=";
hash = "sha256-71py0pysgS3jDkKeqD/K4KJ821bolz/4PTjt2rDdUy8=";
})
];
++ lib.optional (ver == "2.36") (fetchpatch {
url = "https://github.com/dexidp/dex/commit/000004b13b876e04a6f75ec0394f7cabe84fb15e.patch";
hash = "sha256-u85RnwfhcQt7RK11Ed/fDLUbHOuD+TKJU8UHQslZowM=";
});
vendorSha256 = "sha256-BxFiRHOGIJf3jTVtrw/QbnvG5gyfwAKQGd3IiWw5iVc=";
vendorHash = lib.optionalString (ver == "2.35") "sha256-BxFiRHOGIJf3jTVtrw/QbnvG5gyfwAKQGd3IiWw5iVc="
+ lib.optionalString (ver == "2.36") "sha256-hxq7JPz8uD5WQIPO2anSf9+kzyoQy/BQ0OVTblA8qts=";
});
};