diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | etc/guix-gc.timer.in (renamed from etc/guix-gc.timer) | 0 | ||||
| -rw-r--r-- | nix/local.mk | 12 |
3 files changed, 10 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index cdb3869de04..66c2ea39a5c 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -76,6 +76,7 @@ | |||
| 76 | /etc/guix-publish.conf | 76 | /etc/guix-publish.conf |
| 77 | /etc/guix-publish.service | 77 | /etc/guix-publish.service |
| 78 | /etc/guix-gc.service | 78 | /etc/guix-gc.service |
| 79 | /etc/guix-gc.timer | ||
| 79 | /etc/init.d/guix-daemon | 80 | /etc/init.d/guix-daemon |
| 80 | /etc/openrc/guix-daemon | 81 | /etc/openrc/guix-daemon |
| 81 | /guix-* | 82 | /guix-* |
diff --git a/etc/guix-gc.timer b/etc/guix-gc.timer.in index 192132fbda5..192132fbda5 100644 --- a/etc/guix-gc.timer +++ b/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 = \ | |||
| 152 | (lambda (in) \ | 152 | (lambda (in) \ |
| 153 | (write (get-string-all in) out)))))" | 153 | (write (get-string-all in) out)))))" |
| 154 | 154 | ||
| 155 | # The '.service' files for systemd. | 155 | # The '.service' and other files for systemd. |
| 156 | systemdservicedir = $(libdir)/systemd/system | 156 | systemdservicedir = $(libdir)/systemd/system |
| 157 | nodist_systemdservice_DATA = \ | 157 | nodist_systemdservice_DATA = \ |
| 158 | etc/gnu-store.mount \ | 158 | etc/gnu-store.mount \ |
| 159 | etc/guix-daemon.service \ | 159 | etc/guix-daemon.service \ |
| 160 | etc/guix-publish.service \ | 160 | etc/guix-publish.service \ |
| 161 | etc/guix-gc.service | 161 | etc/guix-gc.service \ |
| 162 | etc/guix-gc.timer | ||
| 162 | 163 | ||
| 163 | etc/%.mount: etc/%.mount.in \ | 164 | etc/%.mount: etc/%.mount.in \ |
| 164 | $(top_builddir)/config.status | 165 | $(top_builddir)/config.status |
| @@ -175,6 +176,11 @@ etc/guix-%.service: etc/guix-%.service.in \ | |||
| 175 | < "$<" > "$@.tmp"; \ | 176 | < "$<" > "$@.tmp"; \ |
| 176 | mv "$@.tmp" "$@" | 177 | mv "$@.tmp" "$@" |
| 177 | 178 | ||
| 179 | etc/guix-gc.timer: etc/guix-gc.timer.in \ | ||
| 180 | $(top_builddir)/config.status | ||
| 181 | $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ | ||
| 182 | cp "$@.in" "$@" | ||
| 183 | |||
| 178 | # The service script for sysvinit. | 184 | # The service script for sysvinit. |
| 179 | sysvinitservicedir = $(sysconfdir)/init.d | 185 | sysvinitservicedir = $(sysconfdir)/init.d |
| 180 | nodist_sysvinitservice_DATA = etc/init.d/guix-daemon | 186 | nodist_sysvinitservice_DATA = etc/init.d/guix-daemon |
| @@ -225,7 +231,7 @@ EXTRA_DIST += \ | |||
| 225 | etc/guix-publish.service.in \ | 231 | etc/guix-publish.service.in \ |
| 226 | etc/guix-publish.conf.in \ | 232 | etc/guix-publish.conf.in \ |
| 227 | etc/guix-gc.service.in \ | 233 | etc/guix-gc.service.in \ |
| 228 | etc/guix-gc.timer \ | 234 | etc/guix-gc.timer.in \ |
| 229 | etc/init.d/guix-daemon.in \ | 235 | etc/init.d/guix-daemon.in \ |
| 230 | etc/openrc/guix-daemon.in | 236 | etc/openrc/guix-daemon.in |
| 231 | 237 | ||
