guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/06: Revert "build: Add missing guix-gc.timer file to binary tarball."


From: guix-commits
Subject: 06/06: Revert "build: Add missing guix-gc.timer file to binary tarball."
Date: Wed, 27 Sep 2023 13:35:46 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 0500af5556307d0a4c14a23864e9e4bccd2643d7
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Sep 24 02:00:00 2023 +0200

    Revert "build: Add missing guix-gc.timer file to binary tarball."
    
    This reverts commit 69f6edc1a8596d2cb4c67e0435d35633af6f3cbc.
    
    The intention is good, but nodist_systemdservice_DATA are meant to be
    disposable artefacts generated from corresponding ‘.in’ files.
    
    etc/guix-gc.timer doesn't fit that description, breaking builds:
    
      $ make clean && make
      …
      make[2]: *** No rule to make target 'etc/guix-gc.timer', needed by 
'all-am'.  Stop.
---
 nix/local.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nix/local.mk b/nix/local.mk
index 61d59937e8..44a26dd2c8 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -153,9 +153,8 @@ systemdservicedir = $(libdir)/systemd/system
 nodist_systemdservice_DATA =                   \
   etc/gnu-store.mount                          \
   etc/guix-daemon.service                      \
-  etc/guix-gc.service                          \
-  etc/guix-gc.timer                            \
-  etc/guix-publish.service
+  etc/guix-publish.service                     \
+  etc/guix-gc.service
 
 etc/%.mount: etc/%.mount.in    \
                         $(top_builddir)/config.status



reply via email to

[Prev in Thread] Current Thread [Next in Thread]