From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gLBkAR5e8mOtggEAbAwnHQ (envelope-from ) for ; Sun, 19 Feb 2023 18:36:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OJyTAR5e8mNTPQEAauVa8A (envelope-from ) for ; Sun, 19 Feb 2023 18:36:30 +0100 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 A1ACC251EB for ; Sun, 19 Feb 2023 18:36:29 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTnba-0006Ic-4I; Sun, 19 Feb 2023 12:36:06 -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 1pTnbY-0006IC-Fk for bug-guix@gnu.org; Sun, 19 Feb 2023 12:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTnbW-00048r-IR for bug-guix@gnu.org; Sun, 19 Feb 2023 12:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTnbW-0006EN-BL for bug-guix@gnu.org; Sun, 19 Feb 2023 12:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 04/11] gnu: icecat: Make language packs reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 17:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32026 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167682813623899 (code B ref 32026); Sun, 19 Feb 2023 17:36:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 17:35:36 +0000 Received: from localhost ([127.0.0.1]:49610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTnb5-0006DN-Pn for submit@debbugs.gnu.org; Sun, 19 Feb 2023 12:35:36 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:45721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTnb3-0006D4-AG for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 12:35:34 -0500 Received: by mail-qv1-f51.google.com with SMTP id e17so560374qvr.12 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 09:35:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZHKs/x4Pt3x5lAEfTgv/lJeZ1rFkng5piLGAhW5uB/c=; b=HBluAL2fV6UGlvcoSY9Axx/wD/qlAgbFXM6OzAcvTo9PR3PPVxKTBlhfKWypmpQ/+O 9nD7tT74Un05IbqwfwbSpNI6lIpJTeHRS5JUCGP0RvEKjOD8EKx2Xy9oRpVzAitnHZ6C 9YAIzShwGLienaQeXt8DZNzCjCmbRTA1vls4JiKidvBw3rD/nu3oRP13WQjf5m908esu 4Llblya5YTvb8w7RZod7u/Ed33QO6XzWawTU0EsCWte05O9AkfihMrMgX4hf3qXpTyOU 8bKb53XvI4jNREntiWWnkRFOs9kfDyKPj3JAFl2AAIcivjt1OaM5tMr/Za9hTCmxCl54 IwjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZHKs/x4Pt3x5lAEfTgv/lJeZ1rFkng5piLGAhW5uB/c=; b=PmTTf5gfqd/XkrQz59WZcsTb2iCuepGZk2X/Q49d4ju4wS+cKEI0nZTc9RfNfpEdT5 Ce9dLHCOgZZBIWDI/fcR/+XH32AxNTASSL5LwnOQ8XiTMpK5q+mJJx0fyu0qC19iKNFl heEq5VYVP444fKRcJEFwnvyBmBfCommlgpjdOvKQ+YZPpoITDN8fUodOCsl7VHaWLWVL kpBzUJcRlghBb0Lw5T+b9xw6dKqn+B0CxfZ9+thrqO23drALSohNBN8CtoiZzIUZKobX W+Vu5CHQHRSf4202h7P3AwzgRS3s/q9QIgFpGD/iq+6x4UCeng7dcodCrf3kkon2SmMx Arbw== X-Gm-Message-State: AO0yUKUdRcqKImJqvJePMerNzid0z6ay6gsKBqmuXENjNeeLRE6CqYG5 5oi6dAsyxBSnT7eVlNnnNTQLY//kY/bN3A== X-Google-Smtp-Source: AK7set8E20g7MbdOoCN0hCiQK1dDTT36ppyzZXg9WgDKvmyqGoMpY9D65F0mfS+gseqJmiSJn3cjGQ== X-Received: by 2002:ad4:5fcd:0:b0:56e:b273:fb46 with SMTP id jq13-20020ad45fcd000000b0056eb273fb46mr3950672qvb.51.1676828127591; Sun, 19 Feb 2023 09:35:27 -0800 (PST) Received: from hurd (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id j64-20020a378743000000b00739e7e10b71sm7547208qkd.114.2023.02.19.09.35.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 09:35:27 -0800 (PST) From: Maxim Cournoyer References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> <20230217125539.24467-4-maxim.cournoyer@gmail.com> <8735721ybv.fsf@netris.org> Date: Sun, 19 Feb 2023 12:35:26 -0500 In-Reply-To: <8735721ybv.fsf@netris.org> (Mark H. Weaver's message of "Sat, 18 Feb 2023 16:02:17 -0500") Message-ID: <87fsb1o8wx.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676828189; 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-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=ZHKs/x4Pt3x5lAEfTgv/lJeZ1rFkng5piLGAhW5uB/c=; b=lBYzGyoBSwbfdSHszSopmoo7hKCBjXiLZbrKZQ2P3P0d7k/QuteMBDZeJPp03EmjBA6D6j 3yejKbT/lbeHsb0Q/ZyP/BVZ7LSJuEwsL2U6rDGkBYHkxRpmMOUd2k+LqZG7Slxu5CkpJk VCbxWGU7RMtRGMp2eIMVlpK0mVrKmuwEtdHqpTTblTNiFDy2bJcEChKKO68Kt6Lk71b6lF JcbkdVGE+8RbrbqM/es3VXEx4mV244Zc3+Rro6n2vDi0Q/hmGy5WJWew+Zu0i3xOrhvOjV sUtpU4H5YPcwikVCRP3tdGtbIgYr+G5sZscxmFGRCQBdFsuVbeZvb87xrtYoAQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=HBluAL2f; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676828189; a=rsa-sha256; cv=none; b=rMu0fL38ikgZv+twkafqTpZpPdL5eTVgxF74vsJdxv2eLReP9/HD7KpYCqsCDION9Za5H6 Fs67OJFVKQMPV5Eg3ZivL6x17guGJLDgmL3rBdYVysw4sbN1KjhLwRFJOyvBTmn5VqvZcA escLomtU24uYy5uK4s1bAgRVr7ZBfL9+tk2HCio/y7L91MxwvnSFs8P0RNzjJamJ6KfwyZ ORviiyoXSVyTTtHEuURe9s1Isr++B4Mwl+/kBjv1wzCBLQTG1KcOuOulONmLx/eQ8rLw+/ ri+xBq+KuWTby2HdqwWtBv8p1ley0EvmK0VGYz+iMvblUC5EHW1nJHhHyExy/g== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=HBluAL2f; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-Spam-Score: -2.04 X-Migadu-Queue-Id: A1ACC251EB X-Migadu-Spam-Score: -2.04 X-TUID: cTALeIgtdZF8 Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: >> * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Register. it. >> * gnu/packages/gnuzilla.scm (icecat-source): Apply it. > > Instead of adding this patch in Guix, let's make the change in upstream > IceCat. > > Among other things, adding a 'patches' field to 'icecat-source' has the > unfortunate consequence of forcing an additional 'patch-and-repack' > phase during the build, which unpacks the entire multigigabyte source > code, applies the patch, and repacks it all again. > > Would you like to submit a commit to the gnuzilla repo that simply adds > the 'icecat-reproducible-langpacks.patch' file to the data/patches/ > directory? I guess the file names in the patch also need a component > added to the front (e.g. "a/" and "b/"). > > If you don't want to do it, I'll do it. In any case, it should be > removed from this series of commits for Guix. Done! The issue number of the patch sent is: #61633 I tested it with this: --8<---------------cut here---------------start------------->8--- modified gnu/packages/gnuzilla.scm @@ -43,6 +43,7 @@ (define-module (gnu packages gnuzilla) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix gexp) @@ -523,19 +524,22 @@ (define icecat-source ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. (upstream-icecat-base-version "102.8.0") - (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") + (gnuzilla-commit "fffdd8891c641a9f84a298c0a5ea42f75caec203") (gnuzilla-source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.savannah.gnu.org/gnuzilla.git") - (commit gnuzilla-commit))) - (file-name (git-file-name "gnuzilla" - ;;upstream-icecat-base-version - (string-take gnuzilla-commit 8))) - (sha256 - (base32 - "12id87nsdwm6kra0gm3d3ww8kr0xxb4yllw9wcqmnrlnmspdc1n8")))) + (git-checkout + (url "file:///home/maxim/src/gnuzilla") + (commit gnuzilla-commit)) + ;; (method git-fetch) + ;; (uri (git-reference + ;; (url "file:///home/maxim/src/gnuzilla") + ;; (commit gnuzilla-commit))) + ;; (file-name (git-file-name "gnuzilla" + ;; ;;upstream-icecat-base-version + ;; (string-take gnuzilla-commit 8))) + ;; (sha256 + ;; (base32 + ;; "12id87nsdwm6kra0gm3d3ww8kr0xxb4yllw9wcqmnrlnmspdc1n8")) + ) --8<---------------cut here---------------end--------------->8--- -- Thanks, Maxim