aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-07-17 14:13:40 +0200
committerPeter Simons <simons@cryp.to>2015-07-17 14:13:40 +0200
commit32a81524fe99f541b1a8601c7e800d27e681b934 (patch)
tree598bbe9d278fba006411bed4e7ca23a82b47e905 /pkgs
parentc871eccb3a4fc900793aeffff0cc7b246047883f (diff)
release-lib: rename config option "inHydra" to "allowTexliveBuilds"
Also, take the value of that attribute as an argument to the module so that Hydra maintainers who don't mind building TexLive have a chance to do so.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/typesetting/tex/texlive/default.nix2
-rw-r--r--pkgs/top-level/release-lib.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 7e0a165ae89b..fe8809e8263f 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,7 +1,7 @@
args : with args;
rec {
- src = assert !config.inHydra or false; fetchurl {
+ src = assert config.allowTexliveBuilds or false; fetchurl {
url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;
sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
};
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 8c66964ba72a..ab26ba2fe747 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,4 +1,4 @@
-{ supportedSystems, packageSet ? (import ./all-packages.nix) }:
+{ supportedSystems, packageSet ? (import ./all-packages.nix), allowTexliveBuilds ? false }:
with import ../../lib;
@@ -7,7 +7,7 @@ rec {
# Ensure that we don't build packages marked as unfree.
allPackages = args: packageSet (args // {
config.allowUnfree = false;
- config.inHydra = true;
+ config.allowTexliveBuilds = allowTexliveBuilds;
});
pkgs = pkgsFor "x86_64-linux";