* Include the version in the name attribute.

svn path=/nixos/trunk/; revision=14413
This commit is contained in:
Eelco Dolstra 2009-03-06 14:11:05 +00:00
parent 8d3ee677d5
commit 88fd4080b2

View file

@ -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}";
};