nixos-generate-config: Add a flake default to the conf file (#410332)

authored by Tristan Ross and committed by GitHub f485e839 71c09d9c

+7
+1
nixos/modules/installer/tools/nixos-generate-config.pl
··· 49 49 $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path 50 50 } 51 51 $kernel = $cfg->val("Defaults", "Kernel") // $kernel; 52 + $flake = $cfg->val("Defaults", "Flake") // $flake; 52 53 } 53 54 54 55 for (my $n = 0; $n < scalar @ARGV; $n++) {
+6
nixos/tests/nixos-generate-config.nix
··· 46 46 machine.succeed("rm -rf /etc/nixos") 47 47 machine.succeed("nixos-generate-config --flake") 48 48 machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix") 49 + 50 + machine.succeed("mv /etc/nixos /etc/nixos-with-flake-arg") 51 + machine.succeed("printf '[Defaults]\nFlake = 1\n' > /etc/nixos-generate-config.conf") 52 + machine.succeed("nixos-generate-config") 53 + machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix") 54 + machine.succeed("diff -r /etc/nixos /etc/nixos-with-flake-arg") 49 55 ''; 50 56 }