summaryrefslogtreecommitdiff
path: root/gnu/packages/commencement.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-09-05 10:31:29 +0200
committerMarius Bakke <marius@gnu.org>2022-09-08 21:39:59 +0200
commitc527b0ce23c5d9228d29c5f90892aa5f05e77347 (patch)
tree6e8779f8f11d91fadc588b4e3a76ebea7df91e6b /gnu/packages/commencement.scm
parentd4485c5af7b6f0412b5d536eff62d0c666a5dbe6 (diff)
downloadguix-patches-c527b0ce23c5d9228d29c5f90892aa5f05e77347.tar
guix-patches-c527b0ce23c5d9228d29c5f90892aa5f05e77347.tar.gz
gnu: grep: Update to 3.8.
* gnu/packages/base.scm (grep): Update to 3.8. * gnu/packages/commencement.scm (grep-mesboot)[native-inputs]: Add SED-MESBOOT. * gnu/packages/autotools.scm (libtool)[source](patches): Add patch. * gnu/packages/patches/libtool-grep-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/commencement.scm')
-rw-r--r--gnu/packages/commencement.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 0dbd39382e..c03b9554a5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1845,7 +1845,6 @@ 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 grep-mesboot (mesboot-package "grep-mesboot" grep))
(define sed-mesboot (mesboot-package "sed-mesboot" sed))
;; "sed" from Gash-Utils lacks the 'w' command as of 0.2.0.
@@ -1857,6 +1856,14 @@ exec " gcc "/bin/" program
`(("sed" ,sed-mesboot)
,@(package-native-inputs pkg))))))
+(define grep-mesboot
+ (let ((pkg (mesboot-package "grep-mesboot" grep)))
+ (package
+ (inherit pkg)
+ (native-inputs
+ `(("sed" ,sed-mesboot)
+ ,@(package-native-inputs pkg))))))
+
;; The XZ implementation in Bootar cannot decompress 'tar'.
(define xz-mesboot
(let ((pkg (mesboot-package "xz-mesboot" xz)))