summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-03-29 10:14:16 +0100
committerGitHub <noreply@github.com>2021-03-29 11:14:16 +0200
commit96e4052d706dfe851a997ebc0245c7c7f02dbb47 (patch)
tree4d88ea53e4f378e1ac4b166640706f123b95a0b7
parent860e87d36363f51cfe5c4af2ffdd462e159dad31 (diff)
downloadnixpkgs-96e4052d706dfe851a997ebc0245c7c7f02dbb47.tar
nixpkgs-96e4052d706dfe851a997ebc0245c7c7f02dbb47.tar.gz
nixpkgs-96e4052d706dfe851a997ebc0245c7c7f02dbb47.tar.bz2
nixpkgs-96e4052d706dfe851a997ebc0245c7c7f02dbb47.tar.lz
nixpkgs-96e4052d706dfe851a997ebc0245c7c7f02dbb47.tar.xz
nixpkgs-96e4052d706dfe851a997ebc0245c7c7f02dbb47.tar.zst
nixpkgs-96e4052d706dfe851a997ebc0245c7c7f02dbb47.zip
nixos/hydra: gc-check-reachability no longer exists in nix 2.4 (#117925)
* nixos/hydra: gc-check-reachability no longer exists in nix 2.4

fixup! nixos/hydra: gc-check-reachability no longer exists in nix 2.4

* Update nixos/modules/services/continuous-integration/hydra/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
-rw-r--r--nixos/modules/services/continuous-integration/hydra/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 2206ac522e4..0103cd723d2 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -280,6 +280,8 @@ in
       keep-outputs = true
       keep-derivations = true
 
+
+    '' + optionalString (versionOlder (getVersion config.nix.package.out) "2.4pre") ''
       # The default (`true') slows Nix down a lot since the build farm
       # has so many GC roots.
       gc-check-reachability = false