From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id MCA6EW1noWWgagAAkFu2QA (envelope-from ) for ; Fri, 12 Jan 2024 17:23:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id aDC7C21noWU/twAAqHPOHw (envelope-from ) for ; Fri, 12 Jan 2024 17:23:09 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=C9Tac3VR; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=C9Tac3VR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705075946; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=dNwZ1boHqYtvEJG/AqlWzGGERhB3LbFdQTfpt07QkdY=; b=ttaKfD33kU0E+VpqrLFAiiv+ijvZE4v5LME/dXKjgD0UAUmS6JAkkYuKDOeExKHsvMAhbt Y/P1NEfsHD+8qav/LgjLed8I0DBP9QbgSHnwF+KEZluQh/+xNOGeDqcJRq7BO52kgRUlss iau5zXZKejBu/5unNURMdlsIQDGA9mXx5ag36tVEGwpbcRO62lzxLsyTUY2KRsBxRw6QXo XE8e1SLvtG+LVNnCmg8Uu9cyXbHJcvNQkfcLg4UBCJAIS0UJCwfzhMknivWUXq+zW5rXSL HTD9gVeEL4YylmJUMhZ1QYRbNak7MCZOeigrqvAL22O7Etq3JT5JIyIZGBwabg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=C9Tac3VR; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=C9Tac3VR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705075946; a=rsa-sha256; cv=none; b=cxAGkLJ8rgohg3kn860E6ICf7/y5YOcaV4kk01wzZmsgu4Ve7tV53xzh4u+pHVLvrb/EtB OxCoyxZ5qAYYYUAwvkVmL4akanbJ8NhFT/9+hvqabZ178nIQeBVizbeF75lPdTEydIO5j+ VGRlo+fz5MrZ5YVKzU6Jo2v9TrUljGPncCDatqePG2mVx75LKn01edcJO9HKbb6D6YXec+ ne+qV9aamOOaXkHXffrAn8lPNsz0uZsJGgs3rEpCitlsBb4AC+XFHgK9ZH2XbUqOhK4PPE ggHRL0key0fF5Dk/6+yJpREbzu41Bqs07LyZG/4p0LkWLKOHwmx5YOAhHzPu9A== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 79528D295 for ; Fri, 12 Jan 2024 17:12:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOK8d-0008NK-NN; Fri, 12 Jan 2024 11:12:07 -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 1rOK8b-0008Mk-SO for guix-patches@gnu.org; Fri, 12 Jan 2024 11:12:05 -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 1rOK8b-00021L-IQ; Fri, 12 Jan 2024 11:12:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rOK8Y-0002sl-MF; Fri, 12 Jan 2024 11:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68394] [PATCH python-team v2] gnu: python: Make the build reproducible. References: In-Reply-To: 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:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68394@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by 68394-submit@debbugs.gnu.org id=B68394.170507591011045 (code B ref 68394); Fri, 12 Jan 2024 16:12:02 +0000 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= 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> 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 3.80 X-Spam-Score: 3.80 X-Migadu-Queue-Id: 79528D295 X-TUID: DZz6CizxhBY+ 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