From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id AIJ5BDmtPWQ34gAASxT56A (envelope-from ) for ; Mon, 17 Apr 2023 22:34:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SK1bBDmtPWRGbQEA9RJhRA (envelope-from ) for ; Mon, 17 Apr 2023 22:34:01 +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 AE34A6C3 for ; Mon, 17 Apr 2023 22:33:59 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDE-0003ap-Im; Mon, 17 Apr 2023 10:52:12 -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 1poQDC-0003Zz-Pg for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -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-0005Sq-Hj for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDC-00007C-CW for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 19/20] gnu: node-lts: Update to 18.16.0. 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: Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.1681743124307 (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]:55687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQD5-0008WH-Cf for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCm-0008UZ-WA for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:45 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743103; 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=kyLDlOJdRaKzfOUuA058a6Y2Nzqg/uKG5vGGhXONZrc=; b=qq7P/ah/97LaR7Ehz6A843eA9MQ7bBTUikF2uq9Wdo06eAi1MGL37uzgxm+O2rD8zY9IEk CMcs5NVt4EodLaOyCW3gOr+TDiq8uxrNB3xOs45Uein2bODlKqjDSPlYo9g+xP8fRg4PD/ /0+J3dvtazjAun/nZJZ37sw4pC0cPXk= Date: Mon, 17 Apr 2023 16:51:21 +0200 Message-Id: <60cf0f103485559c418cf9d96e7cc49265356916.1681742871.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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681763640; 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=kyLDlOJdRaKzfOUuA058a6Y2Nzqg/uKG5vGGhXONZrc=; b=NbJWc0jGdEnQPdmUxJkKZpzPJ7zXAiJ9LvMvHZM5zrYow9rYQaiJoeoKPj1FZE9yX/+DRP 1nO7pnLPOtxDIPfDxl0/bjw6fBy51YrXLDvE3zaxe0z9/NUmtKw4GR4AJNh/t059o4U6YA MlFw1BWt0AcC6Fna2He8xcBhnWPj5w2lQ/4dtmqpgi/ZMOA4YORtlh+/aopBfCgxCMdKhn LJe/czx49ZTDpVHMWLJ2nPkB51ll/ew/OsNUfmaCfJWak/o0hkkhavSYGS+INj9SW1Bxjm AZQyiKhksNdAV5crqqQjc9vmwwNq1IvLK3j39VpRmxAOc4MPxpx1jmo1XUiDyA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b="qq7P/ah/"; 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=1681763640; a=rsa-sha256; cv=none; b=o53QleSwsl9ip9EUhFDf48V+XFpiqr7UMUtD0/oPAGlbKxXErphxm+o7gRBSvHTwguwf0A IDMwzydEIu8yOq7s8jAYm32lsV6f4xg6C4Sj4XGJ3ESzBy6T1Tmc1ZZGOSQgZW5WQL4Ros odrdjoFdWrDBv3fInqIHcMZqWYIKd/3o9CJiQs5p8LnUNA3oKXH6lCXndEYd4fXTPHYhPU vu8f47L2U5JDD8BYlFromFeCcjhEVZ/W1NDmKI+jpP5CIhhqn5AaWeiwj1srqe2I9q6/XR YC54Ww3b2M96JRxBMeBMiHr64EfLsHhr5FH7a0tgMMFA0t68lVsKuO68WWPpjg== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b="qq7P/ah/"; 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-Migadu-Spam-Score: -1.11 X-Spam-Score: -1.11 X-Migadu-Queue-Id: AE34A6C3 X-Migadu-Scanner: scn1.migadu.com X-TUID: +BZBOUsfBOOk From: Hilton Chain * gnu/packages/node.scm (node-lts): Update to 18.16.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 f613844a13..35e1386844 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.16.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")) + "0vcc132z7lkxnw5clmiz6sp6ccmw35pyb69hczphrig5frfmqkva")) (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 zlib)))) (define-public libnode -- 2.39.2