Merge master into staging-next

NixOS · Nov 10, 2024 · aa75974 · aa75974
2 parents 0644d3b + 4fee2cd
commit aa75974
Show file tree

Hide file tree

Showing 7 changed files with 310 additions and 185 deletions.
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
@@ -95,7 +95,7 @@ in
         after = ["network.target"];
         wantedBy = ["multi-user.target"];
         script = ''
-          ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
+          exec ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
         '';
         serviceConfig = {
           User = "boinc";

diff --git a/nixos/modules/services/misc/guix/default.nix b/nixos/modules/services/misc/guix/default.nix
@@ -275,7 +275,7 @@ in
       systemd.services.guix-daemon = {
         environment = serviceEnv;
         script = ''
-          ${lib.getExe' package "guix-daemon"} \
+          exec ${lib.getExe' package "guix-daemon"} \
             --build-users-group=${cfg.group} \
             ${lib.optionalString (cfg.substituters.urls != [ ])
               "--substitute-urls='${lib.concatStringsSep " " cfg.substituters.urls}'"} \
@@ -384,7 +384,7 @@ in
             }
         '';
         script = ''
-          ${lib.getExe' package "guix"} publish \
+          exec ${lib.getExe' package "guix"} publish \
             --user=${cfg.publish.user} --port=${builtins.toString cfg.publish.port} \
             ${lib.escapeShellArgs cfg.publish.extraArgs}
         '';
@@ -440,12 +440,10 @@ in
         description = "Guix garbage collection";
         startAt = cfg.gc.dates;
         script = ''
-          ${lib.getExe' package "guix"} gc ${lib.escapeShellArgs cfg.gc.extraArgs}
+          exec ${lib.getExe' package "guix"} gc ${lib.escapeShellArgs cfg.gc.extraArgs}
         '';
-
         serviceConfig = {
           Type = "oneshot";
-
           PrivateDevices = true;
           PrivateNetwork = true;
           ProtectControlGroups = true;