When building nsis, if VERSION is not specified, it defaults to
cvs_version which is non-deterministic as it includes the current date.
This patches nsis to default to SOURCE_DATE_EPOCH if it exists so that
nsis is reproducible.
Upstream change: https://github.com/kichik/nsis/pull/13
Sidenote: also a good demonstration of how Guix allows us to flexibly patch our tools!
Note to reviewers: if you want to compare hashes, please build after Jan 16th 2021 without my substitute server enabled!
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, 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.
Nice. Concept ACK.
32 | @@ -33,7 +33,7 @@ if [ -z "${COMMIT_RANGE}" ]; then 33 | fi 34 | 35 | showdiff() { 36 | - if ! git diff -U0 "${COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then 37 | + if ! git diff -U0 "${COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)contrib/guix/patches/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then
I guess the indentation change here wasn't intentional? :)
The indentation level doesn't match with the fi.
Fixed, nice catch!
Concept ACK
Pushed 954341cefc355d68226ea5cde7c9bd8024e6740c -> ec06efc69684aa08a7f5c7be7d8a683b24ef4f8c
When building nsis, if VERSION is not specified, it defaults to
cvs_version which is non-deterministic as it includes the current date.
This patches nsis to default to SOURCE_DATE_EPOCH if it exists so that
nsis is reproducible.
Upstream change: https://github.com/kichik/nsis/pull/13
Thanks for rebasing.
please build after Jan 16th 2021 without my substitute server enabled!
# guix describe
Generation 5 Jan 18 2021 00:11:42 (current)
guix 1b2c32d
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: 1b2c32dc919ec331bbd3219c586f46fe66e06346
# git rev-parse HEAD
1fca9811e1331ac5dae8188f6178cc37da4929a7
# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
9300fae60f64636c7224376d388a5ec582c60541b844b9d62072bc91bdb731b4 output/bitcoin-1fca9811e133-win-unsigned.tar.gz
1d0d9c713f9ffa2437d5ce29d4bc61abc6866cbe17e0935b0794873e509700cf output/bitcoin-1fca9811e133-win64-debug.zip
6dddccd0af5f820ccaa57a1790c5a589ea43864d542e22bb0d770e5cd562d75d output/bitcoin-1fca9811e133-win64-setup-unsigned.exe
9b52e4fddedf229ce29930baaf6e139cf385cc4a38c0ca50122df4af020a96bd output/bitcoin-1fca9811e133-win64.zip
207f33df4ceb953da33a334604e5dec5f048ee53e69cfad8af1afd52ed0cc98f output/src/bitcoin-1fca9811e133.tar.gz
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit 7acda55c4fa611481979a41dfd5ca016bb535409<br>(master) | commit c0eeb13161f4f4f2b111e039b3c93474b790bea8<br>(master and this pull) |
|---|---|---|
| *-aarch64-linux-gnu-debug.tar.gz | 3cb5d38bef3ce7ff... |
0bf445d3d4a25f57... |
| *-aarch64-linux-gnu.tar.gz | 921f0ea1765e9d3a... |
6313d6e9a20150aa... |
| *-arm-linux-gnueabihf-debug.tar.gz | 292b29d4055e60a7... |
6ca3046fcbd26a8c... |
| *-arm-linux-gnueabihf.tar.gz | 0d62afadd03f613a... |
264deec0506390b0... |
| *-x86_64-linux-gnu-debug.tar.gz | a984b708b2687740... |
12748774b0fe8e5d... |
| *-x86_64-linux-gnu.tar.gz | d008154dc9bdb68e... |
f94bf7d1d79e793b... |
| *.tar.gz | dff681d0d36b7bfa... |
b4a5001eb1ab05a7... |
| guix_build.log | 70436d6db6777cd5... |
3d12f77c61f929ca... |
| guix_build.log.diff | dc043ea0a1e7f0aa... |
Thanks fanquake!
Here are my hashes, they appear to be matching!
# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
9300fae60f64636c7224376d388a5ec582c60541b844b9d62072bc91bdb731b4 output/bitcoin-1fca9811e133-win-unsigned.tar.gz
1d0d9c713f9ffa2437d5ce29d4bc61abc6866cbe17e0935b0794873e509700cf output/bitcoin-1fca9811e133-win64-debug.zip
6dddccd0af5f820ccaa57a1790c5a589ea43864d542e22bb0d770e5cd562d75d output/bitcoin-1fca9811e133-win64-setup-unsigned.exe
9b52e4fddedf229ce29930baaf6e139cf385cc4a38c0ca50122df4af020a96bd output/bitcoin-1fca9811e133-win64.zip
207f33df4ceb953da33a334604e5dec5f048ee53e69cfad8af1afd52ed0cc98f output/src/bitcoin-1fca9811e133.tar.gz
Would you care to supply your stat /gnu/store/n4jdwhwip7wir0gzl92smvsdpwwh2bz9-nsis-x86_64-3.05? Just so we make sure we built nsis on differing dates so we'd potentially trigger the non-determinism.
# stat /gnu/store/n4jdwhwip7wir0gzl92smvsdpwwh2bz9-nsis-x86_64-3.05
File: /gnu/store/n4jdwhwip7wir0gzl92smvsdpwwh2bz9-nsis-x86_64-3.05
Size: 4096 Blocks: 8 IO Block: 4096 directory
Device: 901h/2305d Inode: 23744146 Links: 5
Access: (0555/dr-xr-xr-x) Uid: ( 0/ root) Gid: ( 0/ root)
Access: 2021-01-14 18:52:51.143425311 -0500
Modify: 1969-12-31 19:00:01.000000000 -0500
Change: 2021-01-14 18:52:51.136758471 -0500
Birth: 2021-01-14 18:52:37.683076782 -0500
<!--a722867cd34abeea1fadc8d60700f111-->
Would you care to supply your stat /gnu/store/n4jdwhwip7wir0gzl92smvsdpwwh2bz9-nsis-x86_64-3.05?
# stat /gnu/store/n4jdwhwip7wir0gzl92smvsdpwwh2bz9-nsis-x86_64-3.05/
File: /gnu/store/n4jdwhwip7wir0gzl92smvsdpwwh2bz9-nsis-x86_64-3.05/
Size: 4096 Blocks: 8 IO Block: 4096 directory
Device: 35h/53d Inode: 4096562 Links: 5
Access: (0555/dr-xr-xr-x) Uid: ( 0/ root) Gid: ( 0/ root)
Access: 2021-01-17 06:37:19.000000000
Modify: 1970-01-01 00:00:01.000000000
Change: 2021-01-17 06:37:19.000000000
Lovely! Looks like we fixed the reproducibility problem! This should be good to merge now
ACK 1fca9811e1331ac5dae8188f6178cc37da4929a7