From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iEcIGbZ/8Wb6DgAAe85BDQ:P1 (envelope-from ) for ; Mon, 23 Sep 2024 14:48:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iEcIGbZ/8Wb6DgAAe85BDQ (envelope-from ) for ; Mon, 23 Sep 2024 16:48:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=egRXeecz; dkim=fail ("headers rsa verify failed") header.d=retrospec.tv header.s=fm1 header.b="g 0SgSVe"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="e xJug5S"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727102902; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3sT0ppAnBRIDtX1SrJbWEv2hTTwTuT+1+iLSPxtg08A=; b=CnEdnkf94SnbZJll1YTIHLBhKjFL9bLtmXvvQBIbh4akhTGTHKPfZBisuKjHwDLSySMQuI /cJQNL5iUQsS2XsgiIMyoOK+oh03/X7wwlC2aRbZyPbDM2gKVHlqUV7AJvUzuO+LzHgDmQ kndQsn9H2sYYWQeHliqI7dnfx01ny/A0qvhHr6B/FQNNFHbQxzDxp0o5KVlpwJp6Qeh9H4 FQ+j5afB5HHk9Eiozug1P2a/CUb7bBG63krF51FR6omC3EyIUGTrfWgEebBXmA14mTIuhQ Q87R5FO57A6wbd0xECLc60cRXByZgMcIq/8k2zpDYE/NelS+g58JcZ6/oc5AqA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727102902; a=rsa-sha256; cv=none; b=XmJG54j3dlZfSdmBwO7Ser7k1EVwoKbsC11cfWmLDHckmjqXojHWTCjqe0me0GVuwuWrhP 0flmPDq7O7FDEkBavUUvQMbmTYwgpKgvey0Rnj4d7uosHuF0QPePepiJHSSuZfqVhqgTmr C7lOPye6kAdTBlTpQX3AHjpnSG0n9xTWeun2yGrMUTXFVEemedRs4YsYubt8fIlYAYH5zs BXXPGuP6JcKi0ktYAX8wPZaLMtUKa8ZaohJj29nNVUxFt/IH9bfXbjHldODJnElE3nxXjK UaZqZoMp+64yBMqHTkvLGm207nJzLDsvVz4ZLMHv8rj7D4RwT2Oc6yQPKaDCqQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=egRXeecz; dkim=fail ("headers rsa verify failed") header.d=retrospec.tv header.s=fm1 header.b="g 0SgSVe"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="e xJug5S"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none 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 116BA85219 for ; Mon, 23 Sep 2024 16:48:22 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sskLq-0005Z8-91; Mon, 23 Sep 2024 10:47:46 -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 1sskLn-0005YA-2W for guix-patches@gnu.org; Mon, 23 Sep 2024 10:47:43 -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 1sskLk-00063u-1w for guix-patches@gnu.org; Mon, 23 Sep 2024 10:47:42 -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=3sT0ppAnBRIDtX1SrJbWEv2hTTwTuT+1+iLSPxtg08A=; b=egRXeeczM+G8EuUBhgJfQ/rd9LveR8KSi4TcF007MT6LucW/Auo60qokTMqLCge6bAuFiiQlbpM8Ry6sVLVHDApmep7JaMABPoAE8W3vnDWN5zPFlibGYxnYgtIXm35kE9In3Xr0bIQHuvr8CFrwlteQoZsLGMby3086vyUAlb6ijYqz20kFfLA25cqVQnYuKaMn8cIt3XHvInOXueEauOrxC3pGmTSGJCBY1LHajaQn5goBLWADrrI87l4hJm9lHzGhzbKO16p0IAbK9PmejaInm4l0TXutrGmD746UKn5WaXzYXk6GBWRVCztNltjhyTIQRKowgxfzSyOaiI1qAA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sskM7-00027Z-2l for guix-patches@gnu.org; Mon, 23 Sep 2024 10:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73429] [PATCH v2 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: Mon, 23 Sep 2024 14:48: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?Q?Andr=C3=A9?= Batista , mhw@netris.org, jonathan.brielmaier@web.de, Ian Eure Received: via spool by 73429-submit@debbugs.gnu.org id=B73429.17271028718106 (code B ref 73429); Mon, 23 Sep 2024 14:48:03 +0000 Received: (at 73429) by debbugs.gnu.org; 23 Sep 2024 14:47:51 +0000 Received: from localhost ([127.0.0.1]:44573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sskLu-00026b-Tw for submit@debbugs.gnu.org; Mon, 23 Sep 2024 10:47:51 -0400 Received: from fout-a6-smtp.messagingengine.com ([103.168.172.149]:60077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sskLo-00025k-PT for 73429@debbugs.gnu.org; Mon, 23 Sep 2024 10:47:45 -0400 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id 8BF651380262; Mon, 23 Sep 2024 10:47:16 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Mon, 23 Sep 2024 10:47:16 -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=1727102836; x= 1727189236; bh=3sT0ppAnBRIDtX1SrJbWEv2hTTwTuT+1+iLSPxtg08A=; b=g 0SgSVeK0Y/ex/8pPhHn+iDOznLLEUDZ4bFOFYXc4rqy1MEAaXD0Qq4FDeAlAFYfQ kB15J729KO5xpBmMiEV+AyGfIvcaq38Vc+CaN6C46lGjtgRDcOdB7WN66SksjfJa WyOeNdxnp/CKM6bff2hNCCebPSAJwKP7q/ujlNxgfigbvYQ2T+GEXXA50DbxoH6T 2xWbtRR2Jf3VZTcfW55ICz9eM1Oa4M0+oT5J8FlFE4sktlStqjK+QrDu9dnFlBz7 YIg9mm3674E5/cLqlGHAoxdTI8c1DFOpYMXgSKrRpnN4K8ndeiZdfqfKn3zJCs0r TkmJ9QyeahN3L5cUgu3MA== 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=1727102836; x= 1727189236; bh=3sT0ppAnBRIDtX1SrJbWEv2hTTwTuT+1+iLSPxtg08A=; b=e xJug5SDDYLvLZmtdyfnoAvZE3KZlfZJGXSThiOEFKGgTBm9YRnT442XQFvqWWpjN ic9Gvyhz/DEUNvAhrBz6b8U8lIjo1OlCAhXC1owE6JTrWyNDVGOZCXOS+K0VYsdM B1cERQc/TGwiP54FqC+TQECuphsgKSoaHF4hbF03uneKiZ2CBpoZctcNrBkq+d5K VSfEi6YV8R/A317BwfnRdbtHqpe7ljeqn4WVBeGhPHVHBymKK7UapxjhiuDs4tZE pM3RacvE/ZVOGmW2gz3dHIfFqvZh/iK700n0sVHyYDtI+Epr7JLzzAn+lm5hC/Ns Y3xCNVfakJ5u4DIym57uQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelledgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttden ucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhrohhsphgvtgdrthhvqeenuc ggtffrrghtthgvrhhnpeffhfelgfeufeelfeeigfeivdffteeiuefhtdegudevfeelveeg gfejhfejhffhkeenucffohhmrghinhepghhnuhdrohhrghenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdht vhdpnhgspghrtghpthhtohephedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepje efgedvleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnrghnughrvges rhhishgvuhhprdhnvghtpdhrtghpthhtohepjhhonhgrthhhrghnrdgsrhhivghlmhgrih gvrhesfigvsgdruggvpdhrtghpthhtohepmhhhfiesnhgvthhrihhsrdhorhhgpdhrtghp thhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 23 Sep 2024 10:47:15 -0400 (EDT) From: Ian Eure Date: Mon, 23 Sep 2024 07:47:06 -0700 Message-ID: <20240923144706.2073-4-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240923144706.2073-1-ian@retrospec.tv> References: <20240923144706.2073-1-ian@retrospec.tv> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -9.16 X-Migadu-Queue-Id: 116BA85219 X-Spam-Score: -9.16 X-TUID: LXhdwXhG9U4g 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..6fd0aa51f1 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 #:key 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) -- 2.46.0