GNU bug report logs - #78066
[PATCH 0/2] Fix fail2ban build

Previous Next

Full log

View this message in rfc822 format

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78066 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [bug#78066] [PATCH v2 1/6] gnu: fail2ban: Move file deletion to source snippet.
Date: Sat,  3 May 2025 15:59:57 +0200

* gnu/packages/admin.scm (fail2ban)
  [arguments]<phases>: Move multiple file deletion from here...
  [source]<snippet>: ...to here.
---
 gnu/packages/admin.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d7ae926809..bd07a73c99 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -6244,6 +6244,15 @@ (define-public fail2ban
               (modules '((guix build utils)))
               (snippet
                '(begin
+                  ;; Replacing those by our own paths-guix.conf
+                  (with-directory-excursion "config"
+                    (for-each delete-file
+                              '("paths-arch.conf"
+                                "paths-debian.conf"
+                                "paths-fedora.conf"
+                                "paths-freebsd.conf"
+                                "paths-opensuse.conf"
+                                "paths-osx.conf")))
                   ;; Get rid of absolute file names.
                   (substitute* "setup.py"
                     (("/etc/fail2ban")
@@ -6307,14 +6316,6 @@ (define-public fail2ban
                     (lambda* (#:key inputs #:allow-other-keys)
                       ;; deleting things that are not feasible to fix
                       ;; or won't be used any way
-                      (with-directory-excursion "config"
-                        (for-each delete-file
-                                  '("paths-arch.conf"
-                                    "paths-debian.conf"
-                                    "paths-fedora.conf"
-                                    "paths-freebsd.conf"
-                                    "paths-opensuse.conf"
-                                    "paths-osx.conf")))
                       (with-directory-excursion "config/action.d"
                         (for-each delete-file
                                   '("apf.conf"
-- 
2.49.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.