Subject: [bug#74271] [PATCH] gnu: entr: Update to 5.6

From: Javier Olaechea <[email-masked]>
Date: Sat, 9 Nov 2024 00:27:39 +0000

Adding two more patches on top

The first one makes the package conform with guix style. The second one
follows a recommendation made by guix lint, to swap  bash for bash-minimal.
I have verified that after doing the package not only builds but the entr
executable behaves as expected

Cheers,
Javier Olaechea

-- 
"I object to doing things that computers can do." — Olin Shivers
From b1646199f4aefa9c40f4b0971dedaad3e167abdd Mon Sep 17 00:00:00 2001
Message-ID: <[email-masked]>
In-Reply-To: <[email-masked]>
References: <[email-masked]>
From: Javier Olaechea <[email-masked]>
Date: Fri, 8 Nov 2024 18:51:09 -0500
Subject: [PATCH 2/3] gnu: entr: Improve package style.

* gnu/packages/entr.scm (entr): Improve package style. The changes are the
result of running ./pre-inst-env guix style entr.

Change-Id: I9579e326f88c6066078f2df78a12431f3f4badd4
---
 gnu/packages/entr.scm | 57 ++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm
index bb09acd6aa..f84a217814 100644
--- a/gnu/packages/entr.scm
+++ b/gnu/packages/entr.scm
@@ -37,37 +37,38 @@ (define-public entr
   (package
     (name "entr")
     (version "5.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://eradman.com/entrproject/code/entr-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0kniklgnqv4j9carm78d3423wlwqw1ykxmlla4xmlfwdjbgvh8h2"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://eradman.com/entrproject/code/entr-"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0kniklgnqv4j9carm78d3423wlwqw1ykxmlla4xmlfwdjbgvh8h2"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (setenv "CONFIG_SHELL" (which "bash"))
-               (setenv "CC" ,(cc-for-target))
-               (setenv "PREFIX" out)
-               (setenv "MANPREFIX" (string-append out "/man"))
-               (invoke "./configure"))))
-         (add-before 'build 'remove-fhs-file-names
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "entr.c"
-               (("/bin/sh" command)
-                (search-input-file inputs command))
-               (("/bin/cat" command)
-                (search-input-file inputs command))
-               (("/usr(/bin/clear)" _ command)
-                (search-input-file inputs command))))))))
-    (inputs
-     (list bash coreutils ncurses))
+       #:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (setenv "CONFIG_SHELL"
+                                (which "bash"))
+                        (setenv "CC"
+                                ,(cc-for-target))
+                        (setenv "PREFIX" out)
+                        (setenv "MANPREFIX"
+                                (string-append out "/man"))
+                        (invoke "./configure"))))
+                  (add-before 'build 'remove-fhs-file-names
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "entr.c"
+                        (("/bin/sh" command)
+                         (search-input-file inputs command))
+                        (("/bin/cat" command)
+                         (search-input-file inputs command))
+                        (("/usr(/bin/clear)" _ command)
+                         (search-input-file inputs command))))))))
+    (inputs (list bash coreutils ncurses))
     (home-page "https://eradman.com/entrproject/")
     (synopsis "Run arbitrary commands when files change")
     (description
-- 
2.46.0

From e68de6b81ec5a4f8de7273da4d8fd770bbc553ce Mon Sep 17 00:00:00 2001
Message-ID: <[email-masked]>
In-Reply-To: <[email-masked]>
References: <[email-masked]>
From: Javier Olaechea <[email-masked]>
Date: Fri, 8 Nov 2024 19:03:38 -0500
Subject: [PATCH 3/3] gnu: entr: Switch input from bash to bash-minimal.

* gnu/packages/entr.scm (entr): Switch input from bash to bash-minimal. This
was recommended by guix style lint.

Change-Id: Iccd37c3bf04b95ed510900f9d6ffd9359a227948
---
 gnu/packages/entr.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm
index f84a217814..d60489d14e 100644
--- a/gnu/packages/entr.scm
+++ b/gnu/packages/entr.scm
@@ -68,7 +68,7 @@ (define-public entr
                          (search-input-file inputs command))
                         (("/usr(/bin/clear)" _ command)
                          (search-input-file inputs command))))))))
-    (inputs (list bash coreutils ncurses))
+    (inputs (list bash-minimal coreutils ncurses))
     (home-page "https://eradman.com/entrproject/")
     (synopsis "Run arbitrary commands when files change")
     (description
-- 
2.46.0

From ae09a012f969a700292bdaf9556b515196a6ef38 Mon Sep 17 00:00:00 2001
Message-ID: <[email-masked]>
From: Javier Olaechea <[email-masked]>
Date: Fri, 8 Nov 2024 17:55:45 -0500
Subject: [PATCH 1/3] gnu: entr: Update to 5.6.

* gnu/packages/entr.scm (entr): Update to 5.6.

Change-Id: Idfa2fc88e526deccc7a9ff4d07ede6b0dc6daf72
---
 gnu/packages/entr.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm
index 5a8bbc8e4f..bb09acd6aa 100644
--- a/gnu/packages/entr.scm
+++ b/gnu/packages/entr.scm
@@ -36,14 +36,14 @@ (define-module (gnu packages entr)
 (define-public entr
   (package
     (name "entr")
-    (version "5.5")
+    (version "5.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://eradman.com/entrproject/code/entr-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "09p5aqbb95bysdx73n094v0b07hn3v9kqg6k7yyycnpaxzi0r30j"))))
+                "0kniklgnqv4j9carm78d3423wlwqw1ykxmlla4xmlfwdjbgvh8h2"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"

base-commit: 2a6d96425eea57dc6dd48a2bec16743046e32e06
-- 
2.46.0