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

* Use the Git shortrev in NixOS version strings.

Browse Source 
svn path=/nixos/trunk/; revision=34344
This commit is contained in:
Eelco Dolstra 2012-06-04 14:23:34 +00:00
parent 9b014c471a
commit 39e7b44d37
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release.nix
View File

@ -1,11 +1,11 @@
{ nixosSrc ? {outPath = ./.; rev = 1234;} { nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
, nixpkgs ? {outPath = <nixpkgs>; rev = 5678;} , nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "fedcba"; }
}: }:
let let
version = builtins.readFile ./.version; version = builtins.readFile ./.version;
versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}"; versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}";
makeIso = makeIso =
@ -85,7 +85,7 @@ let
src = nixosSrc; src = nixosSrc;
inherit officialRelease version; inherit officialRelease version versionSuffix;
distPhase = '' distPhase = ''
echo -n $VERSION_SUFFIX > .version-suffix echo -n $VERSION_SUFFIX > .version-suffix