alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Slight cleanup.

Browse source 
svn path=/nixos/trunk/; revision=33735
This commit is contained in:
Eelco Dolstra 2012-04-10 21:19:41 +00:00
parent 2ca7e8a43e
commit 049d2dfca7
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
release.nix
View file

@ -4,6 +4,7 @@
let let
version = builtins.readFile ./.version;
versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}"; versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}";
@ -17,10 +18,8 @@ let
let let
version = builtins.readFile ./.version + (lib.optionalString (!officialRelease) versionSuffix);
versionModule = versionModule =
{ system.nixosVersion = version; { system.nixosVersion = version + (lib.optionalString (!officialRelease) versionSuffix);
isoImage.isoBaseName = "nixos-${type}"; isoImage.isoBaseName = "nixos-${type}";
}; };
@ -33,7 +32,7 @@ let
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-${version}" runCommand "nixos-iso-${config.system.nixosVersion}"
{ meta = { { meta = {
description = "NixOS installation CD (${description}) - ISO image for ${system}"; description = "NixOS installation CD (${description}) - ISO image for ${system}";
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
@ -55,9 +54,7 @@ let
with import <nixpkgs> {inherit system;}; with import <nixpkgs> {inherit system;};
let let
version = builtins.readFile ./.version + (lib.optionalString (!officialRelease) versionSuffix); versionModule = { system.nixosVersion = version + (lib.optionalString (!officialRelease) versionSuffix); };
versionModule = { system.nixosVersion = version; };
config = (import lib/eval-config.nix { config = (import lib/eval-config.nix {
inherit system; inherit system;
@ -86,11 +83,9 @@ let
releaseTools.makeSourceTarball { releaseTools.makeSourceTarball {
name = "nixos-tarball"; name = "nixos-tarball";
version = builtins.readFile ./.version;
src = nixosSrc; src = nixosSrc;
inherit officialRelease; inherit officialRelease version;
distPhase = '' distPhase = ''
echo -n $VERSION_SUFFIX > .version-suffix echo -n $VERSION_SUFFIX > .version-suffix
@ -113,11 +108,9 @@ let
releaseTools.makeSourceTarball { releaseTools.makeSourceTarball {
name = "nixos-channel"; name = "nixos-channel";
version = builtins.readFile ./.version;
src = nixosSrc; src = nixosSrc;
inherit officialRelease versionSuffix; inherit officialRelease version versionSuffix;
buildInputs = [ nixUnstable ]; buildInputs = [ nixUnstable ];