From patchwork Tue Aug 12 13:37:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 43393 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 0E31027BC4A; Tue, 12 Aug 2025 14:39:28 +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=0.0 required=5.0 tests=none autolearn=unavailable version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B896C27BC49 for ; Tue, 12 Aug 2025 14:39:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulpDd-0000T6-T4; Tue, 12 Aug 2025 09:39:14 -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 1ulpDX-0000Rg-If for guix-patches@gnu.org; Tue, 12 Aug 2025 09:39:08 -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 1ulpDU-00034v-9w for guix-patches@gnu.org; Tue, 12 Aug 2025 09:39:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=b85xwm9Zc8in18HHLmnTAWOGF03hiWZn4sRPNxVvQZs=; b=oJt96cFouj1aFr0ZYJJVJDitR8yBGgF+lluF4EfgcWQYDzd40vo1owCzcx5oAv7a6azG0Csd2RrD3RBGEImbIlpiKp/aciuMkmUgiUZZuTWIQZ26g7d/uiQcd8nYiTlTf9+XRHaiJwqpWLazMM2J11J/KjqCcuiljm3XXMTUbBAlNM2zjzc32PyAaqQi6I4IzogqHZsmKs3femiJxOuIPYqPigv1OW5E6DDPlljqW1Tf0muw3dIkjnC4bpEiqPyJe6pj5y7XFOS6ZIA0AIDqUyncZXICaMjE6BagmP17yQCHljdBYmF5jp1dwPCsUQLl87sGPuNuZWrBbsgGQ1PqPA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulpDT-0001OK-8r for guix-patches@gnu.org; Tue, 12 Aug 2025 09:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78689] Merging of "nss-updates" Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 13:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78689 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Efraim Flashner , Maxim Cournoyer , Ian Eure , mail@cbaines.net, 78689@debbugs.gnu.org Received: via spool by 78689-submit@debbugs.gnu.org id=B78689.17550059015270 (code B ref 78689); Tue, 12 Aug 2025 13:39:02 +0000 Received: (at 78689) by debbugs.gnu.org; 12 Aug 2025 13:38:21 +0000 Received: from localhost ([127.0.0.1]:52623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulpCl-0001Ms-5j for submit@debbugs.gnu.org; Tue, 12 Aug 2025 09:38:21 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:49144) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulpCT-0001M2-38 for 78689@debbugs.gnu.org; Tue, 12 Aug 2025 09:38:12 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 8C5A43AD; Tue, 12 Aug 2025 15:37:49 +0200 (CEST) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id xVz0BgdEej8x; Tue, 12 Aug 2025 15:37:47 +0200 (CEST) Received: from jurong (167.76.29.93.rev.sfr.net [93.29.76.167]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D907E14F; Tue, 12 Aug 2025 15:37:45 +0200 (CEST) Date: Tue, 12 Aug 2025 15:37:44 +0200 From: Andreas Enge Message-ID: References: <87zfcdxkd1.fsf@guixotic.coop> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spamd-Result: default: False [-9.60 / 15.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM(-3.00)[-1.000]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 8C5A43AD X-Rspamd-Server: hera X-Spamd-Bar: --------- 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 Am Tue, Aug 12, 2025 at 02:46:30PM +0300 schrieb Efraim Flashner: > I found nss@3.101.4 failed in the 'check phase for i686-linux. It looks > like there's an extra round of parenthesis around the substitute* for > the (unless #$(target-64bit?) > ((substitute* ... > I wasn't able to quickly find a way to remove the extra parenthesis > without also causing a rebuild on x86_64. Oh dear, that will teach us a lesson! The attached commit solves the problem by adding a layer of wrapping. But it is quite ugly. Since we are still early in the rebuild phase, we could also correct the package and rebuild everything. What do you think? Andreas From 10002034a66abf2a67c72f8157c052937140230a Mon Sep 17 00:00:00 2001 Message-ID: <10002034a66abf2a67c72f8157c052937140230a.1755005604.git.andreas@enge.fr> From: Andreas Enge Date: Tue, 12 Aug 2025 15:32:12 +0200 Subject: [PATCH] gnu: nss: Fix build on 32 bit. Change-Id: I81279a601b9d16140fd58af4613bc8aa9573d099 --- gnu/packages/nss.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) base-commit: c20d32dc5d3f69e7bcb49951043cf7786700b72f diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 40adef194b..120becd1cb 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -219,13 +219,28 @@ (define-public nss (substitute* "nss/tests/dbtests/dbtests.sh" ((" -lt 5") " -lt 50")) - (unless #$(target-64bit?) + ;; Workaround for an error in a previous commit that we + ;; prefer to not revert. + #$@(if (target-64bit?) + ;; The previous faulty code, needs to be copied so as + ;; not to change the derivation in 64 bit. + `((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")))))) + ;; The correct code for 32 bit. On the next run, + ;; keep only this "else" branch. + `((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)