Commit 0b162c3d authored by phaer's avatar phaer
Browse files

iso-image: fix output filename 

While switching from isoImage.baseName to the unified image.baseName,
I accidentaly dropped label and system information from the iso filename.

This fixes it by including isoImage.edition in the default baseName for
all our isos. Resulting in filenames such as
`nixos-minimal-25.05beta708350.1d95cb5f-x86_64-linux.iso` again instead
of just nixos-minimal.iso.
parent 1a131ecc

nixos/modules/installer/cd-dvd/iso-image.nix

+1 −0
Original line number Diff line number Diff line
@@ -870,6 +870,7 @@ in 
    # Create the ISO image.

    image.extension = if config.isoImage.compressImage then "iso.zst" else "iso";

    image.filePath = "iso/${config.image.fileName}";

    image.baseName = "nixos${lib.optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}" }-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";

    system.build.image = config.system.build.isoImage;

    system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({

      inherit (config.isoImage) compressImage volumeID contents;

nixos/release.nix

+1 −3
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ let 


    hydraJob ((import lib/eval-config.nix {

      inherit system;

      modules = makeModules module {

        image.baseName = "nixos-${type}";

      };

      modules = makeModules module { };

    }).config.system.build.isoImage);