diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-01-09 20:52:08 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-01-09 20:52:08 +0300 |
| commit | c03fe792656b506b40e18d9c070d0bad8f7f1c3e (patch) | |
| tree | fa3b8e6d5bf875f30a5629f72d76a87e0d67944a /nixos/modules/virtualisation | |
| parent | 84631f32276a86a1748effc7399c8c0ea97500ba (diff) | |
| parent | 119c8f91e7f17d2cb95f42985816820600c389cf (diff) | |
| download | nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.gz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.bz2 nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.lz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.xz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.zst nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.zip | |
Merge pull request #10996 from oxij/nixos-label
nixos: introduce system.nixosLabel support
Diffstat (limited to 'nixos/modules/virtualisation')
4 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 024be4a51163..1ab869cd6a88 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -26,7 +26,7 @@ in ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd rm $diskImage ''; - diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; + diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; buildInputs = [ pkgs.utillinux pkgs.perl ]; exportReferencesGraph = [ "closure" config.system.build.toplevel ]; diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 0eb46d39b521..b6b2bd4f69be 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -26,7 +26,7 @@ in rm $diskImageBase popd ''; - diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; + diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; buildInputs = [ pkgs.utillinux pkgs.perl ]; exportReferencesGraph = [ "closure" config.system.build.toplevel ]; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index f21ddc12ca5a..77074b882468 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -30,7 +30,7 @@ in rm $out/disk.raw popd ''; - diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; + diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; buildInputs = [ pkgs.utillinux pkgs.perl ]; exportReferencesGraph = [ "closure" config.system.build.toplevel ]; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 425726333c40..da9e75a003ad 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -44,8 +44,8 @@ in { system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova" { buildInputs = [ pkgs.linuxPackages.virtualbox ]; - vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})"; - fileName = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova"; + vmName = "NixOS ${config.system.nixosLabel} (${pkgs.stdenv.system})"; + fileName = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.ova"; } '' echo "creating VirtualBox VM..." |