diff options
| author | Andrew Chow <github@achow101.com> | 2023-03-01 11:07:00 -0500 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-03-01 11:07:04 -0500 |
| commit | 74981aa02d2b14ad1c0b82d1eb09cf3169eaa8ae (patch) | |
| tree | d404c41dc85bebc634f5000c5f86db3ed8069bfe /contrib | |
| parent | 4d24e9c57196a7aa6e84a602900e5e6b3f0aab9d (diff) | |
| parent | 2c9eb4afe1f583aafa552b2711b149f17ef8320f (diff) | |
Merge bitcoin/bitcoin#27172: guix: switch to some `minimal` versions of packages in our manifest
2c9eb4afe1f583aafa552b2711b149f17ef8320f guix: use cmake-minimal over cmake (fanquake)
1475515312856afe3f19a95f2c32bc80c7c54484 guix: use coreutils-minimal over coreutils (fanquake)
444562141504ff7f0bb071d6e7bf7f511517e372 guix: use bash-minimal over bash (fanquake)
Pull request description:
Minimal versions of the same packages, that should still be sufficient for our use:
> (define-public bash-minimal
;; A stripped-down Bash for non-interactive use.
> (define-public coreutils-minimal
;; Coreutils without its optional dependencies.
> ;;; This minimal variant of CMake does not include the documentation. It is
;;; used by the cmake-build-system.
(define-public cmake-minimal
ACKs for top commit:
TheCharlatan:
ACK 2c9eb4afe1f5
Sjors:
tACK 2c9eb4afe1f583aafa552b2711b149f17ef8320f
achow101:
ACK 2c9eb4afe1f583aafa552b2711b149f17ef8320f
hebasto:
ACK 2c9eb4afe1f583aafa552b2711b149f17ef8320f,
Tree-SHA512: f91ca9e088b8346b20c2affc80870c31640de3aedcfcc0fb98a5e82c77ef64537870b88552f26759d31d8d0956b1fd685e6c25d5acbc92f5feaececd1a7dd37e
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/guix/manifest.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 379ad898c4..e266e7d0ee 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -566,9 +566,9 @@ inspecting signatures in Mach-O binaries.") (packages->manifest (append (list ;; The Basics - bash + bash-minimal which - coreutils + coreutils-minimal util-linux ;; File(system) inspection file @@ -611,5 +611,5 @@ inspecting signatures in Mach-O binaries.") ((string-contains target "-linux-") (list (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") - (list clang-toolchain-10 binutils cmake xorriso python-signapple)) + (list clang-toolchain-10 binutils cmake-minimal xorriso python-signapple)) (else '()))))) |