mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00
Code Activity

etc: merge etcChecks into checks

Browse source 
The `activate-system` daemon will now run all the checks, which seems
like probably a good idea anyway?
This commit is contained in:
Emily 2025-01-11 15:44:41 +00:00
parent b317dbefbd
commit 26c02d8278
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/nix/default.nix
View file

@ -876,7 +876,7 @@ in
#
# TODO: Maybe this could use a more general file placement mechanism
# to express that we want it deleted and know only one hash?
system.activationScripts.etcChecks.text = mkAfter ''
system.activationScripts.checks.text = mkAfter ''
nixCustomConfKnownSha256Hashes=(
# v0.33.0
6787fade1cf934f82db554e78e1fc788705c2c5257fddf9b59bdd963ca6fec63

2
modules/services/activate-system/default.nix
View file

@ -65,7 +65,7 @@ in
ln -sfn /run/current-system /nix/var/nix/gcroots/current-system
fi
${config.system.activationScripts.etcChecks.text}
${config.system.activationScripts.checks.text}
${config.system.activationScripts.etc.text}
${config.system.activationScripts.keyboard.text}
'';

1
modules/system/activation-scripts.nix
View file

@ -113,7 +113,6 @@ in
${cfg.activationScripts.preActivation.text}
${cfg.activationScripts.etcChecks.text}
${cfg.activationScripts.createRun.text}
${cfg.activationScripts.checks.text}
${cfg.activationScripts.extraActivation.text}

2
modules/system/etc.nix
View file

@ -39,7 +39,7 @@ in
'') etc}
'';
system.activationScripts.etcChecks.text = ''
system.activationScripts.checks.text = mkAfter ''
declare -A etcSha256Hashes=(
${concatMapStringsSep "\n "
(attr: