From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iElPG1UKUGfiCwAA62LTzQ:P1 (envelope-from ) for ; Wed, 04 Dec 2024 07:52:53 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id iElPG1UKUGfiCwAA62LTzQ (envelope-from ) for ; Wed, 04 Dec 2024 08:52:53 +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=OAi1vgH2; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021081301 header.b=WmxU38hh; 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=1733298773; a=rsa-sha256; cv=none; b=PbVfBLG799uMxkzTRUJDsWGfTcqH1fSZQUH06bhbxjLB6D1a7C1jOU/+ZdKd57GJyzx1mm 009UV0kmfPVT/UYky+j9Hi1O9mNXLOwIYuaDz0sVf+dhMvoGaIUb3H2fIQjtKGvz4Vhqhq fT79/G837IS/deycG3ZUf6lHm2n2icfzsAINHepXUeDb4e/qB5CAdo9zMlTgIOExauqHxN QHE3g4u5PPy8PRe//DghDpkfcB0MChuZp1So9HaR0u86gtV0PQ+Um48JOGRpWtam4vDaxm +Z/MFSOt4wA+mTJeHvyhz+XUoBwqcx+OaVBxi0NgS3TcuPHfYkSRZQj6c7AVdA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=OAi1vgH2; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021081301 header.b=WmxU38hh; 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=1733298773; 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=2fODj3qKEisHvUdTaN9DLTXgTKvQNX0NbO51MDtI4uM=; b=sLuBsmoTegTFqW5VywAmgrkx3JtyjpjG8B/7x8wGhgn1a7yvZoDR5iVn4NKXWtJI/4/qnz Cu8Xpbj8GLBt3MSS2XwgQX46VBYtchfGDbqhEJdcTjWeRCe0er0Qle5ZGFfrdhvcxUrklO ym/Ut5LMky7Ah+k/rmscefOUjKK1xv2ETMm0X4vnhwZQUUCLOiqjUkek7BviSg8d+u43XW MEu+PYqS5xcTDDbdrNHyz4K1PkpYHLI7mFpuTok3je2RLNHm0ioVzDwIT3QdxYNbdDwflC /K8pU2JzR7YIriijdQLLLvCToSLo15WbTSW/MzNydT8gruQwEC2p2gQlNZWndA== 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 54CB859D6B for ; Wed, 04 Dec 2024 08:52:53 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIkBh-0007eY-Sn; Wed, 04 Dec 2024 02:52:47 -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 1tIkBG-0007TB-8Z for guix-patches@gnu.org; Wed, 04 Dec 2024 02:52:24 -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 1tIkB2-000292-AX; Wed, 04 Dec 2024 02:52:16 -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=2fODj3qKEisHvUdTaN9DLTXgTKvQNX0NbO51MDtI4uM=; b=OAi1vgH2clPPLVV3fKYS52/Z1KWljJ2g8FYDLkvUWkLo3nyJOShnYYbX5C+E1BleDR36x7ciOHIijqARFQgFzrF6TcBaM4OYuMusrkzd7T/63Pyeg6DPVj7ZETv0u1GVNJKGnELOr7O4XmsMPL80IGhn80AEGH7EbsvKEbABEAE8Tuii2eCkj7XbLZ1Y1CQbhOeqcyz2aL0gZoDviFM9L/2+kDNZQo3KUpfBu127D7S4/x37ncbWRK7YN4uNV7aeZdOwx4E7trDBdlVea8UJLxH+RO3vAJkoYTLKE/Ftf9bUvPH3qMMWUmkKfGN4jsLBn9JroeU1a+OUDwDn8kHdGw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIkB0-0001g2-FS; Wed, 04 Dec 2024 02:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74187] [PATCH v2 23/24] gnu: esbuild-node: Use node-lts instead of node. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, rekado@elephly.net, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Wed, 04 Dec 2024 07:52:02 +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 , jlicht@fsfe.org, Ricardo Wurmus , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: jlicht@fsfe.org, Ricardo Wurmus , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74187-submit@debbugs.gnu.org id=B74187.17332986836376 (code B ref 74187); Wed, 04 Dec 2024 07:52:02 +0000 Received: (at 74187) by debbugs.gnu.org; 4 Dec 2024 07:51:23 +0000 Received: from localhost ([127.0.0.1]:34115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIkAN-0001em-IC for submit@debbugs.gnu.org; Wed, 04 Dec 2024 02:51:23 -0500 Received: from mail2.fsfe.org ([213.95.165.55]:37640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIkAL-0001eX-7m for 74187@debbugs.gnu.org; Wed, 04 Dec 2024 02:51:21 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1733298650; 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=2fODj3qKEisHvUdTaN9DLTXgTKvQNX0NbO51MDtI4uM=; b=WmxU38hhipdLXoSNrx+APKPajQkdxT/x5a/A0NyVfke+ugfc/SjsKfgMGDBRx5pzP4zTIs wjaKl6wHPUoeXNQxwLReTvJiqLrhVlI3w9Hp1+BjUKag/f5ws+/UwnOdTBG/Dqid6Da0b6 P9vx33gwmQrLpT234cYmAXuV7E6Xvrg= Date: Wed, 4 Dec 2024 08:49:45 +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-Queue-Id: 54CB859D6B X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -9.41 X-Spam-Score: -9.41 X-TUID: RhTjJSqP5iY9 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 6960207ea9..b8661814b2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2127,12 +2127,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" @@ -2155,7 +2149,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 @@ -9557,7 +9551,7 @@ (define-public archivebox (build-system python-build-system) (propagated-inputs (list curl - node)) + node-lts)) (inputs (list python youtube-dl -- 2.46.0