From unknown Sat Aug 16 18:44:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64592] [PATCH 1/2] gnu: node-lts: Simplify snippet. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, guix-patches@gnu.org Resent-Date: Thu, 13 Jul 2023 08:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64592@debbugs.gnu.org Cc: Ricardo Wurmus , Jelle Licht X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Jelle Licht Received: via spool by submit@debbugs.gnu.org id=B.168923704011378 (code B ref -1); Thu, 13 Jul 2023 08:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jul 2023 08:30:40 +0000 Received: from localhost ([127.0.0.1]:53330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJrih-0002xQ-G5 for submit@debbugs.gnu.org; Thu, 13 Jul 2023 04:30:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:40776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJric-0002x2-2t for submit@debbugs.gnu.org; Thu, 13 Jul 2023 04:30:37 -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 1qJria-0004Ar-JV for guix-patches@gnu.org; Thu, 13 Jul 2023 04:30:32 -0400 Received: from sender3-of-o58.zoho.com ([136.143.184.58]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qJriY-0000Kb-Hv for guix-patches@gnu.org; Thu, 13 Jul 2023 04:30:32 -0400 Delivered-To: rekado@elephly.net ARC-Seal: i=1; a=rsa-sha256; t=1689237024; cv=none; d=zohomail.com; s=zohoarc; b=ce/kIikKUa72FxlA55VCmY/4c9aG773OwSe8ul+jv3x0zWcaGtjGW8JVLfxfYKPnPzWabNh5ELocxsswxqw954bMe2ZjltPDJl6wnx743aOSLAri+XriP5BMxvlJFMDN14CyNKtYcc2ewMu36bJ1bWVVd82m+5o34FoYuHVGTLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689237024; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=SEGHJzurTmRN+WLFrc9XvVV2jTl8lNA0eNS0zv4yYkk=; b=hqab2b/h5zfiMz/M3XftVhAB6NnyoGHcOm3qxCe8TO7+olx+k0B8xStTxROFkhVQSKh9VUlI5NDpg5gSX77cW4JzUx41lsRnNIYUXWLEFJbJ6rkxFt7u1z/puHPpLjCKux8xmJPoPS5FKSVmclcrMhLl7q019WiEF60MBFj6o4o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1689237024; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:MIME-Version:Content-Type:Content-Transfer-Encoding:Reply-To; bh=SEGHJzurTmRN+WLFrc9XvVV2jTl8lNA0eNS0zv4yYkk=; b=TZTk3ZYwxVmd5J6e2K33wgwmVPS/T3wVwwgqpSaVAJZEbPz3YklUIVovUHAGaR8X BgT97PWDvn1yQR8tFuJ1jfjc9BM0iHgi3VZJaoOvQ9GIf/eRWG0TORdqlYDQDEkw3Do tjXdfGYa31GccSt3OaztKjN0FQ5ofi5HARipaGNk= Received: from localhost (215-111-142-46.pool.kielnet.net [46.142.111.215]) by mx.zohomail.com with SMTPS id 1689237023243712.3518461065023; Thu, 13 Jul 2023 01:30:23 -0700 (PDT) From: Ricardo Wurmus Date: Thu, 13 Jul 2023 10:30:14 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.184.58; envelope-from=rekado@elephly.net; helo=sender3-of-o58.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.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: -2.3 (--) * gnu/packages/node.scm (node-lts)[source]: Remove quasiquote, trailing #T, and IF with explicit booleans. --- gnu/packages/node.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 7695614b3a..c0bb4f2342 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018-2022 Marius Bakke ;;; Copyright © 2020, 2021 Pierre Langlois -;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020, 2023 Ricardo Wurmus ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021, 2022 Philip McGrath @@ -748,13 +748,12 @@ (define-public node-lts "0vcc132z7lkxnw5clmiz6sp6ccmw35pyb69hczphrig5frfmqkva")) (modules '((guix build utils))) (snippet - `(begin + '(begin ;; openssl.cnf is required for build. (for-each delete-file-recursively (find-files "deps/openssl" (lambda (file stat) - (if (string-contains file "nodejs-openssl.cnf") - #f #t)))) + (not (string-contains file "nodejs-openssl.cnf"))))) ;; Remove bundled software, where possible (for-each delete-file-recursively '("deps/cares" @@ -764,8 +763,7 @@ (define-public node-lts (substitute* "Makefile" ;; Remove references to bundled software. (("deps/uv/uv.gyp") "") - (("deps/zlib/zlib.gyp") "")) - #t)))) + (("deps/zlib/zlib.gyp") "")))))) (arguments (substitute-keyword-arguments (package-arguments node) ((#:configure-flags configure-flags) base-commit: 2794caed7c813f2ec4249236de36eaccafee8361 -- 2.40.1 From unknown Sat Aug 16 18:44:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64592] [PATCH 2/2] gnu: node-lts: Install files irrespective of number of hardlinks. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, guix-patches@gnu.org Resent-Date: Thu, 13 Jul 2023 08:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64592@debbugs.gnu.org Cc: Ricardo Wurmus , Jelle Licht X-Debbugs-Original-Xcc: Jelle Licht Received: via spool by 64592-submit@debbugs.gnu.org id=B64592.168923803312980 (code B ref 64592); Thu, 13 Jul 2023 08:48:02 +0000 Received: (at 64592) by debbugs.gnu.org; 13 Jul 2023 08:47:13 +0000 Received: from localhost ([127.0.0.1]:53359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJryi-0003NI-IJ for submit@debbugs.gnu.org; Thu, 13 Jul 2023 04:47:12 -0400 Received: from sender4-of-o50.zoho.com ([136.143.188.50]:21064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJryh-0003NA-1u for 64592@debbugs.gnu.org; Thu, 13 Jul 2023 04:47:11 -0400 Delivered-To: rekado@elephly.net ARC-Seal: i=1; a=rsa-sha256; t=1689238028; cv=none; d=zohomail.com; s=zohoarc; b=Xo5Am6NWVD4HIa9e3Sz+snGv9Rh6EECaly/SlVOgC7gqVvlW3JeRJamrWJVoyPRpTEvzitOMtChurD30gnavhIfh0NoPOZMEJcoKnz9rQ4absyDg9plaZRbGGjH4pPCwQw51iZLCl5tfuAc8us9C5rIEsXFopdo1Hnx64f5Ol6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689238028; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=A1pVJh1z+Og8xzJbOj5hYiiWHnsQ7PWcLACwxNi9gI4=; b=J4PNkmiI9PfEctuQm8RZEzCpvzNBNmh+aoZEDmvsGbPpjCDnk3y8GVDVmNY8UYM724MnwJFiKYhsxmc25bAIDt4Ny2/brlg7ui5LXtrgCafxAaDijQZj3GjyT1uoRXoGhWADwyTow0SAQ2HmQnSDRFGOQmBL24wdP7sf7ld/2jM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1689238028; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=A1pVJh1z+Og8xzJbOj5hYiiWHnsQ7PWcLACwxNi9gI4=; b=P1CZc3jhNRCpSdwqUHHjEm8AF8tvfxRlbMdO55/byDGag6QsUTPldgomBGPTfi/Q hhXI2Vi1YBe3853CMF7LVQSus0H44ahuIMTUI7sOfE43+6NpUw2Hhlcf0bqGCTqebZx tQ3gROcHGubZhQTY9XmV4psn7RMKdYiIS71IW5ow= Received: from localhost (215-111-142-46.pool.kielnet.net [46.142.111.215]) by mx.zohomail.com with SMTPS id 1689238025957453.39661811471444; Thu, 13 Jul 2023 01:47:05 -0700 (PDT) From: Ricardo Wurmus Date: Thu, 13 Jul 2023 10:47:01 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External 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/node.scm (node-lts)[arguments]: Add build phase 'ignore-number-of-hardlinks. --- gnu/packages/node.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index c0bb4f2342..8ba57dd4e0 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -874,7 +874,36 @@ (define-public node-lts (copy-file (string-append llhttp "/src/http.c") "deps/llhttp/src/http.c") (copy-file (string-append llhttp "/include/llhttp.h") - "deps/llhttp/include/llhttp.h")))))))) + "deps/llhttp/include/llhttp.h")))) + ;; npm installs dependencies by copying their files over a tar + ;; stream. A file with more than one hardlink is marked as a + ;; "Link". pacote/lib/fetcher.js calls node-tar's extractor with a + ;; filter that ignores any "Link" entries. This means that + ;; dependending on the number of hardlinks on files in a node-* + ;; package *some* of its files may not be installed when generating + ;; another package's "node_modules" directory. The build output + ;; would differ depending on irrelevant file system state. + ;; + ;; To avoid this, we patch node-tar to treat files with hardlinks + ;; the same as any other file, so that node-tar has no choice but + ;; to extract all of them --- independent of pacote's filter. + ;; + ;; Why not patch pacote's filter instead? This has led to subtle + ;; differences in where the files are installed, so it's easier to + ;; just ensure that files with hardlinks are always treated as + ;; regular files. + ;; + ;; Discussion: + ;; https://lists.gnu.org/archive/html/guix-devel/2023-07/msg00040.html + ;; Upstream bug report: + ;; https://github.com/npm/pacote/issues/285 + (add-after 'install 'ignore-number-of-hardlinks + (lambda* (#:key outputs #:allow-other-keys) + (let ((file (string-append (assoc-ref outputs "out") + "/lib/node_modules/npm/node_modules" + "/tar/lib/write-entry.js"))) + (substitute* file + (("this.stat.nlink > 1") "false"))))))))) (native-inputs (list ;; Runtime dependencies for binaries used as a bootstrap. c-ares-for-node -- 2.40.1 From unknown Sat Aug 16 18:44:07 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: Ricardo Wurmus Subject: bug#64592: closed (Re: bug#64592: [PATCH 1/2] gnu: node-lts: Simplify snippet.) Message-ID: References: <87fs5hh2jq.fsf@envs.net> X-Gnu-PR-Message: they-closed 64592 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 64592@debbugs.gnu.org Date: Fri, 21 Jul 2023 12:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1689942542-30061-1" This is a multi-part message in MIME format... ------------=_1689942542-30061-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64592: [PATCH 1/2] gnu: node-lts: Simplify snippet. 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 64592@debbugs.gnu.org. --=20 64592: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64592 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1689942542-30061-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64592-done) by debbugs.gnu.org; 21 Jul 2023 12:28:27 +0000 Received: from localhost ([127.0.0.1]:60805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMpFD-0007ni-Ax for submit@debbugs.gnu.org; Fri, 21 Jul 2023 08:28:27 -0400 Received: from mail.envs.net ([5.199.136.28]:39612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMpFB-0007nU-H4 for 64592-done@debbugs.gnu.org; Fri, 21 Jul 2023 08:28:26 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 5077538A18D5 for <64592-done@debbugs.gnu.org>; Fri, 21 Jul 2023 12:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1689942502; bh=ygx91E3CGL1pU7c7qVsCKaY4ConlNqlDyuLvSoewvrY=; h=From:To:Subject:Date:In-Reply-To:From; b=RCj/916VMn85FA1ruhzvMfpnnvnWMfVoqN/kPR6BJKqqgFH51eJDFSrD530enp3gg pSyszOcfs6BUNEJZtPONcW4jmkDZvbzdH7h1/v/xqhMTkVAnHygmYlRi5tNoxmk3lf cD42hzDRUsfmpf+SRY7ItjspCqhR/FCsBzzEhjTdGGCmQ6UZSgUGtYgXoy1j5FqxPA Fy8WHBdOlwiS5zLfOKzfbvJBxykpaXAxWk6n22UkxSCfBoES0g04DV/wdWr71aAKN+ Hr8Y9T78ea9mEn8nOIHccZHAGYrdXIxXRb3T88dp6ubfAF0QWbAk5PFHvi79ODLmvW e4KukP92jyxmx4xL+Root4JmMdT2S5Oh8H2GwoBIK3tnu+F1jybQZJjkH7wGlK98wj sMV0tTS8BSP94de2W/vJ7eNSIxxRbSiX/HHDHEvNUS9yJ340mOzuY/XHblmx27s7zw jzh5buAMerjT87fE3Y1f1gTxojzAgYtlOKrJdMYPzCN4P3ksGB+eha2R+KoFO22iqt I6FUH5/S6SQd29p0lYfHn4tduKrwa6be4KjgrWOGQO/+OlfkMhhsNyrrhoFWbf3Dlj L1jHIQaWQ8mI1dA+dox6xPFUwnedQ4E1CPljsaqfEI/rkCVGFvQ7QKiD66ADVmw4aK 6qTLVE8uY0JL9CUclfPxg64c= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8e1-kM9H9mDT for <64592-done@debbugs.gnu.org>; Fri, 21 Jul 2023 12:28:20 +0000 (UTC) Received: from localhost (unknown [117.174.235.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA for <64592-done@debbugs.gnu.org>; Fri, 21 Jul 2023 12:28:20 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id b820bb0c for <64592-done@debbugs.gnu.org>; Fri, 21 Jul 2023 12:28:09 +0000 (UTC) From: =?utf-8?B?5a6L5paH5q2m?= To: bug#64592 <64592-done@debbugs.gnu.org> Subject: Re: bug#64592: [PATCH 1/2] gnu: node-lts: Simplify snippet. Date: Fri, 21 Jul 2023 20:28:09 +0800 In-Reply-To: bug's message of "Fri, 21 Jul 2023 12:25:58 +0000" Message-ID: <87fs5hh2jq.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64592-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 (-) Pushed as 5dc2a88f99e2e448f7e9ca842a4a0d072a8f8f20, close issue... ------------=_1689942542-30061-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Jul 2023 08:30:40 +0000 Received: from localhost ([127.0.0.1]:53330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJrih-0002xQ-G5 for submit@debbugs.gnu.org; Thu, 13 Jul 2023 04:30:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:40776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJric-0002x2-2t for submit@debbugs.gnu.org; Thu, 13 Jul 2023 04:30:37 -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 1qJria-0004Ar-JV for guix-patches@gnu.org; Thu, 13 Jul 2023 04:30:32 -0400 Received: from sender3-of-o58.zoho.com ([136.143.184.58]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qJriY-0000Kb-Hv for guix-patches@gnu.org; Thu, 13 Jul 2023 04:30:32 -0400 Delivered-To: rekado@elephly.net ARC-Seal: i=1; a=rsa-sha256; t=1689237024; cv=none; d=zohomail.com; s=zohoarc; b=ce/kIikKUa72FxlA55VCmY/4c9aG773OwSe8ul+jv3x0zWcaGtjGW8JVLfxfYKPnPzWabNh5ELocxsswxqw954bMe2ZjltPDJl6wnx743aOSLAri+XriP5BMxvlJFMDN14CyNKtYcc2ewMu36bJ1bWVVd82m+5o34FoYuHVGTLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689237024; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=SEGHJzurTmRN+WLFrc9XvVV2jTl8lNA0eNS0zv4yYkk=; b=hqab2b/h5zfiMz/M3XftVhAB6NnyoGHcOm3qxCe8TO7+olx+k0B8xStTxROFkhVQSKh9VUlI5NDpg5gSX77cW4JzUx41lsRnNIYUXWLEFJbJ6rkxFt7u1z/puHPpLjCKux8xmJPoPS5FKSVmclcrMhLl7q019WiEF60MBFj6o4o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1689237024; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:MIME-Version:Content-Type:Content-Transfer-Encoding:Reply-To; bh=SEGHJzurTmRN+WLFrc9XvVV2jTl8lNA0eNS0zv4yYkk=; b=TZTk3ZYwxVmd5J6e2K33wgwmVPS/T3wVwwgqpSaVAJZEbPz3YklUIVovUHAGaR8X BgT97PWDvn1yQR8tFuJ1jfjc9BM0iHgi3VZJaoOvQ9GIf/eRWG0TORdqlYDQDEkw3Do tjXdfGYa31GccSt3OaztKjN0FQ5ofi5HARipaGNk= Received: from localhost (215-111-142-46.pool.kielnet.net [46.142.111.215]) by mx.zohomail.com with SMTPS id 1689237023243712.3518461065023; Thu, 13 Jul 2023 01:30:23 -0700 (PDT) From: Ricardo Wurmus To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: node-lts: Simplify snippet. Date: Thu, 13 Jul 2023 10:30:14 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Debbugs-Cc: Jelle Licht Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.184.58; envelope-from=rekado@elephly.net; helo=sender3-of-o58.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Ricardo Wurmus 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: -2.3 (--) * gnu/packages/node.scm (node-lts)[source]: Remove quasiquote, trailing #T, and IF with explicit booleans. --- gnu/packages/node.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 7695614b3a..c0bb4f2342 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018-2022 Marius Bakke ;;; Copyright © 2020, 2021 Pierre Langlois -;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020, 2023 Ricardo Wurmus ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021, 2022 Philip McGrath @@ -748,13 +748,12 @@ (define-public node-lts "0vcc132z7lkxnw5clmiz6sp6ccmw35pyb69hczphrig5frfmqkva")) (modules '((guix build utils))) (snippet - `(begin + '(begin ;; openssl.cnf is required for build. (for-each delete-file-recursively (find-files "deps/openssl" (lambda (file stat) - (if (string-contains file "nodejs-openssl.cnf") - #f #t)))) + (not (string-contains file "nodejs-openssl.cnf"))))) ;; Remove bundled software, where possible (for-each delete-file-recursively '("deps/cares" @@ -764,8 +763,7 @@ (define-public node-lts (substitute* "Makefile" ;; Remove references to bundled software. (("deps/uv/uv.gyp") "") - (("deps/zlib/zlib.gyp") "")) - #t)))) + (("deps/zlib/zlib.gyp") "")))))) (arguments (substitute-keyword-arguments (package-arguments node) ((#:configure-flags configure-flags) base-commit: 2794caed7c813f2ec4249236de36eaccafee8361 -- 2.40.1 ------------=_1689942542-30061-1--