mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Code Issues Wiki Activity

nixos: Add support for changing supported systems

Browse source 
release.nix and release-combined.nix current hardcode the systems which
they are built for. This change introduces an argument to the
expressions called supportedSystems, which allows the builder to choose
which architectures he wants to build. By default, this uses the same
linux x86_64 and i686 architectures.
This commit is contained in:
William A. Kennington III 2014-04-20 20:06:54 -05:00 committed by Eelco Dolstra
parent a142d68b43
commit 936481a12e
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/release-combined.nix
View file

@ -1,6 +1,7 @@
{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
, officialRelease ? false
, stableBranch ? false
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
}:
let
@ -23,10 +24,8 @@ in rec {
});
nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
inherit officialRelease;
inherit officialRelease supportedSystems;
nixpkgs = nixpkgsSrc;
# Only do Linux builds.
supportedSystems = [ "x86_64-linux" "i686-linux" ];
})) [ "unstable" ];
tested = pkgs.releaseTools.aggregate {

5
nixos/release.nix
View file

@ -1,6 +1,7 @@
{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
, officialRelease ? false
, stableBranch ? false
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
}:
let
@ -10,9 +11,7 @@ let
if officialRelease then ""
else (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
systems = [ "x86_64-linux" "i686-linux" ];
forAllSystems = pkgs.lib.genAttrs systems;
forAllSystems = pkgs.lib.genAttrs supportedSystems;
callTest = fn: args: forAllSystems (system: import fn ({ inherit system; } // args));