From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 3BwdK8KBJWQyGAEASxT56A (envelope-from ) for ; Thu, 30 Mar 2023 14:34:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id cB9QKsKBJWTBygAA9RJhRA (envelope-from ) for ; Thu, 30 Mar 2023 14:34:10 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6A62214FE3 for ; Thu, 30 Mar 2023 14:34:10 +0200 (CEST) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=sxOvHBAN; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680179650; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=HHHtCsaeXpy6LOiCEdKYY3nDrZeOLJAT33C9GOzcpSs=; b=TL8u5icn8nhiJsVJYPIKVA4niUZwoy/FeVpulh5gqujcSgNXDqdgk3xkDZ3XRJMPaZ43YY q9hjqiPUO2R/Yo2G8txCj9qx3kKDWhreSUwPyydEu6piODw9APZTb1spSoPGr3AJItqeAv jY8X2Cq3KHKt+b9s1mSDHCXE7LiwxlmwCHe+gVRB9pdOyEjppsNsqs7QngbxQNvH1Am0Xf u5hBXLrSi5TGmbjx0PCFMuf4F9AdlDhI0zbShTX3PckBtxznUq4nkuPcx3ojZz0TrL76kf 3ofJRezwB7/nqgYKortxsfDsPnfgXAj4a15q+Tbx9EhtafJt5CoaDhj7ZN7syw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680179650; a=rsa-sha256; cv=none; b=u6gZK/LjE6fzMWcwLjG43U3y2p2hDPITwHBSvL8LXOJ3yz7gHZ9pdazC/ZXQ1RtIipvFSY ZyCihmpCYV+orQxOf4+/bwlbMj3uX3TQy99Mo+oKjllJzEIz3nCXJYyD1K5rh5DVKi2Lzv 69FJDicfQoXynAqHNjZ60JfS7O8XyiWpwEAr72QtOBMtpeAoD/J0HKI+1tPxzRKte8X+to 5BdJPx9IdLiCVCgsE1px8nGTjAIlMO5NAd+tVyJkDGg8iKxcHpJv1tTECiKh7da/DzNhqe KSUimlcBU+KNDYP2TXiuHLUs6f7EuMjLqa0/ikonbR6HMUF3uy4HpcEezJm6ow== X-Migadu-Spam-Score: 7.28 X-Migadu-Scanner: scn1.migadu.com X-Migadu-Queue-Id: 6A62214FE3 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=sxOvHBAN; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none) X-Spam-Score: 7.28 X-TUID: bAUyP8tL8Z8y 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) -- 2.39.2