git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #97738 from cole-h/build-vm-for-flakes

nixos-rebuild: add flake support for build-vm

commit684d691c6e9d49d3aab96f4053d011c225aa75bf authorWORLDofPEACE <worldofpeace@protonmail.ch> dateSun 20 Sep 2020, 15:10 (6 years ago) parent8f00cc4e26b348
2 files changed+29−7
flake.nix+23−3 nixos/modules/installer/tools/nixos-rebuild.sh+6−4
flake.nix+23−3
@@ -5,7 +5,6 @@
55
66 outputs = { self }:
77 let
8−
98 jobs = import ./pkgs/top-level/release.nix {
109 nixpkgs = self;
1110 };
@@ -28,10 +27,31 @@
2827 lib = lib.extend (final: prev: {
2928 nixosSystem = { modules, ... } @ args:
3029 import ./nixos/lib/eval-config.nix (args // {
31− modules = modules ++
32− [ { system.nixos.versionSuffix =
30+ modules =
31+ let
32+ vmConfig = (import ./nixos/lib/eval-config.nix
33+ (args // {
34+ modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ];
35+ })).config;
36+
37+ vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix
38+ (args // {
39+ modules = modules ++ [
40+ ./nixos/modules/virtualisation/qemu-vm.nix
41+ { virtualisation.useBootLoader = true; }
42+ ];
43+ })).config;
44+ in
45+ modules ++ [
46+ {
47+ system.nixos.versionSuffix =
3348 ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
3449 system.nixos.revision = final.mkIf (self ? rev) self.rev;
50+
51+ system.build = {
52+ vm = vmConfig.system.build.vm;
53+ vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
54+ };
3555 }
3656 ];
3757 });
nixos/modules/installer/tools/nixos-rebuild.sh+6−4
@@ -438,15 +438,17 @@ if [ -z "$rollback" ]; then
438438 if [[ -z $flake ]]; then
439439 pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")"
440440 else
441− echo "$0: 'build-vm' is not supported with '--flake'" >&2
442− exit 1
441+ nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vm" \
442+ "${extraBuildFlags[@]}" "${lockFlags[@]}"
443+ pathToConfig="$(readlink -f ./result)"
443444 fi
444445 elif [ "$action" = build-vm-with-bootloader ]; then
445446 if [[ -z $flake ]]; then
446447 pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")"
447448 else
448− echo "$0: 'build-vm-with-bootloader' is not supported with '--flake'" >&2
449− exit 1
449+ nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vmWithBootLoader" \
450+ "${extraBuildFlags[@]}" "${lockFlags[@]}"
451+ pathToConfig="$(readlink -f ./result)"
450452 fi
451453 else
452454 showSyntax