aboutsummaryrefslogtreecommitdiff
path: root/pkgs/top-level/release-lib.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-03-20 19:23:55 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-03-20 19:46:18 +0100
commit0461f3589499168867e2de88c78f32e44c8ed557 (patch)
tree364d7766e5b06e31be247303793928ff0ea67503 /pkgs/top-level/release-lib.nix
parent738cf42639c6e45b097bb1fd29508e95a36eb5c0 (diff)
Rename scrubDrv -> hydraJob and make it more effective
It now strictly evaluates all remaining attributes, preventing unevaluated thunks that cannot be garbage-collected. It's also applied to all jobs in Nixpkgs' release.nix. This reduces hydra-eval-jobs' memory consumption on the 14.12 release-combined jobset from 5.1 GB to 2.0 GB.
Diffstat (limited to 'pkgs/top-level/release-lib.nix')
-rw-r--r--pkgs/top-level/release-lib.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 0d608ed44ac5..1f324de8544e 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -44,7 +44,7 @@ rec {
a derivation for each supported platform, i.e. ‘{ x86_64-linux =
f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */
testOn = systems: f: genAttrs
- (filter (x: elem x supportedSystems) systems) (system: f (pkgsFor system));
+ (filter (x: elem x supportedSystems) systems) (system: hydraJob (f (pkgsFor system)));
/* Similar to the testOn function, but with an additional