From patchwork Sun Sep 22 20:53:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 31350 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7991A27BBEA; Sun, 22 Sep 2024 21:55:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EF19E27BBE2 for ; Sun, 22 Sep 2024 21:55:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssTbO-0006Jo-LS; Sun, 22 Sep 2024 16:54:42 -0400 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 1ssTbN-0006Ii-Ij for guix-patches@gnu.org; Sun, 22 Sep 2024 16:54:41 -0400 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 1ssTbN-0007J7-8l for guix-patches@gnu.org; Sun, 22 Sep 2024 16:54:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=tHXxby1qS+FImWrBuS/LX0sf+Hb78G1RWSHydjhKwcM=; b=NaoRqd3t46ZZX1BCAxeuyNdVXwWshq0ctBed8STneKfO40r/j0nPFYMvy/LAG4PzBmCYZ68hUd9VbjCG3P2+DJCi8jXIemtvtfBasELLJdfOQLwByaITDT6xwY1mXVyioWB7qV1HWpO0N8C5ZhSlRqyAEWKq/MMHifoNsf2EiuaX+tKWjY9wIHVvSbNbWc4MOo4h1n6s0YvqIsMRchemMUBYlN30jG7yaOh1kGmPH06MYqMeSsUMKsY50ULSUzMqHHw6vhwWa93NxbXz4BgTpLTYFxerkqIY9xXj6UlWqgtaploH8Nfslsq6Dl5ri78P4p3Vmf101uNs2Nxj88H2yA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssTbj-0001fj-8K for guix-patches@gnu.org; Sun, 22 Sep 2024 16:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73429] [PATCH 3/3] gnu: librewolf-source: Turn into a procedure. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Sep 2024 20:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73429@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , mhw@netris.org, jonathan.brielmaier@web.de, Ian Eure Received: via spool by 73429-submit@debbugs.gnu.org id=B73429.17270384756364 (code B ref 73429); Sun, 22 Sep 2024 20:55:03 +0000 Received: (at 73429) by debbugs.gnu.org; 22 Sep 2024 20:54:35 +0000 Received: from localhost ([127.0.0.1]:42829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssTbG-0001ea-HC for submit@debbugs.gnu.org; Sun, 22 Sep 2024 16:54:34 -0400 Received: from fout3-smtp.messagingengine.com ([103.168.172.146]:40013) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssTb9-0001dq-6Z for 73429@debbugs.gnu.org; Sun, 22 Sep 2024 16:54:27 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 047BD138011E; Sun, 22 Sep 2024 16:54:00 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sun, 22 Sep 2024 16:54:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1727038440; x= 1727124840; bh=tHXxby1qS+FImWrBuS/LX0sf+Hb78G1RWSHydjhKwcM=; b=H uiaTp2UIpsGhLBc+s+wsOpNvDpapgK+jbUR56b357l+R37RosDq7AL7B2n7yyy1H QEPelaUgpp0myK9WxD29BxWXAT6+AAccl6WyT1FadQgAiu49Olso7Ghve2stTPMU K4F+ZvEgS5oJaPZcQs/uXH7VWDpnyFAflpFaAjEbfWwuwMzHV2n5PT+JDbbVR/tM D4sXBNba9mvh8yFkcSs4bEsyn2MNWJXsAt0fE8qjMCfZG2927NmavyOwTBV+bOfe ISaV6FVH8soxQJq/6xkGd3Ux4O842wk81WiWnt2uFK84wC5peYeFNkyPadUjMg6K LCpfoTPzM7BP5+Oei9WWg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727038440; x= 1727124840; bh=tHXxby1qS+FImWrBuS/LX0sf+Hb78G1RWSHydjhKwcM=; b=i F9KxapGsnbKvLre0UpBOkX66U7K/lJ7Ax8aokVkf63aqTUwyLm960NndbS8vy+tY wJ15mgjLpJ3N6mixOlakPbGp8Q6OdFq1pUYGBAqMbDqMwtdoPb+tGlseQsBXjP3y TOZwAGl7aKOd2P03HJyRl8x7qIuhG1l+4wCf6FyUsCnKxXCoOWpbZHnHmU2zhK4p cXjW2XyaN6z5C4HW8MmHqpgAFTVLUuCFxMU+ZzES4hz4eHlthJYL0YJKkEubCp62 wMHJDEQIuhlCZfeHnxiczCgQVqxHaiM5+oP4LRrsnJBCh7TsLGUntfNQ+sezVs6b Xu07K0oPwFGdyh1BZGhGQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedgudehhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddt necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhepfffhlefgueefleefiefgiedvffetieeuhfdtgeduveefleev gefgjefhjefhhfeknecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdr thhvpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhope ejfeegvdelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhgrnhgurhgv sehrihhsvghuphdrnhgvthdprhgtphhtthhopehjohhnrghthhgrnhdrsghrihgvlhhmrg hivghrseifvggsrdguvgdprhgtphhtthhopehmhhifsehnvghtrhhishdrohhrghdprhgt phhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 16:53:58 -0400 (EDT) From: Ian Eure Date: Sun, 22 Sep 2024 13:53:43 -0700 Message-ID: <20240922205343.21437-3-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240922205343.21437-1-ian@retrospec.tv> References: <20240922205343.21437-1-ian@retrospec.tv> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This patch changes the `librewolf-source' variable into the `make-librewolf-source' prodecure. This procedure accepts a LibreWolf version, source hash, and Firefox source hash. The Firefox source version is derived from the provided LibreWolf version. This eases package updates, since the hashes are inside the `librewolf' package, rather than `librewolf-source'; and the version no longer needs to be specified in three places. It also removes a blank line between the file header and `define-module'. * gnu/packages/librewolf.scm (librewolf-source): Turn into a procedure. Change-Id: I96ab1304acde246c179e7aa5dad9ff621be3de82 --- gnu/packages/librewolf.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index bade479656..dd741d22bc 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -40,7 +40,6 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . - (define-module (gnu packages librewolf) #:use-module ((srfi srfi-1) #:hide (zip)) #:use-module (guix build-system gnu) @@ -116,12 +115,13 @@ (define (librewolf-source-origin version hash) (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define librewolf-source - (let* ((ff-src (firefox-source-origin "130.0" - "0w4z3fq5zhm63a0wmhvmqrj263bvy962dir25q3z0x5hx6hjawh2")) +(define* (make-librewolf-source #:version #:firefox-hash #:librewolf-hash) + (let* ((ff-src (firefox-source-origin + (car (string-split version #\-)) + firefox-hash)) (lw-src (librewolf-source-origin - "130.0.1-1" - "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd"))) + version + librewolf-hash))) (origin (method computed-origin-method) @@ -220,7 +220,10 @@ (define-public librewolf (version "130.0.1-1") (source (origin - (inherit librewolf-source) + (inherit (make-librewolf-source + #:version version + #:firefox-hash "0w4z3fq5zhm63a0wmhvmqrj263bvy962dir25q3z0x5hx6hjawh2" + #:librewolf-hash "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd")) (patches (search-patches "librewolf-add-paths-to-rdd-allowlist.patch")))) (build-system gnu-build-system)