mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-09 11:27:28 -03:00
Merge bitcoin/bitcoin#31323: guix: swap moreutils
for just sponge
e8f50c5deb
guix: swap moreutils for just sponge (fanquake) Pull request description: Switch to building the only `moreutils` utility we actually need (`sponge`). This results in having less unused stuff in the Guix environment (i.e all the other `moreutils` utilities), and, the dependency graph is simplified. i.e we no-longer have a dependency on `perl`, `docbook` etc, for this package. Current `moreutils` dependency graph: ![moreutils](https://github.com/user-attachments/assets/b91a8609-1434-4094-ad12-93332737ef0f) In the Guix env, `chronic`, `combine`, `errno`, `ifdata`, `ifne`, `isutf8`, `lckdo`, `mispipe`, `parallel`, `pee`, `ts`, `vidir`, `vipe` & `zrun` (plus their `*.real` variants) are removed. ACKs for top commit: hebasto: ACKe8f50c5deb
. TheCharlatan: Re-ACKe8f50c5deb
Tree-SHA512: 3687ec4a821ff79c26ee839d2af879166edb7e179287a9574eca8fbf34bed1fea8fcdad822a2140d0a0089e1820f3fef29a6100e0e8da788896e1f7bac5ec3e6
This commit is contained in:
commit
efdb49afb9
1 changed files with 33 additions and 3 deletions
|
@ -13,7 +13,6 @@
|
|||
((gnu packages linux) #:select (linux-libre-headers-6.1))
|
||||
(gnu packages llvm)
|
||||
(gnu packages mingw)
|
||||
(gnu packages moreutils)
|
||||
(gnu packages pkg-config)
|
||||
((gnu packages python) #:select (python-minimal))
|
||||
((gnu packages python-build) #:select (python-tomli))
|
||||
|
@ -21,6 +20,7 @@
|
|||
((gnu packages tls) #:select (openssl))
|
||||
((gnu packages version-control) #:select (git-minimal))
|
||||
(guix build-system cmake)
|
||||
(guix build-system gnu)
|
||||
(guix build-system python)
|
||||
(guix build-system trivial)
|
||||
(guix download)
|
||||
|
@ -28,7 +28,7 @@
|
|||
(guix git-download)
|
||||
((guix licenses) #:prefix license:)
|
||||
(guix packages)
|
||||
((guix utils) #:select (substitute-keyword-arguments)))
|
||||
((guix utils) #:select (cc-for-target substitute-keyword-arguments)))
|
||||
|
||||
(define-syntax-rule (search-our-patches file-name ...)
|
||||
"Return the list of absolute file names corresponding to each
|
||||
|
@ -487,6 +487,36 @@ inspecting signatures in Mach-O binaries.")
|
|||
(("^install-others =.*$")
|
||||
(string-append "install-others = " out "/etc/rpc\n")))))))))))))
|
||||
|
||||
;; The sponge tool from moreutils.
|
||||
(define-public sponge
|
||||
(package
|
||||
(name "sponge")
|
||||
(version "0.69")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://git.joeyh.name/index.cgi/moreutils.git/snapshot/
|
||||
moreutils-" version ".tar.gz"))
|
||||
(file-name (string-append "moreutils-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1l859qnzccslvxlh5ghn863bkq2vgmqgnik6jr21b9kc6ljmsy8g"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
|
||||
(install-file "sponge" bin)))))
|
||||
#:make-flags
|
||||
#~(list "sponge" (string-append "CC=" #$(cc-for-target)))))
|
||||
(home-page "https://joeyh.name/code/moreutils/")
|
||||
(synopsis "Miscellaneous general-purpose command-line tools")
|
||||
(description "Just sponge")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(packages->manifest
|
||||
(append
|
||||
(list ;; The Basics
|
||||
|
@ -502,7 +532,7 @@ inspecting signatures in Mach-O binaries.")
|
|||
patch
|
||||
gawk
|
||||
sed
|
||||
moreutils
|
||||
sponge
|
||||
;; Compression and archiving
|
||||
tar
|
||||
gzip
|
||||
|
|
Loading…
Reference in a new issue