image/images: Adapt remaining images to system.build.image & normalized filenames, #359345
+570
−155
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A new NixOS module that adds two new options to `system.build`: - imageModules: An attrset mapping image variant names to a list of nixos modules to use when building such images. - images: An attrset mapping image variant names to a nixos instance based on the current config plus variant-specific modules (see `system.build.imageModules` above.
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
github-actions
bot
added
6.topic: nixos
13 tasks
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.