From patchwork Mon Apr 17 14:51:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49243 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 5E1F61792A; Mon, 17 Apr 2023 15:53:32 +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=-3.7 required=5.0 tests=BAYES_00,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 23EA217936 for ; Mon, 17 Apr 2023 15:53:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDI-0003ez-V4; Mon, 17 Apr 2023 10:52:16 -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 1poQDD-0003aH-7o for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:11 -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 1poQDC-0005T0-W9 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDC-00007L-S9 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 20/20] gnu: libnode: Use node-lts as base. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52:10 +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.1681743124317 (code B ref 59188); Mon, 17 Apr 2023 14:52:10 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:52:04 +0000 Received: from localhost ([127.0.0.1]:55690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQD6-00004q-1Z for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:52:04 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCn-0008Ud-WA for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:46 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743105; 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=zYiWMBwQM07QKO1EY/Vgw+/hLGMIsgjsRZ7jAu9nuW8=; b=uAmlvFVzSQ2EycHKIhLd0zv3mpD/IG75LarzKkILAWgsHMkbqRNBkAKOeIdpKC+J7P8NhE dTtNu5pujoPCXmGKE5/DPSZ6oTn7mWpDbhZU9nY2Ac30XbHmo+Nuc6h3vWrCR5Fqz+vb8f zPcBrcfuBDCAOkVHG4JpGSZGorlLT7k= Date: Mon, 17 Apr 2023 16:51:22 +0200 Message-Id: <24ff0c1a9bc614b7d4a9adffcbfbbfc4c34a25d6.1681742871.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 v7: - Build emacs-nodejs-repl with node-lts - Rebase on master - Update node-lts to 18.16.0 - Still broken on armhf, but has been for years :/ 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 03c92e7ffd..03e0f36cdf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1428,7 +1428,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 35e1386844..37cfec8a6b 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)