Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#25639: guix: Drop repetition of option's defaul…
Browse files Browse the repository at this point in the history
…t value

2ade04c guix: Drop repetition of option's default value (Hennadii Stepanov)

Pull request description:

  Split from bitcoin/bitcoin#25169.

  Guix builds on `x86_64`:
  ```
  492efd1debd9a8587754521aca7a7362338eabd1e96fbec21c89c3ba3c2607fd  guix-build-2ade04c0d9f8/output/aarch64-linux-gnu/SHA256SUMS.part
  22d1b357e984710fd6ebc9b2b636d129376f486039a12c87cbb56e4b9c35d9bc  guix-build-2ade04c0d9f8/output/aarch64-linux-gnu/bitcoin-2ade04c0d9f8-aarch64-linux-gnu-debug.tar.gz
  067e2efb51abc18afbd95d539cb300d63b7c7289d95e95fd3de889962c5835e9  guix-build-2ade04c0d9f8/output/aarch64-linux-gnu/bitcoin-2ade04c0d9f8-aarch64-linux-gnu.tar.gz
  87f1bc63f0d98b6a1df0e5ebf6f89d9d12fe02761af88766d45a78e24a10ccb2  guix-build-2ade04c0d9f8/output/arm-linux-gnueabihf/SHA256SUMS.part
  7e3dfcd0ec2d693f77b2711681155592cd00e22bf6bfca05a8efbd1d50225461  guix-build-2ade04c0d9f8/output/arm-linux-gnueabihf/bitcoin-2ade04c0d9f8-arm-linux-gnueabihf-debug.tar.gz
  c9d887e0839808426d6f9edf38a805ec72a44e759e3012e9b89435e59ba4fc0b  guix-build-2ade04c0d9f8/output/arm-linux-gnueabihf/bitcoin-2ade04c0d9f8-arm-linux-gnueabihf.tar.gz
  f4634a8f9117d94f43ac26121755fc221e88c45d6a8f84c971911ff36bf8a897  guix-build-2ade04c0d9f8/output/arm64-apple-darwin/SHA256SUMS.part
  639ccbd374500b6f75fa8968821ec643577846c6495e2d0910f6d9423099f899  guix-build-2ade04c0d9f8/output/arm64-apple-darwin/bitcoin-2ade04c0d9f8-arm64-apple-darwin-unsigned.dmg
  728767f11990e5310ef94816ba11176caa4b42c4bea181cf10f3bae8d2cd70fc  guix-build-2ade04c0d9f8/output/arm64-apple-darwin/bitcoin-2ade04c0d9f8-arm64-apple-darwin-unsigned.tar.gz
  dd3913946e02c895e932bfb7d621cb68ed26022d81d6b4ebf3c5927a86b86647  guix-build-2ade04c0d9f8/output/arm64-apple-darwin/bitcoin-2ade04c0d9f8-arm64-apple-darwin.tar.gz
  0d69ada990f1a3f9b80d8fe495bb049297c496993b9994e276d97f8aeaecbceb  guix-build-2ade04c0d9f8/output/dist-archive/bitcoin-2ade04c0d9f8.tar.gz
  5b72d28a5b6eee9b184906efe4b774598a3a9bb24a5af71be72ee20175bcd24c  guix-build-2ade04c0d9f8/output/powerpc64-linux-gnu/SHA256SUMS.part
  5dc632d75d68cb6a4277c03dc1d0b0dfb64979a9689b20e1132f7f639158d9a7  guix-build-2ade04c0d9f8/output/powerpc64-linux-gnu/bitcoin-2ade04c0d9f8-powerpc64-linux-gnu-debug.tar.gz
  32a69218d20f0f7e9dd55eb46e5d0b73aa70fb55718d79964acb4a58ee64109f  guix-build-2ade04c0d9f8/output/powerpc64-linux-gnu/bitcoin-2ade04c0d9f8-powerpc64-linux-gnu.tar.gz
  15431ebb9ccc413eab68e622c0ac9cc3360df52cd967e3ccba516d6b7bbc9ea1  guix-build-2ade04c0d9f8/output/powerpc64le-linux-gnu/SHA256SUMS.part
  f6bd41ee2b80ab8e7f78eb3071a8cda943061870d32fa5eefca042a3ef0e65f4  guix-build-2ade04c0d9f8/output/powerpc64le-linux-gnu/bitcoin-2ade04c0d9f8-powerpc64le-linux-gnu-debug.tar.gz
  bcb07c4d94dcd56fbd8b656bbd003441357eed9a4c6ec4a2ca1784ef8d986ef7  guix-build-2ade04c0d9f8/output/powerpc64le-linux-gnu/bitcoin-2ade04c0d9f8-powerpc64le-linux-gnu.tar.gz
  8038401712d0283e4ef5d2933e54647c3505796c5b6b2ef4bb5c1fb6346301b4  guix-build-2ade04c0d9f8/output/riscv64-linux-gnu/SHA256SUMS.part
  35df9ff846450ca571f05db1c07de6e06a14a9c7da50b30945231287a97e47f8  guix-build-2ade04c0d9f8/output/riscv64-linux-gnu/bitcoin-2ade04c0d9f8-riscv64-linux-gnu-debug.tar.gz
  02d2356bb9492857b51a5c54bfc0e24f39a4e0ee95fb40366afe9250bb3fd60c  guix-build-2ade04c0d9f8/output/riscv64-linux-gnu/bitcoin-2ade04c0d9f8-riscv64-linux-gnu.tar.gz
  0dc09ec63e36a3cc4ad7151290e1f648aa99b184161831f48c519073f22a20e1  guix-build-2ade04c0d9f8/output/x86_64-apple-darwin/SHA256SUMS.part
  b5b8dded31154227bbdf30a4d97b695c2495b6c0ede7ff12ebaafafe47a47df0  guix-build-2ade04c0d9f8/output/x86_64-apple-darwin/bitcoin-2ade04c0d9f8-x86_64-apple-darwin-unsigned.dmg
  2a9848487b55af9cf2359148f23d4dc5ff62f6adadf612cb0bd3539d9adcbdbe  guix-build-2ade04c0d9f8/output/x86_64-apple-darwin/bitcoin-2ade04c0d9f8-x86_64-apple-darwin-unsigned.tar.gz
  d4d871f7df69eb172e625fd4170aa956c4f7cba92ae167ac0cbee3b0f381ce52  guix-build-2ade04c0d9f8/output/x86_64-apple-darwin/bitcoin-2ade04c0d9f8-x86_64-apple-darwin.tar.gz
  5e05167a88a821953cc5028af9d3e0a80d606eaecf37f3fac01f95abc6161cc2  guix-build-2ade04c0d9f8/output/x86_64-linux-gnu/SHA256SUMS.part
  ab1d889b3e174428cdf71e41784c7778641bc7001abb88382c7b5d8016b5e08e  guix-build-2ade04c0d9f8/output/x86_64-linux-gnu/bitcoin-2ade04c0d9f8-x86_64-linux-gnu-debug.tar.gz
  d196e8bddc633a08d70e61ec3fc5dacbf58195a91b9e2a20ea53c91b09d3b9eb  guix-build-2ade04c0d9f8/output/x86_64-linux-gnu/bitcoin-2ade04c0d9f8-x86_64-linux-gnu.tar.gz
  ed2f15dadcc401d343869f06ed3c709484b126549aa2bd844ad9e37290d0789a  guix-build-2ade04c0d9f8/output/x86_64-w64-mingw32/SHA256SUMS.part
  319e59326a20bc206d3fc66439f3d246371ca5d9de17e9a18cc9ee8e39ce0e90  guix-build-2ade04c0d9f8/output/x86_64-w64-mingw32/bitcoin-2ade04c0d9f8-win64-debug.zip
  f955183729fd7eba43b3e4c637998bb6f2b1f30b37b8be13199ae4096a04d85c  guix-build-2ade04c0d9f8/output/x86_64-w64-mingw32/bitcoin-2ade04c0d9f8-win64-setup-unsigned.exe
  57fbfb0c00fbd8ba5b23ee2b08299c863d1a6ac9f6b49e1a336612b3027f97fb  guix-build-2ade04c0d9f8/output/x86_64-w64-mingw32/bitcoin-2ade04c0d9f8-win64-unsigned.tar.gz
  0582dd6ad0504c14692c47e721e51dc3b74b5d9e7c0f543b5a5a0965506b5a27  guix-build-2ade04c0d9f8/output/x86_64-w64-mingw32/bitcoin-2ade04c0d9f8-win64.zip
  ```

ACKs for top commit:
  fanquake:
    ACK 2ade04c

Tree-SHA512: 0c8214b884517794e257de31b8d226bc1d28c91deb4db1ce18affd9d792251b8181e65b2c14081d06408c444d9772279ee42cdfac7952b906b3c8e39bba6ce1e
  • Loading branch information
fanquake committed Jul 19, 2022
2 parents c6fafa4 + 2ade04c commit ad466b8
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions contrib/guix/manifest.scm
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,7 @@ inspecting signatures in Mach-O binaries.")
((string-contains target "-linux-")
(list (cond ((string-contains target "riscv64-")
(make-bitcoin-cross-toolchain target
#:base-libc (make-glibc-without-werror glibc-2.27/bitcoin-patched)
#:base-kernel-headers base-linux-kernel-headers))
#:base-libc (make-glibc-without-werror glibc-2.27/bitcoin-patched)))
(else
(make-bitcoin-cross-toolchain target)))))
((string-contains target "darwin")
Expand Down

0 comments on commit ad466b8

Please sign in to comment.