diff options
author | Carl Dong <contact@carldong.me> | 2020-04-07 18:28:28 -0400 |
---|---|---|
committer | Carl Dong <contact@carldong.me> | 2020-04-07 19:00:49 -0400 |
commit | 93439a71eda49fb69f1e82966a23a946733aa6fa (patch) | |
tree | 7077da4a1574f6c7eafd9855752e163331a7a8dc /contrib | |
parent | 35a96792dda9e78165b1598aeac7b2ab759e7be5 (diff) |
guix: Bump to upstream commit with mingw-w64 changes
Most of the mingw-w64 toolchain changes have now been upstreamed, we can
point to a commit that exists upstream.
NOTE: I'm not changing the URL yet until we see that Guix upstream will
accept all my patches for macOS.
-----
The Guix tree that's referred to by this commit contains the following
changes relevant to our mingw-w64 build:
b066c25026
Adds a PACKAGES-WITH-*PATCHES procedure which we can use in the future
to apply patches to packages if those patches are not considered
appropriate to upstream Guix
4719b71572
Adds mingw-w64 (the libc itself) reproducibility patches, taken from
debian.
79825bee07 + 401d28e433 + c1c50cb5b0
Add mingw-w64 specific binutils patches, taken from debian.
Specifically, the "Make DLL import libraries reproducible" patch made
libbitcoinconsensus.dll.a build reproducibly. The followup commits
were hotfixes for my mistakes.
0f864175dc
Bumps mingw-w64 to v7.0.0. This is the first release that enables
secure APIs by default (which we need), and gains _FORTIFY_SOURCE
support. This will also be what Ubuntu Focal 20.04 LTS releases with.
cdf00cf75d
Bumps NSIS to v3.05. This is the first release that includes a fix for
a reproducibility bug found by some of the electrum developers. See
details here: https://sourceforge.net/p/nsis/bugs/1230/
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/guix/guix-build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/guix/guix-build.sh b/contrib/guix/guix-build.sh index ca79d0aceb..e20b2a048d 100755 --- a/contrib/guix/guix-build.sh +++ b/contrib/guix/guix-build.sh @@ -17,7 +17,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}" # across time. time-machine() { guix time-machine --url=https://github.com/dongcarl/guix.git \ - --commit=cf347affd642c709f7e423f7111794ffdb09f5a6 \ + --commit=b066c25026f21fb57677aa34692a5034338e7ee3 \ -- "$@" } |