diff options
author | William A. Kennington III <william@wkennington.com> | 2014-04-20 20:06:54 -0500 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-29 10:53:36 +0200 |
commit | 936481a12e805896e524f9b790f4f36d0300194b (patch) | |
tree | a4b9f2e7a83ca9b3af12415dc74aa93345099afc /nixos/release-combined.nix | |
parent | a142d68b4391fc78cf8c3d4f86300e10c3bf730e (diff) |
nixos: Add support for changing supported systems
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.
Diffstat (limited to 'nixos/release-combined.nix')
-rw-r--r-- | nixos/release-combined.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 15b5b2b8b7bda..8a62bce80a27f 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -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 { |