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

nix-daemon: remove services.nix-daemon.enable

Browse source 
We now manage the launchd daemon unconditionally when we manage the
Nix installation.
This commit is contained in:
Emily 2025-01-28 19:30:20 +00:00
parent adc989f7ec
commit 8a94b5b99b
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/services/nix-daemon.nix
View file

@ -3,17 +3,18 @@
let let
cfg = config.services.nix-daemon; cfg = config.services.nix-daemon;
inherit (lib) mkDefault mkIf mkMerge mkOption types; inherit (lib) mkRemovedOptionModule mkDefault mkIf mkMerge mkOption types;
in in
{ {
options = { imports = [
services.nix-daemon.enable = mkOption { (mkRemovedOptionModule [ "services" "nix-daemon" "enable" ] ''
type = types.bool; nix-darwin now manages nix-daemon unconditionally when
default = config.nix.enable; `nix.enable` is on.
description = "Whether to enable the nix-daemon service."; '')
}; ];
options = {
services.nix-daemon.enableSocketListener = mkOption { services.nix-daemon.enableSocketListener = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -39,7 +40,7 @@ in
}; };
}; };
config = mkIf cfg.enable { config = mkIf config.nix.enable {
launchd.daemons.nix-daemon = { launchd.daemons.nix-daemon = {
command = lib.getExe' config.nix.package "nix-daemon"; command = lib.getExe' config.nix.package "nix-daemon";

1
tests/services-nix-daemon.nix
View file

@ -6,7 +6,6 @@ let
in in
{ {
services.nix-daemon.enable = true;
nix.package = nix; nix.package = nix;
launchd.labelPrefix = "org.nix-darwin"; # should not have an effect on nix-daemon launchd.labelPrefix = "org.nix-darwin"; # should not have an effect on nix-daemon

1
tests/sockets-nix-daemon.nix
View file

@ -5,7 +5,6 @@ let
in in
{ {
services.nix-daemon.enable = true;
services.nix-daemon.enableSocketListener = true; services.nix-daemon.enableSocketListener = true;
nix.package = nix; nix.package = nix;
launchd.labelPrefix = "org.nix-darwin"; # should not have an effect on nix-daemon launchd.labelPrefix = "org.nix-darwin"; # should not have an effect on nix-daemon