From patchwork Thu Mar 30 12:31:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48805 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 8FAB51715D; Thu, 30 Mar 2023 13:34:12 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 5765617149 for ; Thu, 30 Mar 2023 13:34:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSz-0001LB-B5; Thu, 30 Mar 2023 08:33:21 -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 1phrSq-0001Gr-4j for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSn-0001rT-Fd for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSn-00031h-9v for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 19/19] 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, 30 Mar 2023 12:33:09 +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.168017958411541 (code B ref 59188); Thu, 30 Mar 2023 12:33:09 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:33:04 +0000 Received: from localhost ([127.0.0.1]:56055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSh-0002zs-JY for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:04 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:52500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSd-0002z3-1S for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:59 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179578; 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=HHHtCsaeXpy6LOiCEdKYY3nDrZeOLJAT33C9GOzcpSs=; b=sxOvHBANN7X2haCza5FRL8DBYXIeAfHhf/qVXMPQFOoCYrhHQ+NlUOYRhJ102iXJpV9gYi MFA5Z0Dt2gLrEtDRMySBJgADu2Kh1Fkp0pfpISrx+RjdQ6BYLiLT6d4Sh1ONO6UBnwS0S8 3/KLMQPZtD6QgXYfdEj20y2CVN3zIhw= Date: Thu, 30 Mar 2023 14:31:50 +0200 Message-Id: <6ebc7c7ef6f1093d0bbeaf7257fc9683be0f9529.1680179491.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. --- Changes in v6: - Fix build of node-openzwave-shared - Fix build of node-serialport - Rebase on master 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 c1786b7848..60336a5246 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1334,7 +1334,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 a9c4f463c8..399c5ff794 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -905,10 +905,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)