Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

guix: Update python-lief package to 0.13.2 #27813

Merged
merged 1 commit into from
Jun 28, 2023

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Jun 3, 2023

The Guix's python-lief package is going to move to using external deps, rather than the bundled ones (https://lists.gnu.org/archive/html/guix-patches/2023-05/msg01302.html). We want to continue using our own package indefinitely, to keep the build simpler, and allow for easier updating.

Changes in contrib/devtools/security-check.py are caused by lief-project/LIEF@6357c63.

Also see: #27507.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 3, 2023

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 fanquake
Concept ACK luke-jr

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:

  • #27811 (guix: Clean up manifest by hebasto)
  • #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 hebasto marked this pull request as ready for review June 3, 2023 20:38
@hebasto
Copy link
Member Author

hebasto commented Jun 3, 2023

Guix build:

f3006576f4882414f9bbe9e37dbf54567bf24cff5252e487260a79d7f411c0bd  guix-build-e3792a660abf/output/aarch64-linux-gnu/SHA256SUMS.part
61e90a272ab6d534ade60c46da90809f5d03017d31fed4b24225780db8c4aa4d  guix-build-e3792a660abf/output/aarch64-linux-gnu/bitcoin-e3792a660abf-aarch64-linux-gnu-debug.tar.gz
a6e23c73e89076f5cb8c712effd6dd5796fb1e9bfd720b9310b829128e7a94f1  guix-build-e3792a660abf/output/aarch64-linux-gnu/bitcoin-e3792a660abf-aarch64-linux-gnu.tar.gz
8531ad1072f660de83b6c73e2a21701ddb48de2c0fd3b1cab00e5469ce0249ff  guix-build-e3792a660abf/output/arm-linux-gnueabihf/SHA256SUMS.part
ee494a22d0827e32fcd5209a7a5c6b229715a0caa04d54f7fa0bf3bf550db983  guix-build-e3792a660abf/output/arm-linux-gnueabihf/bitcoin-e3792a660abf-arm-linux-gnueabihf-debug.tar.gz
534ddf5b937611713ca783c5b8651374b09265e173329fe028d68e9bda809b28  guix-build-e3792a660abf/output/arm-linux-gnueabihf/bitcoin-e3792a660abf-arm-linux-gnueabihf.tar.gz
bf3f86eb5f50c2a42acd4e3e7bb88aed065e9c863ed9860edb17951270c7510b  guix-build-e3792a660abf/output/arm64-apple-darwin/SHA256SUMS.part
9c6b93e407f57d81f18200bf7baf969b01e3f19ac8aa00dc02f390c66669ef52  guix-build-e3792a660abf/output/arm64-apple-darwin/bitcoin-e3792a660abf-arm64-apple-darwin-unsigned.dmg
d762d3b85bbdf86d74684e6f665b76130b38d2f7799b7b7724004f5f7f77291a  guix-build-e3792a660abf/output/arm64-apple-darwin/bitcoin-e3792a660abf-arm64-apple-darwin-unsigned.tar.gz
df7864cfd5b9af185abc47a0c36b350c2e815631a8a1a84fe82f53a937a7c613  guix-build-e3792a660abf/output/arm64-apple-darwin/bitcoin-e3792a660abf-arm64-apple-darwin.tar.gz
07facd09f33134796b66f6ea85b86d4289bb563f6b6fb316ea648c52e9644598  guix-build-e3792a660abf/output/dist-archive/bitcoin-e3792a660abf.tar.gz
0596801dc20aa339a6e8bfc7190fc04b4e1c6321fa10d1f0d6ab1e94f40e6aa3  guix-build-e3792a660abf/output/powerpc64-linux-gnu/SHA256SUMS.part
98b000aaf23646beaa7437cfaa89689f6c00d4503ad17c8ba03e90dbbaaca064  guix-build-e3792a660abf/output/powerpc64-linux-gnu/bitcoin-e3792a660abf-powerpc64-linux-gnu-debug.tar.gz
125f61437d295cec4676492bfd48ae075a97466a8a33442d259bd02e243d87b6  guix-build-e3792a660abf/output/powerpc64-linux-gnu/bitcoin-e3792a660abf-powerpc64-linux-gnu.tar.gz
d0ae564037e40cce7b3675bf6f5dc142e8d3738921da70c26b066aca12f98576  guix-build-e3792a660abf/output/powerpc64le-linux-gnu/SHA256SUMS.part
a1d7d52a85d16d67a1b80b910fac1dd50c12b22f733e3944a578aca811259781  guix-build-e3792a660abf/output/powerpc64le-linux-gnu/bitcoin-e3792a660abf-powerpc64le-linux-gnu-debug.tar.gz
9a4c253e5ccb723686f8ba0914c976eb8606fcf624bb396fa6551c9b1aafa9fa  guix-build-e3792a660abf/output/powerpc64le-linux-gnu/bitcoin-e3792a660abf-powerpc64le-linux-gnu.tar.gz
966219630b3a26e4f623ff6f8145dd274f653c913d1683cb6739e2195470364d  guix-build-e3792a660abf/output/riscv64-linux-gnu/SHA256SUMS.part
db971b364caf693bcff25cef3f907d6c4f2c8c2be8b14af7b9df315c26cc3c29  guix-build-e3792a660abf/output/riscv64-linux-gnu/bitcoin-e3792a660abf-riscv64-linux-gnu-debug.tar.gz
31fa8d8f3d60514d2ea8e27061f4c50593d0d550a3940e94df536d4cde8e3502  guix-build-e3792a660abf/output/riscv64-linux-gnu/bitcoin-e3792a660abf-riscv64-linux-gnu.tar.gz
a4dfb100d37a3ffeabb41c0349d568f3bdfcbe6b9b86fa132f76e652d8ed8fad  guix-build-e3792a660abf/output/x86_64-apple-darwin/SHA256SUMS.part
fcc5605eeed92362c016c259a0eb5357fc88a605fa315059cdd33a5cac556b80  guix-build-e3792a660abf/output/x86_64-apple-darwin/bitcoin-e3792a660abf-x86_64-apple-darwin-unsigned.dmg
7a38e336f662fb8b6f009563e2b6adad19f7625d0c5ad5d66066e943970653c3  guix-build-e3792a660abf/output/x86_64-apple-darwin/bitcoin-e3792a660abf-x86_64-apple-darwin-unsigned.tar.gz
cbdde1a0b21e35794abefc499b6ad25be2df39901b9c425ecbbc7e8bb989b238  guix-build-e3792a660abf/output/x86_64-apple-darwin/bitcoin-e3792a660abf-x86_64-apple-darwin.tar.gz
09fb0556e017c432d103ae937ae784954cddbdf050b38cbb0b72470cfc0ad035  guix-build-e3792a660abf/output/x86_64-linux-gnu/SHA256SUMS.part
f0ede8b829e430eba28bf177f28743fee5b052cdf64f915ea40ce0766559a37c  guix-build-e3792a660abf/output/x86_64-linux-gnu/bitcoin-e3792a660abf-x86_64-linux-gnu-debug.tar.gz
6d201f54f5698d2815ad24562fcb6e669c92ac5258562ac37dbfe65b14b4350d  guix-build-e3792a660abf/output/x86_64-linux-gnu/bitcoin-e3792a660abf-x86_64-linux-gnu.tar.gz
93eaa996c28541e6cc5e1939710db5c3a223d071046e8bf482b31aa30419b3d6  guix-build-e3792a660abf/output/x86_64-w64-mingw32/SHA256SUMS.part
aa76241e960d338799c5779d49f134a6499453925c4f7aa6229afbad326aa913  guix-build-e3792a660abf/output/x86_64-w64-mingw32/bitcoin-e3792a660abf-win64-debug.zip
bb9700048b274b38c9da9a412a24a37b733f0b0612d78b0037034940759764ef  guix-build-e3792a660abf/output/x86_64-w64-mingw32/bitcoin-e3792a660abf-win64-setup-unsigned.exe
8a9d7e8a73bcf863a45016244981a8bacb6d17cb1fa81488ef8e162c6c6cfce9  guix-build-e3792a660abf/output/x86_64-w64-mingw32/bitcoin-e3792a660abf-win64-unsigned.tar.gz
a2fb14f382046b51fa20157a68f7005307baa1416c81f3e9c7129b02ebdbf605  guix-build-e3792a660abf/output/x86_64-w64-mingw32/bitcoin-e3792a660abf-win64.zip

