mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-24 20:02:58 +03:00
release.nix: Drop officialRelease flag
This commit is contained in:
parent
8310c6a403
commit
3b616e378a
@ -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" ];
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user