diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-13 18:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 18:01:24 +0000 |
| commit | a3b43106c981a3c747ed2c49a343f74f27177b5a (patch) | |
| tree | 1bd82f22610a7bbd092f30d8f80ff4aa645078b3 /pkgs/tools/security | |
| parent | f4330398cdf36e78ef6b85b921e48544c3f86af4 (diff) | |
| parent | 5975bd00fa0593730c4112ef29dffc149e42a9e3 (diff) | |
| download | nixpkgs-a3b43106c981a3c747ed2c49a343f74f27177b5a.tar nixpkgs-a3b43106c981a3c747ed2c49a343f74f27177b5a.tar.gz nixpkgs-a3b43106c981a3c747ed2c49a343f74f27177b5a.tar.bz2 nixpkgs-a3b43106c981a3c747ed2c49a343f74f27177b5a.tar.lz nixpkgs-a3b43106c981a3c747ed2c49a343f74f27177b5a.tar.xz nixpkgs-a3b43106c981a3c747ed2c49a343f74f27177b5a.tar.zst nixpkgs-a3b43106c981a3c747ed2c49a343f74f27177b5a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/rng-tools/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 92774bd716b..a5470f05613 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -55,7 +55,17 @@ stdenv.mkDerivation rec { ]; doCheck = true; - preCheck = "patchShebangs tests/*.sh"; + preCheck = '' + patchShebangs tests/*.sh + export RNGD_JITTER_TIMEOUT=10 + ''; + # After updating to jitterentropy 3.4.1 jitterentropy initialization seams + # to have increased. On some system rng-tools fail therefore to initialize the + # jitterentropy entropy source. You can increase the init timeout with a command-line + # option (-O jitter:timeout:SECONDS). The environment variable above only has effect + # for the test cases. + # Patching the timeout to a larger value was declined upstream, + # see (https://github.com/nhorman/rng-tools/pull/178). nativeCheckInputs = [ psmisc ]; # rngtestjitter.sh needs killall doInstallCheck = true; |