From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gH84IvFoJ2eQdwAAe85BDQ:P1 (envelope-from ) for ; Sun, 03 Nov 2024 12:13:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gH84IvFoJ2eQdwAAe85BDQ (envelope-from ) for ; Sun, 03 Nov 2024 13:13:37 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Z7w1tEJR; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021081301 header.b=azmLiIsv; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fsfe.org (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730636017; a=rsa-sha256; cv=none; b=iP63A9HF/EiVwuaGRRPL5Jthm1A0WCDVBiuNdxrEmB+RKeuYZ/BzfOKo55uWFTTNaZ2UEg VIZJQnWNVGEalJtN/0wEbuFCDcJrlRPqWuo3XzfrOj5Ilb2WjgnoALFXebWCgWttB7ZoKp YsCBRGu1Py5dI3yIRA9b5nYoq2V3BUO0HL0F5Nhc0UAW+yKY5T+jNxL7YLIizJ8q78eLLr y93YKP4auc63LfhFokuk1hCDDcoOlEhvi/2mq3MYAWQylJRdtvXDhixPYANxx0R6/8SVJV 1kijjsx5+8cM3+2nGJ6QAugX1xPI6RBfvUrFEI0WPNM8hL5zdByGmUX5D2EhoQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Z7w1tEJR; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021081301 header.b=azmLiIsv; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fsfe.org (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730636017; 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=cOdom4o0lqFiOynZFER13ySc32uUBkHlGmQ1uGvfdiU=; b=HV/cd2mJVqkg5lPjG3it4rjoNQ6A183j04ussQ1lR8ehiy7rXsvvvukRr628Lo2z3N8s/V CbXbdS+FnUOWcpuWgTG/mQqaXMJpWm2yoO07hxu5a0AJ7Vct90qF2tFE+1od0qIw0ST6vi P0zcjfmR6XZHlYVdACRH4lZK/pXxW8miOJ9wjKixPY6NmGw73xgVQ+udSQAAwRHIcI+TB2 85mCasXiPmoa3bE+IHA9r5SY9cW3mtyfnbS0tO7EU3STbEy+XMzqocYiCfBGadju4g8xN0 89nO2W5zxw0TVKV3Hq/J76caeq+KlXxDNH889IreBT9/lSzanUQdBTwT4SZl+w== 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 77D41625F3 for ; Sun, 03 Nov 2024 13:13:37 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7ZTg-0000r8-5M; Sun, 03 Nov 2024 07:13:08 -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 1t7ZTc-0000pk-Qv for guix-patches@gnu.org; Sun, 03 Nov 2024 07:13:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t7ZTc-0005RC-Iq for guix-patches@gnu.org; Sun, 03 Nov 2024 07:13:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=cOdom4o0lqFiOynZFER13ySc32uUBkHlGmQ1uGvfdiU=; b=Z7w1tEJRvzCH/trMCR0WC4W3n+tyGJAoyE3lkIhgbVcGdoF8F8uOoYm6RAACCTxVUwTqoPmxp9bpc5zq4MRfo3bep+j4wQLD5E3wh2vVbS2j6ejSvJZUT4u60Dn6bIV0ip1y/EDCQPwtPkNltC+HhhQzYSnstzbssQJ1hM8Cx/xG3bJiDZ4Z+ZG5A7w+WMwOGckvHWU+zsAQ2trBXM5pq9RPzaot58G+KhGSru57Z22IRWHtdXiVX67oYo6iLVOkqiJaWGfpwJfDXK1AlIKtu3TsPagBKBso21tAaa/hN1yQrPDJzGiVE/zS/jBdWZhoyyrk0bUFCMF6iowMW9k2mA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t7ZTc-0004iD-CZ for guix-patches@gnu.org; Sun, 03 Nov 2024 07:13:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74187] [PATCH 19/20] gnu: esbuild-node: Use node-lts instead of node. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Nov 2024 12:13:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74187 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74187@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 74187-submit@debbugs.gnu.org id=B74187.173063592918053 (code B ref 74187); Sun, 03 Nov 2024 12:13:04 +0000 Received: (at 74187) by debbugs.gnu.org; 3 Nov 2024 12:12:09 +0000 Received: from localhost ([127.0.0.1]:60040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7ZSj-0004h1-0r for submit@debbugs.gnu.org; Sun, 03 Nov 2024 07:12:09 -0500 Received: from mail2.fsfe.org ([213.95.165.55]:37764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7ZKi-0004IA-3e for 74187@debbugs.gnu.org; Sun, 03 Nov 2024 07:03:52 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1730635431; 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=cOdom4o0lqFiOynZFER13ySc32uUBkHlGmQ1uGvfdiU=; b=azmLiIsvWC1NC9voN+5P6LJ+TxEkMAlnfLTImpdJvQ0zxB+kvKvSryam/LYfhs2I5NtA3W 4WMMRKH3Th4aKJfxJVAesiO3GEky1xDInivgcT56HjdQTPnnxRAtoFrw+LO3KO4QNKtvNg pcmzfYMfgc1KGTe7ia9itSQJLhmwQbE= Date: Sun, 3 Nov 2024 13:04:06 +0100 Message-ID: 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 X-Migadu-Spam-Score: 0.05 X-Spam-Score: 0.05 X-Migadu-Queue-Id: 77D41625F3 X-Migadu-Scanner: mx12.migadu.com X-TUID: syM2K7xqJBk/ From: Jelle Licht * gnu/packages/web.scm (esbuild-node)[#:phases]: Remove workaround needed for building with older versions of Node. [native-inputs]: Replace node by node-lts. Change-Id: Iedf30dc1a395e674007c08ce6c0881dbb0f94f0e --- gnu/packages/web.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 842c25b509..954da312bd 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2126,12 +2126,6 @@ (define-public esbuild-node (add-after 'build 'build-platform (lambda* (#:key unpack-path #:allow-other-keys) (with-directory-excursion (string-append "src/" unpack-path) - ;; We're using Node 10, which doesn't have this method. - (substitute* "scripts/esbuild.js" - (("exports.buildNativeLib" m) - (string-append - "Object.fromEntries = entries => entries.reduce((result, entry) => (result[entry[0]] = entry[1], result), {});\n" - m))) ;; Must be writable. (for-each make-file-writable (find-files "." ".")) (invoke "node" "scripts/esbuild.js" @@ -2154,7 +2148,7 @@ (define-public esbuild-node (invoke "make" "test-go")))))))) (native-inputs (modify-inputs (package-native-inputs esbuild) - (append node))))) + (append node-lts))))) (define-public wwwoffle (package @@ -9517,7 +9511,7 @@ (define-public archivebox (build-system python-build-system) (propagated-inputs (list curl - node)) + node-lts)) (inputs (list python youtube-dl -- 2.46.0