Skip to content

virtualisation: Use system.build.image, normalize file names#359339

Merged
zimbatm merged 16 commits intoNixOS:masterfrom
phaer:virtualisation-images-phase-two
Nov 29, 2024
Merged

virtualisation: Use system.build.image, normalize file names#359339
zimbatm merged 16 commits intoNixOS:masterfrom
phaer:virtualisation-images-phase-two

Conversation

@phaer
Copy link
Member

@phaer phaer commented Nov 26, 2024

This uses changes in #359326 and #359328 to normalize file names of disk images generated by modules in virtualisation. Please see the PR linked below for a table listing all changed filenames

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

  • 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 Nov 26, 2024
@phaer phaer mentioned this pull request Nov 26, 2024
13 tasks
@phaer phaer force-pushed the virtualisation-images-phase-two branch 2 times, most recently from 9167e27 to 3eaa79e Compare November 26, 2024 17:15
@phaer phaer force-pushed the virtualisation-images-phase-two branch from 3eaa79e to e4217e1 Compare November 26, 2024 20:43
@phaer phaer marked this pull request as ready for review November 26, 2024 20:43
@nix-owners nix-owners bot requested a review from adamcstephens November 26, 2024 20:44
@ofborg ofborg bot added ofborg-internal-error Ofborg encountered an error 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 27, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 28, 2024
@phaer phaer removed the ofborg-internal-error Ofborg encountered an error label Nov 28, 2024
Copy link
Contributor

@adamcstephens adamcstephens left a comment

Choose a reason for hiding this comment

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

Reviewing this for the lxc container changes, I think it looks good. Thanks for undertaking this standardization. ❤️

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Nov 29, 2024
@zimbatm
Copy link
Member

zimbatm commented Nov 29, 2024

Let's merge this before it diverges?

@adamcstephens
Copy link
Contributor

lol, of course I just caused it to diverge. I'm happy to merge once rebased.

@phaer phaer force-pushed the virtualisation-images-phase-two branch from e4217e1 to c78003c Compare November 29, 2024 16:14
@phaer
Copy link
Member Author

phaer commented Nov 29, 2024

Just rebased, if it still looks good it might be good to merge. I did not test a full rebuild of all image since the rebase yet though and probably won't get to it before Monday.

I'll rebase, test & undraft #359345 once this one is done.

@zimbatm
Copy link
Member

zimbatm commented Nov 29, 2024

Passed nixpkgs-review 👍

@zimbatm zimbatm merged commit 223586a into NixOS:master Nov 29, 2024
@phaer phaer deleted the virtualisation-images-phase-two branch November 30, 2024 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants