From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sIrBHHbJr2U9bQEAe85BDQ:P1 (envelope-from ) for ; Tue, 23 Jan 2024 15:13:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sIrBHHbJr2U9bQEAe85BDQ (envelope-from ) for ; Tue, 23 Jan 2024 15:13:10 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=VOHOl3NB; 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=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1706019190; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to: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=1LzVOBI4kWExId8y6H2BeOTXTk9O/riTDbNZlp/wNG8=; b=Yhnrunx45gcwKvDq7A6ukTVBt2pxx4/ZLGTzpl9qIoQ25ipo9uo93XpU8i8Y75MHZ7WqNJ OyvGPa51kxWoSN8uaP1ReNFHELmv13IfoSA1N3xYAyGa5/DaZYaAv55+9mCwArli9pX3OA MqAGIzkiaBlMWlw9j3r3SBXEmVJ+VU816Osjx0D3+1p+W1XUQa5byi3mMzF21BXEUmyO13 DYqbYcUfYrwHv9aSwi6y/XJRvX78qcB+FET/GFamnTY5tO0HqfMQcdFX4LnzdoCuvr5YoN 99n/5LeF19YATy5bkSSQMwY5Q6wyn9myTFEF7zcVpa/o7pK2/tiHud7wdItb6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=VOHOl3NB; 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=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706019190; a=rsa-sha256; cv=none; b=MANQuTN8GKQ2p/Xl9KI+KVbvYwgQqLfbqyCbznpMxkAPBJQnOgxbEBXauNJMy91QWFgB6n GSGN4HlxFVLoYaphpdQayIi2jg0GjcjJGYY7DAGHNG6UG7BGdGgHpcXwmS7hB1hfR13qCF Zgu0qmwtjUsdwdvGpAyOZombCm0M/xFCSfgNYydC0ojJer/Jy3xz6Uw1b/18eq/Nlqz/fR VCKovX3DXvl7ZPNz4Vdq4cirUFcI3pLXcODAI0xSInVat8Lp5h2IwDropnRqRoCdXsen+i dJXshYBwBl7RrnmdMGMJPV2omTiLTLfn3yPoMldOgaJvJ+ObOPnmDxjpHLRV8Q== 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 D96086F47C for ; Tue, 23 Jan 2024 15:13:09 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSHWN-0006as-MB; Tue, 23 Jan 2024 09:13:00 -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 1rSHWL-0006aY-Ok for guix-patches@gnu.org; Tue, 23 Jan 2024 09:12:57 -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 1rSHWL-0006nA-HK for guix-patches@gnu.org; Tue, 23 Jan 2024 09:12:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSHWQ-0007jh-5S for guix-patches@gnu.org; Tue, 23 Jan 2024 09:13:02 -0500 Subject: bug#68394: [PATCH python-team] gnu: python: Make the build reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 23 Jan 2024 14:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 68394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tomas Volf <~@wolfsden.cz> Cc: Munyoki Kilyungi , jgart , 68394-done@debbugs.gnu.org, Lars-Dominik Braun , Marius Bakke Mail-Followup-To: 68394@debbugs.gnu.org, maxim.cournoyer@gmail.com, ~@wolfsden.cz Received: via spool by 68394-done@debbugs.gnu.org id=D68394.170601914829690 (code D ref 68394); Tue, 23 Jan 2024 14:13:01 +0000 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 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-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-Spam-Score: 2.34 X-Migadu-Queue-Id: D96086F47C X-Spam-Score: 2.34 X-Migadu-Scanner: mx11.migadu.com X-TUID: JHsTMAznidbi 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