JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release(-lib).nix: add nixpkgsArgs parameter

Browse Source 
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.
This commit is contained in:
Bjørn Forsman 2017-02-27 17:20:25 +01:00
parent e8351fd305
commit d45df036c3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/release-lib.nix
View File

@ -1,17 +1,15 @@
{ supportedSystems { supportedSystems
, packageSet ? (import ../..) , packageSet ? (import ../..)
, scrubJobs ? true , scrubJobs ? true
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}: }:
with import ../../lib; with import ../../lib;
rec { rec {
# Ensure that we don't build packages marked as unfree. allPackages = args: packageSet (args // nixpkgsArgs);
allPackages = args: packageSet (args // {
config.allowUnfree = false;
config.inHydra = true;
});
pkgs = pkgsFor "x86_64-linux"; pkgs = pkgsFor "x86_64-linux";

4
pkgs/top-level/release.nix
View File

@ -15,9 +15,11 @@
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
, # Strip most of attributes when evaluating to spare memory usage , # Strip most of attributes when evaluating to spare memory usage
scrubJobs ? true scrubJobs ? true
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}: }:
with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
let let