gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tristan Ross
2025-06-06 09:17:30 -07:00
committed by GitHub
parent 71c09d9c9a d5960b9e03
commit f485e8390b
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/installer/tools/nixos-generate-config.pl
+1
View File
@@ -49,6 +49,7 @@ if (-e "/etc/nixos-generate-config.conf") {
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
}
$kernel = $cfg->val("Defaults", "Kernel") // $kernel;
$flake = $cfg->val("Defaults", "Flake") // $flake;
}
for (my $n = 0; $n < scalar @ARGV; $n++) {
nixos/tests/nixos-generate-config.nix
+6
View File
@@ -46,5 +46,11 @@
machine.succeed("rm -rf /etc/nixos")
machine.succeed("nixos-generate-config --flake")
machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix")
machine.succeed("mv /etc/nixos /etc/nixos-with-flake-arg")
machine.succeed("printf '[Defaults]\nFlake = 1\n' > /etc/nixos-generate-config.conf")
machine.succeed("nixos-generate-config")
machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix")
machine.succeed("diff -r /etc/nixos /etc/nixos-with-flake-arg")
'';
}