nixos: Cut off virtualisation.vmVariant.virtualisation.vmVariant #390717
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
github-actions
bot
added
6.topic: nixos
roberth
force-pushed
the
vmvariant-no-nesting
branch
from
f1d462b to
656c2f4
Compare
github-actions
bot
added
10.rebuild-darwin: 0
|
@ofborg test nixos-rebuild-specialisations nixos-rebuild-specialisations-ng |
github-actions
bot
added
10.rebuild-linux: 0
aforemny
approved these changes
Mar 18, 2025
There was a problem hiding this comment.
LGTM!
The following tests were successful to my expectation:
nix-build $(nix-instantiate --expr 'let inherit ((import ./nixos {
configuration = { modulesPath, ... }: {
imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
config = {
virtualisation.vmVariant.networking.hostName = "vm";
};
};
}).config.system.build) toplevel vm vmWithBootLoader; in [ toplevel vm vmWithBootLoader ]')
warning: you did not specify '--add-root'; the result might be removed by the garbage collector
/nix/store/sfr7grrdh5v4y978q492qvphvgd828d4-nixos-system-nixos-25.05pre-git
/nix/store/ihxssrwczgqnrr2x69illciai2d3j8ws-nixos-vm
/nix/store/zps0bk3wk24nx474ddm8sfw8cqp4ax99-nixos-vm
nix-instantiate --eval --strict --expr 'let inherit (import ./nixos {
configuration = { modulesPath, ... }: {
config = {
virtualisation.vmVariant.networking.hostName = "vm";
};
};
}) config; in [ config.networking.hostName config.virtualisation.vmVariant.networking.hostName ]'
[ "nixos" "vm" ]
nix-instantiate --eval --strict --expr 'let inherit (import ./nixos {
configuration = { modulesPath, ... }: {
config = {
virtualisation.vmVariant.networking.hostName = "vm";
};
};
}) config; in config.virtualisation.vmVariant.virtualisation.vmVariant'
error: virtualisation.vmVariant*.virtualisation.vmVariant is not supported
PS. I rebased onto master before testing.
| @@ -2,6 +2,7 @@ | |||
| config, | |||
| extendModules, | |||
| lib, | |||
| specialArgs, | |||
wegank
added
the
12.approvals: 1
mightyiam
reviewed
Mar 20, 2025
nixos/tests/all-tests.nix
Outdated
Comment on lines
836
to
846
| nixos-rebuild-build-vm-image-script = callTest { | ||
| test = | ||
| (pkgs.nixos { nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform; }) | ||
| .config.virtualisation.vmVariant.system.build.vm; | ||
| }; | ||
| nixos-rebuild-build-vm-with-bootloader-image-script = callTest { | ||
| test = | ||
| (pkgs.nixos { nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform; }) | ||
| .config.virtualisation.vmVariantWithBootLoader.system.build.vmWithBootLoader; | ||
| }; |
There was a problem hiding this comment.
Since #391021 has been merged these seem extraneous.
roberth
force-pushed
the
vmvariant-no-nesting
branch
2 times, most recently
from
fd778ef to
5b9533d
Compare
This produced an unnecessarily infinitely deep config tree. The "cut off" option can be written to, but not read from. Being written to is important, because it allows users to conveniently define vmVariant config without having to check isVmVariant. There's a small chance that someone *reads* from vmVariant config in their normal config, and for them it will not be possible to evaluate with `nixos-rebuild build-vm` anymore. If this is a problem, we could perhaps make the vmVariant root appear instead of the `throw` error. This could also be done using mkOption apply.
github-actions
bot
added
10.rebuild-linux: 1-10
and removed
10.rebuild-linux: 0
roberth
force-pushed
the
vmvariant-no-nesting
branch
from
5b9533d to
9aab8b8
Compare
|
@ofborg test vm-variant |
mightyiam
approved these changes
Mar 20, 2025
wegank
added
12.approvals: 2
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 produced an unnecessarily infinitely deep config tree, which is troublesome for configuration diffing.
The "cut off" option can be written to, but not read from. Being written to is important, because it allows users to conveniently define vmVariant config without having to check isVmVariant.
There's a small chance that someone reads from vmVariant config in their normal config, and for them it will not be possible to evaluate with
nixos-rebuild build-vmanymore.If this is a problem, we could perhaps make the vmVariant root appear instead of the mkSinkUndeclaredOptions error. This could be done using mkOption apply.
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.