summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-10-09 09:50:20 +0200
committerGitHub <noreply@github.com>2022-10-09 09:50:20 +0200
commit4ece171482c59763505f16ee753c8fed0b7e2c3f (patch)
treeae1b5e1820e9c5f42cd32ffd63e9672147b02682 /pkgs
parentd052fcf0eda1c13715d6eec87b017c14d753b17a (diff)
parent15914eba855c306a397595b83810d9894c34f41b (diff)
downloadnixpkgs-4ece171482c59763505f16ee753c8fed0b7e2c3f.tar
nixpkgs-4ece171482c59763505f16ee753c8fed0b7e2c3f.tar.gz
nixpkgs-4ece171482c59763505f16ee753c8fed0b7e2c3f.tar.bz2
nixpkgs-4ece171482c59763505f16ee753c8fed0b7e2c3f.tar.lz
nixpkgs-4ece171482c59763505f16ee753c8fed0b7e2c3f.tar.xz
nixpkgs-4ece171482c59763505f16ee753c8fed0b7e2c3f.tar.zst
nixpkgs-4ece171482c59763505f16ee753c8fed0b7e2c3f.zip
Merge pull request #194738 from mayflower/pi-tokenjanitor
nixos/privacyidea: add proper support for `privacyidea-token-janitor`
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/privacyidea/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix
index d7613b0c2a5..405d992576d 100644
--- a/pkgs/applications/misc/privacyidea/default.nix
+++ b/pkgs/applications/misc/privacyidea/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchFromGitHub, cacert, openssl, nixosTests
-, python39
+, python39, fetchpatch
 }:
 
 let
@@ -107,6 +107,16 @@ python3'.pkgs.buildPythonPackage rec {
     pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt
   ];
 
+  patches = [
+    # Apply https://github.com/privacyidea/privacyidea/pull/3304, fixes
+    # `Exceeds the limit (4300) for integer string conversion` in the tests,
+    # see https://hydra.nixos.org/build/192932057
+    (fetchpatch {
+      url = "https://github.com/privacyidea/privacyidea/commit/0e28f36c0b3291a361669f4a3a77c294f4564475.patch";
+      sha256 = "sha256-QqcO8bkt+I2JKce/xk2ZhzEaLZ3E4uZ4x5W9Kk0pMQQ=";
+    })
+  ];
+
   passthru.tests = { inherit (nixosTests) privacyidea; };
 
   checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ];