From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jan 2020 22:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39146@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157912688322961 (code B ref -1); Wed, 15 Jan 2020 22:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jan 2020 22:21:23 +0000 Received: from localhost ([127.0.0.1]:36437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1irr2R-0005yF-Kb for submit@debbugs.gnu.org; Wed, 15 Jan 2020 17:21:23 -0500 Received: from lists.gnu.org ([209.51.188.17]:37375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1irr2P-0005y8-OV for submit@debbugs.gnu.org; Wed, 15 Jan 2020 17:21:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irr2O-0000NV-PV for guix-patches@gnu.org; Wed, 15 Jan 2020 17:21:21 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irr2N-0006NP-OO for guix-patches@gnu.org; Wed, 15 Jan 2020 17:21:20 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:39754) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1irr2N-0006MG-EK for guix-patches@gnu.org; Wed, 15 Jan 2020 17:21:19 -0500 Received: (qmail 5381 invoked by uid 1009); 15 Jan 2020 23:21:17 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25695. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.008668 secs); 15 Jan 2020 22:21:17 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 15 Jan 2020 23:21:17 +0100 Date: Wed, 15 Jan 2020 23:21:15 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 37.59.186.212 X-Spam-Score: -2.3 (--) 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: -3.3 (---) * gnu/packages/gnuzilla.scm (icecat)[arguments](dont-store-compiler-paths): New phase. --- gnu/packages/gnuzilla.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index c619cd5d55..ae155e51ba 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -890,6 +890,16 @@ from forcing GEXP-PROMISE." (substitute* '("browser/confvars.sh") (("MOZ_SERVICES_SYNC=0") "MOZ_SERVICES_SYNC=1")) #t)) + (add-after 'unpack 'dont-store-compiler-paths + (lambda _ + ;; Remove references to the compilers used from the output. Reduces + ;; `guix size icecat' by 1 GiB on x86-64. + (let ((zap "Store reference removed")) + (substitute* "toolkit/content/buildconfig.html" + (("@CC@") zap) + (("@CXX@") zap) + (("@RUSTC@") zap) + (("@MOZ_CONFIGURE_OPTIONS@") zap))))) (add-after 'unpack 'apply-guix-specific-patches (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((patch (string-append (assoc-ref (or native-inputs inputs) -- 2.24.1 From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> In-Reply-To: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2020 17:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.157962824430356 (code B ref 39146); Tue, 21 Jan 2020 17:38:01 +0000 Received: (at 39146) by debbugs.gnu.org; 21 Jan 2020 17:37:24 +0000 Received: from localhost ([127.0.0.1]:48386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itxSr-0007tV-Gu for submit@debbugs.gnu.org; Tue, 21 Jan 2020 12:37:24 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:60444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itxSm-0007tI-11 for 39146@debbugs.gnu.org; Tue, 21 Jan 2020 12:37:19 -0500 Received: (qmail 16253 invoked by uid 1009); 21 Jan 2020 18:37:13 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25701. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.008782 secs); 21 Jan 2020 17:37:13 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 21 Jan 2020 18:37:13 +0100 Date: Tue, 21 Jan 2020 18:37:11 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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 (-) * gnu/packages/gnuzilla.scm (icecat)[arguments](dont-store-compiler-paths): New phase. --- gnu/packages/gnuzilla.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ae0c58eedb..d32333ca96 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -906,6 +907,16 @@ from forcing GEXP-PROMISE." "-p1" "--input" file)))) (or native-inputs inputs))) #t)) + (add-after 'unpack 'dont-store-compiler-paths + (lambda _ + ;; Remove references to the compilers used from the output. Reduces + ;; `guix size icecat' by 1 GiB on x86-64. + (let ((zap "Store reference removed")) + (substitute* "toolkit/content/buildconfig.html" + (("@CC@") zap) + (("@CXX@") zap) + (("@RUSTC@") zap) + (("@MOZ_CONFIGURE_OPTIONS@") zap))))) (add-after 'apply-guix-specific-patches 'remove-bundled-libraries (lambda _ ;; Remove bundled libraries that we don't use, since they may -- 2.25.0 From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2020 17:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mark H Weaver Cc: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= , Marius Bakke , 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.157962914131902 (code B ref 39146); Tue, 21 Jan 2020 17:53:02 +0000 Received: (at 39146) by debbugs.gnu.org; 21 Jan 2020 17:52:21 +0000 Received: from localhost ([127.0.0.1]:48408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itxhJ-0008IO-Ai for submit@debbugs.gnu.org; Tue, 21 Jan 2020 12:52:21 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:36694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itxhD-0008IA-3O for 39146@debbugs.gnu.org; Tue, 21 Jan 2020 12:52:16 -0500 Received: from localhost (089144220057.atnat0029.highway.webapn.at [89.144.220.57]) by dd26836.kasserver.com (Postfix) with ESMTPSA id D5AA03368239; Tue, 21 Jan 2020 18:52:07 +0100 (CET) Date: Tue, 21 Jan 2020 18:52:02 +0100 From: Danny Milosavljevic Message-ID: <20200121185202.4cfbdc37@scratchpost.org> In-Reply-To: <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/bmP3AAnmQYLWWuJMWX6lznC"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Score: -0.7 (/) 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 (-) --Sig_/bmP3AAnmQYLWWuJMWX6lznC Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Mark, since we have to touch Rust anyway, the icecat patch from Jakub below could= also go to guix staging. Is the patch OK? Should we do it? --Sig_/bmP3AAnmQYLWWuJMWX6lznC Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl4nOkIACgkQ5xo1VCww uqX5Rwf+K43re5qCuPBnebeoxybnm/rOxrM7K1RpxB5x3iB3i5M8GlAHVP1R0AlW obBv38xJ+/zAciW5G4BsBGaEm99Wc69kWJ/iRIhooMT/w8gVHkBScGxGDZ6P7yr/ 6ZDIJqbXs2LOLme+w4kzyWAQUTCDvABdjfBvXjmPe0CSv8845Z9iJfqCPI/qSlL0 my78StN0sdjeKTDMRCrhN7AdneHxOF5ksI9/7smxcUDTtEQzdx0IOYvBZETGtPdX 4/lxZ07GRgePA3X3eORQ2f0zo1plMTkv69VCa3vgMUT6EYbTMWC/HfkiWiuO2lLN 9kdgLUwCuOQbah0Q9NvCLz0RbAJ1ww== =2A7a -----END PGP SIGNATURE----- --Sig_/bmP3AAnmQYLWWuJMWX6lznC-- From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2020 18:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.15796299658512 (code B ref 39146); Tue, 21 Jan 2020 18:07:01 +0000 Received: (at 39146) by debbugs.gnu.org; 21 Jan 2020 18:06:05 +0000 Received: from localhost ([127.0.0.1]:48442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itxua-0002Cs-No for submit@debbugs.gnu.org; Tue, 21 Jan 2020 13:06:05 -0500 Received: from tobias.gr ([80.241.217.52]:39578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itxuU-0002Cg-0m for 39146@debbugs.gnu.org; Tue, 21 Jan 2020 13:05:59 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id 30efd8a3 for <39146@debbugs.gnu.org>; Tue, 21 Jan 2020 18:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:references:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=Ia+crO20Ya7OY9pTpgeghH ARbb3Ox5YwsFF0IH6Zn4M=; b=ajI+QsysOhnAj6g8sZNFn+k12CHaQ+Ck2v9Tik 5IoKI6J0cVOBciH8uJZohI03uopZYDf+CXDaISM4vBUVezaBpqlfuJsSGhed+aXH YCHn/5Kj9lfgEEP629AT1CFZqLuT5eJpNPw4znx3E5fCIqJ+AEpOArxD4Z/8dlAM Bc15HMk0+dYmw3Sd1SebkKsiJBgkaEusD62Hxp2VD1diUlYgdnpRiw3IyDIswh2l K8PTEGlcj5Ug7NX5ZgqOcvjY/huy7xvZGlBpRWo5oge6PzgsQw+CcgDNQw31ukL0 wj6WiPXjZWhGFVZaG+gn/IcM9UAo/R/Ck8jdCJ/PgpySATaA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 69721d98 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <39146@debbugs.gnu.org>; Tue, 21 Jan 2020 18:05:51 +0000 (UTC) From: Tobias Geerinckx-Rice References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> In-reply-to: <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> Date: Tue, 21 Jan 2020 19:05:52 +0100 Message-ID: <87pnfcadmn.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) 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: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Jakub, Jakub K=C4=85dzio=C5=82ka =E5=86=99=E9=81=93=EF=BC=9A > + (add-after 'unpack 'dont-store-compiler-paths > + (lambda _ > + ;; Remove references to the compilers used from=20 > the output. Reduces > + ;; `guix size icecat' by 1 GiB on x86-64. > + (let ((zap "Store reference removed")) > + (substitute* "toolkit/content/buildconfig.html" > + (("@CC@") zap) > + (("@CXX@") zap) > + (("@RUSTC@") zap) > + (("@MOZ_CONFIGURE_OPTIONS@") zap))))) Thanks! This is a fine fix, but I wonder if you know where/how=20 this file is processed by the build system? I think scanning for=20 and neutralising any store reference in the final HTML would be=20 less error-prone. Thoughts? Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfo+u0AlEeO9y5k0W2Imw8BjFSTwFAl4nPYAACgkQ2Imw8BjF STyPnxAAsDRHnbr7nV8huW7TSkhi7bNZB/NTDi28JxSZTZ1uMcFv4jpeNJSA0ygv FIRbg/oaSpB+dggMzXbE9tQQ+Uiod/U3a7TVu2moCJ5WbhPanTsfF0ysIwipsF/C lJUpKsxhO+xRS70BvEJlm9cTTle13dej+8Q2f4BE3vv9A/fr5K+69yMRxHgd9lgf 9RpIVM9IGjJX0XtftyAju3RXJP+RZ/oU0jv3xFtTEnCaXKCvP0UnqmRcKsXw9X2D NvPWIo0n2RKjH4TMc8Ub4YKyCFaoa+B5feAu5yg1S0YgBJ94p4n1o1fAQ5//XjXi 51SeHHS4jFkx47qG0TQ6UryQmewDgpTrfLa9rY4vsdmfYBuB/ajeNyhyPQjZuXnT 9XRsNVhObSOyehEqEBbKeYYqWjT3gO5kiLZY0KkqJIaPb06TUGXqCbfve7QfI+DM KgZqehpAiFZiVyI+i9mN5nfi1BAh/3MSKqzN8HcunVMvNFI3mwq8OTiKsxKor1oL 9nbhoCB0U4z8/g5KUaXHIJZxhkvR6ygcvvEm4qUewa7ggRmiTgAAiDY0qb97EjYm ZnJNYwJNm3ARaLImQp3K2lrfXvsW3bxg2bS5ZA0J5Q9iiVnY7569VIDavRUy5hUH YijGNdh6K5lmfrSwXUKF1wXGdXUiA24NFISZeyIC5FhLaUCzLgk= =Ke1n -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH] gnu: icecat: Remove about:buildconfig store references. References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> In-Reply-To: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2020 01:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39146@debbugs.gnu.org Cc: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.157965686517067 (code B ref 39146); Wed, 22 Jan 2020 01:35:02 +0000 Received: (at 39146) by debbugs.gnu.org; 22 Jan 2020 01:34:25 +0000 Received: from localhost ([127.0.0.1]:48765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu4uX-0004RD-3A for submit@debbugs.gnu.org; Tue, 21 Jan 2020 20:34:25 -0500 Received: from tobias.gr ([80.241.217.52]:53228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu4uU-0004R0-K0 for 39146@debbugs.gnu.org; Tue, 21 Jan 2020 20:34:24 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id f3444ebd; Wed, 22 Jan 2020 01:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=2018; i=me@tobias.gr; bh=/BYX/sPQ+ 1mf8WkSFgMfsLWpMBCMB0nmmgYNZnzQ92I=; b=lT1XmB59+4DdRgR2HJYFLSZ/C aHaX43X1BBkhg7GQzpJSINn0ZraS1IJH9Va+ZAnSd50s5MejzX0vVJouO3E1r8nn W0gcrCgby5MBsfDHVDm0tMVAHMK3kq+/Tr5hnZMujibI+HDck+aQ8bc12TefrKLf M2H0w2VDWLOkU0JAgtbqz/FnyUOSN/zlFe4h0SP+YPUukZBFijkGe4H40EXtwVB4 NFNNMKdw5ULLXLUrTMHjc30DZsoTNdwL1BUVKE01KWVod0bz00sRb++W7FM+s/8e 8q659gp9wcaCJBzQFIpbY8etgEHnKOPUnSyRUFKNUoIbWvyEULCakhT7oT4Kg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 03307af9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 22 Jan 2020 01:34:20 +0000 (UTC) From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 02:34:06 +0100 Message-Id: <20200122013406.3476-1-me@tobias.gr> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) 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: -3.3 (---) * gnu/packages/gnuzilla.scm (icecat)[arguments]: New ‘neutralise-store-references’ phase. Reported-by: Jakub Kądziołka --- Jakub, IceCats, What do you think of this attempt at robustness? Any drawbacks I've missed? Kind regards, T G-R gnu/packages/gnuzilla.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ae0c58eedb..d4a793971c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1067,6 +1068,15 @@ from forcing GEXP-PROMISE." (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build tools in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (("(/gnu/store/)([0-9a-z]{32})" all store hash) + (string-append store (string-take hash 8) "…"))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. -- 2.23.0 From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH] gnu: icecat: Remove about:buildconfig store references. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2020 14:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice , 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.157970397432277 (code B ref 39146); Wed, 22 Jan 2020 14:40:01 +0000 Received: (at 39146) by debbugs.gnu.org; 22 Jan 2020 14:39:34 +0000 Received: from localhost ([127.0.0.1]:49322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuHAM-0008OX-2h for submit@debbugs.gnu.org; Wed, 22 Jan 2020 09:39:34 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:55584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuHAJ-0008ON-S5 for 39146@debbugs.gnu.org; Wed, 22 Jan 2020 09:39:32 -0500 Received: (qmail 10902 invoked by uid 1009); 22 Jan 2020 15:39:29 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25702. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.02435 secs); 22 Jan 2020 14:39:29 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 22 Jan 2020 15:39:29 +0100 Date: Wed, 22 Jan 2020 15:39:28 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200122143928.6cr5vc6vbspjqkrf@zdrowyportier.kadziolka.net> References: <20200122013406.3476-1-me@tobias.gr> <20200122135107.73z6upacjwial3zq@zdrowyportier.kadziolka.net> <87o8uvlgnn.fsf@nckx> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87o8uvlgnn.fsf@nckx> X-Spam-Score: 0.0 (/) 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 (-) On Wed, Jan 22, 2020 at 03:19:06PM +0100, Tobias Geerinckx-Rice wrote: > Jakub, > > Did you mean to send this off-list? Either's fine by me. Whoops, not at all. I need to configure mutt to default to reply-to-all... adding the list back into CC. > Jakub Kądziołka 写道： > > Firstly, note that /gnu/store/ is not guaranteed to be the store path, > > since this parameter can be changed by passing --with-store-dir to > > ./configure. > > Er, whoops, of course. I was going to replace that after testing. By the > time they'd finished I'd forgot. > > > I assume you tested this patch? When I tried to do my substitutions > > after the expansion is done, but before the files are packaged into > > a zip-like file, I couldn't find a good place to hook in the build. > > Indeed. The result is stored in lib/icecat/omni.ja, which is an > uncompressed (so GC works) zip file. > > > Also, there's already some code to help with removing references in > > guix/build/utils.scm (remove-store-references), but the result you get > > with what you're proposing seems much more user-friendly. > > Heh, thank you! That's intentional. :-) > > Remove-store-references' length-preservation is great in some cases > (compiled executables, binary data, weird code, …) but this wasn't a good > fit. > > Thanks for taking a look; I'll test & send a (%store-directory) fix. Thanks > for your enthousiastic contributions to Guix in general. A short while after switching to Guix, I read this on Reddit: | If you're looking to just use one of these distros without actively | contributing back, I'd go with NixOS right now. If you're an enthusiast | that wants to contribute to one of these two projects, GuixSD needs more | help to reach critical mass. ( -- https://www.reddit.com/r/NixOS/comments/9zwiee/nixos_vs_guixsd/eb6zqcu/) This, together with the fact that Guix is quite easy to hack on, has inspired me to contribute. > > Looks like you haven't updated your git in a while ;) > > Nope, just other people's. > > My Guix sqlite DB was corrupted beyond repair in December, I've been limping > along using ‘guix pack’s from my build farm ever since, because it was never > the ‘right time’ to reinstall… > > I blame Guix for making that even possible and relatively painless. > > Kind regards, > > T G-R > From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove about:buildconfig store references. References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> In-Reply-To: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2020 20:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39146@debbugs.gnu.org Cc: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.157972401426356 (code B ref 39146); Wed, 22 Jan 2020 20:14:01 +0000 Received: (at 39146) by debbugs.gnu.org; 22 Jan 2020 20:13:34 +0000 Received: from localhost ([127.0.0.1]:51395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuMNW-0006qw-EZ for submit@debbugs.gnu.org; Wed, 22 Jan 2020 15:13:34 -0500 Received: from tobias.gr ([80.241.217.52]:60772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuMNT-0006qj-Gl for 39146@debbugs.gnu.org; Wed, 22 Jan 2020 15:13:28 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id 56170c57; Wed, 22 Jan 2020 20:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=2018; i=me@tobias.gr; bh=NAstZ3MqJ Bqtpclwe0gXOa8qXd2+jbv6l6InFy//TLM=; b=Hz3Tj06I11AaB8sGu5m0v+LXS wdtI3u5pEinyOA0vqxfj28JRDFRVLeR739/JD85xMTrAq81onAsFdFVjuA/kDrro QJKCMg/mI/5GtZZqBPl3rQxrqVZZUL/vThhEPZBbKfYCFmK++ZfWTXCT54xlcBm3 TgfYiuEoFhP+g/1HuR2n/afTVxIaDIPgtbgFXI3tIU0gvh/ccOSb1iTvqYei6IZB yi66RQ0rn1a5Zrmk3ZdJ28p+JwDTvTYQlUOvdVrA0HzCAbbYItqAn2cqnIpr6LMw yE5vdRb6KL7DBPLz0q5+DoJSyMzZ/NcGFdjxngxkKtxZRsUc2iPafcsKLVs+A== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 3871112c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 22 Jan 2020 20:13:25 +0000 (UTC) From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 21:13:13 +0100 Message-Id: <20200122201313.27946-1-me@tobias.gr> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) 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 (-) * gnu/packages/gnuzilla.scm (icecat)[arguments]: New ‘neutralise-store-references’ phase. Reported-by: Jakub Kądziołka --- So, Here's a version that correctly calls %store-directory. Tested again, output looks the same. Jakub: I accidentally kept your copyright line in v1, but didn't actually use your code (although part of your comment survives :-). Is the Reported-by above acceptable? Kind regards, T G-R gnu/packages/gnuzilla.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ae0c58eedb..96c3c78e98 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Oleg Pykhalov @@ -1067,6 +1067,15 @@ from forcing GEXP-PROMISE." (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build tools in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (((format #f "(~a/)([0-9a-z]{32})" (%store-directory)) _ store hash) + (string-append store (string-take hash 8) "…"))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. -- 2.23.0 From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove about:buildconfig store references. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2020 20:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice , 39146@debbugs.gnu.org Cc: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.15797248952846 (code B ref 39146); Wed, 22 Jan 2020 20:29:02 +0000 Received: (at 39146) by debbugs.gnu.org; 22 Jan 2020 20:28:15 +0000 Received: from localhost ([127.0.0.1]:51401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuMbm-0000jq-Ty for submit@debbugs.gnu.org; Wed, 22 Jan 2020 15:28:15 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:37761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuMbk-0000jY-RZ for 39146@debbugs.gnu.org; Wed, 22 Jan 2020 15:28:14 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id CEC464C1; Wed, 22 Jan 2020 15:28:06 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 22 Jan 2020 15:28:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm1; bh=n01ACd/JD++QurowCFZUQDkcWO 360/BcHH/7SefxHdI=; b=YIzB6iEyxUdNI4ckb0JQZPB3U/viY74XUF83BCi4uq c/q3sbW8R0tTowJrCLwgieh6+Cu2QRkZGtiPcaAA6E9DxYmYu1zfa4fxHxJLN60f hHOZMh6DDTQanxJU6qIOjKMSfwvqWSn9XktAf0N/KBbRVs8u7KDOpo83L9fjxm+j k93iugIz60mO+6NHTNBulEUTnPtD5zaHrPgaxzQvCGckeOhpY+aRlqUteYtWfNHX stP+yBgW3ayYaChIzhW8OUl5wx6eYm1sr0o+D8SlujqbBJJAuYCX+LNIa1DuLB31 hU6avrCaB4zrhGG7aVTgVH0YKq48Srm8Slb+8KzvRXsw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=n01ACd /JD++QurowCFZUQDkcWO360/BcHH/7SefxHdI=; b=WbMoz94holyFMoCEtOc+4x 5aP4cJxYcE/GxNhavGFnWI6sfHEVpYxeesYpq93hD37ER5MtRIHRQJRDMvtLMj2E MrNrq4mPXaBKhr74S/0i4xK9D+waWPlAo7n3K9SZrgbfNdB4E5lGvmfwyFZY9mvw CesN14qH4cq1KALpI2xyTQKisXtT4ox7Rj7sayC0U8LXrnYF2708Smz/hvbb7yEe cLoDlggtT5U7jG228+q2+8W2oYfsttb2aNlYLu3ILe5cAmsM/jrbzKnJ2kWM8f2h dZKKMNP48GgZi7VO1aWfMiMhHhvENAs71IGFmhLOe2IM+zSLz0jTvSAhLJR7IVKA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrvddtgddufedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujghffgffkfggtgesghdtre ertderjeenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeekgedrvddtvddrieelrddvheefnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghs thhmrghilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-3035.bb.online.no [84.202.69.253]) by mail.messagingengine.com (Postfix) with ESMTPA id BF3BB30602DE; Wed, 22 Jan 2020 15:28:05 -0500 (EST) From: Marius Bakke In-Reply-To: <20200122201313.27946-1-me@tobias.gr> References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200122201313.27946-1-me@tobias.gr> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Wed, 22 Jan 2020 21:28:02 +0100 Message-ID: <87iml3tewd.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Tobias Geerinckx-Rice via Guix-patches via writes: > * gnu/packages/gnuzilla.scm (icecat)[arguments]: > New =E2=80=98neutralise-store-references=E2=80=99 phase. [...] > + (add-after 'build 'neutralise-store-references > + (lambda _ > + ;; Mangle the store references to compilers & other build t= ools in > + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on= x86-64. > + (substitute* > + "dist/bin/chrome/toolkit/content/global/buildconfig.htm= l" > + (((format #f "(~a/)([0-9a-z]{32})" (%store-directory)) _ = store hash) > + (string-append store (string-take hash 8) "=E2=80=A6"))) > + #t)) Is it possible to use 'remove-store-references' here? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl4osFIACgkQoqBt8qM6 VPpPSggAtfT+Ay2M/a40/o23/yJ0WEEr/6NA/mqWB1FWZzrvexmdO/9z8rn1ETgP Q61LFHsJnxIP7hVNid0fU6lYZ93d8WOYdMuhcE/AGNYRJ9OVLHiQX6LSQ86ed9he 8eNGWqAlQiGpsnNIt13L16VxtpDpdp89K9C81tlkdEJ8dnTsTMRmGnrxy6kg9rnX PEktHZEqp1nz+49p8wq4Gzc4zH2rVIWMbTDWPI/Tv6PifMrKMleS35c+jE5FkbLv 4LRVhL5Mr4qZlV+3CobRfNU7QO/oTjfpLOcfJTJoi5H/1eeUTxlaPZOtTtElDqgc jAWQ5MTYsNVIXQd630Jajn1Bzi/9kQ== =58ZN -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove about:buildconfig store references. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2020 20:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice Cc: 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.15797262545254 (code B ref 39146); Wed, 22 Jan 2020 20:51:01 +0000 Received: (at 39146) by debbugs.gnu.org; 22 Jan 2020 20:50:54 +0000 Received: from localhost ([127.0.0.1]:51424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuMxh-0001Me-UU for submit@debbugs.gnu.org; Wed, 22 Jan 2020 15:50:54 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:51498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuMxf-0001MV-Rt for 39146@debbugs.gnu.org; Wed, 22 Jan 2020 15:50:52 -0500 Received: (qmail 12685 invoked by uid 1009); 22 Jan 2020 21:50:49 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25702. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.0192 secs); 22 Jan 2020 20:50:49 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 22 Jan 2020 21:50:49 +0100 Date: Wed, 22 Jan 2020 21:50:47 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200122205047.dclrpcyispjwm4dr@zdrowyportier.kadziolka.net> References: <20200122201313.27946-1-me@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200122201313.27946-1-me@tobias.gr> X-Spam-Score: 0.0 (/) 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 (-) On Wed, Jan 22, 2020 at 09:13:13PM +0100, Tobias Geerinckx-Rice wrote: > Jakub: I accidentally kept your copyright line in v1, but didn't actually use your code (although part of your comment survives :-). Is the Reported-by above acceptable? I feel like Co-authored-by might fit better, but either is fine by me. > + ;; Mangle the store references to compilers & other build tools in > + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64. Minor² nit: I feel like this wording suggests this only matters on x64. How about: reducing IceCat's closure by 1 GiB (measured on x86-64). > + (substitute* > + "dist/bin/chrome/toolkit/content/global/buildconfig.html" > + (((format #f "(~a/)([0-9a-z]{32})" (%store-directory)) _ store hash) > + (string-append store (string-take hash 8) "…"))) > + #t)) I don't know whether this is a supported use case, but... what if (%store-directory) contains regex metacharacters? Marius Bakke wrote: > Is it possible to use 'remove-store-references' here? For later reference, resolved on IRC: http://logs.guix.gnu.org/guix/2020-01-22.log#213448 Regards, Jakub Kądziołka From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2020 21:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Danny Milosavljevic Cc: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= , Marius Bakke , 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.15797283078458 (code B ref 39146); Wed, 22 Jan 2020 21:26:01 +0000 Received: (at 39146) by debbugs.gnu.org; 22 Jan 2020 21:25:07 +0000 Received: from localhost ([127.0.0.1]:51456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuNUp-0002CL-8o for submit@debbugs.gnu.org; Wed, 22 Jan 2020 16:25:07 -0500 Received: from world.peace.net ([64.112.178.59]:41532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuNUn-0002CE-Oe for 39146@debbugs.gnu.org; Wed, 22 Jan 2020 16:25:06 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iuNUm-0007tV-Pb; Wed, 22 Jan 2020 16:25:04 -0500 From: Mark H Weaver In-Reply-To: <20200121185202.4cfbdc37@scratchpost.org> References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> <20200121185202.4cfbdc37@scratchpost.org> Date: Wed, 22 Jan 2020 16:23:31 -0500 Message-ID: <87muaf6v81.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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 Danny, Thanks for checking in with me on this. > since we have to touch Rust anyway, the icecat patch from Jakub below could also > go to guix staging. > > Is the patch OK? Should we do it? Instead of removing the build configuration information entirely, how about transforming the store paths in some way that makes them invisible to the reference scanner without losing information? For example, inserting a period (.) somewhere within the store hash would be sufficient and fairly obvious. What do you think? Also, the new phase should end with #t. Thanks, Mark From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Jan 2020 08:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mark H Weaver Cc: Danny Milosavljevic , Marius Bakke , 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.157976866617345 (code B ref 39146); Thu, 23 Jan 2020 08:38:02 +0000 Received: (at 39146) by debbugs.gnu.org; 23 Jan 2020 08:37:46 +0000 Received: from localhost ([127.0.0.1]:51786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuXzl-0004Vh-Sa for submit@debbugs.gnu.org; Thu, 23 Jan 2020 03:37:46 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:34294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuXzi-0004VX-VU for 39146@debbugs.gnu.org; Thu, 23 Jan 2020 03:37:43 -0500 Received: (qmail 5171 invoked by uid 1009); 23 Jan 2020 09:37:40 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25703. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.01939 secs); 23 Jan 2020 08:37:40 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 23 Jan 2020 09:37:40 +0100 Date: Thu, 23 Jan 2020 09:37:38 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200123083738.c5wd3mx2bk3a5xy7@zdrowyportier.kadziolka.net> References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> <20200121185202.4cfbdc37@scratchpost.org> <87muaf6v81.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87muaf6v81.fsf@netris.org> X-Spam-Score: 0.0 (/) 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 (-) On Wed, Jan 22, 2020 at 04:23:31PM -0500, Mark H Weaver wrote: > Hi Danny, > > Thanks for checking in with me on this. > > > since we have to touch Rust anyway, the icecat patch from Jakub below could also > > go to guix staging. > > > > Is the patch OK? Should we do it? > > Instead of removing the build configuration information entirely, how > about transforming the store paths in some way that makes them invisible > to the reference scanner without losing information? For example, > inserting a period (.) somewhere within the store hash would be > sufficient and fairly obvious. > > What do you think? It wasn't clear to me how to transform the paths after they get substituted, but nckx has suggested a better approach: https://debbugs.gnu.org/39146 Regards, Jakub Kądziołka From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2020 02:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Cc: Danny Milosavljevic , Marius Bakke , Tobias Geerinckx-Rice , 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.15798345292357 (code B ref 39146); Fri, 24 Jan 2020 02:56:01 +0000 Received: (at 39146) by debbugs.gnu.org; 24 Jan 2020 02:55:29 +0000 Received: from localhost ([127.0.0.1]:53390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iup85-0000bx-8m for submit@debbugs.gnu.org; Thu, 23 Jan 2020 21:55:29 -0500 Received: from world.peace.net ([64.112.178.59]:44588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iup83-0000bp-Lo for 39146@debbugs.gnu.org; Thu, 23 Jan 2020 21:55:28 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iup81-0004F1-6I; Thu, 23 Jan 2020 21:55:25 -0500 From: Mark H Weaver In-Reply-To: <20200123083738.c5wd3mx2bk3a5xy7@zdrowyportier.kadziolka.net> References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> <20200121185202.4cfbdc37@scratchpost.org> <87muaf6v81.fsf@netris.org> <20200123083738.c5wd3mx2bk3a5xy7@zdrowyportier.kadziolka.net> Date: Thu, 23 Jan 2020 21:53:48 -0500 Message-ID: <87k15h7eeg.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) 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 (-) I like the approach of Tobias' proposed patch, but to avoid losing information (most of the hash), how about changing: (string-append store (string-take hash 8) "=E2=80=A6") to something like: (string-append store (string-take hash 2) "." (string-drop hash 2)) What do you think? Anyway, I don't feel strongly about it, and I acknowledge that neither approach is perfect. Regards, Mark From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Feb 2020 18:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mark H Weaver Cc: Danny Milosavljevic , Marius Bakke , Tobias Geerinckx-Rice , 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.158135988426386 (code B ref 39146); Mon, 10 Feb 2020 18:39:01 +0000 Received: (at 39146) by debbugs.gnu.org; 10 Feb 2020 18:38:04 +0000 Received: from localhost ([127.0.0.1]:55390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1DwZ-0006rW-NQ for submit@debbugs.gnu.org; Mon, 10 Feb 2020 13:38:03 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:39558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1DwX-0006r6-Jh for 39146@debbugs.gnu.org; Mon, 10 Feb 2020 13:38:02 -0500 Received: (qmail 878 invoked by uid 1009); 10 Feb 2020 19:37:59 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25719. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.024154 secs); 10 Feb 2020 18:37:59 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 10 Feb 2020 19:37:59 +0100 Date: Mon, 10 Feb 2020 19:38:31 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200210183831.7evt4ci6r3qtgfm5@gravity> References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> <20200121185202.4cfbdc37@scratchpost.org> <87muaf6v81.fsf@netris.org> <20200123083738.c5wd3mx2bk3a5xy7@zdrowyportier.kadziolka.net> <87k15h7eeg.fsf@netris.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ycerfm2yodxrgg4e" Content-Disposition: inline In-Reply-To: <87k15h7eeg.fsf@netris.org> X-Spam-Score: 0.0 (/) 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 (-) --ycerfm2yodxrgg4e Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 23, 2020 at 09:53:48PM -0500, Mark H Weaver wrote: > I like the approach of Tobias' proposed patch, but to avoid losing > information (most of the hash), how about changing: >=20 > (string-append store (string-take hash 8) "=E2=80=A6") >=20 > to something like: >=20 > (string-append store (string-take hash 2) "." (string-drop hash 2)) >=20 > What do you think? Anyway, I don't feel strongly about it, and I > acknowledge that neither approach is perfect. I feel like the unicode character "=E2=80=A6" makes it much more clear that= the path has been modified, but it's a moot point considering that if someone might get confused by this, they probably won't be able to make use of the hash. However, now that I come back to this after some time, I realize that there is another solution: (string-append store (string-take hash 8) "" (string-drop hash 8)) This would neuter the reference without having any user-visible impact on about:buildconfig. What do you think? Kind regards, Jakub K=C4=85dzio=C5=82ka --ycerfm2yodxrgg4e Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl5BoyMACgkQ4xWnWEYT FWQ5YA//bTFb7ANKOwiwUoi+zlTZtGAHUs/QjXBoRePlyoLWjHz4Z+VELvYBMsdN 0pgJ74WyrbNomSYM1liR+VzpvOuzM+8vR5HaNYCBoSViDDTlDYaiwaE7f+RBayr+ BBzyOlR9eHsHL42JRkzJwbjkCuNqRlsdw1znZRMo/uhPsqXnV3hidM+olZsdIgfJ Dc3zWbAElz/zPIlk4YeKefzT3d3wh1ksFpKrwOXORiTkPK7SmdXTnsQ4UIwEmJ9q Z78QweguWsjIeFBkGoSoVDWUQpxx2szJSHBP7Hty0Y/cdqTaqkzSkwFh78LzpYEh 08wi7R8P6WHKQiu978BPwQv/BDTZI90VvjcbWM+dSq+gFQ72/r/Y5Bo9Ir9fhz/h IeuNPCBQimoD6CgcH4cxxCuEiaDoySUYsWJ8NRdQ4wrGMagKcHvNPlCULogDSOdx 3+vzMHvNBKY9+v9FzJQEIDRpoh2KKsteouXHgIZOnVJAPsLkDMP8CIFLM0mIQ94A 5DbVFcxYNR+QIT+o+B4Vq3TNBZgb3K+KDkQRrh5u+kSesKOFt2vIQ0uRoncdXzxc wtm8Ih01hCCITxtMHdd7Ow5nHxg9Qvk75SazEhti49Xxqhrk1KUmExqhMmb/R6vw pbLjipBcxvLK+TmK5Lh57nKyHOQ3I8zoMIysQ0x60XxlxsRMkMc= =tlHT -----END PGP SIGNATURE----- --ycerfm2yodxrgg4e-- From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Feb 2020 20:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Cc: Danny Milosavljevic , Marius Bakke , Tobias Geerinckx-Rice , 39146@debbugs.gnu.org Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.158136635311709 (code B ref 39146); Mon, 10 Feb 2020 20:26:02 +0000 Received: (at 39146) by debbugs.gnu.org; 10 Feb 2020 20:25:53 +0000 Received: from localhost ([127.0.0.1]:55502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1Fcv-00032n-7i for submit@debbugs.gnu.org; Mon, 10 Feb 2020 15:25:53 -0500 Received: from world.peace.net ([64.112.178.59]:58382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1Fct-00032d-CF for 39146@debbugs.gnu.org; Mon, 10 Feb 2020 15:25:51 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1j1Fcq-00074C-NM; Mon, 10 Feb 2020 15:25:48 -0500 From: Mark H Weaver In-Reply-To: <20200210183831.7evt4ci6r3qtgfm5@gravity> References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> <20200121185202.4cfbdc37@scratchpost.org> <87muaf6v81.fsf@netris.org> <20200123083738.c5wd3mx2bk3a5xy7@zdrowyportier.kadziolka.net> <87k15h7eeg.fsf@netris.org> <20200210183831.7evt4ci6r3qtgfm5@gravity> Date: Mon, 10 Feb 2020 15:24:09 -0500 Message-ID: <871rr2nqbf.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) 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 Jakub, Jakub K=C4=85dzio=C5=82ka wrote: > However, now that I come back to this after some time, I realize that > there is another solution: >=20 > (string-append store (string-take hash 8) "" > (string-drop hash 8)) >=20 > This would neuter the reference without having any user-visible impact on > about:buildconfig. What do you think? Great idea, I think this is the right approach. Would you like to propose a patch and test it? Thank you! Mark From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove compiler paths from about:buildconfig Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Feb 2020 21:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Cc: Mark H Weaver , Marius Bakke , 39146@debbugs.gnu.org, Danny Milosavljevic Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.158137138119701 (code B ref 39146); Mon, 10 Feb 2020 21:50:02 +0000 Received: (at 39146) by debbugs.gnu.org; 10 Feb 2020 21:49:41 +0000 Received: from localhost ([127.0.0.1]:55637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1Gw1-00057h-4n for submit@debbugs.gnu.org; Mon, 10 Feb 2020 16:49:41 -0500 Received: from tobias.gr ([80.241.217.52]:33806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1Gvy-00057X-EI for 39146@debbugs.gnu.org; Mon, 10 Feb 2020 16:49:39 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id 6eabe0ca; Mon, 10 Feb 2020 21:49:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=date:from :subject:to:cc:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=2018; i=me@tobias.gr; bh=B4Q1vnzXexUNMR1OtBttICGFL+fnqTNi0QIaLJwBU/4=; b=UzPf2mIzVfmb 23/BEPwrvMTZlyZI03stL3NrVPgqlQyc4EgXnPnYGWSnv08CLyzd9cvwW05oHXVW +AWZrR/jRoLEEMtnl4aLAZ03tsuzollb42rA8lLCPlQAc2i/HmzrtaRAsntCR6Kc MiMUw3KJdiBP8vG2Xuoi0aPYVkxgiW6TOsCR4ItiJNqcNhNC4zQTrhq0C5Mwtvwe EvVdJWo9A3eCiy5KXAp8zIWwe+rZqq1MeMZRLBqvcGxXZINCrlorlEOg+Qag3RGK nt9Y5pK8FfcKZIsY8gYX+lEbZULCINDwUocl/WTz9Vt6OwWt0W2neIbBWbIKO8Z3 0k+Mn+t5dg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 20cd6f41 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 10 Feb 2020 21:49:36 +0000 (UTC) Date: Mon, 10 Feb 2020 22:49:31 +0100 From: Tobias Geerinckx-Rice Message-Id: <1581371371.3276.1@tobias.gr> In-Reply-To: <20200210183831.7evt4ci6r3qtgfm5@gravity> References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> <20200121173711.5gegrl233dtjneni@zdrowyportier.kadziolka.net> <20200121185202.4cfbdc37@scratchpost.org> <87muaf6v81.fsf@netris.org> <20200123083738.c5wd3mx2bk3a5xy7@zdrowyportier.kadziolka.net> <87k15h7eeg.fsf@netris.org> <20200210183831.7evt4ci6r3qtgfm5@gravity> X-Mailer: geary/3.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) 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: -3.3 (---) Jakub, all, On Mon, Feb 10, 2020 at 7:38 PM, Jakub =3D?UTF-8?b?S8SFZHppb8WCa2E=3D?=3D=20 wrote: > On Thu, Jan 23, 2020 at 09:53:48PM -0500, Mark H Weaver wrote: >> I like the approach of Tobias' proposed patch, but to avoid losing >> information (most of the hash), how about changing: >>=20 >> (string-append store (string-take hash 8) "=85") >>=20 >> to something like: >>=20 >> (string-append store (string-take hash 2) "." (string-drop hash=20 >> 2)) >>=20 >> What do you think? Anyway, I don't feel strongly about it, and I >> acknowledge that neither approach is perfect. > I feel like the unicode character "=85" makes it much more clear that=20 > the > path has been modified, but it's a moot point considering that if > someone might get confused by this, they probably won't be able to=20 > make > use of the hash. >=20 > However, now that I come back to this after some time, I realize that > there is another solution: >=20 > (string-append store (string-take hash 8) "" > (string-drop hash 8)) >=20 > This would neuter the reference without having any user-visible=20 > impact on > about:buildconfig. What do you think? The truncation of these very long paths was fully intended as a=20 feature, but if people do think they're actually useful I think this is=20 a clever hack worthy of Guix :-) Have you tested whether copying & pasting still works fine with this? Kind regards, T G-R, adrift without mu4e = From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v3] gnu: icecat: Remove about:buildconfig store references. References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Feb 2020 19:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39146@debbugs.gnu.org Cc: Mark H Weaver , Marius Bakke , Tobias Geerinckx-Rice , Danny Milosavljevic Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.15815367013628 (code B ref 39146); Wed, 12 Feb 2020 19:45:02 +0000 Received: (at 39146) by debbugs.gnu.org; 12 Feb 2020 19:45:01 +0000 Received: from localhost ([127.0.0.1]:59083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1xwN-0000wN-W5 for submit@debbugs.gnu.org; Wed, 12 Feb 2020 14:45:00 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:34110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1xwL-0000wE-8x for 39146@debbugs.gnu.org; Wed, 12 Feb 2020 14:44:53 -0500 Received: (qmail 8086 invoked by uid 1009); 12 Feb 2020 20:44:51 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25720. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.026486 secs); 12 Feb 2020 19:44:51 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 12 Feb 2020 20:44:51 +0100 Date: Wed, 12 Feb 2020 20:45:25 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200212194525.joyg66cikh5xfnuu@gravity> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tj2tog4cutjlnixn" Content-Disposition: inline In-Reply-To: <1581371371.3276.1@tobias.gr> X-Spam-Score: 0.0 (/) 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 (-) --tj2tog4cutjlnixn Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * gnu/packages/gnuzilla.scm (icecat)[arguments]: New =E2=80=98neutralise-store-references=E2=80=99 phase. Co-authored-by: Tobias Geerinckx-Rice --- On Mon, Feb 10, 2020 at 10:49:31PM +0100, Tobias Geerinckx-Rice wrote: > The truncation of these very long paths was fully intended as a feature, = but > if people do think they're actually useful I think this is a clever hack > worthy of Guix :-) >=20 > Have you tested whether copying & pasting still works fine with this? At the time it was just a rough idea, but here's a patch. After waiting a while for IceCat to compile, I tested this and it's working flawlessly. Selection and copy-paste are unhindered. In the end, I decided to use a comment instead of an empty span, since it'll be less mysterious should someone stumble upon it. It's also more greppable. (to be clear, I only tested the comment version, so perhaps the one wouldn't have even worked. Not that it matters...) BTW, do you happen to know a good way to send a patch as a reply? I ended up using `neomutt -H' and then specifying all the CC's manually... gnu/packages/gnuzilla.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ae0c58eedb..114e5e636c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,10 +7,11 @@ ;;; Copyright =C2=A9 2016 Alex Griffin ;;; Copyright =C2=A9 2017 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2017 ng0 -;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2019 Ivan Petkov ;;; Copyright =C2=A9 2020 Oleg Pykhalov +;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1067,6 +1068,17 @@ from forcing GEXP-PROMISE." (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build too= ls in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x= 86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (((format #f "(~a/)([0-9a-z]{32})" (%store-directory)) _ st= ore hash) + (string-append store (string-take hash 8) + "" + (string-drop hash 8)))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. --=20 2.25.0 --tj2tog4cutjlnixn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl5EVdUACgkQ4xWnWEYT FWSAFRAAlkidMV5LWIP8CdFNBzBgriyHcrPxv2utLAoT9rVdK4nnZzwt1h0E5Zv3 dawLf4QMpLrQs+3BqWQsxb/Iu6FGccwDCUhcp5k+yLrm874/3blRp3+e85C3Kzfr 97XKbuMekE7Srg95UX1NjF+ss5QI/q5P1K+pvAWOSDhUo+/D8EpnFeKZyCto05L2 clYrzJht4JSDS9qFXCEWFbF1yHMjqMuNxBeuLwvyC6dhqm5s393wiKhw0PJTnoiy BMPI2B6l7FgVTGCLyhSKt89wa47KVAlMYfVYUaJdQAu7DfJg9T3/c2LBN8pK5FSk 6ltImmRkvNy9KB2qiBlUur62se3EgLceLEtG6J6zMrw913G6vDlsTwqQuWYAq5sQ jhZz1Cy01PiSMyW3B3WcyPT1Hwz3dBUUE5oO5X9zsfb/C5QUEQ/h7jwLHHFsSF05 8x6qW9Wn+DW6S5TliibivNfpFkYAkmsgZ460YoAhtJNx/Fp2D5Y4w3/BwBecoV1g kO9KQaZnJju6Gc3Aun7P8PLXaCnLx0EMG4ZRz8vA0b1EAXJA0QEJqtcm4xN2HDHz 655HG9/J8b7+DKwf8ioIkT94p/5keEZ7GdNSlewwNUA1nsEVTmhIUAYo96w6453C WsPqATBmUzYhbf9fw8+OD+ZHdopezPqZ71Cow7qbwVx5f3CloCE= =4Ojm -----END PGP SIGNATURE----- --tj2tog4cutjlnixn-- From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v3] gnu: icecat: Remove about:buildconfig store references. References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Feb 2020 20:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= , 39146@debbugs.gnu.org Cc: Mark H Weaver , Marius Bakke , Tobias Geerinckx-Rice , Danny Milosavljevic Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.15815381495811 (code B ref 39146); Wed, 12 Feb 2020 20:10:02 +0000 Received: (at 39146) by debbugs.gnu.org; 12 Feb 2020 20:09:09 +0000 Received: from localhost ([127.0.0.1]:59096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1yJi-0001VV-AE for submit@debbugs.gnu.org; Wed, 12 Feb 2020 15:09:09 -0500 Received: from pb-smtp21.pobox.com ([173.228.157.53]:58296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1yJf-0001V7-CH for 39146@debbugs.gnu.org; Wed, 12 Feb 2020 15:09:00 -0500 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 4E9A1B44E7; Wed, 12 Feb 2020 15:08:58 -0500 (EST) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:date:message-id:mime-version:content-type :content-transfer-encoding; s=sasl; bh=rYb7mTur1Lr0E2qGGgb2kpR6e 1U=; b=unj91QUa3jYCw84GQK78xHCNXjcjJLbhbJLgWfjuuF/l7QVjZrfJIP6Vm rR/74/uq4wWz0WWO9gCxWFwcj08aFgOeox3HqyeNBECaSNnNEIvfDbDYu3vrRK26 tZ63TTuUOGJjXcyObzZWWyQjbDKjOnDmgX3hOzb/bqJiApJptY= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 4713AB44E6; Wed, 12 Feb 2020 15:08:58 -0500 (EST) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:in-reply-to:date:message-id:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=pYvtoMkSUVjjHOn+7I/UOWD/rrtppoPo1+/RtPhxrak=; b=DYP6GBJGK81BdyHplLaq1YxpIOmW5TrvrghDReWVHVZPvTJFnmF2EFZoPJTlURrFdREKN93+SOpXjHoBE+YoSXNvPYC04jD96SFFkYizHf8o3fumhXOpotyYC0R0r3CCeUblO7XUkZs44T0lx/I0lRnXOFxXPtyyYC6IvC2woAw= Received: from localhost (unknown [45.33.91.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id B18F6B44E5; Wed, 12 Feb 2020 15:08:55 -0500 (EST) (envelope-from kyle@kyleam.com) From: Kyle Meyer In-Reply-To: <20200212194525.joyg66cikh5xfnuu@gravity> Date: Wed, 12 Feb 2020 20:08:54 +0000 Message-ID: <87a75nin55.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Pobox-Relay-ID: 7F4D873A-4DD3-11EA-8C2F-8D86F504CC47-24757444!pb-smtp21.pobox.com X-Spam-Score: -0.7 (/) 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 (-) Jakub K=C4=85dzio=C5=82ka writes: > BTW, do you happen to know a good way to send a patch as a reply? I > ended up using `neomutt -H' and then specifying all the CC's manually... One option is to reply to the message as you normally would and then insert the patch under scissors. Here's an example using your patch. I've kept the "From:" line, but that's not necessary if the sender of the email matches the patch author. On the other end, that can be applied with `git am --scissors'. -- >8 -- From: =3D?UTF-8?q?Jakub=3D20K=3DC4=3D85dzio=3DC5=3D82ka?=3D Subject: [PATCH v3] gnu: icecat: Remove about:buildconfig store references. * gnu/packages/gnuzilla.scm (icecat)[arguments]: New =E2=80=98neutralise-store-references=E2=80=99 phase. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/gnuzilla.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 863edb3b4e..7d5020f7c2 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,10 +7,11 @@ ;;; Copyright =C2=A9 2016 Alex Griffin ;;; Copyright =C2=A9 2017 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2017 ng0 -;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2019 Ivan Petkov ;;; Copyright =C2=A9 2020 Oleg Pykhalov +;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1067,6 +1068,17 @@ (define-public icecat (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build too= ls in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x= 86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (((format #f "(~a/)([0-9a-z]{32})" (%store-directory)) _ st= ore hash) + (string-append store (string-take hash 8) + "" + (string-drop hash 8)))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. --=20 2.25.0 From unknown Sat Jun 14 09:01:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v4] gnu: icecat: Remove about:buildconfig store references. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Feb 2020 22:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39146@debbugs.gnu.org Cc: Mark H Weaver , Marius Bakke , Tobias Geerinckx-Rice , Danny Milosavljevic Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.158163136518255 (code B ref 39146); Thu, 13 Feb 2020 22:03:02 +0000 Received: (at 39146) by debbugs.gnu.org; 13 Feb 2020 22:02:45 +0000 Received: from localhost ([127.0.0.1]:60558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j2MZD-0004kI-Tv for submit@debbugs.gnu.org; Thu, 13 Feb 2020 17:02:44 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:52530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j2MZA-0004k7-Fs for 39146@debbugs.gnu.org; Thu, 13 Feb 2020 17:02:38 -0500 Received: (qmail 4282 invoked by uid 1009); 13 Feb 2020 23:02:34 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25721. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.009023 secs); 13 Feb 2020 22:02:34 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 13 Feb 2020 23:02:34 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Thu, 13 Feb 2020 23:03:07 +0100 Message-Id: <20200213220307.24701-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200212194525.joyg66cikh5xfnuu@gravity> References: <20200212194525.joyg66cikh5xfnuu@gravity> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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 (-) * gnu/packages/gnuzilla.scm (icecat)[arguments]: New ‘neutralise-store-references’ phase. Co-authored-by: Tobias Geerinckx-Rice --- Changes from the previous version: - use regexp-quote around %store-directory, since today's IRC discussion has made me aware that this exists as a built-in - reflow some lines gnu/packages/gnuzilla.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ae0c58eedb..fe6664e909 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,10 +7,11 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -882,6 +883,7 @@ from forcing GEXP-PROMISE." #:modules ((ice-9 ftw) (ice-9 rdelim) + (ice-9 regex) (ice-9 match) (srfi srfi-34) (srfi srfi-35) @@ -1067,6 +1069,20 @@ from forcing GEXP-PROMISE." (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build tools in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (((format #f "(~a/)([0-9a-df-np-sv-z]{32})" + (regexp-quote (%store-directory))) + _ store hash) + (string-append store + (string-take hash 8) + "" + (string-drop hash 8)))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. -- 2.25.0 From unknown Sat Jun 14 09:01:04 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Subject: bug#39146: closed (Done: gnu: icecat: Remove about:buildconfig store references.) Message-ID: References: <20200226213343.bzahtg2c52btbe4e@gravity> <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> X-Gnu-PR-Message: they-closed 39146 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 39146@debbugs.gnu.org Date: Wed, 26 Feb 2020 21:34:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1582752842-4558-1" This is a multi-part message in MIME format... ------------=_1582752842-4558-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #39146: [PATCH] gnu: icecat: Remove compiler paths from about:buildconfig which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 39146@debbugs.gnu.org. --=20 39146: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D39146 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1582752842-4558-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 39146-done) by debbugs.gnu.org; 26 Feb 2020 21:33:03 +0000 Received: from localhost ([127.0.0.1]:57865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j74Ih-0001A7-J8 for submit@debbugs.gnu.org; Wed, 26 Feb 2020 16:33:03 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:58596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j74If-00019f-Js for 39146-done@debbugs.gnu.org; Wed, 26 Feb 2020 16:33:02 -0500 Received: (qmail 20881 invoked by uid 1009); 26 Feb 2020 22:32:59 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25734. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.020541 secs); 26 Feb 2020 21:32:59 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 26 Feb 2020 22:32:58 +0100 Date: Wed, 26 Feb 2020 22:33:43 +0100 From: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= To: 39146-done@debbugs.gnu.org Subject: Done: gnu: icecat: Remove about:buildconfig store references. Message-ID: <20200226213343.bzahtg2c52btbe4e@gravity> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7jy3xktamq422yl5" Content-Disposition: inline X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39146-done 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 (-) --7jy3xktamq422yl5 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Pushed as 37db2370db884ceac3bc97123aaaed84377398eb, closing. Regards, Jakub K=C4=85dzio=C5=82ka --7jy3xktamq422yl5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl5W5DcACgkQ4xWnWEYT FWRqRw//TJ9e5j1QTgD/5q4dn/f1Y4vshPA7gdZNcUvdz1V1FjE4Ts6qDerQ3Mv9 A5CaJUq8qwlXkQUTgqsd7gZHsP9mYvZiQgzELMzraUpDc5uZVcoAyFpbBzeRfhgY af8eUO/fm/gArpXSiUotWXg3qYv6BM3EUZVimLxSTAWoewjGRYOaPQb0aTxLO7iX ejOVQA3OeVbmqCjjzYn0EcdscJ7fPVyK8ONzim9MK3zx0FuTh+CseXTrxCKfblkw huAYs/a+xp1Isv+gILijq6vA+gYdBws4fKpHCiwivNLLJnTsFzSXy1dqyRnRBXA1 /Zp//zjLXw9lu0hRl14hKYtGkdbNZJb6Ad/mbLcpqMzL5bociDJ0Xz6c2bmf+t9D 499iS7EcHWPMuXeLQ2EPg78ntVe5gN8mjVhl2txokxIYoulBVD6YoDNMpYJlBnoH uZM6NFUWfsLkOItULMUvFqAUVdDj7rSWckZEo1+1GH5DDg6xfjD678ob3b1EwUKt xcHuO6rNrreIeKq5NG7UsLB3mdEe4x0C+ef8BEJ1q5a0oLc1xaqlBNF5l4/PR4uf 3T3fOW9LFRgAX9PC68xwQnxfN/1VL5H8JqEsN6J9v/hqNXy+ESvnjl1ODN/1FPzF jpIorfW85Pb2wWvHBVKsftOSDwtMu0dJlS+OHh0DEjEp1VS/9Xc= =hFVE -----END PGP SIGNATURE----- --7jy3xktamq422yl5-- ------------=_1582752842-4558-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 15 Jan 2020 22:21:23 +0000 Received: from localhost ([127.0.0.1]:36437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1irr2R-0005yF-Kb for submit@debbugs.gnu.org; Wed, 15 Jan 2020 17:21:23 -0500 Received: from lists.gnu.org ([209.51.188.17]:37375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1irr2P-0005y8-OV for submit@debbugs.gnu.org; Wed, 15 Jan 2020 17:21:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irr2O-0000NV-PV for guix-patches@gnu.org; Wed, 15 Jan 2020 17:21:21 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irr2N-0006NP-OO for guix-patches@gnu.org; Wed, 15 Jan 2020 17:21:20 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:39754) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1irr2N-0006MG-EK for guix-patches@gnu.org; Wed, 15 Jan 2020 17:21:19 -0500 Received: (qmail 5381 invoked by uid 1009); 15 Jan 2020 23:21:17 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25695. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.008668 secs); 15 Jan 2020 22:21:17 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 15 Jan 2020 23:21:17 +0100 Date: Wed, 15 Jan 2020 23:21:15 +0100 From: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= To: guix-patches@gnu.org Subject: [PATCH] gnu: icecat: Remove compiler paths from about:buildconfig Message-ID: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 37.59.186.212 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit 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: -3.3 (---) * gnu/packages/gnuzilla.scm (icecat)[arguments](dont-store-compiler-paths): New phase. --- gnu/packages/gnuzilla.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index c619cd5d55..ae155e51ba 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -890,6 +890,16 @@ from forcing GEXP-PROMISE." (substitute* '("browser/confvars.sh") (("MOZ_SERVICES_SYNC=0") "MOZ_SERVICES_SYNC=1")) #t)) + (add-after 'unpack 'dont-store-compiler-paths + (lambda _ + ;; Remove references to the compilers used from the output. Reduces + ;; `guix size icecat' by 1 GiB on x86-64. + (let ((zap "Store reference removed")) + (substitute* "toolkit/content/buildconfig.html" + (("@CC@") zap) + (("@CXX@") zap) + (("@RUSTC@") zap) + (("@MOZ_CONFIGURE_OPTIONS@") zap))))) (add-after 'unpack 'apply-guix-specific-patches (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((patch (string-append (assoc-ref (or native-inputs inputs) -- 2.24.1 ------------=_1582752842-4558-1--