release.nix: Drop officialRelease flag

Changed files
+5 -8
nixos
+3 -4
nixos/release-combined.nix
···
-
{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
-
, officialRelease ? false
+
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
}:
···
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" ];
+2 -4
nixos/release.nix
···
-
{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
-
, officialRelease ? false
+
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
}:
···
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;