* Include the version in the name attribute.
Author: eelco @ rev 14413 svn path=/nixos/branches/fix-style/; revision=14449
This commit is contained in:
parent
e05e4b6bca
commit
0a010e671a
12
release.nix
12
release.nix
@ -14,11 +14,15 @@ let
|
|||||||
|
|
||||||
releaseTools.makeSourceTarball {
|
releaseTools.makeSourceTarball {
|
||||||
name = "nixos-tarball";
|
name = "nixos-tarball";
|
||||||
|
|
||||||
|
version = builtins.readFile ./VERSION;
|
||||||
|
|
||||||
src = nixosSrc;
|
src = nixosSrc;
|
||||||
|
|
||||||
inherit officialRelease;
|
inherit officialRelease;
|
||||||
|
|
||||||
distPhase = ''
|
distPhase = ''
|
||||||
releaseName=nixos-$(cat $src/VERSION)$VERSION_SUFFIX
|
releaseName=nixos-$VERSION
|
||||||
ensureDir "$out/tarballs"
|
ensureDir "$out/tarballs"
|
||||||
mkdir ../$releaseName
|
mkdir ../$releaseName
|
||||||
cp -prd . ../$releaseName
|
cp -prd . ../$releaseName
|
||||||
@ -50,16 +54,18 @@ let
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
|
||||||
|
|
||||||
iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
|
iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
|
||||||
platform = system;
|
platform = system;
|
||||||
compressImage = true;
|
compressImage = true;
|
||||||
nixpkgsPath = nixpkgs.path;
|
nixpkgsPath = nixpkgs.path;
|
||||||
relName = "nixos-${builtins.readFile ./VERSION}${if !officialRelease then "pre${toString nixosSrc.rev}" else ""}";
|
relName = "nixos-${version}";
|
||||||
}).rescueCD;
|
}).rescueCD;
|
||||||
|
|
||||||
in
|
in
|
||||||
# Declare the ISO as a build product so that it shows up in Hydra.
|
# Declare the ISO as a build product so that it shows up in Hydra.
|
||||||
runCommand "nixos-iso"
|
runCommand "nixos-iso-${version}"
|
||||||
{ meta = {
|
{ meta = {
|
||||||
description = "NixOS installation CD ISO image for ${system}";
|
description = "NixOS installation CD ISO image for ${system}";
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user