From 88fd4080b29e03c869fae838f59f81c72d40a57c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Mar 2009 14:11:05 +0000
Subject: [PATCH] * Include the version in the name attribute.

svn path=/nixos/trunk/; revision=14413
---
 release.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index d291e21b8dd3..24b70478748b 100644
--- a/release.nix
+++ b/release.nix
@@ -14,11 +14,15 @@ let
 
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
+        
+        version = builtins.readFile ./VERSION;
+        
         src = nixosSrc;
+        
         inherit officialRelease;
 
         distPhase = ''
-          releaseName=nixos-$(cat $src/VERSION)$VERSION_SUFFIX
+          releaseName=nixos-$VERSION
           ensureDir "$out/tarballs"
           mkdir ../$releaseName
           cp -prd . ../$releaseName
@@ -50,16 +54,18 @@ let
 
       let
 
+        version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
         iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
           platform = system;
           compressImage = true;
           nixpkgsPath = nixpkgs.path;
-          relName = "nixos-${builtins.readFile ./VERSION}${if !officialRelease then "pre${toString nixosSrc.rev}" else ""}";
+          relName = "nixos-${version}";
         }).rescueCD;
 
       in
         # Declare the ISO as a build product so that it shows up in Hydra.
-        runCommand "nixos-iso"
+        runCommand "nixos-iso-${version}"
           { meta = {
               description = "NixOS installation CD ISO image for ${system}";
             };