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

release*: Support nixpkgsArgs for all release-*.nix files

Browse Source 
This is a bit dirty because there's no easy way to propagate these
function arguments while still allowing --arg from the command line
This commit is contained in:
Silvan Mosberger 2020-09-11 18:20:35 +02:00
parent c413f10daf
commit c1e96ff74f
No known key found for this signature in database
GPG Key ID: E8F1E9EAD284E17D
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,9 +5,11 @@
supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] supportedSystems ? [ "x86_64-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
nativePlatforms = all; nativePlatforms = all;

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

@ -5,9 +5,11 @@
{ # The platforms for which we build Nixpkgs. { # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" ] supportedSystems ? [ "x86_64-linux" ]
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}: }:
with import ./release-lib.nix {inherit supportedSystems; }; with import ./release-lib.nix {inherit supportedSystems nixpkgsArgs; };
with lib; with lib;
let let

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

@ -3,9 +3,11 @@
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}: }:
with import ./release-lib.nix { inherit supportedSystems; }; with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
{ {