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

activation: rename pre/post hooks

Browse source 
Renamed extraPostActivation and extraUserPostActivation.
This commit is contained in:
Daiderd Jordan 2018-01-13 17:12:02 +01:00
parent 789623213e
commit 174a36a296
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/alias.nix
View file

@ -21,6 +21,8 @@ in
assertions = assertions =
[ { assertion = config.nix.profile == null; message = "nix.profile was renamed to nix.package"; } [ { assertion = config.nix.profile == null; message = "nix.profile was renamed to nix.package"; }
{ assertion = config.security.enableAccessibilityAccess == null; message = "security.enableAccessibilityAccess was removed, it's broken since 10.12 because of SIP"; } { assertion = config.security.enableAccessibilityAccess == null; message = "security.enableAccessibilityAccess was removed, it's broken since 10.12 because of SIP"; }
{ assertion = config.system.activationScripts.extraPostActivation.text == ""; message = "system.activationScripts.extraPostActivation was renamed to system.activationScripts.postActivation"; }
{ assertion = config.system.activationScripts.extraUserPostActivation.text == ""; message = "system.activationScripts.extraUserPostActivation was renamed to system.activationScripts.postUserActivation"; }
]; ];
warnings = mkIf (config.networking.networkservices != null) [ warnings = mkIf (config.networking.networkservices != null) [
@ -31,5 +33,8 @@ in
nix.package = mkIf (config.nix.profile != null) config.nix.profile; nix.package = mkIf (config.nix.profile != null) config.nix.profile;
system.activationScripts.extraPostActivation.text = mkDefault "";
system.activationScripts.extraUserPostActivation.text = mkDefault "";
}; };
} }

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

@ -50,8 +50,9 @@ in
# Ensure a consistent umask. # Ensure a consistent umask.
umask 0022 umask 0022
${cfg.activationScripts.extraActivation.text} ${cfg.activationScripts.preActivation.text}
${cfg.activationScripts.extraActivation.text}
${cfg.activationScripts.groups.text} ${cfg.activationScripts.groups.text}
${cfg.activationScripts.users.text} ${cfg.activationScripts.users.text}
${cfg.activationScripts.nix.text} ${cfg.activationScripts.nix.text}
@ -63,7 +64,7 @@ in
${cfg.activationScripts.networking.text} ${cfg.activationScripts.networking.text}
${cfg.activationScripts.keyboard.text} ${cfg.activationScripts.keyboard.text}
${cfg.activationScripts.extraPostActivation.text} ${cfg.activationScripts.postActivation.text}
# Make this configuration the current configuration. # Make this configuration the current configuration.
# The readlink is there to ensure that when $systemConfig = /system # The readlink is there to ensure that when $systemConfig = /system
@ -91,14 +92,14 @@ in
# Ensure a consistent umask. # Ensure a consistent umask.
umask 0022 umask 0022
${cfg.activationScripts.preUserActivation.text}
${cfg.activationScripts.checks.text} ${cfg.activationScripts.checks.text}
${cfg.activationScripts.extraUserActivation.text} ${cfg.activationScripts.extraUserActivation.text}
${cfg.activationScripts.defaults.text} ${cfg.activationScripts.defaults.text}
${cfg.activationScripts.userLaunchd.text} ${cfg.activationScripts.userLaunchd.text}
${cfg.activationScripts.extraUserPostActivation.text} ${cfg.activationScripts.postUserActivation.text}
exit $_status exit $_status
''; '';
@ -106,9 +107,11 @@ in
# Extra activation scripts, that can be customized by users # Extra activation scripts, that can be customized by users
# don't use this unless you know what you are doing. # don't use this unless you know what you are doing.
system.activationScripts.extraActivation.text = mkDefault ""; system.activationScripts.extraActivation.text = mkDefault "";
system.activationScripts.extraPostActivation.text = mkDefault ""; system.activationScripts.preActivation.text = mkDefault "";
system.activationScripts.postActivation.text = mkDefault "";
system.activationScripts.extraUserActivation.text = mkDefault ""; system.activationScripts.extraUserActivation.text = mkDefault "";
system.activationScripts.extraUserPostActivation.text = mkDefault ""; system.activationScripts.preUserActivation.text = mkDefault "";
system.activationScripts.postUserActivation.text = mkDefault "";
}; };
} }