diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 4cc418f88881..090d8400f1cb 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -1,5 +1,4 @@ -{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; } -, officialRelease ? false +{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" "i686-linux" ] }: @@ -19,12 +18,12 @@ let in rec { nixos = removeMaintainers (import ./release.nix { - inherit officialRelease stableBranch; + inherit stableBranch; nixpkgs = nixpkgsSrc; }); nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix { - inherit officialRelease supportedSystems; + inherit supportedSystems; nixpkgs = nixpkgsSrc; })) [ "unstable" ]; diff --git a/nixos/release.nix b/nixos/release.nix index 4caabd97839e..30f87aaa4f2c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,5 +1,4 @@ -{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; } -, officialRelease ? false +{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" "i686-linux" ] }: @@ -8,8 +7,7 @@ let version = builtins.readFile ../.version; versionSuffix = - if officialRelease then "" - else (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; + (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; forAllSystems = pkgs.lib.genAttrs supportedSystems;