-
Notifications
You must be signed in to change notification settings - Fork 37.7k
guix: update time-machine #28580
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 time-machine #28580
Conversation
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
Concept ACK. |
|
d808bf1
to
e54b2d3
Compare
Briefly tested the e54b2d3 guix build on (Intel) macOS Ventura 13.6, and it seems to work fine. Guix hashes...
|
LLVM 16 & 17 should land upstream shortly. Going to wait to include both, to unblock other PRs with this bump. |
e54b2d3
to
3002e9f
Compare
Updated to a newer hash. We've also upstreamed a GCC bump from 10.4.0 to 10.5.0: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=2fbb5398a39bf18e41235891a0740fa0bc4d7a4d. |
3002e9f
to
feebc9a
Compare
python-altgraph (0.17.4) has been upstreamed. See: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=0c6198319a61d85cd8925af418466dcdccf3daff Also includes: GCC 10.4.0 -> 10.5.0: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=2fbb5398a39bf18e41235891a0740fa0bc4d7a4d. Linux Kernel Headers 6.1.46 -> 6.1.61 LLVM 16 & 17 become available.
feebc9a
to
92d12f1
Compare
Unrelated: I've been trying to run |
@achow101 Can you confirm that |
I'm not sure why there would be any issue, given this is a subdependency, of something we don't even use in signapple any more (so only installing has to succeed), and it can ultimtely be removed (I will open PRs). |
See achow101/signapple#13 and #28859. |
Guix Build (aarch64): 13a7d1be447ecb614cf43034af4f7a3a7ce7dffbcdb6c1773bc939ba80587ef6 guix-build-92d12f1c8903/output/aarch64-linux-gnu/SHA256SUMS.part
5ab66c69b742a89b0aa52705e48563749cb72ebcc92745a4eb07df285a20c62a guix-build-92d12f1c8903/output/aarch64-linux-gnu/bitcoin-92d12f1c8903-aarch64-linux-gnu-debug.tar.gz
d3224eb0eb66bf4433ed8757667ed438e419db4240b06d76122e8754de241742 guix-build-92d12f1c8903/output/aarch64-linux-gnu/bitcoin-92d12f1c8903-aarch64-linux-gnu.tar.gz
9f5ecd1d7a7e5e028c5561ea91dabf92d8e3339d04fe62df657db5eefe2a30b3 guix-build-92d12f1c8903/output/arm-linux-gnueabihf/SHA256SUMS.part
7e7489be45a66aeee2cba82417def4ebba604858dee1247d837dd7a7f51c8128 guix-build-92d12f1c8903/output/arm-linux-gnueabihf/bitcoin-92d12f1c8903-arm-linux-gnueabihf-debug.tar.gz
912d40ba614982157d88fed7e763800510071f53fce408c97bcd80ff13c5806a guix-build-92d12f1c8903/output/arm-linux-gnueabihf/bitcoin-92d12f1c8903-arm-linux-gnueabihf.tar.gz
a297c3b394861a078870f1d2bd5a4a51c96c4932f853f62e470bde64963cf090 guix-build-92d12f1c8903/output/arm64-apple-darwin/SHA256SUMS.part
d308af6595f82d4c41bafe0f74577d05342081a54b2900d50605b46f39146cb6 guix-build-92d12f1c8903/output/arm64-apple-darwin/bitcoin-92d12f1c8903-arm64-apple-darwin-unsigned.tar.gz
464fbc05609536284a4e55752558c85bfdc706c1b8a0b84c9c3d8fa42c809223 guix-build-92d12f1c8903/output/arm64-apple-darwin/bitcoin-92d12f1c8903-arm64-apple-darwin-unsigned.zip
88a1a09cb4a68c31797a4b5cc53e214496631601b8759d52001be0ec1bbf9a17 guix-build-92d12f1c8903/output/arm64-apple-darwin/bitcoin-92d12f1c8903-arm64-apple-darwin.tar.gz
f3ac4cc07e9d094c0d03ff82493e3bab81e984c7898f53d8c4e7df2b3b6b2e32 guix-build-92d12f1c8903/output/dist-archive/bitcoin-92d12f1c8903.tar.gz
ba91a60d667ec04dba9a9cde9c1c83783e241dea0f63241e47234638cb9ac9e9 guix-build-92d12f1c8903/output/powerpc64-linux-gnu/SHA256SUMS.part
ea71a87cf6754414a40784519772eb525b978798845f842e8ff9c51860c6f263 guix-build-92d12f1c8903/output/powerpc64-linux-gnu/bitcoin-92d12f1c8903-powerpc64-linux-gnu-debug.tar.gz
5404fb2d1d1576077e03e27c6020916207604ff1e114a304de0fa8c2c5cae4dc guix-build-92d12f1c8903/output/powerpc64-linux-gnu/bitcoin-92d12f1c8903-powerpc64-linux-gnu.tar.gz
48feab1e33e4bbfdb4f3d90d99009d65fbc5c31f04c05b6f77cef04cd08018c4 guix-build-92d12f1c8903/output/powerpc64le-linux-gnu/SHA256SUMS.part
2ee8441ddfed1a9cbc94267350654e3362e111fac73e2adc506314e65a0cedf0 guix-build-92d12f1c8903/output/powerpc64le-linux-gnu/bitcoin-92d12f1c8903-powerpc64le-linux-gnu-debug.tar.gz
cea80c06816fced92b4de5d487377835075f7e1e9f9ad4b81bd9fbffd8735f10 guix-build-92d12f1c8903/output/powerpc64le-linux-gnu/bitcoin-92d12f1c8903-powerpc64le-linux-gnu.tar.gz
87f3b76bf1db1f28a1976f50e147c0b85fa65dc2b55c9c806f03a49087e73a7a guix-build-92d12f1c8903/output/riscv64-linux-gnu/SHA256SUMS.part
1e756e22d96a4952f4e464832cc08057468e3cacbb059ae493edb915de7eae59 guix-build-92d12f1c8903/output/riscv64-linux-gnu/bitcoin-92d12f1c8903-riscv64-linux-gnu-debug.tar.gz
5f69e675c6ac3acae2edaa6452514ac53a31830721c3b125c08db2ede3a97b0c guix-build-92d12f1c8903/output/riscv64-linux-gnu/bitcoin-92d12f1c8903-riscv64-linux-gnu.tar.gz
e28b57d153c1f27f7e21c91cf419e8617f3d275752468467ebcd00d510275720 guix-build-92d12f1c8903/output/x86_64-apple-darwin/SHA256SUMS.part
4ed7892254a12996c9e798d72918e265fd3bb804522509c7c93c2fd3f16099dd guix-build-92d12f1c8903/output/x86_64-apple-darwin/bitcoin-92d12f1c8903-x86_64-apple-darwin-unsigned.tar.gz
453e7ecb87ddf7f71070c6c5d94ec0cec49c509ccdfcf9b59648cd39ba18befd guix-build-92d12f1c8903/output/x86_64-apple-darwin/bitcoin-92d12f1c8903-x86_64-apple-darwin-unsigned.zip
99737fb77d0c216b63015f755550d20fe015f10f6d8583aa8bf56a0d9d876120 guix-build-92d12f1c8903/output/x86_64-apple-darwin/bitcoin-92d12f1c8903-x86_64-apple-darwin.tar.gz
5b57937b0c95572a040400ffc22db64bdc34499686608822ff1d5b57f1df7c18 guix-build-92d12f1c8903/output/x86_64-linux-gnu/SHA256SUMS.part
26a7e3c16bcd657252d5891297a8a76ce572745c98af18a94680344abcda3766 guix-build-92d12f1c8903/output/x86_64-linux-gnu/bitcoin-92d12f1c8903-x86_64-linux-gnu-debug.tar.gz
75bc6314abdb4ec4db32b0582957c36c0c9778b76a1c366035c17f1573316987 guix-build-92d12f1c8903/output/x86_64-linux-gnu/bitcoin-92d12f1c8903-x86_64-linux-gnu.tar.gz
2af76ac210300ba5f8f554cadfb647c3bcce5329ca41d41f7ea817b1a2186dd1 guix-build-92d12f1c8903/output/x86_64-w64-mingw32/SHA256SUMS.part
f415f4b3ed4d6c6d854e4d34badcd43ba41b803be52996dc7554af42e6e8cd7a guix-build-92d12f1c8903/output/x86_64-w64-mingw32/bitcoin-92d12f1c8903-win64-debug.zip
17bf660bedd48de146617ebfbd0309e53ebb08848fdfbaa7fab69083ff7b47ee guix-build-92d12f1c8903/output/x86_64-w64-mingw32/bitcoin-92d12f1c8903-win64-setup-unsigned.exe
834dbc836e40f955025b03c4175b63de27fb24edaa99245559c62a1282d5333c guix-build-92d12f1c8903/output/x86_64-w64-mingw32/bitcoin-92d12f1c8903-win64-unsigned.tar.gz
7620053cceb7d3aefca8e099f54878b9c1c656122d27be87f42164a1d93d2063 guix-build-92d12f1c8903/output/x86_64-w64-mingw32/bitcoin-92d12f1c8903-win64.zip |
Briefly tested the 92d12f1 guix build on (Intel) macOS Ventura 13.6, and it seems to work fine. Guix hashes...
|
This is major and unblocks a bunch of toolchain bumps we've needed to do for years. Great work from everyone involved. Thanks @fanquake for pushing on the guix side. |
My Guix builds:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK 92d12f1.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM ACK 92d12f1
Post-merge ACK 92d12f1. x86_64 guix builds:
|
Guix builds (on x86_64)
|
The LLVM 17 that was merged into Guix is currently 17.0.3. That is fine for our usage, but I've also sent a patch upstream to try get it bumped to 17.0.5: https://lists.gnu.org/archive/html/guix-patches/2023-11/msg00964.html. |
I am trying to compile this on riscv64, however, it still does not seem to work.
|
Does Guix work normally? |
Yeah, it works. Let's move the discussion to #29020 |
, bitcoin#28786, bitcoin#29078, bitcoin#27897, bitcoin#29651, bitcoin#29695, bitcoin#29673, bitcoin#29828, bitcoin#29846, bitcoin#30231, bitcoin#30438, partial bitcoin#30511 (guix backports: part 5) 91b7ef8 merge bitcoin#30438: build Linux GCC with --enable-cet (Kittywhiskers Van Gogh) cfc6cba partial bitcoin#30511: GCC 12 consolidation (Kittywhiskers Van Gogh) 06f5431 merge bitcoin#30231: bump time-machine to f0bb724211872cd6158fce6162e0b8c73efed126 (Kittywhiskers Van Gogh) 5b292ee merge bitcoin#29846: replace GCC unaligned VMOV patch with binutils patch (Kittywhiskers Van Gogh) 4d1f7dc merge bitcoin#29828: remove `gcc-toolchain static` from Windows build (Kittywhiskers Van Gogh) f321d3d merge bitcoin#29673: use GCC 11 in macOS build env (Kittywhiskers Van Gogh) d570e2d merge bitcoin#29695: build GCC with --enable-standard-branch-protection (Kittywhiskers Van Gogh) c965943 merge bitcoin#29651: bump time-machine to dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a (Kittywhiskers Van Gogh) 59a125a merge bitcoin#27897: use GCC 12.3.0 to build releases (Kittywhiskers Van Gogh) a701b06 merge bitcoin#29078: Bump guix time-machine to unlock riscv64 metal (Kittywhiskers Van Gogh) d4b10a3 merge bitcoin#28786: switch to 6.1 kernel headers over 5.15 (Kittywhiskers Van Gogh) c371870 merge bitcoin#28580: update time-machine (Kittywhiskers Van Gogh) d36c9b6 merge bitcoin#28759: update signapple to latest master (Kittywhiskers Van Gogh) 38c71d8 merge bitcoin#28370: remove GCC 10 workaround from NSIS (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependent on #6382 * Dependency for #6384 ## Breaking Changes None expected ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 91b7ef8 Tree-SHA512: 0cfb436a430cf4b624a48a9928ecac9cd5c50e88e51ed04e7d1d0100968af8be1183364f035ac75153781a5e1616aa2f6fadabf0a1c03ec4b66dedea544b77ad
Summary: ``` python-altgraph (0.17.4) has been upstreamed, see: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=0c6198319a61d85cd8925af418466dcdccf3daff, so we can use it, and drop our package definition. ``` Backport of [[bitcoin/bitcoin#28580 | core#28580]]. Depends on D17229. Test Plan: Run the GUIX OSX build. Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D17230
Summary: ``` python-altgraph (0.17.4) has been upstreamed, see: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=0c6198319a61d85cd8925af418466dcdccf3daff, so we can use it, and drop our package definition. ``` Backport of [[bitcoin/bitcoin#28580 | core#28580]]. Depends on D17229. Test Plan: Run the GUIX OSX build. Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D17230
python-altgraph (0.17.4) has been upstreamed, see: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=0c6198319a61d85cd8925af418466dcdccf3daff, so we can use it, and drop our package definition.
Also includes: