guix: Jump forwards in time-machine and adapt #21088
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 tasks
7ba5e91 to
47d3600
Compare
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsNo conflicts as of last run. |
47d3600 to
bc9798a
Compare
|
|
Builds at bc9798a: # guix describe
Generation 4 Feb 17 2021 09:40:04 (current)
guix 43b2e44
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: 43b2e440c38a39eb64088bd6c08771c060aa10fc
# git rev-parse HEAD
bc9798a0ab0c086308a74bd621366b77a5c8fcec
# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
18aa63cdadb698e987e4fadcc908442abeed18fe6bf035b4112cd585d15c83ad output/bitcoin-bc9798a0ab0c-aarch64-linux-gnu-debug.tar.gz
7c38873593aed7fbc68e56a9cecbb01dcff2d72f9aa9adc5a1a68a77a40d2960 output/bitcoin-bc9798a0ab0c-aarch64-linux-gnu.tar.gz
eeb403d3f284db09cec84da703adbf81de3b4f90a27c24d480364f6d6c2d0a14 output/bitcoin-bc9798a0ab0c-arm-linux-gnueabihf-debug.tar.gz
fac2c57a9f82e948adf6c7fa0cf6a9aa137e7575954b47c83db6abf49aafa62f output/bitcoin-bc9798a0ab0c-arm-linux-gnueabihf.tar.gz
151935d87b920f912f64939e07908c774f4ded4d64938e7ab112fd240eccc8a1 output/bitcoin-bc9798a0ab0c-osx-unsigned.dmg
842a16a5712b611a87b254777227028d8c6f0795a6958411fd24177c26b3fc41 output/bitcoin-bc9798a0ab0c-osx-unsigned.tar.gz
ddf8fb9136a1c87c0d318c76fa74134baf463f44219a963f2a839eb54157358b output/bitcoin-bc9798a0ab0c-osx64.tar.gz
085c836089f81dcce26809144ae0c09d034a41f1a4505c4443cab75df54d61cf output/bitcoin-bc9798a0ab0c-riscv64-linux-gnu-debug.tar.gz
06b9c7e92241c8f8ac3f84ce931d5f8e7eca1f610b65f3df1559b709a277c46d output/bitcoin-bc9798a0ab0c-riscv64-linux-gnu.tar.gz
9228c52760c808672f7a5f5a6d3410eabd3a3a2c704f1c092de0664bf21145b0 output/bitcoin-bc9798a0ab0c-win-unsigned.tar.gz
0511b8d5c0d4ea13c74b3e9cd3bb4ac5f06f71c86c8af4faaf6591c13d59064e output/bitcoin-bc9798a0ab0c-win64-debug.zip
e914b75e33545e63ee193378e4d040b0607558316af6b0f49a2cea81d2b56e96 output/bitcoin-bc9798a0ab0c-win64-setup-unsigned.exe
b3b96e3d4cb7f7dc67002601c8ba91ff81fd025c4af7bc53d9cfeae3e40070b2 output/bitcoin-bc9798a0ab0c-win64.zip
1432c4bf32efe5ae005e3670b9ae9d61cc9933faafcf71628e00cf4ca86598fd output/bitcoin-bc9798a0ab0c-x86_64-linux-gnu-debug.tar.gz
f01832d9d4d775a02c05f919b32426fb574ba4c53bdbbbb41405b1310b733b69 output/bitcoin-bc9798a0ab0c-x86_64-linux-gnu.tar.gz
4655e1bd683e722ce09af7939569fd57da37d936abdf2bb96c092b79cd42e809 output/src/bitcoin-bc9798a0ab0c.tar.gz |
|
I guess this needs rebase to remove "COMMITS AFTER THIS ARE NON-BASE" and the one before it (as #21087 is merged)? |
The new time-machine commit is Guix v1.2.0 with a yet-unupstreamed patch
for NSIS.
A few important changes:
1. Guix switched back from using CPATH to C{,PLUS}_INCLUDE_PATH as the
way to indicate #include search paths.
2. GCC's library is now split into a separate output, whereas before it
was included in the default output. This means that our gcc toolchain
packages need to propagate that output.
3. A few package versions were bumped
bc9798a to
d02076b
Compare
|
|
Builds at d02076b: # guix describe
Generation 5 Feb 19 2021 08:43:07 (current)
guix 0ce63d1
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: 0ce63d11b5e27bfc7f5082c3021be7561ffc8c76
# git rev-parse HEAD
d02076b8852d8faae95cee6e3de434460c07412a
# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
d51e521efe311bab30be466e6fb413c5beb065ff21f0bd2ecf0e9c79aa2b081f output/bitcoin-d02076b8852d-aarch64-linux-gnu-debug.tar.gz
537887732490d222b97f3930205ead28b4bcd157e7e535f2ed315b8b2093e9d4 output/bitcoin-d02076b8852d-aarch64-linux-gnu.tar.gz
9764ec49dab093c286eaecf2f3fb401286d0915ff35dce50fe44ab3df3781dd2 output/bitcoin-d02076b8852d-arm-linux-gnueabihf-debug.tar.gz
62ff3f8e672e8ca8c92d6ae85f1948b9abd296699f9f92ac51d42d503d977b57 output/bitcoin-d02076b8852d-arm-linux-gnueabihf.tar.gz
78f7c61f162fc3766647bb371e32aecaa37d3a8ed6aae5fa96f25bc1f3b4d799 output/bitcoin-d02076b8852d-osx-unsigned.dmg
b986d2427a046e4471ba8cb35641f71091db89bd08de07af56aae19c7416ef2c output/bitcoin-d02076b8852d-osx-unsigned.tar.gz
42feb7daa96e440dba10480add1306869efac57ea0e2d88a1c54b1e6eadfa066 output/bitcoin-d02076b8852d-osx64.tar.gz
6c82f019641d6b4452ea41cd33d58ebcd49e2db29c279a7ef407cd61fe0c84d9 output/bitcoin-d02076b8852d-riscv64-linux-gnu-debug.tar.gz
9cbcf6d2f6b29312611ab5157c0f606257d19a95bc1fad34783ad57cbbcb8114 output/bitcoin-d02076b8852d-riscv64-linux-gnu.tar.gz
b77938c2cc2af2b367d06a775ca343e30179458d7339c87a1e2e1a3db92b64e9 output/bitcoin-d02076b8852d-win-unsigned.tar.gz
4d69c4e23f3dd38a395f5fadfbd2917281aebd139ac7876ba93fd440644dcb1c output/bitcoin-d02076b8852d-win64-debug.zip
2f615ab46de1166233ea723009c40ae080c3db920cbfd6f70569dc35119cefe6 output/bitcoin-d02076b8852d-win64-setup-unsigned.exe
3f418b43804e4af9d826ebb580e4024cc656e02e4457d7b1e7cded6b0f24a85b output/bitcoin-d02076b8852d-win64.zip
2273fa78d7b5b2e8947190c5f6dfc10ad6c989a55cdce54460f6e88a4cdcc78f output/bitcoin-d02076b8852d-x86_64-linux-gnu-debug.tar.gz
02e9463e49a562633983b6ee2d5e15909c585646db52374d91e01780f5cf1386 output/bitcoin-d02076b8852d-x86_64-linux-gnu.tar.gz
0f0a8322d1095ee6aee4aaa43a8439a3ee1d9b6325f3bc2634c77cc96adc1f63 output/src/bitcoin-d02076b8852d.tar.gz |
|
ACK d02076b Exact match. |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Feb 19, 2021
d02076b guix: Jump forwards in time-machine and adapt (Carl Dong) f8ca8c5 guix: Supply --keep-failed for debugging (Carl Dong) Pull request description: ``` The new time-machine commit is Guix v1.2.0 with a yet-unupstreamed patch for NSIS. A few important changes: 1. Guix switched back from using CPATH to C{,PLUS}_INCLUDE_PATH as the way to indicate #include search paths. 2. GCC's library is now split into a separate output, whereas before it was included in the default output. This means that our gcc toolchain packages need to propagate that output. 3. A few package versions were bumped ``` See this compare to review my custom patches to Guix: dongcarl/guix@version-1.2.0...7d6bd44 ACKs for top commit: laanwj: ACK d02076b Tree-SHA512: 896d5bf1b6e5fda2f0106013c568c119bbbb86cb31a8c0a22432bada9b7da51678b96374bf8fd7c15353698ba47ac9dd39874d40c39001281471db7c78bf1705
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See this compare to review my custom patches to Guix: dongcarl/guix@version-1.2.0...7d6bd44