diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/ipcalc/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/security/rng-tools/default.nix | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 15357471c0f..454f595e8e6 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ipcalc"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitLab { owner = "ipcalc"; repo = "ipcalc"; rev = version; - hash = "sha256-HlAGAjNUjfr/Ysjiml54vph/S5pS6fTMWYJwLFr1NSI="; + hash = "sha256-9eaR1zG8tjSGlkpyY1zTHAVgN5ypuyRfeRq6ct6zsLU="; }; patches = [ @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/ipcalc/ipcalc"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } 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; |