diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 15b5b2b8b7b..8a62bce80a2 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 { diff --git a/nixos/release.nix b/nixos/release.nix index 4a10ff39ed0..81a5f06f403 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -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));