public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release.nix: Drop officialRelease flag

This commit is contained in:
Eelco Dolstra 2014-05-01 14:52:07 +02:00
parent 8310c6a403
commit 3b616e378a
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/release-combined.nix
View File

@ -1,5 +1,4 @@
{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; } { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, officialRelease ? false
, stableBranch ? false , stableBranch ? false
, supportedSystems ? [ "x86_64-linux" "i686-linux" ] , supportedSystems ? [ "x86_64-linux" "i686-linux" ]
}: }:
@ -19,12 +18,12 @@ let
in rec { in rec {
nixos = removeMaintainers (import ./release.nix { nixos = removeMaintainers (import ./release.nix {
inherit officialRelease stableBranch; inherit stableBranch;
nixpkgs = nixpkgsSrc; nixpkgs = nixpkgsSrc;
}); });
nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix { nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
inherit officialRelease supportedSystems; inherit supportedSystems;
nixpkgs = nixpkgsSrc; nixpkgs = nixpkgsSrc;
})) [ "unstable" ]; })) [ "unstable" ];

6
nixos/release.nix
View File

@ -1,5 +1,4 @@
{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; } { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, officialRelease ? false
, stableBranch ? false , stableBranch ? false
, supportedSystems ? [ "x86_64-linux" "i686-linux" ] , supportedSystems ? [ "x86_64-linux" "i686-linux" ]
}: }:
@ -8,8 +7,7 @@ let
version = builtins.readFile ../.version; version = builtins.readFile ../.version;
versionSuffix = versionSuffix =
if officialRelease then "" (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
else (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
forAllSystems = pkgs.lib.genAttrs supportedSystems; forAllSystems = pkgs.lib.genAttrs supportedSystems;