From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 qL/ADhkYEWSCcQEASxT56A (envelope-from ) for ; Wed, 15 Mar 2023 01:58:01 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oPTuDRkYEWTxkwAAG6o9tA (envelope-from ) for ; Wed, 15 Mar 2023 01:58:01 +0100 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 D42B0EB69 for ; Wed, 15 Mar 2023 01:58:00 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFRw-000056-Nh; Tue, 14 Mar 2023 20:57:04 -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 1pcFRv-0008UP-7u for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:03 -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 1pcFRu-0007H9-US for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFRu-0002Bn-QZ for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 16/17] gnu: node-lts: Update to 18.15.0. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:57:02 +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: Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417738302 (code B ref 59188); Wed, 15 Mar 2023 00:57:02 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:56:13 +0000 Received: from localhost ([127.0.0.1]:38796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFR6-00029k-V6 for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:56:13 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:57128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025N-5K for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:52 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bPZdRuEv6Tq+rAO69sZwB1fzmYD1Zmhs2Gw6TD11WJQ=; b=qgME2Rit732K5FhOQfMg92AK5NH5ooKUlQHVJkt0cPWYo744quXo8wHmI850j8SLWH1W6g IX/3WEoh7BgDbbAXaIqU9mkRss2de3BR0uXWZSfeOf9LIb7chzY+KiJxAEzlQoBdSVguWd lP2s1r6aAnL1bEjJwlSzDJV116Iv3dI= Date: Wed, 15 Mar 2023 01:55:31 +0100 Message-Id: <03ba6a80aaf999fc9e0e602ae730be84b390eca8.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=qgME2Rit; 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-Seal: i=1; s=key1; d=yhetil.org; t=1678841880; a=rsa-sha256; cv=none; b=aDvrQg55HGbAir2bLLIjr1uDuVGH9dbsHPzYNlWsJZaib92ot2iZydcjgs6qIKAP9pHt7g sl9QszAP7lLuy0g52yiaxNGBt4To55g9EZmeMHS1ZPX9hagJfchyz7XZL/WLRP63Yz9Yhy xb3BXKPdHGKUJ2ozXFXJXLCPQPJ2UmyQ4k/Sv7n31akaibChOAuQ1fpO/KuLkydbYOtp2v T49iRtsx0I42yf09kD9Wxm9KFa+pPH6E8GMbbj83ZgCaUZQJIf5Zlvn2IsD+CLdvTARKYv fJpZO2/hpCZLNA242obPmCU64/JgCr7Ee2FojZL9RmqK3QHCV4GdKgpSiuCe2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678841880; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=bPZdRuEv6Tq+rAO69sZwB1fzmYD1Zmhs2Gw6TD11WJQ=; b=Rql9ilE35Fj+3KZRsI6tngZyla7mYznxwJKV+A75ISYBUDwyDD6+a/rMdUWadK/X4cWzEf yjjn2nALMPzmzyzQS8Mnrd2MWOlPSoUxxVrMuwJEwpDSFXI1Bl3G830YN+F8P+K4CmWnND ADLLP6L9z+MwLvxF3TE+b8LZqGq7S5S80ppt/7VJcR7Sut1ULfpK4rT8239TUtYcUQ3BE9 56aFTHy+zZ7/IPxDbsOd9GCC22SKXPupTZuCPnogDCEeUd8fhZcFt8U+hIIISlnyoSisNw ga9o+1zyMXj5ycPaUqn/HXlZRnLMg1wjMCbPMJ3jmmxpUzWNElLNOM9A2alHwA== X-Migadu-Spam-Score: -1.13 X-Spam-Score: -1.13 X-Migadu-Queue-Id: D42B0EB69 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=qgME2Rit; 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-TUID: 5MvNAMDMShU4 From: Hilton Chain * gnu/packages/node.scm (node-lts): Update to 18.15.0. [snippet]: Keep file deps/openssl/nodejs-openssl.cnf. [arguments]<#:configure-flags>: Enable v8 snapshot compression. <#:phases>: Adjust problematic tests to delete accordingly. Patch additional file with hardcoded references to /bin/sh. [native-inputs,inputs]: Replace openssl-1.1 with openssl. --- (no changes since v1) gnu/packages/node.scm | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index de847490a3..f9f1c13e99 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021, 2022 Philip McGrath +;;; Copyright © 2022 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -737,23 +738,28 @@ (define-public llhttp-bootstrap (define-public node-lts (package (inherit node) - (version "14.19.3") + (version "18.15.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version - "/node-v" version ".tar.xz")) + "/node-v" version ".tar.gz")) (sha256 (base32 - "15691j5zhiikyamiwwd7f282g6d9acfhq91nrwx54xya38gmpx2w")) + "0axc4jl71wjjhwzpdc3xg607r32554d0h0lmvb65p0f8ycz4qp6n")) (modules '((guix build utils))) (snippet `(begin + ;; openssl.cnf is required for build. + (for-each delete-file-recursively + (find-files "deps/openssl" + (lambda (file stat) + (if (string-contains file "nodejs-openssl.cnf") + #f #t)))) ;; Remove bundled software, where possible (for-each delete-file-recursively '("deps/cares" "deps/icu-small" "deps/nghttp2" - "deps/openssl" "deps/zlib")) (substitute* "Makefile" ;; Remove references to bundled software. @@ -769,7 +775,9 @@ (define-public node-lts "--shared-openssl" "--shared-zlib" "--shared-brotli" - "--with-intl=system-icu")) + "--with-intl=system-icu" + ;;Needed for correct snapshot checksums + "--v8-enable-snapshot-compression")) ((#:phases phases) `(modify-phases ,phases (replace 'set-bootstrap-host-rpath @@ -802,23 +810,31 @@ (define-public node-lts libuv "/lib:" zlib "/lib" "'],")))))) + (add-after 'patch-hardcoded-program-references + 'patch-additional-hardcoded-program-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "test/parallel/test-stdin-from-file-spawn.js" + (("'/bin/sh'") (string-append + "'" (search-input-file inputs "/bin/sh") + "'"))))) (replace 'delete-problematic-tests (lambda* (#:key inputs #:allow-other-keys) ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. (for-each delete-file - '("test/parallel/test-cluster-master-error.js" - "test/parallel/test-cluster-master-kill.js")) + '("test/parallel/test-cluster-primary-error.js" + "test/parallel/test-cluster-primary-kill.js")) ;; These require a DNS resolver. (for-each delete-file '("test/parallel/test-dns.js" - "test/parallel/test-dns-lookupService-promises.js")) + "test/parallel/test-dns-lookupService-promises.js" + "test/parallel/test-net-socket-connect-without-cb.js" + "test/parallel/test-tcp-wrap-listen.js")) ;; These tests require networking. (for-each delete-file - '("test/parallel/test-https-agent-unref-socket.js" - "test/parallel/test-corepack-yarn-install.js")) + '("test/parallel/test-https-agent-unref-socket.js")) ;; This test is timing-sensitive, and fails sporadically on ;; slow, busy, or even very fast machines. @@ -868,7 +884,7 @@ (define-public node-lts icu4c-71 libuv-for-node `(,nghttp2 "lib") - openssl-1.1 + openssl zlib ;; Regular build-time dependencies. perl @@ -885,7 +901,7 @@ (define-public node-lts llhttp-bootstrap brotli `(,nghttp2 "lib") - openssl-1.1 + openssl python-wrapper ;; for node-gyp (supports python3) zlib)))) -- 2.39.2