From patchwork Thu Jul 13 08:30:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 51693 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 161F427BBE9; Thu, 13 Jul 2023 09:31:33 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 9C52927BBE2 for ; Thu, 13 Jul 2023 09:31:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qJrj7-0004FE-8N; Thu, 13 Jul 2023 04:31:05 -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 1qJrj5-0004Ey-Oo for guix-patches@gnu.org; Thu, 13 Jul 2023 04:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qJrj5-0000RU-GV for guix-patches@gnu.org; Thu, 13 Jul 2023 04:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qJrj5-0002yJ-14; Thu, 13 Jul 2023 04:31:03 -0400 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 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-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 * 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(-) base-commit: 2794caed7c813f2ec4249236de36eaccafee8361 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)