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.
This commit is contained in:
Peter Simons 2015-07-17 14:13:40 +02:00
parent c871eccb3a
commit 32a81524fe
2 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,7 @@
args : with args; args : with args;
rec { 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; url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;
sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3"; sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
}; };

View File

@ -1,4 +1,4 @@
{ supportedSystems, packageSet ? (import ./all-packages.nix) }: { supportedSystems, packageSet ? (import ./all-packages.nix), allowTexliveBuilds ? false }:
with import ../../lib; with import ../../lib;
@ -7,7 +7,7 @@ rec {
# Ensure that we don't build packages marked as unfree. # Ensure that we don't build packages marked as unfree.
allPackages = args: packageSet (args // { allPackages = args: packageSet (args // {
config.allowUnfree = false; config.allowUnfree = false;
config.inHydra = true; config.allowTexliveBuilds = allowTexliveBuilds;
}); });
pkgs = pkgsFor "x86_64-linux"; pkgs = pkgsFor "x86_64-linux";