From c0bfe44978d53ab529c7ce85ff64773af70ad2e1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 29 Oct 2025 11:41:35 +0100
Subject: [PATCH] gnu: emacs-shell-command+: Update to 2.5.0.

* gnu/packages/emacs-xyz.scm (emacs-shell-command+): Update to 2.5.0.
[source]: Set upstream to Codeberg.
[arguments]: Run all tests.

Change-Id: I3b8d4422c1eb6ccb618a654b0a3f87353fc95483
---
 gnu/packages/emacs-xyz.scm | 51 ++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9fd5aac1da1b0fbb0aa37586b54054f172a89a6c..fccaa11c4cccbbb9b8c9c9e5e47774f808a35e7d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -42949,39 +42949,30 @@ rather excellent completion provided by both Bash and Zsh.")
     (license license:gpl3+)))
 
 (define-public emacs-shell-command+
-  (package
-    (name "emacs-shell-command+")
-    (version "2.4.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.sr.ht/~pkal/shell-command-plus")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "022i7ydwckxqk16s4a83mrdr0c4rmap906qypdkjfh1rjw75qwm5"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list #:test-command #~(list "make" "test")
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'fix-tests
-                 (lambda _
-                   (substitute* "shell-command+-tests.el"
-                     (("\"shell-command\\+-tests\\.el\"" all)
-                      (string-join (list "\"shell-command+-autoloads.el\""
-                                         "\"shell-command+-pkg.el\""
-                                         all)
-                                   " "))))))))
-    (home-page "https://elpa.gnu.org/packages/shell-command+.html")
-    (synopsis "Extended Emacs @code{shell-command}")
-    (description
-     "Shell-command+ is a @code{shell-command} substitute that extends the
+  (let ((commit "8388de44c488106a53913e7028b0e3f3859982bb")) ;version bump
+    (package
+      (name "emacs-shell-command+")
+      (version "2.5.0")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://codeberg.org/pkal/shell-command-plus.el")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1mrik2cwz9fs6mqfry00nxlpk6ky02zgpwr7dh5n4fqlavjly4j2"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list #:test-command #~(list "make" "test")))
+      (home-page "https://elpa.gnu.org/packages/shell-command+.html")
+      (synopsis "Extended Emacs @code{shell-command}")
+      (description
+       "Shell-command+ is a @code{shell-command} substitute that extends the
 regular Emacs command with several features.  You can for example count all
 the lines in a buffer with @code{> wc -l}, or delete all lower case letters in
 the selected region with @code{| tr -d a-z}.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-shell-pop
   (let ((commit "4b4394037940a890a313d715d203d9ead2d156a6")