Skip to content

Commit e8f50c5

Browse files
committed
guix: swap moreutils for just sponge
We build the only moreutils utility we actually need (sponge), have less unused stuff in the Guix environment, and, the dependency graph is simplified. i.e we no-longer have a dependency on perl, docbook etc, for this package.
1 parent 2638fdb commit e8f50c5

File tree

1 file changed

+33
-3
lines changed

1 file changed

+33
-3
lines changed

contrib/guix/manifest.scm

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@
1313
((gnu packages linux) #:select (linux-libre-headers-6.1))
1414
(gnu packages llvm)
1515
(gnu packages mingw)
16-
(gnu packages moreutils)
1716
(gnu packages pkg-config)
1817
((gnu packages python) #:select (python-minimal))
1918
((gnu packages python-build) #:select (python-tomli))
2019
((gnu packages python-crypto) #:select (python-asn1crypto))
2120
((gnu packages tls) #:select (openssl))
2221
((gnu packages version-control) #:select (git-minimal))
2322
(guix build-system cmake)
23+
(guix build-system gnu)
2424
(guix build-system python)
2525
(guix build-system trivial)
2626
(guix download)
2727
(guix gexp)
2828
(guix git-download)
2929
((guix licenses) #:prefix license:)
3030
(guix packages)
31-
((guix utils) #:select (substitute-keyword-arguments)))
31+
((guix utils) #:select (cc-for-target substitute-keyword-arguments)))
3232

3333
(define-syntax-rule (search-our-patches file-name ...)
3434
"Return the list of absolute file names corresponding to each
@@ -487,6 +487,36 @@ inspecting signatures in Mach-O binaries.")
487487
(("^install-others =.*$")
488488
(string-append "install-others = " out "/etc/rpc\n")))))))))))))
489489

490+
;; The sponge tool from moreutils.
491+
(define-public sponge
492+
(package
493+
(name "sponge")
494+
(version "0.69")
495+
(source (origin
496+
(method url-fetch)
497+
(uri (string-append
498+
"https://git.joeyh.name/index.cgi/moreutils.git/snapshot/
499+
moreutils-" version ".tar.gz"))
500+
(file-name (string-append "moreutils-" version ".tar.gz"))
501+
(sha256
502+
(base32
503+
"1l859qnzccslvxlh5ghn863bkq2vgmqgnik6jr21b9kc6ljmsy8g"))))
504+
(build-system gnu-build-system)
505+
(arguments
506+
(list #:phases
507+
#~(modify-phases %standard-phases
508+
(delete 'configure)
509+
(replace 'install
510+
(lambda* (#:key outputs #:allow-other-keys)
511+
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
512+
(install-file "sponge" bin)))))
513+
#:make-flags
514+
#~(list "sponge" (string-append "CC=" #$(cc-for-target)))))
515+
(home-page "https://joeyh.name/code/moreutils/")
516+
(synopsis "Miscellaneous general-purpose command-line tools")
517+
(description "Just sponge")
518+
(license license:gpl2+)))
519+
490520
(packages->manifest
491521
(append
492522
(list ;; The Basics
@@ -502,7 +532,7 @@ inspecting signatures in Mach-O binaries.")
502532
patch
503533
gawk
504534
sed
505-
moreutils
535+
sponge
506536
;; Compression and archiving
507537
tar
508538
gzip

0 commit comments

Comments
 (0)