From patchwork Fri Jan 12 16:00:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58824 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 18D2427BBE2; Fri, 12 Jan 2024 16:02:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A408427BBE9 for ; Fri, 12 Jan 2024 16:02:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOJyz-00014d-On; Fri, 12 Jan 2024 11:02:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOJyw-00013o-Bl for guix-patches@gnu.org; Fri, 12 Jan 2024 11:02:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rOJyw-0005Rt-2i; Fri, 12 Jan 2024 11:02:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rOJys-0002YN-EZ; Fri, 12 Jan 2024 11:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68407] [PATCH python-team v2] gnu: python: Make the build reproducible. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 12 Jan 2024 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68407 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68407@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by submit@debbugs.gnu.org id=B.17050752777969 (code B ref -1); Fri, 12 Jan 2024 16:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jan 2024 16:01:17 +0000 Received: from localhost ([127.0.0.1]:37318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOJy8-000245-JH for submit@debbugs.gnu.org; Fri, 12 Jan 2024 11:01:17 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rOJy5-0001s7-My for submit@debbugs.gnu.org; Fri, 12 Jan 2024 11:01:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1rOJxa-0000hq-Jn for guix-patches@gnu.org; Fri, 12 Jan 2024 11:01:00 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1rOJxX-0004ew-1w for guix-patches@gnu.org; Fri, 12 Jan 2024 11:00:41 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id C6521251621; Fri, 12 Jan 2024 16:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705075233; bh=XQm1x3UqtNwTG4HXYq411SS4p7Ps9lVbKfTZDQhb2fI=; h=From:To:Cc:Subject:Date; b=jYBwusPZbuowwthVHQ1w+GMtUUfkasOB6VH927EsudcQzOHPtJO7/H4QOjNTKn2B3 vYMpnaeZQNylHs817RACn6XNPY9c+DE+aHXZhjj2SOSIBVQGrsYKXO1YSK/HxfJA3b VmKtZ1lYUgldCx8IzfRYtSQrUXznfmICCJsygLaajLCb4EFuM5O14iBriMXUQgoLQ3 1Z33qt7TSrbFGkYmjNIK/GEZlJK1HYEd4RgSjE9YVLKcaAEZX6tIc0i4c8PMr4gw+w aEy97KF1ntlP+eDfHPA3pWlp8S1q5/sIy3sTMCQG/gMaycEJz2sphLsYmKH83sZXZ2 mnYp/txFf2ZcqOQnuHtOb/4nZDgLbQeJ8y9lks0vdcYK7yPm1zn1yybx2/b2jT7LHX EjK3gzTYXHQ+YiADk185tegRdafjukyUKdoXPd0Ljrh4V35Rs0BYWH/LwZ7NnCf+zp UYgacFmIQ5y2RkJ5DK31tnV3DSxmu7ZKW5vwwbJamITovaBi6ZWP7eue2g2uNl6+oE 6g/4htHsyBYYNEzUxuBNRk4zWogsvYopu5p9fLtQ3DDYEvI0BJYH/KJgjgy0GwZqZj u/1v6DPKUS3TbqyYvIyAbIR1RW/BlHCcpUhof5j995Dh/D4e9tjuId5c/K5RJ2brKA i/EydM4kpTPUZZb1xKjkC100= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 2FEE225128D; Fri, 12 Jan 2024 16:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705075233; bh=XQm1x3UqtNwTG4HXYq411SS4p7Ps9lVbKfTZDQhb2fI=; h=From:To:Cc:Subject:Date; b=jYBwusPZbuowwthVHQ1w+GMtUUfkasOB6VH927EsudcQzOHPtJO7/H4QOjNTKn2B3 vYMpnaeZQNylHs817RACn6XNPY9c+DE+aHXZhjj2SOSIBVQGrsYKXO1YSK/HxfJA3b VmKtZ1lYUgldCx8IzfRYtSQrUXznfmICCJsygLaajLCb4EFuM5O14iBriMXUQgoLQ3 1Z33qt7TSrbFGkYmjNIK/GEZlJK1HYEd4RgSjE9YVLKcaAEZX6tIc0i4c8PMr4gw+w aEy97KF1ntlP+eDfHPA3pWlp8S1q5/sIy3sTMCQG/gMaycEJz2sphLsYmKH83sZXZ2 mnYp/txFf2ZcqOQnuHtOb/4nZDgLbQeJ8y9lks0vdcYK7yPm1zn1yybx2/b2jT7LHX EjK3gzTYXHQ+YiADk185tegRdafjukyUKdoXPd0Ljrh4V35Rs0BYWH/LwZ7NnCf+zp UYgacFmIQ5y2RkJ5DK31tnV3DSxmu7ZKW5vwwbJamITovaBi6ZWP7eue2g2uNl6+oE 6g/4htHsyBYYNEzUxuBNRk4zWogsvYopu5p9fLtQ3DDYEvI0BJYH/KJgjgy0GwZqZj u/1v6DPKUS3TbqyYvIyAbIR1RW/BlHCcpUhof5j995Dh/D4e9tjuId5c/K5RJ2brKA i/EydM4kpTPUZZb1xKjkC100= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 12 Jan 2024 17:00:00 +0100 Message-ID: <3171d7e17ba481e977e45fdf35fb0ef42250abb4.1705075200.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 5c0f77f4241c9beac0c82deae946bfdc70b49ff0 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"))