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

Set the version of the VirtualBox image properly

Browse source
This commit is contained in:
Eelco Dolstra 2013-07-02 13:33:27 +02:00
parent 3a9f908c8b
commit 5af3a14885
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
release.nix
View file

@ -13,6 +13,10 @@ let
pkgs = import <nixpkgs> { system = "x86_64-linux"; }; pkgs = import <nixpkgs> { system = "x86_64-linux"; };
versionModule =
{ system.nixosVersionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix; };
makeIso = makeIso =
{ module, type, description ? type, maintainers ? ["eelco"], system }: { module, type, description ? type, maintainers ? ["eelco"], system }:
@ -20,14 +24,9 @@ let
let let
versionModule =
{ system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix;
isoImage.isoBaseName = "nixos-${type}";
};
config = (import lib/eval-config.nix { config = (import lib/eval-config.nix {
inherit system; inherit system;
modules = [ module versionModule ]; modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ];
}).config; }).config;
iso = config.system.build.isoImage; iso = config.system.build.isoImage;
@ -54,7 +53,6 @@ let
with import <nixpkgs> { inherit system; }; with import <nixpkgs> { inherit system; };
let let
versionModule = { system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix; };
config = (import lib/eval-config.nix { config = (import lib/eval-config.nix {
inherit system; inherit system;
@ -62,6 +60,7 @@ let
}).config; }).config;
tarball = config.system.build.tarball; tarball = config.system.build.tarball;
in in
tarball // tarball //
{ meta = { { meta = {
@ -184,7 +183,8 @@ in {
config = (import lib/eval-config.nix { config = (import lib/eval-config.nix {
inherit system; inherit system;
modules = modules =
[ ./modules/virtualisation/virtualbox-image.nix [ versionModule
./modules/virtualisation/virtualbox-image.nix
./modules/installer/cd-dvd/channel.nix ./modules/installer/cd-dvd/channel.nix
./modules/profiles/demo.nix ./modules/profiles/demo.nix
]; ];