aboutsummaryrefslogtreecommitdiff
path: root/pkgs/top-level/release-lib.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-12-16 13:59:02 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-12-16 15:38:59 +0100
commit7cd3d502bb19a95bca0137e6d81f65da29ed4092 (patch)
treef5f2747c8333f09b7e5d739fe590ccc23b92aeb2 /pkgs/top-level/release-lib.nix
parent493f633002e4044752a4384e765e41bd850b22ff (diff)
copy-tarballs.pl: Revive extracting all tarballs from release.nix
Diffstat (limited to 'pkgs/top-level/release-lib.nix')
-rw-r--r--pkgs/top-level/release-lib.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 15380ea43c8e..2f0296223a0e 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,4 +1,8 @@
-{ supportedSystems, packageSet ? (import ./all-packages.nix), allowTexliveBuilds ? false }:
+{ supportedSystems
+, packageSet ? (import ./all-packages.nix)
+, allowTexliveBuilds ? false
+, scrubJobs ? true
+}:
with import ../../lib;
@@ -14,6 +18,9 @@ rec {
pkgs = pkgsFor "x86_64-linux";
+ hydraJob' = if scrubJobs then hydraJob else id;
+
+
/* !!! Hack: poor man's memoisation function. Necessary to prevent
Nixpkgs from being evaluated again and again for every
job/platform pair. */
@@ -48,7 +55,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: hydraJob (f (pkgsFor system)));
+ (filter (x: elem x supportedSystems) systems) (system: hydraJob' (f (pkgsFor system)));
/* Similar to the testOn function, but with an additional