guix: import/sync python-lief (0.12.3) package definition from upstream #27296

pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:import_lief_curr_upstream changing 1 files +34 −29

fanquake commented at 10:02 AM on March 22, 2023: member

Update to version 0.12.3. Retain our PPC64 patch. Mention when we can drop our local definition.

Also switch to using cmake-minimal (see #27172), which fixes atleast one build failure I've seen on aarch64, where cmake dependencies fail to build. Fix that by using the cmake without all the dependencies we don't actually need:

The following derivations will be built:
  /gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv
  /gnu/store/f9zwh1ldy63ga0i5w6cbbqlj6sfq226j-cmake-3.21.4.drv
  /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv

building /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv...
/ 'check' phasenote: keeping build directory `/tmp/guix-build-python-sphinx-4.2.0.drv-5'
builder for `/gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv' failed with exit code 1
build of /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv failed
View build log at '/var/log/guix/drvs/3w/g6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv.gz'.
cannot build derivation `/gnu/store/f9zwh1ldy63ga0i5w6cbbqlj6sfq226j-cmake-3.21.4.drv': 1 dependencies couldn't be built
cannot build derivation `/gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv': 1 dependencies couldn't be built
guix environment: error: build of `/gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv' failed

guix: import LIEF from upstream (0.12.3)

Updates to version 0.12.3.
Retain our PPC64 patch.
Mention when we can drop our local definition.

43d8173f99

guix: use cmake-minimal for python-lief

This also fixes atleast one --no-substitues build failure I've seen,
where cmake dependencies wouldn't build:
```bash
The following derivations will be built:
  /gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv
  /gnu/store/f9zwh1ldy63ga0i5w6cbbqlj6sfq226j-cmake-3.21.4.drv
  /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv

building /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv...
/ 'check' phasenote: keeping build directory `/tmp/guix-build-python-sphinx-4.2.0.drv-5'
builder for `/gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv' failed with exit code 1
build of /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv failed
View build log at '/var/log/guix/drvs/3w/g6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv.gz'.
cannot build derivation `/gnu/store/f9zwh1ldy63ga0i5w6cbbqlj6sfq226j-cmake-3.21.4.drv': 1 dependencies couldn't be built
cannot build derivation `/gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv': 1 dependencies couldn't be built
guix environment: error: build of `/gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv' failed
```

24f26e08cc

fanquake added the label Build system on Mar 22, 2023
fanquake added the label DrahtBot Guix build requested on Mar 22, 2023
fanquake requested review from TheCharlatan on Mar 22, 2023
DrahtBot commented at 10:02 AM on March 22, 2023: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK TheCharlatan

Concept ACK hebasto

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #25573 ([POC] guix: produce a fully -static-pie x86_64 bitcoind using GCC and glibc by fanquake)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
hebasto commented at 10:09 AM on March 22, 2023: member

Concept ACK.

Type	Reviewers
ACK	TheCharlatan
Concept ACK	hebasto

DrahtBot commented at 7:03 PM on March 22, 2023: contributor

Guix builds

File	commit 6e69fead2baf4a40209863bca1df990830fc481a<br>(master)	commit 8f144e97ff7fc7ff942a400b9afbcf176753712b<br>(master and this pull)
SHA256SUMS.part	`92a393cd404c2088...`	`133ed576cd0764bc...`
*-aarch64-linux-gnu-debug.tar.gz	`7598464fd562a38c...`	`550df50bfa02b24d...`
*-aarch64-linux-gnu.tar.gz	`4d8ded8ddf23086b...`	`3f1633a1e74a66a8...`
*-arm-linux-gnueabihf-debug.tar.gz	`351db5157dd5cb13...`	`c3667c69929f77dd...`
*-arm-linux-gnueabihf.tar.gz	`2537976f53001473...`	`77cbdec345237915...`
*-powerpc64-linux-gnu-debug.tar.gz	`65ebb98ed0980476...`	`7a456cdc6167a076...`
*-powerpc64-linux-gnu.tar.gz	`918f1dae62fe164b...`	`0a79f75baf41ba60...`
*-powerpc64le-linux-gnu-debug.tar.gz	`f07da834ef0f429c...`	`650ee977734cf2cc...`
*-powerpc64le-linux-gnu.tar.gz	`558079b7fe0bd72c...`	`981d41b4f37d7fa9...`
*-riscv64-linux-gnu-debug.tar.gz	`a794609269c4dfe0...`	`147d3cbd2667071e...`
*-riscv64-linux-gnu.tar.gz	`d856da193654b83e...`	`b8b8157d986e792c...`
*-x86_64-linux-gnu-debug.tar.gz	`0506af40ff9dc23c...`	`09b57eb14e267c0f...`
*-x86_64-linux-gnu.tar.gz	`adbf955027122f49...`	`c59e16700264fcbd...`
*.tar.gz	`11093687a464621a...`	`f5dc352bea33ca35...`
guix_build.log	`357cee8bc389f771...`	`655b3c8c991faa67...`
guix_build.log.diff		`3a42a99f9dbff4c9...`

DrahtBot removed the label DrahtBot Guix build requested on Mar 22, 2023

hebasto commented at 2:54 PM on March 23, 2023: member

Guix builds:

2780a866c6a930a413cab8de3840d01c3166712d12d2f17693f30cb162eb4b92  guix-build-24f26e08cc0d/output/aarch64-linux-gnu/SHA256SUMS.part
13ccce6016de14a892b2cfac52d0a412e2c348862871a8b38498ceaf352cf48a  guix-build-24f26e08cc0d/output/aarch64-linux-gnu/bitcoin-24f26e08cc0d-aarch64-linux-gnu-debug.tar.gz
3e7c7ea6fde2cdf50f4a8c66baf5ae86295f4b426fef62f32d91839a770149ce  guix-build-24f26e08cc0d/output/aarch64-linux-gnu/bitcoin-24f26e08cc0d-aarch64-linux-gnu.tar.gz
9a25be8a68331fb4fa9ef93732a7cded63efb1e9477e8c2998874d1e291054be  guix-build-24f26e08cc0d/output/arm-linux-gnueabihf/SHA256SUMS.part
a17693ffda5933c8c00d51ff29584458a0f258b8c27ea15c8c5c2a2dc3858c8c  guix-build-24f26e08cc0d/output/arm-linux-gnueabihf/bitcoin-24f26e08cc0d-arm-linux-gnueabihf-debug.tar.gz
ff0c9e7faeb08c7fdc622e84e60682f62f95d2ef0290cfc93e2bcdd43323ad44  guix-build-24f26e08cc0d/output/arm-linux-gnueabihf/bitcoin-24f26e08cc0d-arm-linux-gnueabihf.tar.gz
c83afa2f07719e673b70da993410b145cbc41a27ebd186d3aa4a88c8677762b9  guix-build-24f26e08cc0d/output/arm64-apple-darwin/SHA256SUMS.part
745633d45bdd7c59dd41af8e02f55c344fcbc6c4f3673b6ed216668f9aead729  guix-build-24f26e08cc0d/output/arm64-apple-darwin/bitcoin-24f26e08cc0d-arm64-apple-darwin-unsigned.dmg
49fb27cb9ff8224ebb242a287c0c48386243793f8898df9d09ab38cf16161ed7  guix-build-24f26e08cc0d/output/arm64-apple-darwin/bitcoin-24f26e08cc0d-arm64-apple-darwin-unsigned.tar.gz
98ebc9dc4df15154063ff159c120c06685e0fe0e7c4e6115667fc42e007c111c  guix-build-24f26e08cc0d/output/arm64-apple-darwin/bitcoin-24f26e08cc0d-arm64-apple-darwin.tar.gz
42979e898fef2f32755e263a147b2db126dbbad9b87ba1b26d0bda79ff58284e  guix-build-24f26e08cc0d/output/dist-archive/bitcoin-24f26e08cc0d.tar.gz
1897359d41bc98ebabbdc4fe68f2277a6d44a8083c673c160fe20875c2819a15  guix-build-24f26e08cc0d/output/powerpc64-linux-gnu/SHA256SUMS.part
1cc531f4e83516f3d8eeaa3ff99dc7bf58e2985030cfaca91a7a08c67e6c7c31  guix-build-24f26e08cc0d/output/powerpc64-linux-gnu/bitcoin-24f26e08cc0d-powerpc64-linux-gnu-debug.tar.gz
1768788f05926679ec581a250f0d6c24b8cd8f14987a5ae0918bbcdb0b6e0847  guix-build-24f26e08cc0d/output/powerpc64-linux-gnu/bitcoin-24f26e08cc0d-powerpc64-linux-gnu.tar.gz
a50b10e67b2a4e642cc9b19d6bc0e3a5fa5f89a2d441b516baeaaceb9377a7a4  guix-build-24f26e08cc0d/output/powerpc64le-linux-gnu/SHA256SUMS.part
9a7baa7664090c84eb500532a9672cdf7e8821778212f96ea14fb45eed17cb2e  guix-build-24f26e08cc0d/output/powerpc64le-linux-gnu/bitcoin-24f26e08cc0d-powerpc64le-linux-gnu-debug.tar.gz
3a27db9dcc2103e8fdf3be57375ae113da2f5e5cd65c7fcc39be35894e10f838  guix-build-24f26e08cc0d/output/powerpc64le-linux-gnu/bitcoin-24f26e08cc0d-powerpc64le-linux-gnu.tar.gz
7c86ee10bfd0860784991a122b9c6dbdc6ea3af25bbd10227bc2cfb8761b510b  guix-build-24f26e08cc0d/output/riscv64-linux-gnu/SHA256SUMS.part
57e8cfd4ffc0c64faa040dd618935cd14752e52574631bf9ceba9a4199f036cc  guix-build-24f26e08cc0d/output/riscv64-linux-gnu/bitcoin-24f26e08cc0d-riscv64-linux-gnu-debug.tar.gz
dcc9b133d3e830dc3f784908d0f8858082b6836dc1f8a37831ef047020c74bd1  guix-build-24f26e08cc0d/output/riscv64-linux-gnu/bitcoin-24f26e08cc0d-riscv64-linux-gnu.tar.gz
560cb58c401f46458850b02e2f3f4befcfe3017f82bc149a60b5c23434b06f6c  guix-build-24f26e08cc0d/output/x86_64-apple-darwin/SHA256SUMS.part
62d02a460b18c0ddbb55ece1ff0fa2514757f860f778e0769c6a8ed1b91f17ed  guix-build-24f26e08cc0d/output/x86_64-apple-darwin/bitcoin-24f26e08cc0d-x86_64-apple-darwin-unsigned.dmg
212b5fcdf41aef6a31a7786e2d0da3859488e0111841d0b10808620ca83d43cf  guix-build-24f26e08cc0d/output/x86_64-apple-darwin/bitcoin-24f26e08cc0d-x86_64-apple-darwin-unsigned.tar.gz
9c20f47bf9bd4c8209b389ab3a7fcbab89a6860774e13f8437f3e261800e938e  guix-build-24f26e08cc0d/output/x86_64-apple-darwin/bitcoin-24f26e08cc0d-x86_64-apple-darwin.tar.gz
6fa78bf4facd3703a7dc99bbcdef8c5191858dc7a3950ce92674eb99c253f71a  guix-build-24f26e08cc0d/output/x86_64-linux-gnu/SHA256SUMS.part
d410960b66cce5569d4e6466d8a8bc6bb5a010abc057b83085e927deb2394345  guix-build-24f26e08cc0d/output/x86_64-linux-gnu/bitcoin-24f26e08cc0d-x86_64-linux-gnu-debug.tar.gz
d50a46c30e2e328ee936c14cfd72ad2e96956f98e849015a4dd1ecd371a4f4fa  guix-build-24f26e08cc0d/output/x86_64-linux-gnu/bitcoin-24f26e08cc0d-x86_64-linux-gnu.tar.gz
3af39753a35944968e53972ef911f46d5bdd2b07b7ee746bba5436ee21d9793d  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/SHA256SUMS.part
4d1fb14c0d174ff7d43665d30d6e865123b1d8dc9b1dd408ba937014c94229b8  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/bitcoin-24f26e08cc0d-win64-debug.zip
1c66e19c50435278a50baf13e335f7f3bb6d07a15afe9b53940fcfc02468c7dd  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/bitcoin-24f26e08cc0d-win64-setup-unsigned.exe
a0099101dcedb71631b261f7afe21871978a99fd49d9d49601a19323c88336ca  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/bitcoin-24f26e08cc0d-win64-unsigned.tar.gz
c89c393c65e685c2148bb4963ca16b8df5714ff9eccf89c062f572e965fbadcc  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/bitcoin-24f26e08cc0d-win64.zip

TheCharlatan approved

TheCharlatan commented at 9:19 AM on March 24, 2023: contributor

ACK 24f26e08cc0db4041c51fe8391b1736b47a13af9

I verified that the python-lief bump is indeed just https://github.com/guix-mirror/guix/blob/83bfdb409787cb2737e68b093a319b247b7858e6/gnu/packages/python-xyz.scm#L31235-L31265 .

find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

2780a866c6a930a413cab8de3840d01c3166712d12d2f17693f30cb162eb4b92  guix-build-24f26e08cc0d/output/aarch64-linux-gnu/SHA256SUMS.part
13ccce6016de14a892b2cfac52d0a412e2c348862871a8b38498ceaf352cf48a  guix-build-24f26e08cc0d/output/aarch64-linux-gnu/bitcoin-24f26e08cc0d-aarch64-linux-gnu-debug.tar.gz
3e7c7ea6fde2cdf50f4a8c66baf5ae86295f4b426fef62f32d91839a770149ce  guix-build-24f26e08cc0d/output/aarch64-linux-gnu/bitcoin-24f26e08cc0d-aarch64-linux-gnu.tar.gz
9a25be8a68331fb4fa9ef93732a7cded63efb1e9477e8c2998874d1e291054be  guix-build-24f26e08cc0d/output/arm-linux-gnueabihf/SHA256SUMS.part
a17693ffda5933c8c00d51ff29584458a0f258b8c27ea15c8c5c2a2dc3858c8c  guix-build-24f26e08cc0d/output/arm-linux-gnueabihf/bitcoin-24f26e08cc0d-arm-linux-gnueabihf-debug.tar.gz
ff0c9e7faeb08c7fdc622e84e60682f62f95d2ef0290cfc93e2bcdd43323ad44  guix-build-24f26e08cc0d/output/arm-linux-gnueabihf/bitcoin-24f26e08cc0d-arm-linux-gnueabihf.tar.gz
c83afa2f07719e673b70da993410b145cbc41a27ebd186d3aa4a88c8677762b9  guix-build-24f26e08cc0d/output/arm64-apple-darwin/SHA256SUMS.part
745633d45bdd7c59dd41af8e02f55c344fcbc6c4f3673b6ed216668f9aead729  guix-build-24f26e08cc0d/output/arm64-apple-darwin/bitcoin-24f26e08cc0d-arm64-apple-darwin-unsigned.dmg
49fb27cb9ff8224ebb242a287c0c48386243793f8898df9d09ab38cf16161ed7  guix-build-24f26e08cc0d/output/arm64-apple-darwin/bitcoin-24f26e08cc0d-arm64-apple-darwin-unsigned.tar.gz
98ebc9dc4df15154063ff159c120c06685e0fe0e7c4e6115667fc42e007c111c  guix-build-24f26e08cc0d/output/arm64-apple-darwin/bitcoin-24f26e08cc0d-arm64-apple-darwin.tar.gz
42979e898fef2f32755e263a147b2db126dbbad9b87ba1b26d0bda79ff58284e  guix-build-24f26e08cc0d/output/dist-archive/bitcoin-24f26e08cc0d.tar.gz
1897359d41bc98ebabbdc4fe68f2277a6d44a8083c673c160fe20875c2819a15  guix-build-24f26e08cc0d/output/powerpc64-linux-gnu/SHA256SUMS.part
1cc531f4e83516f3d8eeaa3ff99dc7bf58e2985030cfaca91a7a08c67e6c7c31  guix-build-24f26e08cc0d/output/powerpc64-linux-gnu/bitcoin-24f26e08cc0d-powerpc64-linux-gnu-debug.tar.gz
1768788f05926679ec581a250f0d6c24b8cd8f14987a5ae0918bbcdb0b6e0847  guix-build-24f26e08cc0d/output/powerpc64-linux-gnu/bitcoin-24f26e08cc0d-powerpc64-linux-gnu.tar.gz
a50b10e67b2a4e642cc9b19d6bc0e3a5fa5f89a2d441b516baeaaceb9377a7a4  guix-build-24f26e08cc0d/output/powerpc64le-linux-gnu/SHA256SUMS.part
9a7baa7664090c84eb500532a9672cdf7e8821778212f96ea14fb45eed17cb2e  guix-build-24f26e08cc0d/output/powerpc64le-linux-gnu/bitcoin-24f26e08cc0d-powerpc64le-linux-gnu-debug.tar.gz
3a27db9dcc2103e8fdf3be57375ae113da2f5e5cd65c7fcc39be35894e10f838  guix-build-24f26e08cc0d/output/powerpc64le-linux-gnu/bitcoin-24f26e08cc0d-powerpc64le-linux-gnu.tar.gz
7c86ee10bfd0860784991a122b9c6dbdc6ea3af25bbd10227bc2cfb8761b510b  guix-build-24f26e08cc0d/output/riscv64-linux-gnu/SHA256SUMS.part
57e8cfd4ffc0c64faa040dd618935cd14752e52574631bf9ceba9a4199f036cc  guix-build-24f26e08cc0d/output/riscv64-linux-gnu/bitcoin-24f26e08cc0d-riscv64-linux-gnu-debug.tar.gz
dcc9b133d3e830dc3f784908d0f8858082b6836dc1f8a37831ef047020c74bd1  guix-build-24f26e08cc0d/output/riscv64-linux-gnu/bitcoin-24f26e08cc0d-riscv64-linux-gnu.tar.gz
560cb58c401f46458850b02e2f3f4befcfe3017f82bc149a60b5c23434b06f6c  guix-build-24f26e08cc0d/output/x86_64-apple-darwin/SHA256SUMS.part
62d02a460b18c0ddbb55ece1ff0fa2514757f860f778e0769c6a8ed1b91f17ed  guix-build-24f26e08cc0d/output/x86_64-apple-darwin/bitcoin-24f26e08cc0d-x86_64-apple-darwin-unsigned.dmg
212b5fcdf41aef6a31a7786e2d0da3859488e0111841d0b10808620ca83d43cf  guix-build-24f26e08cc0d/output/x86_64-apple-darwin/bitcoin-24f26e08cc0d-x86_64-apple-darwin-unsigned.tar.gz
9c20f47bf9bd4c8209b389ab3a7fcbab89a6860774e13f8437f3e261800e938e  guix-build-24f26e08cc0d/output/x86_64-apple-darwin/bitcoin-24f26e08cc0d-x86_64-apple-darwin.tar.gz
6fa78bf4facd3703a7dc99bbcdef8c5191858dc7a3950ce92674eb99c253f71a  guix-build-24f26e08cc0d/output/x86_64-linux-gnu/SHA256SUMS.part
d410960b66cce5569d4e6466d8a8bc6bb5a010abc057b83085e927deb2394345  guix-build-24f26e08cc0d/output/x86_64-linux-gnu/bitcoin-24f26e08cc0d-x86_64-linux-gnu-debug.tar.gz
d50a46c30e2e328ee936c14cfd72ad2e96956f98e849015a4dd1ecd371a4f4fa  guix-build-24f26e08cc0d/output/x86_64-linux-gnu/bitcoin-24f26e08cc0d-x86_64-linux-gnu.tar.gz
3af39753a35944968e53972ef911f46d5bdd2b07b7ee746bba5436ee21d9793d  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/SHA256SUMS.part
4d1fb14c0d174ff7d43665d30d6e865123b1d8dc9b1dd408ba937014c94229b8  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/bitcoin-24f26e08cc0d-win64-debug.zip
1c66e19c50435278a50baf13e335f7f3bb6d07a15afe9b53940fcfc02468c7dd  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/bitcoin-24f26e08cc0d-win64-setup-unsigned.exe
a0099101dcedb71631b261f7afe21871978a99fd49d9d49601a19323c88336ca  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/bitcoin-24f26e08cc0d-win64-unsigned.tar.gz
c89c393c65e685c2148bb4963ca16b8df5714ff9eccf89c062f572e965fbadcc  guix-build-24f26e08cc0d/output/x86_64-w64-mingw32/bitcoin-24f26e08cc0d-win64.zip