From patchwork Fri Nov 11 06:24:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44447 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 AAFAB27BBEA; Fri, 11 Nov 2022 06:25:06 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 F1FBA27BBE9 for ; Fri, 11 Nov 2022 06:25:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otNTM-0008Az-EZ; Fri, 11 Nov 2022 01:25:04 -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 1otNTK-0008Ar-Vj for guix-patches@gnu.org; Fri, 11 Nov 2022 01:25: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 1otNTK-0007E2-Mj for guix-patches@gnu.org; Fri, 11 Nov 2022 01:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1otNTK-00056N-Hv for guix-patches@gnu.org; Fri, 11 Nov 2022 01:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v2 4/4] gnu: libnode: Use node-lts as base. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Nov 2022 06:25: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 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166814787519573 (code B ref -1); Fri, 11 Nov 2022 06:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Nov 2022 06:24:35 +0000 Received: from localhost ([127.0.0.1]:44933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNSt-00055d-49 for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:24:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:42228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNSr-00055W-MG for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:24:34 -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 1otNSr-00086y-Gk for guix-patches@gnu.org; Fri, 11 Nov 2022 01:24:33 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otNSq-00079e-1a for guix-patches@gnu.org; Fri, 11 Nov 2022 01:24:33 -0500 Date: Fri, 11 Nov 2022 14:24:07 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668147870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oMnqBXg6d381CM+Wvv6qxph/T3hkVg0YnweRxwWDPGg=; b=qeN+bkfPxAC43X8w/b/ypI2tm9OnCoV9jyqXAOOq/BspJompygwqHY+faS5agro4ui5zCJ qN6kpStDQXCHNwIIH6p9h+0lzkP6hCdrcn2VTcTk+YsNVsKP3DFIF2diu0QuwE/ZgThx7s t4bbylHsBI1IPPg/A/q+m+BRpJwypiO+VaRuiJ2UzyswsqraSs6N6AsgqWuFyF5OZjTUPB x0HXaaD3u1fjntrlX2+drdfzJymIreND/2vkLPr4pFs0incqmb3ilH7z6+CSbleZSojx4w 6iSquaXZcqSsp2ddfUQfq/Ypfr+vppc4bmGaczztLU7BEzvyFv13gg/849+EQw== Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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 (libnode): Use node-lts as base. * gnu/packages/cran.scm (r-v8)[arguments]<#:phases>: Adjusted accordingly. --- 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 a1702ae5f6..8f04d9ad6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -902,7 +902,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 cae7d3b0ca..0e56d12038 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -901,10 +901,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)