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

image/images: Adapt remaining images to system.build.image & normalized filenames, #359345

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

phaer
Copy link
Member

@phaer phaer commented Nov 26, 2024

This builds on changes in #359339 and adapts remaining images to declare system.build.image and normalize file names.
It also adds a generic disk-image.nix in order to be able to build plain qcow/raw images, similar to how nixos generators does.

It was split off #347275 in order to upstream that one in smaller chunks, easier to review, test and (hopefully not) revert.

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 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 26, 2024
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 27, 2024
@phaer phaer force-pushed the virtualisation-images-phase-three branch from 4e802fe to 4c1cdf8 Compare November 29, 2024 22:24
@phaer phaer marked this pull request as ready for review November 29, 2024 22:24
@phaer phaer removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 29, 2024
@phaer phaer requested a review from adamcstephens November 29, 2024 22:25
@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 Nov 29, 2024
@infinisil
Copy link
Member

You're the lucky first customer of #359704 :D

and rename:
- sdImage.imageBaseName -> image.BaseName
- sdImage.imageName -> image.fileName
and rename:
- isoImage.isoBaseName -> image.baseName
- isoImage.isoName -> image.fileName
and rename:
- amazonImage.name -> image.baseName
New module to support qemu, qemu-efi, raw, raw-efi outputs as known
from nixos-generators in system.build.images.
to achieve feature parity with nixos-generators
@phaer phaer force-pushed the virtualisation-images-phase-three branch from 4c1cdf8 to bc627af Compare November 30, 2024 09:38
Copy link
Member

@Lassulus Lassulus left a comment

Choose a reason for hiding this comment

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

lgtm, this makes the whole image story much more cleaned up in nixpkgs.

@misuzu misuzu added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 14, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: GNOME GNOME desktop environment and its underlying platform 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 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants