mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
* Use the Git shortrev in NixOS version strings.
svn path=/nixos/trunk/; revision=34344
This commit is contained in:
parent
9b014c471a
commit
39e7b44d37
1 changed files with 4 additions and 4 deletions
|
@ -1,11 +1,11 @@
|
|||
{ nixosSrc ? {outPath = ./.; rev = 1234;}
|
||||
, nixpkgs ? {outPath = <nixpkgs>; rev = 5678;}
|
||||
{ nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
|
||||
, nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "fedcba"; }
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
version = builtins.readFile ./.version;
|
||||
versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}";
|
||||
versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}";
|
||||
|
||||
|
||||
makeIso =
|
||||
|
@ -85,7 +85,7 @@ let
|
|||
|
||||
src = nixosSrc;
|
||||
|
||||
inherit officialRelease version;
|
||||
inherit officialRelease version versionSuffix;
|
||||
|
||||
distPhase = ''
|
||||
echo -n $VERSION_SUFFIX > .version-suffix
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue