andreas pushed a commit to branch core-packages-team
in repository guix.
commit 2768348db2e32c2dec6a1934d38036015f18c3bd
Author: Zheng Junjie <[email protected]>
AuthorDate: Mon Feb 10 09:54:57 2025 +0800
gnu: sed: Update to 4.9.
* gnu/packages/base.scm (sed): Update to 4.9.
* gnu/packages/commencement.scm (sed-mesboot): Keep version on 4.8.
Change-Id: I9a279e67c88cbc549d4964af012b50a2b25c04e9
---
gnu/packages/base.scm | 52 ++++++++++++++++---------------------------
gnu/packages/commencement.scm | 31 +++++++++++++++++++++++++-
2 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 47a864f227..d7068a1bf8 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -192,35 +192,21 @@ including, for example, recursive directory searching.")
(define-public sed
(package
- (name "sed")
- (version "4.8")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/sed/sed-" version
- ".tar.gz"))
- (sha256
- (base32
- "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk"))
- (patches (search-patches "coreutils-gnulib-tests.patch"))
-
- ;; Remove this snippet once upstream releases a fixed version.
- ;; This snippet changes Makefile.in, even though the upstream
- ;; patch changes testsuite/local.mk, since we build sed from a
- ;; release tarball. See: https://bugs.gnu.org/36150
- (snippet
- '(begin
- (substitute* "Makefile.in"
- (("^ abs_srcdir='\\$\\(abs_srcdir\\)'.*" previous-line)
- (string-append
- previous-line
- " CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n")))))
- (modules '((guix build utils)))))
- (build-system gnu-build-system)
- (synopsis "Stream editor")
- (native-inputs (append (if (target-loongarch64?)
- (list config)
- '())
- (list perl))) ;for tests
+ (name "sed")
+ (version "4.9")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/sed/sed-" version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0bi808vfkg3szmpy9g5wc7jnn2yk6djiz412d30km9rky0c8liyi"))))
+ (build-system gnu-build-system)
+ (synopsis "Stream editor")
+ (native-inputs (append (if (target-loongarch64?)
+ (list config)
+ '())
+ (list perl))) ;for tests
(arguments (if (target-loongarch64?)
(list #:phases
#~(modify-phases %standard-phases
@@ -234,14 +220,14 @@ including, for example, recursive directory searching.")
(string-append "/bin/" file))
"./build-aux"))
'("config.guess" "config.sub"))))))
'()))
- (description
- "Sed is a non-interactive, text stream editor. It receives a text
+ (description
+ "Sed is a non-interactive, text stream editor. It receives a text
input from a file or from standard input and it then applies a series of text
editing commands to the stream and prints its output to standard output. It
is often used for substituting text patterns in a stream. The GNU
implementation offers several extensions over the standard utility.")
- (license gpl3+)
- (home-page "https://www.gnu.org/software/sed/";)))
+ (license gpl3+)
+ (home-page "https://www.gnu.org/software/sed/";)))
(define-public tar
(package
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 990d286ade..44c109d9bd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1852,7 +1852,36 @@ exec " gcc "/bin/" program
;; In the future, Gash et al. could handle it directly, but it's not
;; ready yet.
(define bash-mesboot (mesboot-package "bash-mesboot" static-bash))
-(define sed-mesboot (mesboot-package "sed-mesboot" sed))
+
+;; "sed" from Gash-Utils lacks the 'w' command as of 0.2.0.
+(define sed-mesboot
+ (mesboot-package
+ "sed-mesboot"
+ (package
+ (inherit sed)
+ (version "4.8")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/sed/sed-" version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk"))
+ (patches (search-patches "coreutils-gnulib-tests.patch"))
+
+ ;; Remove this snippet once upstream releases a fixed version.
+ ;; This snippet changes Makefile.in, even though the upstream
+ ;; patch changes testsuite/local.mk, since we build sed from a
+ ;; release tarball. See: https://bugs.gnu.org/36150
+ (snippet
+ '(begin
+ (substitute* "Makefile.in"
+ (("^ abs_srcdir='\\$\\(abs_srcdir\\)'.*" previous-line)
+ (string-append
+ previous-line
+ " CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n")))))
+ (modules '((guix build utils))))))))
;; "sed" from Gash-Utils lacks the 'w' command as of 0.2.0.
(define coreutils-mesboot
