Skip to content

Commit

Permalink
Merge bitcoin#27172: guix: switch to some minimal versions of packa…
Browse files Browse the repository at this point in the history
…ges in our manifest

2c9eb4a guix: use cmake-minimal over cmake (fanquake)
1475515 guix: use coreutils-minimal over coreutils (fanquake)
4445621 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 2c9eb4a
  Sjors:
    tACK 2c9eb4a
  achow101:
    ACK 2c9eb4a
  hebasto:
    ACK 2c9eb4a,

Tree-SHA512: f91ca9e088b8346b20c2affc80870c31640de3aedcfcc0fb98a5e82c77ef64537870b88552f26759d31d8d0956b1fd685e6c25d5acbc92f5feaececd1a7dd37e
  • Loading branch information
achow101 committed Mar 1, 2023
2 parents 4d24e9c + 2c9eb4a commit 74981aa
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions contrib/guix/manifest.scm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 '())))))

0 comments on commit 74981aa

Please sign in to comment.