nix-gc: remove extraneous quotes from shell script

nix-community · Jul 31, 2024 · 58cef37 · 58cef37
1 parent 4fcd54d
commit 58cef37
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/modules/services/nix-gc.nix b/modules/services/nix-gc.nix
@@ -111,10 +111,10 @@ in {
         Unit = { Description = "Nix Garbage Collector"; };
         Service = {
           Type = "oneshot";
-          ExecStart = toString (pkgs.writeShellScript "nix-gc" ''
-            exec "${nixPackage}/bin/nix-collect-garbage ${
+          ExecStart = toString (pkgs.writeShellScript "nix-gc"
+            "exec ${nixPackage}/bin/nix-collect-garbage ${
               lib.optionalString (cfg.options != null) cfg.options
-            }"'');
+            }");
         };
       };
       systemd.user.timers.nix-gc = {

diff --git a/tests/modules/services/nix-gc/basic.nix b/tests/modules/services/nix-gc/basic.nix
@@ -25,5 +25,16 @@
     timerFile=$(normalizeStorePaths $timerFile)
 
     assertFileContent $timerFile ${./expected.timer}
+
+    nixgcScriptFile=$(grep -o \
+      '/nix/store/.*-nix-gc' \
+      $TESTED/home-files/.config/systemd/user/nix-gc.service
+    )
+
+    assertFileExists $nixgcScriptFile
+
+    nixgcScriptFile=$(normalizeStorePaths $nixgcScriptFile)
+
+    assertFileContent $nixgcScriptFile ${./nix-gc-script-expected}
   '';
 }
diff --git a/tests/modules/services/nix-gc/nix-gc-script-expected b/tests/modules/services/nix-gc/nix-gc-script-expected
@@ -0,0 +1,2 @@
+#!/nix/store/00000000000000000000000000000000-bash/bin/bash
+exec @nix@/bin/nix-collect-garbage --delete-older-than 30d --max-freed $((64 * 1024**3))