Page MenuHomePhabricator
Files F13114994

D16726.diff
No OneTemporary
Actions

D16726.diff
View Options

diff --git a/electrum/contrib/build-wine/_build.sh b/electrum/contrib/build-wine/_build.sh
--- a/electrum/contrib/build-wine/_build.sh
+++ b/electrum/contrib/build-wine/_build.sh
@@ -55,7 +55,7 @@
LIBUSB_COMMIT="c6a35c56016ea2ab2f19115d2ea1e85e0edae155"
PYINSTALLER_REPO='https://github.com/pyinstaller/pyinstaller.git'
- PYINSTALLER_COMMIT=90256f93ed943daf6de53c7dd39710a415f705cb # Version 6.4.0
+ PYINSTALLER_COMMIT=085296f616a4b7eff4614710f9527b164c463c21 # Version 6.10.0
## These settings probably don't need change
PYHOME=c:/python$PYTHON_VERSION
diff --git a/electrum/contrib/osx/make_osx b/electrum/contrib/osx/make_osx
--- a/electrum/contrib/osx/make_osx
+++ b/electrum/contrib/osx/make_osx
@@ -146,11 +146,8 @@
info "Building PyInstaller."
PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
-PYINSTALLER_COMMIT="90256f93ed943daf6de53c7dd39710a415f705cb"
-# ^ tag "v6.4.0"
-# TODO test newer versions of pyinstaller for build-reproducibility.
-# we are using this version for now due to change in code-signing behaviour
-# (https://github.com/pyinstaller/pyinstaller/pull/5581)
+PYINSTALLER_COMMIT="085296f616a4b7eff4614710f9527b164c463c21"
+# ^ tag "v6.10.0"
(
if [ -f "$BUILDDIR/pyinstaller/PyInstaller/bootloader/Darwin-64bit/runw" || -f "$BUILDDIR/pyinstaller/PyInstaller/bootloader/Darwin-64bit-arm/runw" ]; then
info "pyinstaller already built, skipping"
diff --git a/electrum/contrib/osx/requirements-osx-build.txt b/electrum/contrib/osx/requirements-osx-build.txt
--- a/electrum/contrib/osx/requirements-osx-build.txt
+++ b/electrum/contrib/osx/requirements-osx-build.txt
@@ -40,9 +40,8 @@
requests==2.32.3 \
--hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
--hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
-setuptools==70.3.0 \
- --hash=sha256:f171bab1dfbc86b132997f26a119f6056a57950d058587841a0082e8830f9dc5 \
- --hash=sha256:fe384da74336c398e0d956d1cae0669bc02eed936cdb1d49b57de1990dc11ffc
+setuptools==65.5.1 \
+ --hash=sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f
six==1.16.0 \
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
--hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 09:07 (19 m, 32 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5182586
Default Alt Text
D16726.diff (2 KB)

Event Timeline