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

Merge pull request #21891 from Ericson2314/release-cross

Browse Source 
top-level: Add more options to release-cross.nix, normalize param com…
This commit is contained in:
John Ericson 2017-01-14 14:28:31 -05:00 committed by GitHub
commit b859ae25dd
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,12 @@
with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; };
{ # The platforms for which we build Nixpkgs.
supportedSystems ? [ builtins.currentSystem ]
, # Strip most of attributes when evaluating to spare memory usage
scrubJobs ? true
}:
with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
let let
lib = import ../../lib; lib = import ../../lib;

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

@ -11,10 +11,10 @@
{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
# The platforms for which we build Nixpkgs. , # The platforms for which we build Nixpkgs.
, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
# Strip most of attributes when evaluating to spare memory usage , # Strip most of attributes when evaluating to spare memory usage
, scrubJobs ? true scrubJobs ? true
}: }:
with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; with import ./release-lib.nix { inherit supportedSystems scrubJobs; };