diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-01 14:52:07 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-01 15:05:14 +0200 |
commit | 3b616e378a81129ad69a56322506d6f45e6358b3 (patch) | |
tree | ab66528ad7a12e23247261a9856d3912461d6915 /nixos/release.nix | |
parent | 8310c6a4031f9a0ba66c6c677e672ee7ee4a65d1 (diff) | |
download | nixpkgs-3b616e378a81129ad69a56322506d6f45e6358b3.tar nixpkgs-3b616e378a81129ad69a56322506d6f45e6358b3.tar.gz nixpkgs-3b616e378a81129ad69a56322506d6f45e6358b3.tar.bz2 nixpkgs-3b616e378a81129ad69a56322506d6f45e6358b3.tar.lz nixpkgs-3b616e378a81129ad69a56322506d6f45e6358b3.tar.xz nixpkgs-3b616e378a81129ad69a56322506d6f45e6358b3.tar.zst nixpkgs-3b616e378a81129ad69a56322506d6f45e6358b3.zip |
release.nix: Drop officialRelease flag
Diffstat (limited to 'nixos/release.nix')
-rw-r--r-- | nixos/release.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 4caabd97839..30f87aaa4f2 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; |