@fanquake
Copy link
Member

fanquake commented Jun 5, 2023

The usage of LIEF 0.13.1 in the developer environment has been assumed since #27507.

The only requirement to have LIEF 0.13.1 installed, is if you want to run the Python linter, which is not a reason to bump packages in our release environment. Outside of that, I don't think LIEF is used for anything in developer environments.

@hebasto
Copy link
Member Author

hebasto commented Jun 5, 2023

... which is not a reason to bump packages in our release environment.

"and drops the patch that was upstreamed."

@jarolrod
Copy link
Member

jarolrod commented Jun 6, 2023

Guix hashes

f3006576f4882414f9bbe9e37dbf54567bf24cff5252e487260a79d7f411c0bd  guix-build-e3792a660abf/output/aarch64-linux-gnu/SHA256SUMS.part
61e90a272ab6d534ade60c46da90809f5d03017d31fed4b24225780db8c4aa4d  guix-build-e3792a660abf/output/aarch64-linux-gnu/bitcoin-e3792a660abf-aarch64-linux-gnu-debug.tar.gz
a6e23c73e89076f5cb8c712effd6dd5796fb1e9bfd720b9310b829128e7a94f1  guix-build-e3792a660abf/output/aarch64-linux-gnu/bitcoin-e3792a660abf-aarch64-linux-gnu.tar.gz
8531ad1072f660de83b6c73e2a21701ddb48de2c0fd3b1cab00e5469ce0249ff  guix-build-e3792a660abf/output/arm-linux-gnueabihf/SHA256SUMS.part
ee494a22d0827e32fcd5209a7a5c6b229715a0caa04d54f7fa0bf3bf550db983  guix-build-e3792a660abf/output/arm-linux-gnueabihf/bitcoin-e3792a660abf-arm-linux-gnueabihf-debug.tar.gz
534ddf5b937611713ca783c5b8651374b09265e173329fe028d68e9bda809b28  guix-build-e3792a660abf/output/arm-linux-gnueabihf/bitcoin-e3792a660abf-arm-linux-gnueabihf.tar.gz
bf3f86eb5f50c2a42acd4e3e7bb88aed065e9c863ed9860edb17951270c7510b  guix-build-e3792a660abf/output/arm64-apple-darwin/SHA256SUMS.part
9c6b93e407f57d81f18200bf7baf969b01e3f19ac8aa00dc02f390c66669ef52  guix-build-e3792a660abf/output/arm64-apple-darwin/bitcoin-e3792a660abf-arm64-apple-darwin-unsigned.dmg
d762d3b85bbdf86d74684e6f665b76130b38d2f7799b7b7724004f5f7f77291a  guix-build-e3792a660abf/output/arm64-apple-darwin/bitcoin-e3792a660abf-arm64-apple-darwin-unsigned.tar.gz
df7864cfd5b9af185abc47a0c36b350c2e815631a8a1a84fe82f53a937a7c613  guix-build-e3792a660abf/output/arm64-apple-darwin/bitcoin-e3792a660abf-arm64-apple-darwin.tar.gz
07facd09f33134796b66f6ea85b86d4289bb563f6b6fb316ea648c52e9644598  guix-build-e3792a660abf/output/dist-archive/bitcoin-e3792a660abf.tar.gz
0596801dc20aa339a6e8bfc7190fc04b4e1c6321fa10d1f0d6ab1e94f40e6aa3  guix-build-e3792a660abf/output/powerpc64-linux-gnu/SHA256SUMS.part
98b000aaf23646beaa7437cfaa89689f6c00d4503ad17c8ba03e90dbbaaca064  guix-build-e3792a660abf/output/powerpc64-linux-gnu/bitcoin-e3792a660abf-powerpc64-linux-gnu-debug.tar.gz
125f61437d295cec4676492bfd48ae075a97466a8a33442d259bd02e243d87b6  guix-build-e3792a660abf/output/powerpc64-linux-gnu/bitcoin-e3792a660abf-powerpc64-linux-gnu.tar.gz
d0ae564037e40cce7b3675bf6f5dc142e8d3738921da70c26b066aca12f98576  guix-build-e3792a660abf/output/powerpc64le-linux-gnu/SHA256SUMS.part
a1d7d52a85d16d67a1b80b910fac1dd50c12b22f733e3944a578aca811259781  guix-build-e3792a660abf/output/powerpc64le-linux-gnu/bitcoin-e3792a660abf-powerpc64le-linux-gnu-debug.tar.gz
9a4c253e5ccb723686f8ba0914c976eb8606fcf624bb396fa6551c9b1aafa9fa  guix-build-e3792a660abf/output/powerpc64le-linux-gnu/bitcoin-e3792a660abf-powerpc64le-linux-gnu.tar.gz
966219630b3a26e4f623ff6f8145dd274f653c913d1683cb6739e2195470364d  guix-build-e3792a660abf/output/riscv64-linux-gnu/SHA256SUMS.part
db971b364caf693bcff25cef3f907d6c4f2c8c2be8b14af7b9df315c26cc3c29  guix-build-e3792a660abf/output/riscv64-linux-gnu/bitcoin-e3792a660abf-riscv64-linux-gnu-debug.tar.gz
31fa8d8f3d60514d2ea8e27061f4c50593d0d550a3940e94df536d4cde8e3502  guix-build-e3792a660abf/output/riscv64-linux-gnu/bitcoin-e3792a660abf-riscv64-linux-gnu.tar.gz
a4dfb100d37a3ffeabb41c0349d568f3bdfcbe6b9b86fa132f76e652d8ed8fad  guix-build-e3792a660abf/output/x86_64-apple-darwin/SHA256SUMS.part
fcc5605eeed92362c016c259a0eb5357fc88a605fa315059cdd33a5cac556b80  guix-build-e3792a660abf/output/x86_64-apple-darwin/bitcoin-e3792a660abf-x86_64-apple-darwin-unsigned.dmg
7a38e336f662fb8b6f009563e2b6adad19f7625d0c5ad5d66066e943970653c3  guix-build-e3792a660abf/output/x86_64-apple-darwin/bitcoin-e3792a660abf-x86_64-apple-darwin-unsigned.tar.gz
cbdde1a0b21e35794abefc499b6ad25be2df39901b9c425ecbbc7e8bb989b238  guix-build-e3792a660abf/output/x86_64-apple-darwin/bitcoin-e3792a660abf-x86_64-apple-darwin.tar.gz
09fb0556e017c432d103ae937ae784954cddbdf050b38cbb0b72470cfc0ad035  guix-build-e3792a660abf/output/x86_64-linux-gnu/SHA256SUMS.part
f0ede8b829e430eba28bf177f28743fee5b052cdf64f915ea40ce0766559a37c  guix-build-e3792a660abf/output/x86_64-linux-gnu/bitcoin-e3792a660abf-x86_64-linux-gnu-debug.tar.gz
6d201f54f5698d2815ad24562fcb6e669c92ac5258562ac37dbfe65b14b4350d  guix-build-e3792a660abf/output/x86_64-linux-gnu/bitcoin-e3792a660abf-x86_64-linux-gnu.tar.gz
93eaa996c28541e6cc5e1939710db5c3a223d071046e8bf482b31aa30419b3d6  guix-build-e3792a660abf/output/x86_64-w64-mingw32/SHA256SUMS.part
aa76241e960d338799c5779d49f134a6499453925c4f7aa6229afbad326aa913  guix-build-e3792a660abf/output/x86_64-w64-mingw32/bitcoin-e3792a660abf-win64-debug.zip
bb9700048b274b38c9da9a412a24a37b733f0b0612d78b0037034940759764ef  guix-build-e3792a660abf/output/x86_64-w64-mingw32/bitcoin-e3792a660abf-win64-setup-unsigned.exe
8a9d7e8a73bcf863a45016244981a8bacb6d17cb1fa81488ef8e162c6c6cfce9  guix-build-e3792a660abf/output/x86_64-w64-mingw32/bitcoin-e3792a660abf-win64-unsigned.tar.gz
a2fb14f382046b51fa20157a68f7005307baa1416c81f3e9c7129b02ebdbf605  guix-build-e3792a660abf/output/x86_64-w64-mingw32/bitcoin-e3792a660abf-win64.zip

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK - Given that with LIEF 0.13.1, it looks like the Guix package is going to move to using external deps, rather than the bundled ones (https://lists.gnu.org/archive/html/guix-patches/2023-05/msg01302.html), we probably want to continue using our own package indefinitely, to keep the build simpler, and allow for easier updating.

I also think the PR description needs updating, because LIEF in Guix is not related to developer environments, where LIEF would only be installed for access to type stubs during linting.

I've been testing this PR as part of some other changes.

contrib/guix/manifest.scm Outdated Show resolved Hide resolved
contrib/guix/manifest.scm Outdated Show resolved Hide resolved
@fanquake
Copy link
Member

0.13.2 is now also out: https://github.com/lief-project/LIEF/releases/tag/0.13.2.

@hebasto hebasto changed the title guix: Update python-lief package to 0.13.1 guix: Update python-lief package to 0.13.2 Jun 23, 2023
@hebasto
Copy link
Member Author

hebasto commented Jun 23, 2023

Addressed @fanquake's comments.

Removed dependency on (guix gexp).

I also think the PR description needs updating...

Thanks! Done.

@hebasto
Copy link
Member Author

hebasto commented Jun 23, 2023

Guix builds:

ec1cab49e34ff69340ffd221172f5c4bb7d5560e9762e4b9b81e310d11f3fa21  guix-build-ed40b41b4f04/output/aarch64-linux-gnu/SHA256SUMS.part
838fd2b54d2d7b0e072549c32372741e0d36cafd1886dbe900094114d70b8da9  guix-build-ed40b41b4f04/output/aarch64-linux-gnu/bitcoin-ed40b41b4f04-aarch64-linux-gnu-debug.tar.gz
c9d52502ab4b7e76e069dc04ad323c488d5d36602830d8c6e12b4efcc252c993  guix-build-ed40b41b4f04/output/aarch64-linux-gnu/bitcoin-ed40b41b4f04-aarch64-linux-gnu.tar.gz
3f28f20ff8110d7e28d061a673e9550f1ce7ac2b92759c3f1973075b5de170f4  guix-build-ed40b41b4f04/output/arm-linux-gnueabihf/SHA256SUMS.part
2293a758fe4381f486bcd3e91643e54b10c7fc03c1e732ddfcaecf40db8d8904  guix-build-ed40b41b4f04/output/arm-linux-gnueabihf/bitcoin-ed40b41b4f04-arm-linux-gnueabihf-debug.tar.gz
21e1d285ae36a51086c0cd6a6c1ceba534d2c5c320a6fa75445449507944445d  guix-build-ed40b41b4f04/output/arm-linux-gnueabihf/bitcoin-ed40b41b4f04-arm-linux-gnueabihf.tar.gz
eb0327af998a733c329572e4f939911362a7add4192aabf6e0d641552f5b6bc0  guix-build-ed40b41b4f04/output/arm64-apple-darwin/SHA256SUMS.part
a444f0bedc51e94dd7b40170089a01140694afbf5b0db5cd9cbaa40cc1300ca1  guix-build-ed40b41b4f04/output/arm64-apple-darwin/bitcoin-ed40b41b4f04-arm64-apple-darwin-unsigned.dmg
93dfee7ebabe417df9aa5b7de2955e2a5a5feeeceba51d7978bd20c297776612  guix-build-ed40b41b4f04/output/arm64-apple-darwin/bitcoin-ed40b41b4f04-arm64-apple-darwin-unsigned.tar.gz
05197a2283918e12c1c1ebfbd21b6bfe0565a78955b617c86bbb0fdb15c18f30  guix-build-ed40b41b4f04/output/arm64-apple-darwin/bitcoin-ed40b41b4f04-arm64-apple-darwin.tar.gz
05b13409a05b01eed632291a4c992f2b5383ea7cfd4fd9d19cc30eac48958464  guix-build-ed40b41b4f04/output/dist-archive/bitcoin-ed40b41b4f04.tar.gz
a3a87afc35feaced071f045606a35182b3c2a1024243008b8c2f4cce5850d1e4  guix-build-ed40b41b4f04/output/powerpc64-linux-gnu/SHA256SUMS.part
50ce9501208ca82b2d1a902a2416505c76c2b96bc22a82944f0b70abbced01d1  guix-build-ed40b41b4f04/output/powerpc64-linux-gnu/bitcoin-ed40b41b4f04-powerpc64-linux-gnu-debug.tar.gz
a6c161a85c77dd990dbc70ebfa39f52a12deeedb46aca9d41a58326243ccef46  guix-build-ed40b41b4f04/output/powerpc64-linux-gnu/bitcoin-ed40b41b4f04-powerpc64-linux-gnu.tar.gz
6476db3d9e57cf8381165f7bbe301a5affc7e707c39100dbe251d62f52c61ea0  guix-build-ed40b41b4f04/output/powerpc64le-linux-gnu/SHA256SUMS.part
51815e694bb32b6303e9990058d6badfbb242e8602a38b91e3a25eaed913927f  guix-build-ed40b41b4f04/output/powerpc64le-linux-gnu/bitcoin-ed40b41b4f04-powerpc64le-linux-gnu-debug.tar.gz
09f7ea95e44e1c554459ceee9c503e66f09d7b923292893e684711666bc6c8f3  guix-build-ed40b41b4f04/output/powerpc64le-linux-gnu/bitcoin-ed40b41b4f04-powerpc64le-linux-gnu.tar.gz
1ca1aeb5c6421c1f4a9f3b189496debcc2963cf38a1110f845a170888101012f  guix-build-ed40b41b4f04/output/riscv64-linux-gnu/SHA256SUMS.part
175eb45c7f51338d2cc23aa9129763ceda0f7cfbd8b8740d23e91fa480e7b7a1  guix-build-ed40b41b4f04/output/riscv64-linux-gnu/bitcoin-ed40b41b4f04-riscv64-linux-gnu-debug.tar.gz
a4b2c894067127e352a272f7326504fb18b2c878c2984f14657beb88dd2006ba  guix-build-ed40b41b4f04/output/riscv64-linux-gnu/bitcoin-ed40b41b4f04-riscv64-linux-gnu.tar.gz
b1f0addac4ffd26be6494c2380a0f7855a43307582ca92eb908273dd3ee72700  guix-build-ed40b41b4f04/output/x86_64-apple-darwin/SHA256SUMS.part
6bfd2e83161f6f5e64166c593a9e97091e728de5c9666b1d0796802a82b89c71  guix-build-ed40b41b4f04/output/x86_64-apple-darwin/bitcoin-ed40b41b4f04-x86_64-apple-darwin-unsigned.dmg
6555b4d54cb4119c8c3f22d7e549852c80e3fef8bc66eca1bf6fc511e8972937  guix-build-ed40b41b4f04/output/x86_64-apple-darwin/bitcoin-ed40b41b4f04-x86_64-apple-darwin-unsigned.tar.gz
7d2f9a0ae03c80e671e0c4c58ed3996890a1acab71453c78c07370b4f607189f  guix-build-ed40b41b4f04/output/x86_64-apple-darwin/bitcoin-ed40b41b4f04-x86_64-apple-darwin.tar.gz
91723dc33120f351c529637ee42872218abe06071b4ab80ecbc3c3255ec94cac  guix-build-ed40b41b4f04/output/x86_64-linux-gnu/SHA256SUMS.part
acf3de05357f4a6e8b4b847966593736bd1021e5851e1f79a51534c4df57f024  guix-build-ed40b41b4f04/output/x86_64-linux-gnu/bitcoin-ed40b41b4f04-x86_64-linux-gnu-debug.tar.gz
98f5311a57a7942026d4cf4303c7939d085cc305be448fa91a040037e7e2dac6  guix-build-ed40b41b4f04/output/x86_64-linux-gnu/bitcoin-ed40b41b4f04-x86_64-linux-gnu.tar.gz
e034ad2cbd4ee5318b4ee91b808f7545dcc28bf0908c60b891685e687a5b7e94  guix-build-ed40b41b4f04/output/x86_64-w64-mingw32/SHA256SUMS.part
5274a4f9707d8ae04c95b032be91adf379de4343bb55fffac0570dd59509b703  guix-build-ed40b41b4f04/output/x86_64-w64-mingw32/bitcoin-ed40b41b4f04-win64-debug.zip
c1a0860a946db1b87ead092941d8dac4528f2ff7d74f9bc9b6f0cafca9644159  guix-build-ed40b41b4f04/output/x86_64-w64-mingw32/bitcoin-ed40b41b4f04-win64-setup-unsigned.exe
a424e622cf5aa7f93c940b41ec6edc148d182e6ce1805a3e9a204b31e345104c  guix-build-ed40b41b4f04/output/x86_64-w64-mingw32/bitcoin-ed40b41b4f04-win64-unsigned.tar.gz
ec26dd0109ec9eabeb33a8564d5784d0551fd7701924ff558ed74e33b41c6e14  guix-build-ed40b41b4f04/output/x86_64-w64-mingw32/bitcoin-ed40b41b4f04-win64.zip

@fanquake
Copy link
Member

Removed dependency on (guix gexp).

NACK. Why is that an improvement?

@hebasto
Copy link
Member Author

hebasto commented Jun 23, 2023

Removed dependency on (guix gexp).

NACK.

Ok. Reverted back.

Why is that an improvement?

I saw no reasons to use (guix gexp) solely for the sake of a single package.

@DrahtBot
Copy link
Contributor

Guix builds

File commit 6a47337
(master)
commit 57eec96
(master and this pull)
SHA256SUMS.part 1b1bb3a40071466e... 7b3c63a53f0ebe2a...
*-aarch64-linux-gnu-debug.tar.gz 2132dc8c790cb8b4... f38a138d17ed8d49...
*-aarch64-linux-gnu.tar.gz fd25000e111cd1a2... 6e64b6b167b50dc7...
*-arm-linux-gnueabihf-debug.tar.gz 9983a056c55089ab... 9d4fdb959e3b707c...
*-arm-linux-gnueabihf.tar.gz a89820d1c52cdc2d... a1dfa405330201a2...
*-powerpc64-linux-gnu-debug.tar.gz 9ba0d47e53c05ad6... fd063883e8fe1e03...
*-powerpc64-linux-gnu.tar.gz d666fbc0c401b3c8... 1bc1fa1c10593f16...
*-powerpc64le-linux-gnu-debug.tar.gz 95665c3000856732... e88735f7854d7b18...
*-powerpc64le-linux-gnu.tar.gz 6db745bd281bd994... 182b6e59968f32a6...
*-riscv64-linux-gnu-debug.tar.gz 90fa7dc5b11d7c2c... bee6924518582e86...
*-riscv64-linux-gnu.tar.gz bcf18fea587e179c... 6517451f07fea634...
*-x86_64-linux-gnu-debug.tar.gz a0f3287e95678721... 5819d7c1a7e4abb1...
*-x86_64-linux-gnu.tar.gz 42cbca9ea85bc07e... dcb2de1244be4fb3...
*.tar.gz 27691a7fab860e50... d6a6829cb84f5315...
guix_build.log fb242c61f5065fed... 4456b6cefe726493...
guix_build.log.diff ca198b05c43380eb...

@luke-jr
Copy link
Member

luke-jr commented Jun 24, 2023

Would be better to use Guix upstream's lief if possible. Unbundled deps is better, not worse.

If upstream is broken at present, concept ACK for now.

@hebasto
Copy link
Member Author

hebasto commented Jun 26, 2023

Guix builds:

018716ffdc0c60b1dfa27f95d1fb4e03d0e37f50cfc325ee35d200039b3f419e  guix-build-529c92e837b2/output/aarch64-linux-gnu/SHA256SUMS.part
bb6e74d4806879560e7b6e50bce4b47b383ed5d763e6d25feac64b0c944cc036  guix-build-529c92e837b2/output/aarch64-linux-gnu/bitcoin-529c92e837b2-aarch64-linux-gnu-debug.tar.gz
2e6fc404211c94bc9a0265a783fabcd3c0bfddb9a87322b612185489ef6264d9  guix-build-529c92e837b2/output/aarch64-linux-gnu/bitcoin-529c92e837b2-aarch64-linux-gnu.tar.gz
b0f0d9e2e4466cc301c3e96c9d4e4a8b916a18bf1300610b63e6cfae262a3dee  guix-build-529c92e837b2/output/arm-linux-gnueabihf/SHA256SUMS.part
e7a81c9b54fc998ed744acac906854c8a0927de04398798393893f8e46cb9a70  guix-build-529c92e837b2/output/arm-linux-gnueabihf/bitcoin-529c92e837b2-arm-linux-gnueabihf-debug.tar.gz
6e12d04f048e809f04748aa0ddb309331084314a06d7983cff27833ec2fc129d  guix-build-529c92e837b2/output/arm-linux-gnueabihf/bitcoin-529c92e837b2-arm-linux-gnueabihf.tar.gz
41bbdb3c678c777d001f8e0b4193e332b919ea73a0b601ac909df1acaa747a09  guix-build-529c92e837b2/output/arm64-apple-darwin/SHA256SUMS.part
8878aa364dd091e1e90ec505df9d01813c9944dac828fc659e66ade239e2a872  guix-build-529c92e837b2/output/arm64-apple-darwin/bitcoin-529c92e837b2-arm64-apple-darwin-unsigned.dmg
83ec8b9b06985502711924465a2456403c82c2450195bdb15547ce4c0ba98c0c  guix-build-529c92e837b2/output/arm64-apple-darwin/bitcoin-529c92e837b2-arm64-apple-darwin-unsigned.tar.gz
05f1400892ad82c8619bfbb4bd492f22c20a8b6de89d1315925502d3e6e29d01  guix-build-529c92e837b2/output/arm64-apple-darwin/bitcoin-529c92e837b2-arm64-apple-darwin.tar.gz
85bb1b32ccdd0b3dc05079b72db7b2f11098098458f4e54f75e0f8738ba2648b  guix-build-529c92e837b2/output/dist-archive/bitcoin-529c92e837b2.tar.gz
ca44eaeafc0b8e8df455afc18a5b7006e3826c602ebdc50bd7e2bba1a40cd48f  guix-build-529c92e837b2/output/powerpc64-linux-gnu/SHA256SUMS.part
37f8b3b4822cbd2b47ca9b3dbe070f1bde70c47876d03dfa0158357e72685b2d  guix-build-529c92e837b2/output/powerpc64-linux-gnu/bitcoin-529c92e837b2-powerpc64-linux-gnu-debug.tar.gz
289d8db2e12f5c4d7627b1739e55efba76e87f0cdb3605de9f533eaade641ca7  guix-build-529c92e837b2/output/powerpc64-linux-gnu/bitcoin-529c92e837b2-powerpc64-linux-gnu.tar.gz
43ea0c5bfdb79482cd308d34f41b1597abae8cc08e1430a7340ff466a34743e7  guix-build-529c92e837b2/output/powerpc64le-linux-gnu/SHA256SUMS.part
9537a4eb031f6d486c5db9aa0de68c6a5969ff53186efa7248394dcc88a7098c  guix-build-529c92e837b2/output/powerpc64le-linux-gnu/bitcoin-529c92e837b2-powerpc64le-linux-gnu-debug.tar.gz
08a7596b710cb8a2009778adf25471e7e9cc0e9c577cc91694bc237e34dd7552  guix-build-529c92e837b2/output/powerpc64le-linux-gnu/bitcoin-529c92e837b2-powerpc64le-linux-gnu.tar.gz
680401083fa241110f08fb5224a49b20c21861a51d2e326d777234a7082350e5  guix-build-529c92e837b2/output/riscv64-linux-gnu/SHA256SUMS.part
364eb0b4960b1cac1430d2bcbe9f354c7d0457209d8022a9e164689b8adc1e65  guix-build-529c92e837b2/output/riscv64-linux-gnu/bitcoin-529c92e837b2-riscv64-linux-gnu-debug.tar.gz
36d5dffca5602ec1b1a4de61ff95f8970724575fbcbb40159f1c34638e42392b  guix-build-529c92e837b2/output/riscv64-linux-gnu/bitcoin-529c92e837b2-riscv64-linux-gnu.tar.gz
1474b9d4a377344a17a8c19958d7eaea482e42f1c083c8a6110a8c82815fed7b  guix-build-529c92e837b2/output/x86_64-apple-darwin/SHA256SUMS.part
6db103ff5f0a47f9b2ee70976b08e9f521704cfc6733300686988c72efb08ca5  guix-build-529c92e837b2/output/x86_64-apple-darwin/bitcoin-529c92e837b2-x86_64-apple-darwin-unsigned.dmg
c8d7c3f38fbbd770c4e3f950914fab0567fd116a6399c6b6ed25f7428bdcf48a  guix-build-529c92e837b2/output/x86_64-apple-darwin/bitcoin-529c92e837b2-x86_64-apple-darwin-unsigned.tar.gz
e385cf8740be4ea5916809547beff7b91682b2488ea6aea689ce65f68650c94a  guix-build-529c92e837b2/output/x86_64-apple-darwin/bitcoin-529c92e837b2-x86_64-apple-darwin.tar.gz
b3998a9d1cb6cfd463b1f23800d49d7a97e8108335be22661df22e7531c8a220  guix-build-529c92e837b2/output/x86_64-linux-gnu/SHA256SUMS.part
48177acf4a31c1edd25b2783fe60b49d903890aa04225dd5ed7e96390728584d  guix-build-529c92e837b2/output/x86_64-linux-gnu/bitcoin-529c92e837b2-x86_64-linux-gnu-debug.tar.gz
53f5873bbbd6b39a9dfbf77765a28b1f34b402d53999498aee6ae405e81acdf4  guix-build-529c92e837b2/output/x86_64-linux-gnu/bitcoin-529c92e837b2-x86_64-linux-gnu.tar.gz
b97ade8531d51582747c0f5c5ef129d2cecd2d2cfcdcddfe0aec5754c63fcf2b  guix-build-529c92e837b2/output/x86_64-w64-mingw32/SHA256SUMS.part
8a12efc03fb02be9285795b50624621d7935c71f85c23116e903108de0536943  guix-build-529c92e837b2/output/x86_64-w64-mingw32/bitcoin-529c92e837b2-win64-debug.zip
3eab525239e6fd95477938fb819da77941e7fd3762e25f72b2c149e0146a6d7e  guix-build-529c92e837b2/output/x86_64-w64-mingw32/bitcoin-529c92e837b2-win64-setup-unsigned.exe
4e0eb66abcb5d155f3e68a5abf292bb55b52851d71dc826e5cb48d018143bc9b  guix-build-529c92e837b2/output/x86_64-w64-mingw32/bitcoin-529c92e837b2-win64-unsigned.tar.gz
d9f3cd5e83756fc3bb6c2d94472331e137ca67ce7e47988d1b3190d9a2b8a241  guix-build-529c92e837b2/output/x86_64-w64-mingw32/bitcoin-529c92e837b2-win64.zip

@fanquake
Copy link
Member

Guix Build:

018716ffdc0c60b1dfa27f95d1fb4e03d0e37f50cfc325ee35d200039b3f419e  guix-build-529c92e837b2/output/aarch64-linux-gnu/SHA256SUMS.part
bb6e74d4806879560e7b6e50bce4b47b383ed5d763e6d25feac64b0c944cc036  guix-build-529c92e837b2/output/aarch64-linux-gnu/bitcoin-529c92e837b2-aarch64-linux-gnu-debug.tar.gz
2e6fc404211c94bc9a0265a783fabcd3c0bfddb9a87322b612185489ef6264d9  guix-build-529c92e837b2/output/aarch64-linux-gnu/bitcoin-529c92e837b2-aarch64-linux-gnu.tar.gz
b0f0d9e2e4466cc301c3e96c9d4e4a8b916a18bf1300610b63e6cfae262a3dee  guix-build-529c92e837b2/output/arm-linux-gnueabihf/SHA256SUMS.part
e7a81c9b54fc998ed744acac906854c8a0927de04398798393893f8e46cb9a70  guix-build-529c92e837b2/output/arm-linux-gnueabihf/bitcoin-529c92e837b2-arm-linux-gnueabihf-debug.tar.gz
6e12d04f048e809f04748aa0ddb309331084314a06d7983cff27833ec2fc129d  guix-build-529c92e837b2/output/arm-linux-gnueabihf/bitcoin-529c92e837b2-arm-linux-gnueabihf.tar.gz
41bbdb3c678c777d001f8e0b4193e332b919ea73a0b601ac909df1acaa747a09  guix-build-529c92e837b2/output/arm64-apple-darwin/SHA256SUMS.part
8878aa364dd091e1e90ec505df9d01813c9944dac828fc659e66ade239e2a872  guix-build-529c92e837b2/output/arm64-apple-darwin/bitcoin-529c92e837b2-arm64-apple-darwin-unsigned.dmg
83ec8b9b06985502711924465a2456403c82c2450195bdb15547ce4c0ba98c0c  guix-build-529c92e837b2/output/arm64-apple-darwin/bitcoin-529c92e837b2-arm64-apple-darwin-unsigned.tar.gz
05f1400892ad82c8619bfbb4bd492f22c20a8b6de89d1315925502d3e6e29d01  guix-build-529c92e837b2/output/arm64-apple-darwin/bitcoin-529c92e837b2-arm64-apple-darwin.tar.gz
85bb1b32ccdd0b3dc05079b72db7b2f11098098458f4e54f75e0f8738ba2648b  guix-build-529c92e837b2/output/dist-archive/bitcoin-529c92e837b2.tar.gz
ca44eaeafc0b8e8df455afc18a5b7006e3826c602ebdc50bd7e2bba1a40cd48f  guix-build-529c92e837b2/output/powerpc64-linux-gnu/SHA256SUMS.part
37f8b3b4822cbd2b47ca9b3dbe070f1bde70c47876d03dfa0158357e72685b2d  guix-build-529c92e837b2/output/powerpc64-linux-gnu/bitcoin-529c92e837b2-powerpc64-linux-gnu-debug.tar.gz
289d8db2e12f5c4d7627b1739e55efba76e87f0cdb3605de9f533eaade641ca7  guix-build-529c92e837b2/output/powerpc64-linux-gnu/bitcoin-529c92e837b2-powerpc64-linux-gnu.tar.gz
43ea0c5bfdb79482cd308d34f41b1597abae8cc08e1430a7340ff466a34743e7  guix-build-529c92e837b2/output/powerpc64le-linux-gnu/SHA256SUMS.part
9537a4eb031f6d486c5db9aa0de68c6a5969ff53186efa7248394dcc88a7098c  guix-build-529c92e837b2/output/powerpc64le-linux-gnu/bitcoin-529c92e837b2-powerpc64le-linux-gnu-debug.tar.gz
08a7596b710cb8a2009778adf25471e7e9cc0e9c577cc91694bc237e34dd7552  guix-build-529c92e837b2/output/powerpc64le-linux-gnu/bitcoin-529c92e837b2-powerpc64le-linux-gnu.tar.gz
680401083fa241110f08fb5224a49b20c21861a51d2e326d777234a7082350e5  guix-build-529c92e837b2/output/riscv64-linux-gnu/SHA256SUMS.part
364eb0b4960b1cac1430d2bcbe9f354c7d0457209d8022a9e164689b8adc1e65  guix-build-529c92e837b2/output/riscv64-linux-gnu/bitcoin-529c92e837b2-riscv64-linux-gnu-debug.tar.gz
36d5dffca5602ec1b1a4de61ff95f8970724575fbcbb40159f1c34638e42392b  guix-build-529c92e837b2/output/riscv64-linux-gnu/bitcoin-529c92e837b2-riscv64-linux-gnu.tar.gz
1474b9d4a377344a17a8c19958d7eaea482e42f1c083c8a6110a8c82815fed7b  guix-build-529c92e837b2/output/x86_64-apple-darwin/SHA256SUMS.part
6db103ff5f0a47f9b2ee70976b08e9f521704cfc6733300686988c72efb08ca5  guix-build-529c92e837b2/output/x86_64-apple-darwin/bitcoin-529c92e837b2-x86_64-apple-darwin-unsigned.dmg
c8d7c3f38fbbd770c4e3f950914fab0567fd116a6399c6b6ed25f7428bdcf48a  guix-build-529c92e837b2/output/x86_64-apple-darwin/bitcoin-529c92e837b2-x86_64-apple-darwin-unsigned.tar.gz
e385cf8740be4ea5916809547beff7b91682b2488ea6aea689ce65f68650c94a  guix-build-529c92e837b2/output/x86_64-apple-darwin/bitcoin-529c92e837b2-x86_64-apple-darwin.tar.gz
b3998a9d1cb6cfd463b1f23800d49d7a97e8108335be22661df22e7531c8a220  guix-build-529c92e837b2/output/x86_64-linux-gnu/SHA256SUMS.part
48177acf4a31c1edd25b2783fe60b49d903890aa04225dd5ed7e96390728584d  guix-build-529c92e837b2/output/x86_64-linux-gnu/bitcoin-529c92e837b2-x86_64-linux-gnu-debug.tar.gz
53f5873bbbd6b39a9dfbf77765a28b1f34b402d53999498aee6ae405e81acdf4  guix-build-529c92e837b2/output/x86_64-linux-gnu/bitcoin-529c92e837b2-x86_64-linux-gnu.tar.gz
b97ade8531d51582747c0f5c5ef129d2cecd2d2cfcdcddfe0aec5754c63fcf2b  guix-build-529c92e837b2/output/x86_64-w64-mingw32/SHA256SUMS.part
8a12efc03fb02be9285795b50624621d7935c71f85c23116e903108de0536943  guix-build-529c92e837b2/output/x86_64-w64-mingw32/bitcoin-529c92e837b2-win64-debug.zip
3eab525239e6fd95477938fb819da77941e7fd3762e25f72b2c149e0146a6d7e  guix-build-529c92e837b2/output/x86_64-w64-mingw32/bitcoin-529c92e837b2-win64-setup-unsigned.exe
4e0eb66abcb5d155f3e68a5abf292bb55b52851d71dc826e5cb48d018143bc9b  guix-build-529c92e837b2/output/x86_64-w64-mingw32/bitcoin-529c92e837b2-win64-unsigned.tar.gz
d9f3cd5e83756fc3bb6c2d94472331e137ca67ce7e47988d1b3190d9a2b8a241  guix-build-529c92e837b2/output/x86_64-w64-mingw32/bitcoin-529c92e837b2-win64.zip

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 529c92e

@fanquake fanquake merged commit ec822e8 into bitcoin:master Jun 28, 2023
@hebasto hebasto deleted the 230601-lief branch June 28, 2023 11:33
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 30, 2023
529c92e guix: Update `python-lief` package to 0.13.2 (Hennadii Stepanov)

Pull request description:

  The Guix's `python-lief` package is going to move to using external deps, rather than the bundled ones (https://lists.gnu.org/archive/html/guix-patches/2023-05/msg01302.html). We want to continue using our own package indefinitely, to keep the build simpler, and allow for easier updating.

  Changes in `contrib/devtools/security-check.py` are caused by lief-project/LIEF@6357c63.

  Also see: bitcoin#27507.

ACKs for top commit:
  fanquake:
    ACK 529c92e

Tree-SHA512: ad81111b090a39b380fe25bb27b54a339e78a158f462c7adda25d5ee55f0d654107b1486b29b9687ad0808e27b01e04f53a0e8ffc6600b79103d6bd0dfec64ef
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jan 31, 2024
Summary:
Updates to version 0.13.2.

The Guix's python-lief package is going to move to using external deps, rather than the bundled ones (https://lists.gnu.org/archive/html/guix-patches/2023-05/msg01302.html). We want to continue using our own package indefinitely, to keep the build simpler, and allow for easier updating.

This is a backport of [[bitcoin/bitcoin#27296 | core#27296]] and  [[bitcoin/bitcoin#27813 | core#27813]]
Depends on D15326

Test Plan: `contrib/guix/guix-build`

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Subscribers: Fabien

Differential Revision: https://reviews.bitcoinabc.org/D15327
@bitcoin bitcoin locked and limited conversation to collaborators Jun 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants