diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-02-27 17:20:25 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-04-11 19:43:34 +0200 |
commit | d45df036c3aac928c84b2512ddb11d1a78335fed (patch) | |
tree | 2dddc91d5b19e6d567b8f58de765ad434d800c9d /pkgs/top-level/release-lib.nix | |
parent | e8351fd30519e1b268eeb006c5b18cdb7f73e7fa (diff) | |
download | nixpkgs-d45df036c3aac928c84b2512ddb11d1a78335fed.tar nixpkgs-d45df036c3aac928c84b2512ddb11d1a78335fed.tar.gz nixpkgs-d45df036c3aac928c84b2512ddb11d1a78335fed.tar.bz2 nixpkgs-d45df036c3aac928c84b2512ddb11d1a78335fed.tar.lz nixpkgs-d45df036c3aac928c84b2512ddb11d1a78335fed.tar.xz nixpkgs-d45df036c3aac928c84b2512ddb11d1a78335fed.tar.zst nixpkgs-d45df036c3aac928c84b2512ddb11d1a78335fed.zip |
release(-lib).nix: add nixpkgsArgs parameter
This allows customizing the nixpkgs arguments by the caller. My use case is creating a personal nixpkgs channel containing some unfree packages. The default is still to not build unfree packages, so for nixpkgs this is no functional change.
Diffstat (limited to 'pkgs/top-level/release-lib.nix')
-rw-r--r-- | pkgs/top-level/release-lib.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index a6e574a7d11..59d571f0bd1 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,17 +1,15 @@ { supportedSystems , packageSet ? (import ../..) , scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: with import ../../lib; rec { - # Ensure that we don't build packages marked as unfree. - allPackages = args: packageSet (args // { - config.allowUnfree = false; - config.inHydra = true; - }); + allPackages = args: packageSet (args // nixpkgsArgs); pkgs = pkgsFor "x86_64-linux"; |