pyrox.dev
lol
nixos: rename some outputs for better discoverability in /nix/store
+7
-5
+3
-1
nixos/modules/system/activation/top-level.nix
+3
-1
nixos/modules/system/activation/top-level.nix
···
99
99
# makes it bootable.
100
100
baseSystem = showWarnings (
101
101
if [] == failed then pkgs.stdenv.mkDerivation {
102
-
name = "nixos-${config.system.nixosVersion}";
102
+
name = let hn = config.networking.hostName;
103
+
nn = if (hn != "") then hn else "unnamed";
104
+
in "nixos-system-${nn}-${config.system.nixosVersion}";
103
105
preferLocalBuild = true;
104
106
allowSubstitutes = false;
105
107
buildCommand = systemBuilder;
+1
-1
nixos/modules/virtualisation/azure-image.nix
+1
-1
nixos/modules/virtualisation/azure-image.nix
···
26
26
${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
27
27
rm $diskImage
28
28
'';
29
-
diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
29
+
diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
30
30
buildInputs = [ pkgs.utillinux pkgs.perl ];
31
31
exportReferencesGraph =
32
32
[ "closure" config.system.build.toplevel ];
+1
-1
nixos/modules/virtualisation/brightbox-image.nix
+1
-1
nixos/modules/virtualisation/brightbox-image.nix
···
26
26
rm $diskImageBase
27
27
popd
28
28
'';
29
-
diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
29
+
diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
30
30
buildInputs = [ pkgs.utillinux pkgs.perl ];
31
31
exportReferencesGraph =
32
32
[ "closure" config.system.build.toplevel ];
+1
-1
nixos/modules/virtualisation/google-compute-image.nix
+1
-1
nixos/modules/virtualisation/google-compute-image.nix
···
30
30
rm $out/disk.raw
31
31
popd
32
32
'';
33
-
diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
33
+
diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
34
34
buildInputs = [ pkgs.utillinux pkgs.perl ];
35
35
exportReferencesGraph =
36
36
[ "closure" config.system.build.toplevel ];
+1
-1
nixos/modules/virtualisation/virtualbox-image.nix
+1
-1
nixos/modules/virtualisation/virtualbox-image.nix
···
101
101
system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova"
102
102
{ buildInputs = [ pkgs.linuxPackages.virtualbox ];
103
103
vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})";
104
-
fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
104
+
fileName = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
105
105
}
106
106
''
107
107
echo "creating VirtualBox VM..."