From 61ca5bdbce55c38615b6f98a1835fa64b5220a7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 2 Mar 2025 14:21:59 +0200 Subject: [PATCH] nix: Install guix-gc systemd timer. * nix/local.mk (nodist_systemdservice_DATA): Add etc/guix-gc.timer. (etc/guix-gc.timer): Add rule to generate file. (EXTRA_DIST): Add guix-gc.timer.in, remove guix-gc.timer. * gitignore: Add etc/guix-gc.timer. Change-Id: I361aef660fe7d9803f58f4e31e16d8db595d1853 --- .gitignore | 1 + etc/{guix-gc.timer => guix-gc.timer.in} | 0 nix/local.mk | 12 +++++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) rename etc/{guix-gc.timer => guix-gc.timer.in} (100%) diff --git a/.gitignore b/.gitignore index cdb3869de04..66c2ea39a5c 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,7 @@ /etc/guix-publish.conf /etc/guix-publish.service /etc/guix-gc.service +/etc/guix-gc.timer /etc/init.d/guix-daemon /etc/openrc/guix-daemon /guix-* diff --git a/etc/guix-gc.timer b/etc/guix-gc.timer.in similarity index 100% rename from etc/guix-gc.timer rename to etc/guix-gc.timer.in diff --git a/nix/local.mk b/nix/local.mk index 0d23a48a024..53938ff52a9 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -152,13 +152,14 @@ noinst_HEADERS = \ (lambda (in) \ (write (get-string-all in) out)))))" -# The '.service' files for systemd. +# The '.service' and other files for systemd. systemdservicedir = $(libdir)/systemd/system nodist_systemdservice_DATA = \ etc/gnu-store.mount \ etc/guix-daemon.service \ etc/guix-publish.service \ - etc/guix-gc.service + etc/guix-gc.service \ + etc/guix-gc.timer etc/%.mount: etc/%.mount.in \ $(top_builddir)/config.status @@ -175,6 +176,11 @@ etc/guix-%.service: etc/guix-%.service.in \ < "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +etc/guix-gc.timer: etc/guix-gc.timer.in \ + $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ + cp "$@.in" "$@" + # The service script for sysvinit. sysvinitservicedir = $(sysconfdir)/init.d nodist_sysvinitservice_DATA = etc/init.d/guix-daemon @@ -225,7 +231,7 @@ EXTRA_DIST += \ etc/guix-publish.service.in \ etc/guix-publish.conf.in \ etc/guix-gc.service.in \ - etc/guix-gc.timer \ + etc/guix-gc.timer.in \ etc/init.d/guix-daemon.in \ etc/openrc/guix-daemon.in