From: Tomas Volf <~@wolfsden.cz>
To: 68394@debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>, Lars-Dominik Braun <lars@6xq.net>,
Marius Bakke <marius@gnu.org>,
Munyoki Kilyungi <me@bonfacemunyoki.com>,
jgart <jgart@dismail.de>
Subject: [bug#68394] [PATCH python-team v2] gnu: python: Make the build reproducible.
Date: Fri, 12 Jan 2024 17:11:29 +0100 [thread overview]
Message-ID: <3171d7e17ba481e977e45fdf35fb0ef42250abb4.1705075889.git.~@wolfsden.cz> (raw)
In-Reply-To: <f0dcb5eadb333cf840f515ddda025734d924c25a.1705019596.git.~@wolfsden.cz>
While python build was reproducible on a single machine, once multiple
file systems entered the picture, it was no longer true. My local builds on
BTRFS differed from build on ext4 done in a virtual machine.
The solution adopted by the upstream (and debian) was cherry-picked. With
this patch, build on my machine (BTRFS) and in a guix system vm (ext4) produce
the same store item.
More info: https://github.com/python/cpython/pull/8226
* gnu/packages/python.scm (python-3.10)[source]: Apply reproducibility patch.
Change-Id: I0273dc0f8511a7acdcc2b462a26cc29a9756c801
---
Use patch directly from the upstream.
gnu/packages/python.scm | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 51d5f598d7..c92ac720a5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -428,12 +428,21 @@ (define-public python-3.10
(method url-fetch)
(uri (string-append "https://www.python.org/ftp/python/"
version "/Python-" version ".tar.xz"))
- (patches (search-patches
- "python-3-arm-alignment.patch"
- "python-3-deterministic-build-info.patch"
- "python-3-fix-tests.patch"
- "python-3-hurd-configure.patch"
- "python-3-search-paths.patch"))
+ (patches
+ (cons*
+ ;; https://github.com/python/cpython/pull/8226
+ (origin
+ (method url-fetch)
+ (uri "https://github.com/python/cpython/commit/6c8ea7c1dacd42f3ba00440231ec0e6b1a38300d.patch")
+ (sha256
+ (base32
+ "13llngsyskp4c9j8lwqqpwp7h07mxai734zk1i387z8g261jk46v")))
+ (search-patches
+ "python-3-arm-alignment.patch"
+ "python-3-deterministic-build-info.patch"
+ "python-3-fix-tests.patch"
+ "python-3-hurd-configure.patch"
+ "python-3-search-paths.patch")))
(sha256
(base32
"0j6wvh2ad5jjq5n7sjmj1k66mh6lipabavchc3rb4vsinwaq9vbf"))
base-commit: 5c0f77f4241c9beac0c82deae946bfdc70b49ff0
--
2.41.0
next prev parent reply other threads:[~2024-01-12 16:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 0:33 [bug#68394] [PATCH python-team] gnu: python: Make the build reproducible Tomas Volf
2024-01-12 7:39 ` Lars-Dominik Braun
2024-01-12 16:11 ` Tomas Volf [this message]
2024-01-23 14:12 ` bug#68394: " Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='3171d7e17ba481e977e45fdf35fb0ef42250abb4.1705075889.git.~@wolfsden.cz' \
--to=~@wolfsden.cz \
--cc=68394@debbugs.gnu.org \
--cc=jgart@dismail.de \
--cc=lars@6xq.net \
--cc=marius@gnu.org \
--cc=me@bonfacemunyoki.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.