diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-09-19 00:17:49 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-09-19 00:17:49 +0300 |
| commit | b2578aa871e532f4518408ff396e4899a23a38e3 (patch) | |
| tree | b7e69f8177d5dc64e9a418f9c368b614d7dbd755 /nixos | |
| parent | a5352a0da4af3dda43e7893f049d6348237c81a2 (diff) | |
| parent | a153de28bb79213903a53a8b5a0f36f92d082eec (diff) | |
| download | nixpkgs-b2578aa871e532f4518408ff396e4899a23a38e3.tar nixpkgs-b2578aa871e532f4518408ff396e4899a23a38e3.tar.gz nixpkgs-b2578aa871e532f4518408ff396e4899a23a38e3.tar.bz2 nixpkgs-b2578aa871e532f4518408ff396e4899a23a38e3.tar.lz nixpkgs-b2578aa871e532f4518408ff396e4899a23a38e3.tar.xz nixpkgs-b2578aa871e532f4518408ff396e4899a23a38e3.tar.zst nixpkgs-b2578aa871e532f4518408ff396e4899a23a38e3.zip | |
Merge pull request #9927 from oxij/nixos-discoverability
nixos: rename some outputs for better discoverability in /nix/store
Diffstat (limited to 'nixos')
5 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index a977ddb7bb4..81088a56fb1 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -99,7 +99,9 @@ let # makes it bootable. baseSystem = showWarnings ( if [] == failed then pkgs.stdenv.mkDerivation { - name = "nixos-${config.system.nixosVersion}"; + name = let hn = config.networking.hostName; + nn = if (hn != "") then hn else "unnamed"; + in "nixos-system-${nn}-${config.system.nixosVersion}"; preferLocalBuild = true; allowSubstitutes = false; buildCommand = systemBuilder; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 3f554d127c3..1013396c049 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-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; + diskImageBase = "nixos-image-${config.system.nixosVersion}-${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 3a956caca0c..0eb46d39b52 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-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; + diskImageBase = "nixos-image-${config.system.nixosVersion}-${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 516da926f84..f21ddc12ca5 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-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; + diskImageBase = "nixos-image-${config.system.nixosVersion}-${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 767a8c339a3..2d3b4834fc5 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -101,7 +101,7 @@ in { system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova" { buildInputs = [ pkgs.linuxPackages.virtualbox ]; vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})"; - fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova"; + fileName = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova"; } '' echo "creating VirtualBox VM..." |