diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-11-17 07:23:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 07:23:21 -0500 |
| commit | cf194054c0d19509b84b4ee1a669a181eb64ef9f (patch) | |
| tree | 096e31ee844f5039012bf87602d6c99cb581850d /pkgs | |
| parent | 065d029e21b9f018939b91828e5c1e768c5df3d0 (diff) | |
| parent | c851fd99bd6e2aac2dd6e1f403f429d65d2b25d5 (diff) | |
| download | nixlib-cf194054c0d19509b84b4ee1a669a181eb64ef9f.tar nixlib-cf194054c0d19509b84b4ee1a669a181eb64ef9f.tar.gz nixlib-cf194054c0d19509b84b4ee1a669a181eb64ef9f.tar.bz2 nixlib-cf194054c0d19509b84b4ee1a669a181eb64ef9f.tar.lz nixlib-cf194054c0d19509b84b4ee1a669a181eb64ef9f.tar.xz nixlib-cf194054c0d19509b84b4ee1a669a181eb64ef9f.tar.zst nixlib-cf194054c0d19509b84b4ee1a669a181eb64ef9f.zip | |
Merge pull request #268019 from NickCao/hydra
Revert "hydra_unstable: add patch for Crypt::Passphrase::Argon2"
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch | 28 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/unstable.nix | 4 |
2 files changed, 0 insertions, 32 deletions
diff --git a/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch b/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch deleted file mode 100644 index 0c8e6ae434d6..000000000000 --- a/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6a5fb9efaea35ca29836371307f5083576f421ab Mon Sep 17 00:00:00 2001 -From: Stig Palmquist <git@stig.io> -Date: Fri, 20 Oct 2023 00:09:28 +0200 -Subject: [PATCH] Set output length of C::P::Argon2 hashes to 16 - -Since the default lengths in Crypt::Passphrase::Argon2 changed from 16 -to 32 in in 0.009, some tests that expected the passphrase to be -unchanged started failing. ---- - src/lib/Hydra/Schema/Result/Users.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/Hydra/Schema/Result/Users.pm b/src/lib/Hydra/Schema/Result/Users.pm -index b3de6543..c28ae931 100644 ---- a/src/lib/Hydra/Schema/Result/Users.pm -+++ b/src/lib/Hydra/Schema/Result/Users.pm -@@ -216,7 +216,7 @@ sub json_hint { - - sub _authenticator() { - my $authenticator = Crypt::Passphrase->new( -- encoder => 'Argon2', -+ encoder => { module => 'Argon2', output_size => 16 }, - validators => [ - (sub { - my ($password, $hash) = @_; --- -2.42.0 - diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 26102f36daf0..02774ac41058 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -205,10 +205,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - ./crypt-passphrase-argon2-fix-output-len.patch - ]; - postPatch = '' # Change 5s timeout for init to 30s substituteInPlace t/lib/HydraTestContext.pm \ |