From patchwork Tue May 6 22:51:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42355 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 A3E4C27BC49; Tue, 6 May 2025 23:52:42 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 E7F5127BC4B for ; Tue, 6 May 2025 23:52:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCR8z-0001Xp-Go; Tue, 06 May 2025 18:52:09 -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 1uCR8u-0001W5-Ia for guix-patches@gnu.org; Tue, 06 May 2025 18:52:04 -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 1uCR8u-00068U-1B for guix-patches@gnu.org; Tue, 06 May 2025 18:52:04 -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=xGY7pEUzTBL+dSMcAFJkIOCtlmTyaXOluQnFgR6+AkU=; b=OSe6e3MyS1XWkdjZ2LXjPqfIQLKQ/RGowhO7j9PKYRfLZHXlFP4pYwAvfeNInZ1IX9hCGZhRT9MMW9SDGZNb1oF5FXYZtSVozKUz7KukHl8gZbE/6xerEnaocrgRchje0ttlDk9uaf4WiP8ZK37O76Lp3mkLAICiQhvTzS4Sqp8zoTBffJU+VZ2NHmEMdJsQW9XxwvKav1HcBlhEvZmMAt0ABGvUugfv8hJe5cDeJdu7eDa9ZoWr2Tq81axOn0S8Bj4zMJEmfEg5LLsfN4tLBr/bxkVT9RlCkAEiOl1DuLW3tFb/AdUVkncga2rDHdW9R6/gIzEBZgTe4plkNFn/vQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCR8t-0003Sg-Sv for guix-patches@gnu.org; Tue, 06 May 2025 18:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v2 4/6] gnu: nss: Clean up. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 May 2025 22:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73152@debbugs.gnu.org Cc: Ian Eure Received: via spool by 73152-submit@debbugs.gnu.org id=B73152.174657189513222 (code B ref 73152); Tue, 06 May 2025 22:52:03 +0000 Received: (at 73152) by debbugs.gnu.org; 6 May 2025 22:51:35 +0000 Received: from localhost ([127.0.0.1]:35210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCR8Q-0003R7-Rt for submit@debbugs.gnu.org; Tue, 06 May 2025 18:51:35 -0400 Received: from fout-a8-smtp.messagingengine.com ([103.168.172.151]:53795) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCR8J-0003Pv-Il for 73152@debbugs.gnu.org; Tue, 06 May 2025 18:51:29 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 6B9CB1380FB8; Tue, 6 May 2025 18:51:22 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Tue, 06 May 2025 18:51:22 -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=fm2; t=1746571882; x= 1746658282; bh=xGY7pEUzTBL+dSMcAFJkIOCtlmTyaXOluQnFgR6+AkU=; b=G eRGFi5NoE4FksjtKmUfFHuHytgdWuk3e9T2I+OAkGlijJ8pNn7ltuzZ44zsCHKEX 56c9N3ehYKi2CX7wu3PFhiIAR7F4AvAQ3/T0Nn5JIY9+KPQmrHDjg/eTlXXUjBP0 mINqpm5Cvfs8SaEVRF10/XSc2n471KlPof9xKeSxyMEwIfrhZkK4eYXXNpAqM/+T uOvwR/AUodc2vlwcpULLLeNwlHqld/N0Djmn9aF1XLXevWrlpCm1a/zD7iS+Yfd1 RH7FLL1qnH8FDMcmZDXddUZWZ87AloPa+O0hcrn3+3lUVaxqnUPpctuIzIO62gv8 /En6XxRgPJxxGaeJYZyRw== 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-sender :x-me-sender:x-sasl-enc; s=fm3; t=1746571882; x=1746658282; bh=x GY7pEUzTBL+dSMcAFJkIOCtlmTyaXOluQnFgR6+AkU=; b=OPbh1/J2+GIs5VO8V 10HC4TzAl8NaCMzWeC3Ed8iQNZRiNC6RB60vZm1eYfbUdlALmMaGv9ZceOFdcHwT tTGmOQtUXa6tG51dkk6V3sn4DlTC7Ebp8+wqR91kpZV3drf6fo0xGTKICFXU7GJN 77qZt3/cCI6kALre7091SybvjE2A3GWAJrVQapiHVVMVBOWPNDa+5lO9Nr/zvJly gRCMvBv2xkzadq5Jz+PrF7JpKjyVLg5jBShUFN3aa4d47ALUg38+387WDUufjY9S bNxOlmt06czMRZVOjej7H3ZDFvXSiNGhopi6uiJEJ1KRfR2Zgi3cAPh4pAyRcTGP Inw6g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeehvddvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepkefgledvheeufe etkeefvdehteeuueeludfgtefgleevvdejffefgeefgfdvudeunecuffhomhgrihhnpehm ohiiihhllhgrrdhorhhgpdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggp rhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvse guvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgv tgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 6 May 2025 18:51:21 -0400 (EDT) From: Ian Eure Date: Tue, 6 May 2025 15:51:06 -0700 Message-ID: <20250506225115.22450-4-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250506225115.22450-1-ian@retrospec.tv> References: <20250506225115.22450-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 Platform-specific build conditionals currently use ungexp to inject code into the build phase: #$@(if ... #~(...) #~(...)). Change these to use unless/when where appropriate, and ungexp the test value instead of the whole form. * gnu/packages/nss.scm (nss): Clean up gexps. * gnu/packages/nss.scm (nss): Extract URI code into `nss-uri'. * gnu/packages/nss.scm (nss-uri): New variable. Change-Id: I5843eb5bf80f01650e0e87a9c479d5d1ab187f9e --- gnu/packages/nss.scm | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index abaee7e980..1deb92c00f 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -95,8 +95,16 @@ (define-public nspr in the Mozilla clients.") (license license:mpl2.0))) - -;; nss should track ESRs, but currently doesn't. 3.102.1 is the current ESR. +(define (nss-uri version) + (let* ((versions (string-split version #\.)) + (directory-version (string-join versions "_")) + ;; 3.101.3 release has a typo in the filename. + (filename-version + (if (string=? "3.101.3" version) "3.101_3" version))) + (string-append + "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" + "releases/NSS_" directory-version "_RTM/src/" + "nss-" filename-version ".tar.gz"))) (define-public nss (package @@ -107,12 +115,7 @@ (define-public nss (version "3.99") (source (origin (method url-fetch) - (uri (let ((version-with-underscores - (string-join (string-split version #\.) "_"))) - (string-append - "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" - "releases/NSS_" version-with-underscores "_RTM/src/" - "nss-" version ".tar.gz"))) + (uri (nss-uri version)) (sha256 (base32 "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw")) @@ -185,13 +188,12 @@ (define-public nss (setenv "CCC" #$(cxx-for-target)) (setenv "NATIVE_CC" "gcc") ;; No VSX on powerpc-linux. - #$@(if (target-ppc32?) - #~((setenv "NSS_DISABLE_CRYPTO_VSX" "1")) - #~()) + (when #$(target-ppc32?) + (setenv "NSS_DISABLE_CRYPTO_VSX" "1")) + ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. - #$@(if (target-64bit?) - #~((setenv "USE_64" "1")) - #~()))) + (when #$(target-64bit?) + (setenv "USE_64" "1")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (if tests? @@ -210,15 +212,13 @@ (define-public nss (substitute* "nss/tests/dbtests/dbtests.sh" ((" -lt 5") " -lt 50")) - #$@(if (target-64bit?) - '() - ;; The script fails to determine the source - ;; directory when running under 'datefudge' (see - ;; ). Help it. - #~((substitute* "nss/tests/gtests/gtests.sh" - (("SOURCE_DIR=.*") - (string-append "SOURCE_DIR=" (getcwd) "/nss\n"))))) - + (unless #$(target-64bit?) + ;; The script fails to determine the source + ;; directory when running under 'datefudge' (see + ;; ). Help it. + ((substitute* "nss/tests/gtests/gtests.sh" + (("SOURCE_DIR=.*") + (string-append "SOURCE_DIR=" (getcwd) "/nss\n"))))) (let ((release-date (getenv "GUIX_NSS_RELEASE_DATE"))) (when (string=? "" release-date)