From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 11 19:33:53 2024 Received: (at submit) by debbugs.gnu.org; 12 Jan 2024 00:33:53 +0000 Received: from localhost ([127.0.0.1]:34362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rO5Ue-0001QH-US for submit@debbugs.gnu.org; Thu, 11 Jan 2024 19:33:53 -0500 Received: from lists.gnu.org ([2001:470:142::17]:57612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rO5Ub-0001Pz-82 for submit@debbugs.gnu.org; Thu, 11 Jan 2024 19:33:51 -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 1rO5UX-00005n-Ut for guix-patches@gnu.org; Thu, 11 Jan 2024 19:33:45 -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 1rO5UV-0004XH-HE for guix-patches@gnu.org; Thu, 11 Jan 2024 19:33:45 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 61C6624EEE9; Fri, 12 Jan 2024 00:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705019620; bh=DiwVstw38yyACwBMKivmYsVcdoQwkA1Je97ABAhB1+Q=; h=From:To:Cc:Subject:Date; b=goYG3JqZxgcyICad5Fgst8DTMkgC7Dj4Ve2hTy7/oK1CtH66BAOECA4GFXUB+0Uj2 8tKD2AMEQIRkFdNXnuuHTI9/4qLtBQHgzcKZh3/eo0jz0nd1ULOrBslVRSf3HPP3Zj /cSyrKBzZRsUpsPAZz4ECrzI23Or2XW1DVr0K9gyT8Aad5Png7Vx2zXidSPCxy0jnW JW3dS40FtwPFk0DX9J9eFp6HLIB9nw5PdLyCeFmdWyuoctl0BW2ZHpizw3xfUOMYF/ TXy7umiM6jw+Fd1qHktvMyG7qE1LcP4LqsFb6IiblwR/oy4wm5CTMqoU/tzNQTU0E6 Em/T+0sjEYnyJKt/VyVPdnlW9t9neBXs059Whzy593cWQmzIz8NOmWss0PNNIMFck7 atIAJFV666npXfwguvcNXrS3YZbFwZUzG+a8SnHXYD3GFPZHBK/B2Y2P+BaIcMemch 69eD+9jCC6yMM5plhcKMfaADqST7KePdlZ6XKPnklg8vSZmmlX1jb6KsrCEf2fxNmn VLFbtnuYokXZb5Enmwki5nf+m+J3x6jw9vvyKt1nFXKOB/C9cWZ8z6lckb93mwmLHN oKFO5QUwSgJnmSjqgo7MqiJ42UokCm+DGIYZvjrLe4gs1diVuDxn31QtFEkMafnwtH yqnavKt3Qfo8FcCiYKTFH7To= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id AD397250E1A; Fri, 12 Jan 2024 00:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705019619; bh=DiwVstw38yyACwBMKivmYsVcdoQwkA1Je97ABAhB1+Q=; h=From:To:Cc:Subject:Date; b=nJn5zCPBCdFLzAj618nGfy5OmLA6h9vgyminTfcyOhwEox7WJ3A9JKJQIUBWDLtYo cqXlF7PR4+2da2nQlH2kYyVnvjTJPtImOTvbv7bM8MraFSvs1xnp7tZsIo7QvVsL4K HAH2uzg3QoGrf8j2YL+b/l0ejJZNKsUsO01hpa4PhK11gcTV7RjjEQtdwkg7wIcm6p HwXJ3Tf2mrLthgNDq6h3S7L4TnLRPs6P7AWrxF546d0X2aBQV00fI43T8yW4E2HASB 142830EGyztTj5pkfWg7daudgNitBCLK2udJHvCXoADypkcS8j68Z+GgZlI1V3JJJg txVKrahE14ZE4+NjsdUTW07O7JTEIjzMLpbjjVqTXhW4RYaW4oNWhFiFGADu+sYehD EBM+fkv8nGxDIw0nG1ExszSaBJYHxmlJx7LVvBRyMkXpS4mpb0pUvPqA8s0t167Chx lXxbGFDDbYHbq+eTwEqv4N7L0nalZOgnMUkl+tVZochHN8Cut1bEOcDeo8heME8Tzs peU8WRosrpT8Vs6jZ033qAqln49Ye5G9zIEr1c0aGAukTWDh/avfgWU0qCxgzM+ZrR fBwUD0nKmyEgf7/PaG+ItfVtDpV1KS7jhMjJ+TxVI/vnmGb+41pe7PSQ4+pSiV/tF5 2lnJQtRkze9yCP2OZqGb097g= From: Tomas Volf <~@wolfsden.cz> To: guix-patches@gnu.org Subject: [PATCH python-team] gnu: python: Make the build reproducible. Date: Fri, 12 Jan 2024 01:33:16 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Content-Transfer-Encoding: 8bit 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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) 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 distutils library present in current python is sensitive to file system ordering. The solution is the same opensuse used, sorting the list of files. With this patch, build on my machine (BTRFS) and in a guix system vm (ext4) produce the same store item. More info: https://bugzilla.opensuse.org/show_bug.cgi?id=1049186 * gnu/packages/python.scm (python-3.10)[arguments]<#:phases>: Add 'patch-distutils phase. Change-Id: I0273dc0f8511a7acdcc2b462a26cc29a9756c801 --- gnu/packages/python.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 51d5f598d7..319a917b4b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -515,6 +515,19 @@ (define-public python-3.10 (substitute* "Makefile.pre.in" (("-j0") "-j1"))))) '()) + (add-after 'unpack 'patch-distutils + (lambda _ + ;; Ensure byte_compile produces the same output regardless + ;; filesystem ordering. For more information see: + ;; https://bugzilla.opensuse.org/show_bug.cgi?id=1049186 + (let* ((file "Lib/distutils/util.py") + (old-content (call-with-input-file file get-string-all))) + (substitute* file + (("^ for file in py_files:\n$") + " for file in sorted(py_files):\n")) + (if (string=? old-content + (call-with-input-file file get-string-all)) + (error "substitute did nothing, phase requires an update"))))) (add-after 'unpack 'remove-windows-binaries (lambda _ ;; Delete .exe from embedded .whl (zip) files base-commit: 5c0f77f4241c9beac0c82deae946bfdc70b49ff0 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 12 02:39:33 2024 Received: (at 68394) by debbugs.gnu.org; 12 Jan 2024 07:39:33 +0000 Received: from localhost ([127.0.0.1]:34789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOC8a-0004PO-M3 for submit@debbugs.gnu.org; Fri, 12 Jan 2024 02:39:32 -0500 Received: from mout-p-102.mailbox.org ([2001:67c:2050:0:465::102]:56204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOC8Y-0004P1-Px for 68394@debbugs.gnu.org; Fri, 12 Jan 2024 02:39:31 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4TBD232Py7z9sXg; Fri, 12 Jan 2024 08:39:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1705045163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5OEx553BLPx6n3F03tDRdIMaE/93EX4xAx2x6fUdBls=; b=BZ9999AnbsDidJG9gda4X/CzokL+up6eizREhI5sS1ETY2ypY0bPBwrWhdw0j807RREF+t cqc3YmtjCGSaZhZVsVf5y+1ftYtzoYtopHCaKpi6KHORVNIm/Ux8eczDqZS2jzZ7aqJ73M kXl8JwlUE/LNGyYJ1zcgAE8Hb4J7caffBXIg3nFlieAZX9MDUTAfBRDwNGQrDH//7L2R9B ctReUeeTYjrinOeLY38xylOK46lnjZIR+m5xk7in8SoV+sX5dXzByu8rOnIzbr4/npqblm mGgw6RAVmarzJdIAUVBi2CRjBbB736pmBJfGLXW45LiAJM7SDY4s80fiCSkj3w== Date: Fri, 12 Jan 2024 08:39:20 +0100 From: Lars-Dominik Braun To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#68394] [PATCH python-team] gnu: python: Make the build reproducible. Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68394 Cc: Munyoki Kilyungi , 68394@debbugs.gnu.org, jgart , Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, > + (substitute* file > + (("^ for file in py_files:\n$") > + " for file in sorted(py_files):\n")) as far as I understand this change was rejected from upstream Python, see https://github.com/python/cpython/pull/8057, and instead this is the accepted (and merged) solution: https://github.com/python/cpython/pull/8226 That patch is also used by Debian. Cheers, Lars From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 12 11:11:50 2024 Received: (at 68394) by debbugs.gnu.org; 12 Jan 2024 16:11:50 +0000 Received: from localhost ([127.0.0.1]:37360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOK8M-0002s5-BJ for submit@debbugs.gnu.org; Fri, 12 Jan 2024 11:11:50 -0500 Received: from wolfsden.cz ([37.205.8.62]:51340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rOK8J-0002rt-Vb for 68394@debbugs.gnu.org; Fri, 12 Jan 2024 11:11:48 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 4DF5E250EC9; Fri, 12 Jan 2024 16:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705075908; bh=XQm1x3UqtNwTG4HXYq411SS4p7Ps9lVbKfTZDQhb2fI=; h=From:To:Cc:Subject:Date; b=C9Tac3VRevmRtXGrvYLac34OR6jEnkmWHxQ9av9dtAZLX0hPJkEOedaaRP3dd+Q/S 9lu58Dk+5lf93hl380Cz/+bW37Tt2fhddTJxNialrgEkaaa4RykscmnZNG0dtOF0AO Ol1fheoJMCprAd4WH/irKNAZjfYOg/AoXiWYPZUKJlWcHf+rGBG70xXc7k3q0Hd9JF z9Dd5RpoVRuNlP+HSAliiKdjwZu1DNq9m4sVzAtWj6EAF80ENtL/2vIztnbYFp9QP8 GpF/xXICSAGagaSWRIttRw+FG96xGOZjHnMkMGwHCMUu5hQrle71bIyWz43AmvuDbp p358oNFfSSVwUWaCOyKQbJVW5SSZCqL5Zq5FmE92YQFA6PJrzREkx1+glbpDv1IZTo 3dAQPudiH5hvjuuELEAD0q6UqBWg5uztSUcQYJDdWo0dlsw4YFrWcM32ToO1WrWg4E VFCnvDyxRWTSYYQChDRf9gb75hn6YivgIaeHTzacOHSXYI6MpXfHEtMkRh/v7hvTZj QPp/AnMA/CEnDsIzkJUwM/JAGiEFStBJeQChGjHQDkXsQz+BtE7i9iSh3kyTXZT9lZ JIu9SbvzxB+7Acr6z2e+zKDFXhijeHIJcH5taPbSh84JiQoK8Q4ABJlW2Nsq1UvATH 2kURgJ//jTI4ftamW8qBlVY0= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id D7894251624; Fri, 12 Jan 2024 16:11:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705075908; bh=XQm1x3UqtNwTG4HXYq411SS4p7Ps9lVbKfTZDQhb2fI=; h=From:To:Cc:Subject:Date; b=C9Tac3VRevmRtXGrvYLac34OR6jEnkmWHxQ9av9dtAZLX0hPJkEOedaaRP3dd+Q/S 9lu58Dk+5lf93hl380Cz/+bW37Tt2fhddTJxNialrgEkaaa4RykscmnZNG0dtOF0AO Ol1fheoJMCprAd4WH/irKNAZjfYOg/AoXiWYPZUKJlWcHf+rGBG70xXc7k3q0Hd9JF z9Dd5RpoVRuNlP+HSAliiKdjwZu1DNq9m4sVzAtWj6EAF80ENtL/2vIztnbYFp9QP8 GpF/xXICSAGagaSWRIttRw+FG96xGOZjHnMkMGwHCMUu5hQrle71bIyWz43AmvuDbp p358oNFfSSVwUWaCOyKQbJVW5SSZCqL5Zq5FmE92YQFA6PJrzREkx1+glbpDv1IZTo 3dAQPudiH5hvjuuELEAD0q6UqBWg5uztSUcQYJDdWo0dlsw4YFrWcM32ToO1WrWg4E VFCnvDyxRWTSYYQChDRf9gb75hn6YivgIaeHTzacOHSXYI6MpXfHEtMkRh/v7hvTZj QPp/AnMA/CEnDsIzkJUwM/JAGiEFStBJeQChGjHQDkXsQz+BtE7i9iSh3kyTXZT9lZ JIu9SbvzxB+7Acr6z2e+zKDFXhijeHIJcH5taPbSh84JiQoK8Q4ABJlW2Nsq1UvATH 2kURgJ//jTI4ftamW8qBlVY0= From: Tomas Volf <~@wolfsden.cz> To: 68394@debbugs.gnu.org Subject: [PATCH python-team v2] gnu: python: Make the build reproducible. Date: Fri, 12 Jan 2024 17:11:29 +0100 Message-ID: <3171d7e17ba481e977e45fdf35fb0ef42250abb4.1705075889.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68394 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 23 09:12:28 2024 Received: (at 68394-done) by debbugs.gnu.org; 23 Jan 2024 14:12:28 +0000 Received: from localhost ([127.0.0.1]:42495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSHVs-0007io-Bj for submit@debbugs.gnu.org; Tue, 23 Jan 2024 09:12:28 -0500 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:49223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSHVp-0007iY-TE for 68394-done@debbugs.gnu.org; Tue, 23 Jan 2024 09:12:26 -0500 Received: by mail-qt1-x82a.google.com with SMTP id d75a77b69052e-429be992974so26143541cf.2 for <68394-done@debbugs.gnu.org>; Tue, 23 Jan 2024 06:12:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706019135; x=1706623935; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=1LzVOBI4kWExId8y6H2BeOTXTk9O/riTDbNZlp/wNG8=; b=VOHOl3NBqXp+wRUao5R+FDh11q2M4UfaogHDNaaJ4jA11lGY0XyUtxSUF+Rfc8S2L2 6xbZS88wOGxOrwLJLdLwDm6RR2ub6Zz12honiE1jcb2o8niCV7f8iIxlPSCP7x+SiRWy F9he42rmNuzFi0ZAOmEN1dbt5SSTWG3b+APA4HRk6ZKX+kNxjBDROuVM2shrBDOxt02G BnzZ6Ubi/Q61dRCj3m5r+vaansCu73Bdv6btPr08EV4u28ksJDeXImL5lxRYiEyKaVni YdJmfLXVGf3QKGWG+6bFXtVvmQN4c/MJbliDvwHuozoJuranxt4U8xJN/IHz4drGVjPE Ydyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706019135; x=1706623935; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1LzVOBI4kWExId8y6H2BeOTXTk9O/riTDbNZlp/wNG8=; b=qI/ytBIg+k4BrB1tdk/+/m4QoNdY4hV5hbEkcVnr1PA4gzTnCMteoWpZJqa/+dTv0M 7SXEYuFuA7LzTeH5Qd6gTBamUnaCLEFIlaH3qCYgY7E+2E/r6im/dRi74VCKIhLouUBX HNUHT73rTnQpjEVzuV/diF7QG0sxQ+4HY/roOBnZqlM1CqbXJHs4RmZw7Y5mUSLM57Kx I5ovcI+P92yRIxvWik8FIV9UXI4vK/AXb4Wu3Qag+WzgQzVidHZ4fKxWH4xiBo1YU94F rpjJe/WrYFmI5KQok0rsov/j70gJhZ9X51HBptCnJhTG7jIbF7czPRHuDLUIYs75IwrX wNYw== X-Gm-Message-State: AOJu0YwfKJXrNiCm5cr0wpskCffJdv16uvwpJu2iQdhkuY7QCNtfY1IZ HcxJP5hd0a4+IzhZnmXr1ulDNcKuhLonKIuH0dsjU59Ol0WWzvSsxXp1lZg8Xv8= X-Google-Smtp-Source: AGHT+IEq7BtKG86eE0atUUIlXS9MebNGlOJFqoiWtXfJAAYPS2yTbOjSEO+GMFwIiXCT/+QajaECTQ== X-Received: by 2002:a05:622a:28a:b0:42a:441b:ca93 with SMTP id z10-20020a05622a028a00b0042a441bca93mr904806qtw.36.1706019135509; Tue, 23 Jan 2024 06:12:15 -0800 (PST) Received: from hurd (dsl-158-18.b2b2c.ca. [66.158.158.18]) by smtp.gmail.com with ESMTPSA id hf16-20020a05622a609000b0042a3358bf59sm3019372qtb.79.2024.01.23.06.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 06:12:15 -0800 (PST) From: Maxim Cournoyer To: Tomas Volf <~@wolfsden.cz> Subject: Re: bug#68394: [PATCH python-team] gnu: python: Make the build reproducible. In-Reply-To: <3171d7e17ba481e977e45fdf35fb0ef42250abb4.1705075889.git.~@wolfsden.cz> (Tomas Volf's message of "Fri, 12 Jan 2024 17:11:29 +0100") References: <3171d7e17ba481e977e45fdf35fb0ef42250abb4.1705075889.git.~@wolfsden.cz> Date: Tue, 23 Jan 2024 09:12:14 -0500 Message-ID: <87o7dc16m9.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68394-done Cc: Munyoki Kilyungi , jgart , 68394-done@debbugs.gnu.org, Lars-Dominik Braun , Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Tomas, Tomas Volf <~@wolfsden.cz> writes: > 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 I've pushed a variant of this on to core-updates in commit e84519a949 ("gnu: python: Make the build reproducible."), thank you! > --- > 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"))) I've opted to keep the patch local, which has been discussed as preferred in the past (I think for reliability -- they don't disappear). -- Thanks, Maxim From unknown Fri Jun 20 19:47:49 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 21 Feb 2024 12:24:12 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator