Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

iso-image: include release and system info in iso filenames again #372127

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

phaer
Copy link
Member

@phaer phaer commented Jan 8, 2025

This should hopefully fix a channel-blocking mistake i made w.r.t. to filenames of generated isoImages in #359345. Thanks @vcunat for reporting and apologies for breaking it!

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.1d95cb5-x86_64-linux.iso again instead of just nixos-minimal.iso.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 8, 2025
@phaer phaer requested a review from vcunat January 8, 2025 13:05
@nix-owners nix-owners bot requested a review from ElvishJerricco January 8, 2025 13:05
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 8, 2025
@phaer phaer changed the title iso-image: fix output filename iso-image: include release and system info in iso filenames again Jan 8, 2025
@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Jan 8, 2025
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.1d95cb5-x86_64-linux.iso` again instead
of just nixos-minimal.iso.
@phaer phaer force-pushed the fix-iso-filename branch from be1f81b to 0b162c3 Compare January 8, 2025 13:35
Copy link
Member

@mweinelt mweinelt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/nix/store/ybb761l6iaxd6pprj8haxqmz1dvg5cxr-nixos-minimal.iso
/nix/store/3n62kvaxy8pxmrz961fa3bhfb7z6fkyz-nixos-minimal-25.05beta708350.1d95cb5-x86_64-linux.iso

@mweinelt mweinelt merged commit bffc22e into NixOS:master Jan 8, 2025
24 of 28 checks passed
@phaer phaer deleted the fix-iso-filename branch January 8, 2025 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: channel blocker Blocks a channel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants