From patchwork Thu Mar 2 22:53:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47545 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 1917316D02; Thu, 2 Mar 2023 22:55:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 A264816CDE for ; Thu, 2 Mar 2023 22:55:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXrpJ-0001Xm-0J; Thu, 02 Mar 2023 17:55:05 -0500 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 1pXrpH-0001Uh-1N for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:03 -0500 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 1pXrpG-0004xe-Ml for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXrpG-0004rg-HW for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 16/16] gnu: libnode: Use node-lts as base. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Ricardo Wurmus , Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.167779765118623 (code B ref 59188); Thu, 02 Mar 2023 22:55:02 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:11 +0000 Received: from localhost ([127.0.0.1]:58672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroR-0004qE-3A for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:11 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004on-TB for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6SNrDTuxB7uuNdleym2Lvq93pCn52+WDI+ZtO9XXxpA=; b=GXmu8/LklX3kiMKAaJg7DxxXRf+6kpMiaTQAvtKj3yPA4948MQAc/BlI3Tzjp6AwY9Fsax I4slX3m2k0Bc/tEkKA/N8lShl2C1SgIPuu+ZSnFTN0AVEf4BtzVNv7BnpZyv17OeOQ0gIJ Hx7vJTBgFaHGdAyyKjUi0hZPMXI4v68= Date: Thu, 2 Mar 2023 23:53:49 +0100 Message-Id: <103fe522f447d27d977c9574330198901ceed2a0.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: 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 From: Hilton Chain * gnu/packages/node.scm (libnode): Use node-lts as base. * gnu/packages/cran.scm (r-v8)[arguments]<#:phases>: Adjusted accordingly. --- (no changes since v1) gnu/packages/cran.scm | 2 +- gnu/packages/node.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 16314b33d7..d21a207f16 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1304,7 +1304,7 @@ (define-public r-v8 (("^PKG_LIBS=.*") (string-append "PKG_LIBS=" (assoc-ref inputs "libnode") - "/lib/libnode.so.64\n"))) + "/lib/libnode.so.108\n"))) (setenv "INCLUDE_DIR" (string-append (assoc-ref inputs "libnode") diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ce05276180..7a2eb5f280 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -906,10 +906,10 @@ (define-public node-lts zlib)))) (define-public libnode - (package/inherit node + (package/inherit node-lts (name "libnode") (arguments - (substitute-keyword-arguments (package-arguments node) + (substitute-keyword-arguments (package-arguments node-lts) ((#:configure-flags flags ''()) `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases)