[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/13: gnu: direvent: Update to 5.3.
From: |
guix-commits |
Subject: |
09/13: gnu: direvent: Update to 5.3. |
Date: |
Mon, 3 Jan 2022 23:39:18 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit a0c6b55881ec6d90bff44f67c7eda04b2a6feaf7
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Jan 4 05:06:11 2022 +0100
gnu: direvent: Update to 5.3.
* gnu/packages/admin.scm (direvent): Update to 5.3.
[source]: Drop hard-to-maintain snippet…
[arguments]: …in favour of a wider regexp in the 'substitute-file-names
phase, renamed from 'patch-/bin/sh, as we also patch "/bin/kill" to keep
the tests passing.
---
gnu/packages/admin.scm | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 48a65e649b..deac09c23b 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2379,37 +2379,33 @@ features of ls(1), find(1), stat(1) and du(1).")
(define-public direvent
(package
(name "direvent")
- (version "5.2")
+ (version "5.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/direvent/direvent-"
version ".tar.gz"))
(sha256
(base32
- "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613"))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- (substitute* "tests/testsuite"
- (("#![[:blank:]]?/bin/sh")
- "#!$SHELL"))))))
+ "15y4jk5vlcd003bvf42c6z9zd4gz4pwqpwaapqmyk7x4gnksh1cl"))))
(build-system gnu-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
- (add-before 'build 'patch-/bin/sh
+ (add-before 'build 'substitute-file-names
(lambda* (#:key inputs #:allow-other-keys)
;; Use the right shell when executing the watcher and
;; user-provided shell commands.
(let ((bash (assoc-ref inputs "bash")))
(substitute* '("src/direvent.c" "src/progman.c")
(("\"/bin/sh\"")
- (string-append "\"" bash "/bin/sh\"")))
+ (string-append "\"" bash "/bin/sh\""))))
- ;; Adjust the 'shell.at' test accordingly.
- (substitute* "tests/testsuite"
- (("SHELL=/bin/sh")
- (string-append "SHELL=" bash "/bin/sh")))))))))
+ ;; Adjust the test suite similarly.
+ (substitute* "tests/testsuite"
+ (("(SHELL=|#![[:space:]]*)/bin/sh" _ prefix)
+ (string-append prefix (which "sh")))
+ (("/bin/kill")
+ (which "kill"))))))))
(home-page "https://www.gnu.org.ua/software/direvent/")
(synopsis "Daemon to monitor directories for events such as file removal")
(description
- 02/13: gnu: Add perl-app-xml-docbook-builder., (continued)
- 02/13: gnu: Add perl-app-xml-docbook-builder., guix-commits, 2022/01/03
- 06/13: gnu: fortune-mod: Use G-expressions., guix-commits, 2022/01/03
- 01/13: gnu: fasm: Update to 1.73.29., guix-commits, 2022/01/03
- 05/13: gnu: rinutils: Update to 0.10.0., guix-commits, 2022/01/03
- 08/13: gnu: direvent: Use G-expressions., guix-commits, 2022/01/03
- 10/13: gnu: pgloader: Update to 3.6.3., guix-commits, 2022/01/03
- 13/13: gnu: diffoscope: Update to 198., guix-commits, 2022/01/03
- 07/13: gnu: fortune-mod: Update to 3.12.0., guix-commits, 2022/01/03
- 11/13: gnu: pgloader: Use G-expressions., guix-commits, 2022/01/03
- 12/13: gnu: mpv: Update to 0.34.1., guix-commits, 2022/01/03
- 09/13: gnu: direvent: Update to 5.3.,
guix-commits <=