b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

release-lib.nix: Make the set of supported platforms an argument

Browse source
This commit is contained in:
Eelco Dolstra 2013-03-26 13:12:25 +01:00
parent f135b6e530
commit c5f45036e6
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/top-level/release-cross.nix
View file

@ -1,4 +1,4 @@
with (import ./release-lib.nix);
with import ./release-lib.nix { supportedSystems = []; };
let
nativePlatforms = linux;

6
pkgs/top-level/release-lib.nix
View file

@ -1,3 +1,5 @@
{ supportedSystems }:
rec {
# Ensure that we don't build packages marked as unfree.
@ -8,10 +10,6 @@ rec {
pkgs = allPackages { system = "x86_64-linux"; };
# The platforms for which we build Nixpkgs.
supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ];
/* !!! Hack: poor man's memoisation function. Necessary to prevent
Nixpkgs from being evaluated again and again for every
job/platform pair. */

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

@ -11,9 +11,11 @@
{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false
, # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
}:
with import ./release-lib.nix;
with import ./release-lib.nix { inherit supportedSystems; };
let