From 39e7b44d37fffbc359e2ed3a020a1b4e1c7e10db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jun 2012 14:23:34 +0000
Subject: [PATCH] * Use the Git shortrev in NixOS version strings.

svn path=/nixos/trunk/; revision=34344
---
 release.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release.nix b/release.nix
index 11276fa695a..4ccbd2ef754 100644
--- a/release.nix
+++ b/release.nix
@@ -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