diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-10 12:16:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-10 13:28:22 +0200 |
| commit | a5357e80cd885ad9b36109f7a5369e67f649ee9e (patch) | |
| tree | 5e18bb45b67262a0041291af03ebc1777bc1135c /nixos/release.nix | |
| parent | a7824368c26ae1809a36495f870ea7a625c55206 (diff) | |
| download | nixpkgs-a5357e80cd885ad9b36109f7a5369e67f649ee9e.tar nixpkgs-a5357e80cd885ad9b36109f7a5369e67f649ee9e.tar.gz nixpkgs-a5357e80cd885ad9b36109f7a5369e67f649ee9e.tar.bz2 nixpkgs-a5357e80cd885ad9b36109f7a5369e67f649ee9e.tar.lz nixpkgs-a5357e80cd885ad9b36109f7a5369e67f649ee9e.tar.xz nixpkgs-a5357e80cd885ad9b36109f7a5369e67f649ee9e.tar.zst nixpkgs-a5357e80cd885ad9b36109f7a5369e67f649ee9e.zip | |
Tweak the version string
It's now "<yy>.<mm>pre<commit-count>.<short-hash>" (e.g. "13.10pre5678.gfedcba") for the unstable branch, and "<yy>.<mm>.<commit-count>.<short-hash>" (e.g. "13.10.5678.gfedcba") for stable branches.
Diffstat (limited to 'nixos/release.nix')
| -rw-r--r-- | nixos/release.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 8409ca87717..094eacf7059 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,11 +1,14 @@ { nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; } , officialRelease ? false +, stableBranch ? false }: let version = builtins.readFile ../.version; - versionSuffix = "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}"; + versionSuffix = + if officialRelease then "" + else (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; systems = [ "x86_64-linux" "i686-linux" ]; @@ -13,7 +16,7 @@ let versionModule = - { system.nixosVersionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix; }; + { system.nixosVersionSuffix = versionSuffix; }; makeIso = @@ -78,7 +81,8 @@ in { src = nixpkgs; - inherit officialRelease version versionSuffix; + officialRelease = false; # FIXME: fix this in makeSourceTarball + inherit version versionSuffix; buildInputs = [ pkgs.nixUnstable ]; |