Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

nix-gc: call nix-collect-garbage in a shell script

Browse source 
This will match the behavior in the upstream service which allows the
user to set options to something that uses shell syntax.
This commit is contained in:
Ninja3047 2024-07-22 21:51:02 -04:00 committed by Robert Helgesson
parent 89670e27e1
commit db40fead89
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/services/nix-gc.nix
View file

@ -110,9 +110,10 @@ in {
systemd.user.services.nix-gc = { systemd.user.services.nix-gc = {
Unit = { Description = "Nix Garbage Collector"; }; Unit = { Description = "Nix Garbage Collector"; };
Service = { Service = {
ExecStart = "${nixPackage}/bin/nix-collect-garbage ${ ExecStart = toString (pkgs.writeShellScript "nix-gc" ''
exec "${nixPackage}/bin/nix-collect-garbage ${
lib.optionalString (cfg.options != null) cfg.options lib.optionalString (cfg.options != null) cfg.options
}"; }"'');
}; };
}; };
systemd.user.timers.nix-gc = { systemd.user.timers.nix-gc = {

2
tests/modules/services/nix-gc/basic.nix
View file

@ -4,7 +4,7 @@
nix.gc = { nix.gc = {
automatic = true; automatic = true;
frequency = "monthly"; frequency = "monthly";
options = "--delete-older-than 30d"; options = "--delete-older-than 30d --max-freed $((64 * 1024**3))";
}; };
test.stubs.nix = { name = "nix"; }; test.stubs.nix = { name = "nix"; };

2
tests/modules/services/nix-gc/expected.service
View file

@ -1,5 +1,5 @@
[Service] [Service]
ExecStart=@nix@/bin/nix-collect-garbage --delete-older-than 30d ExecStart=/nix/store/00000000000000000000000000000000-nix-gc
[Unit] [Unit]
Description=Nix Garbage Collector Description=Nix Garbage Collector