From unknown Sat Sep 20 14:55:14 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#59188 <59188@debbugs.gnu.org> To: bug#59188 <59188@debbugs.gnu.org> Subject: Status: [PATCH 0/4] gnu: node-lts: Update to 18.12.1. Reply-To: bug#59188 <59188@debbugs.gnu.org> Date: Sat, 20 Sep 2025 21:55:14 +0000 retitle 59188 [PATCH 0/4] gnu: node-lts: Update to 18.12.1. reassign 59188 guix-patches submitter 59188 Hilton Chain severity 59188 normal tag 59188 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 00:34:43 2022 Received: (at submit) by debbugs.gnu.org; 11 Nov 2022 05:34:43 +0000 Received: from localhost ([127.0.0.1]:44851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMgc-0003eV-Vg for submit@debbugs.gnu.org; Fri, 11 Nov 2022 00:34:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:37832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMga-0003eN-7L for submit@debbugs.gnu.org; Fri, 11 Nov 2022 00:34:42 -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 1otMgZ-0006U0-VW for guix-patches@gnu.org; Fri, 11 Nov 2022 00:34:40 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otMgY-0001hD-Ej for guix-patches@gnu.org; Fri, 11 Nov 2022 00:34:39 -0500 Date: Fri, 11 Nov 2022 13:34:12 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668144874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lo01j2u+IfjcsyizUs9JsGfRAShhWCJEYg1o3en+HyM=; b=x90udLzPQSWQed8pi9O23TR5pizUGVPXDAS5pMgmBaTfe/wfY6hUEzxEBXl7vmeNag/a1l wjBTEVXi0tPcvrkjDv7Ah/zxLpM7JcNkKUmsnFuE5UUDk+0+Flw4sQwdLWYNpmQr+lMgzE MRV/5aUnn90V5kJNCLVXMf3xUdz1Ooa5WKVEZww3+wPfjBHf0cJlGTo5LbBjgudH90umGm fBNVw9KsG76OduJiUaZt0QfuBEU8xHngwHcxtarTrxNisO6GxSe6QZcEw+mxmbJsxXMriT 0eAW71PJuxHtqM6EPcnllBtBmovd9eB4DhFxBK3+OtXKZ9+kX6eIyDZBTsv8Lw== Message-ID: From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH 0/4] gnu: node-lts: Update to 18.12.1. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hilton Chain (4): gnu: libuv-for-node: Update to 1.43.0. gnu: llhttp-bootstrap: Update to 6.0.10. gnu: node-lts: Update to 18.12.1. gnu: libnode: Use node-lts as base. gnu/local.mk | 1 - gnu/packages/libevent.scm | 4 +- gnu/packages/node.scm | 44 +++++--- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 4 files changed, 30 insertions(+), 119 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch base-commit: 70df5c47a89f4f353a1df94467581a0f0da599a4 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 00:36:11 2022 Received: (at 59188) by debbugs.gnu.org; 11 Nov 2022 05:36:12 +0000 Received: from localhost ([127.0.0.1]:44861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMi3-0003hV-JS for submit@debbugs.gnu.org; Fri, 11 Nov 2022 00:36:11 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:52726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMi1-0003hH-U3 for 59188@debbugs.gnu.org; Fri, 11 Nov 2022 00:36:10 -0500 Date: Fri, 11 Nov 2022 13:35:41 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668144963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eyZEREh/v3I0IZz4CO1FnTMUsw0vt3e+sCwCej23oxY=; b=P9H96HFLsB48oaI2m93Yh9AQiW19vISY3b0jKsLUqZjPrvW+/BBRl5NOeyuM4kamzlGzBE lM4NXqExG8VwaVZMgOAdyhf80h0OffgyRN1yxGqkD7SBxyYC5IzCRzDrG7vMBK0WsQG3NT 3FZXiizD8cV1swYZCmMmwfOGHX9VfGIqhyuwOGJeaylBgK9hM8L6XstCjzQ6GaX/sKjnmY KckQMxDS7aPwHxW2Q4wdnbKW4WpLPLXfolHz4SOAp/pqHCWjWVUFYo0mfOG1Xl2sKqsRte bG1Hj5W8oqMbCbsnu3Ugiy2HmgRhgLHUcbZSObVCzuAAq4Wk2GGU3Y42Ba8tzQ== Message-ID: From: Hilton Chain To: 59188@debbugs.gnu.org Subject: [PATCH 1/4] gnu: libuv-for-node: Update to 1.43.0. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/libevent.scm (libuv-for-node): Update to 1.43.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 176e66cf42..5aff343c06 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -147,14 +147,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.43.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh")))) (properties '((hidden? . #t))))) (define-public libuv-julia -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 00:37:15 2022 Received: (at 59188) by debbugs.gnu.org; 11 Nov 2022 05:37:15 +0000 Received: from localhost ([127.0.0.1]:44865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMj5-0003jB-1N for submit@debbugs.gnu.org; Fri, 11 Nov 2022 00:37:15 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:60002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMj2-0003iy-Ib for 59188@debbugs.gnu.org; Fri, 11 Nov 2022 00:37:13 -0500 Date: Fri, 11 Nov 2022 13:36:44 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668145026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nt0XDhBl4b1d9p7IR3qcKznTKx+BRAza5fynxVmXT+E=; b=pqDdubAYIxJ3E32MwQPUjqn2cTqUfoSyVasM7wYuyHEdCY6lUfFxGJHrBur+n6STet9cHT B0RrVDIRNuDHjMB8ipHjgZxdgIJVrXrfSparhwcoDsNqgjrPwswM99iByjAXJJROZBH0gW gZcsgglda2M+s9ZKWdGqPNIabStoviLCAojgSQf5ep/Nx6U5W2anYndZH4rZlGIZe4iO4j uWM6twEwIxDis4Yupa0Ic4gcbR/wmp+MkkH68QWR8cmg6Xbry+Ird5AaDQbwKEbw5jkyVa iWjpPpgPzSdyb46D0VJ+AEuYPyw4m/0dmelSaD/dRPaZovUeua+ZuudjVnX4DA== Message-ID: From: Hilton Chain To: 59188@debbugs.gnu.org Subject: [PATCH 2/4] gnu: llhttp-bootstrap: Update to 6.0.10. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index 27b31ea27f..1c4b9def96 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1480,7 +1480,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 4e9daa522d..0af0158f45 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -666,7 +666,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -675,8 +675,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 00:37:51 2022 Received: (at 59188) by debbugs.gnu.org; 11 Nov 2022 05:37:51 +0000 Received: from localhost ([127.0.0.1]:44868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMje-0003kF-L1 for submit@debbugs.gnu.org; Fri, 11 Nov 2022 00:37:51 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:58922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMjd-0003k3-Ny for 59188@debbugs.gnu.org; Fri, 11 Nov 2022 00:37:50 -0500 Date: Fri, 11 Nov 2022 13:37:22 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668145064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+BztkIybduMea0BNsVgCDKWEuFtULcDVz6Q0/o0o2QU=; b=veuCQLMO3bDU4ht/iNt82zF/V0gGQ+M5isE8CDU1eWyHeGs73HT2/HhEWjfGekIXc89bww yYLAft2q4JvM93WE2p/JUD+Rg/c93roafHBPqucYzcgdZyZxjyKCttMWoZ/OuNEYmat+Le xjbynz+IVqVGclqT0cq/Oz3Lae2aAfgDx2blhb0AXoORZZuPa7lzpS4NzvmKgF+M8SUhBE XrkRFD0zlLLVZLscpC/6DfzY467XlCpUdlV3Nq7GmPGuwxPc7G5BliM2L8NOS9v13Vyncf X7UiNRi/4AXMAFCTc+rTA8hwDz/ga8NDZxKw9ZSRoTPxSfnk+S/p9Zn0gkj8ag== Message-ID: From: Hilton Chain To: 59188@debbugs.gnu.org Subject: [PATCH 3/4] gnu: node-lts: Update to 18.12.1. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/node.scm (node-lts): Update to 18.12.1. [snippet]: Keep file deps/openssl/nodejs-openssl.cnf. [arguments]<#: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. --- gnu/packages/node.scm | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 0af0158f45..cae7d3b0ca 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -735,23 +735,28 @@ (define-public llhttp-bootstrap (define-public node-lts (package (inherit node) - (version "14.19.3") + (version "18.12.1") (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")) + "11n1h54wgh61inrlqjp0j4fqcz6kl60a3iip7ya90nqdl3fp90ds")) (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. @@ -800,23 +805,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. @@ -866,7 +879,7 @@ (define-public node-lts icu4c-71 libuv-for-node `(,nghttp2 "lib") - openssl-1.1 + openssl zlib ;; Regular build-time dependencies. perl @@ -883,7 +896,7 @@ (define-public node-lts llhttp-bootstrap brotli `(,nghttp2 "lib") - openssl-1.1 + openssl python-wrapper ;; for node-gyp (supports python3) zlib)))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 00:38:21 2022 Received: (at 59188) by debbugs.gnu.org; 11 Nov 2022 05:38:21 +0000 Received: from localhost ([127.0.0.1]:44873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMk9-0003lS-41 for submit@debbugs.gnu.org; Fri, 11 Nov 2022 00:38:21 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:46822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otMk7-0003lG-T6 for 59188@debbugs.gnu.org; Fri, 11 Nov 2022 00:38:20 -0500 Date: Fri, 11 Nov 2022 13:37:52 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668145094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ap24DSSRumfgWKhL85CC5E9MjnK7EC+rNTWSIu7FF9E=; b=3VGFsHjLgBLqOlpUhwp6EuPTXZvRSnGtqzBfLEHVv1PARwgRxaaFznwupr5KHIg8ORuxhv EHhjm1x0u10Sh8LLLU+XKyVtFEEh+yu1NyKSn+8nViV1ynphA1MsI6bZTTuHTQ9Tt8ibkJ 1ungL8dUM26bULHaxj2k6pD8s4uuy6CQfNhw2JR4z5R+f9tfSUxYJnXOLorV+OCE/sGgFt Lsu6kJ7A+yiruypqXvajGFw4KGDjAPrVn6da0cXxP07Eb1AGuOPKBR28muIare4SC+iOg6 4zhX02Ca5w6gmZVOqWtja81a+uEKlc2tyR4FkwBOa7dQdQFFgXayRtuMzS3GMw== Message-ID: From: Hilton Chain To: 59188@debbugs.gnu.org Subject: [PATCH 4/4] gnu: libnode: Use node-lts as base. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/node.scm (libnode): Use node-lts as base. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index cae7d3b0ca..0e56d12038 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -901,10 +901,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) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 01:21:51 2022 Received: (at submit) by debbugs.gnu.org; 11 Nov 2022 06:21:51 +0000 Received: from localhost ([127.0.0.1]:44912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNQE-000505-Ut for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:21:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:57312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNQD-0004zy-Do for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:21:50 -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 1otNQD-0007WZ-89 for guix-patches@gnu.org; Fri, 11 Nov 2022 01:21:49 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otNQB-0006hB-OL for guix-patches@gnu.org; Fri, 11 Nov 2022 01:21:49 -0500 Date: Fri, 11 Nov 2022 14:21:15 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668147705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=mSqvXGu1cU/sl9PCjNk+atdqVo4TK4x91J1h1o9FUP4=; b=ivpiuVkuREkz9LDu5H3xnpuYC5zCo/YLD7I3oDXukr+s937dL1z8FoULy3j1k0QxitiY3e xh2GqUUJGJ+ICeMWz7mazPIvdl4FXWuU/tLFFkEkqllUu6gXCDOdDsS4JHjjS6i/9BdZfW gLRa8V700XtxZF7VIwZWyZ5ChVR6F+pdHDblG2Cm+msUJie/a5gE13ja4hjKOQPUMqMSKv dIVYOrjJ184kT0r8nGs0v69Rkebit/b5to4XL+SBFsyjOmBYQ3X8MoITZomv2VTo4jroa6 6pBBlUzvJkBJ2ptvj/dan5m9eTXdXdVesRZG4MAspr2i7Y7oOaVinL3zJkq0aw== Message-ID: From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH v2 0/4] gnu: node-lts: Update to 18.12.1. References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) v1 -> v2: Fix libnode path for r-v8. Hilton Chain (4): gnu: libuv-for-node: Update to 1.43.0. gnu: llhttp-bootstrap: Update to 6.0.10. gnu: node-lts: Update to 18.12.1. gnu: libnode: Use node-lts as base. gnu/local.mk | 1 - gnu/packages/cran.scm | 2 +- gnu/packages/libevent.scm | 4 +- gnu/packages/node.scm | 44 +++++--- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 5 files changed, 31 insertions(+), 120 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch base-commit: 70df5c47a89f4f353a1df94467581a0f0da599a4 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 01:22:56 2022 Received: (at submit) by debbugs.gnu.org; 11 Nov 2022 06:22:56 +0000 Received: from localhost ([127.0.0.1]:44916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNRI-00051k-A8 for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:22:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:59882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNRG-00051d-SR for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:22:55 -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 1otNRG-0007j9-Id for guix-patches@gnu.org; Fri, 11 Nov 2022 01:22:54 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otNRD-0006xT-TL for guix-patches@gnu.org; Fri, 11 Nov 2022 01:22:53 -0500 Date: Fri, 11 Nov 2022 14:22:27 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668147770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eyZEREh/v3I0IZz4CO1FnTMUsw0vt3e+sCwCej23oxY=; b=HhAzoK+CZELvO77NR040TML5uUI/LHDRd1gWfD1BMnl74KhscyMAliFooBxb8mfVjuJ6S6 hCAUHOJjTZeYplg1EExOjAI8gGhOAPsdqx9+FDGsUsyucG9g5L/QF6B2cJmYm2/O5GLxN5 k9GXnL6P+CRDh/eQiNFsY9drHDmGfl0muOenAOR3mSTZ0RThxykO8P6pTo51GeOdDHBr0e MlxZ6Qc65ssdwa6r7vLY2Qi05uTRUyEsf5jhKw8XD6W8baYuBvOHeAqdTDYwevrKcH3Kb8 p7nqjOvLcfIJgetriJzrbT5vGNjbFJuDYrfKNj3UcCFCTsgR6Yg0aZfcslN+3g== Message-ID: From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH v2 1/4] gnu: libuv-for-node: Update to 1.43.0. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/libevent.scm (libuv-for-node): Update to 1.43.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 176e66cf42..5aff343c06 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -147,14 +147,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.43.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh")))) (properties '((hidden? . #t))))) (define-public libuv-julia -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 01:23:26 2022 Received: (at submit) by debbugs.gnu.org; 11 Nov 2022 06:23:26 +0000 Received: from localhost ([127.0.0.1]:44920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNRl-000531-Ms for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:23:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:54380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNRj-00052t-8a for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:23:23 -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 1otNRi-0007rq-Du for guix-patches@gnu.org; Fri, 11 Nov 2022 01:23:23 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otNRg-00070W-4R for guix-patches@gnu.org; Fri, 11 Nov 2022 01:23:21 -0500 Date: Fri, 11 Nov 2022 14:22:56 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668147798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=VKqc9Obaud/QIMUdMjfTmcNDZHCE0IkT6sc1CSMz2lI=; b=atulJJfxTh5vGELWzSHoRT/OgL5zIGnslokbJtgPnGwk5keYYcWogWJkjwqOTdx5C+mrN3 0n6UK4ugqnQS5tc2+3C1qgfelV+hQ/vdJg0TgaXT3f1o4NbQywOOaitGfoZtEbrIG5ceAh DPfOEr5c/GTQeuP+rEckmIb45Se2B6kpdSEDpDsNlCPwY3elCd+tN289Qx7SgK5dsBjUz8 7o1a0ZuZ6K1nu5XBUjBVYrnlU6yPrvYcsHX03/hawjWJCJQ8pscxGJwwkfI0GcVOUL253y 3tHuyfvgOtIiweUU6XWKQZUsNHun7Ip1wfjy26nbb0tVQVXCeeJHmvVE+POinQ== Message-ID: From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH v2 2/4] gnu: llhttp-bootstrap: Update to 6.0.10. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index 27b31ea27f..1c4b9def96 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1480,7 +1480,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 4e9daa522d..0af0158f45 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -666,7 +666,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -675,8 +675,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 01:23:59 2022 Received: (at submit) by debbugs.gnu.org; 11 Nov 2022 06:23:59 +0000 Received: from localhost ([127.0.0.1]:44928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNSI-00054I-J7 for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:23:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:41306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNSG-00054B-P4 for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:23:57 -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 1otNSG-0007y8-Jn for guix-patches@gnu.org; Fri, 11 Nov 2022 01:23:56 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otNSF-00074W-0q for guix-patches@gnu.org; Fri, 11 Nov 2022 01:23:56 -0500 Date: Fri, 11 Nov 2022 14:23:27 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668147831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+BztkIybduMea0BNsVgCDKWEuFtULcDVz6Q0/o0o2QU=; b=ZL0cf1DmOcBC1Cm/VKdxvk1Op4E6svYd1zyAiG2X3mdqE6kCl4VYUCJmmvsCh4ct8JkTxL 2pjiNK49JS38Rbq7JZxBZwIcgphLdQJtbrt89JGFp2RYvqtiw/bieA5Vz531zuOBbrcPNr g2c4dBooeCBtLK3MkdFjJWdbyt+Xd6z3YwlfhPpvSoXvuX03xgWGWLgl3KwPzs4WG400zp PZ3rsh/sSXmb3KptqQDx/eRjmon21PtJZYQ+d3f9zJ6ezHbH7lcUEV1T1yMUKNPCEJHi81 8rkroU3CUFBYUjM0zqW2Egufscgsoc914pUcUwLoZehYGldM2ezxgznK2CsikA== Message-ID: From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH v2 3/4] gnu: node-lts: Update to 18.12.1. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/node.scm (node-lts): Update to 18.12.1. [snippet]: Keep file deps/openssl/nodejs-openssl.cnf. [arguments]<#: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. --- gnu/packages/node.scm | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 0af0158f45..cae7d3b0ca 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -735,23 +735,28 @@ (define-public llhttp-bootstrap (define-public node-lts (package (inherit node) - (version "14.19.3") + (version "18.12.1") (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")) + "11n1h54wgh61inrlqjp0j4fqcz6kl60a3iip7ya90nqdl3fp90ds")) (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. @@ -800,23 +805,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. @@ -866,7 +879,7 @@ (define-public node-lts icu4c-71 libuv-for-node `(,nghttp2 "lib") - openssl-1.1 + openssl zlib ;; Regular build-time dependencies. perl @@ -883,7 +896,7 @@ (define-public node-lts llhttp-bootstrap brotli `(,nghttp2 "lib") - openssl-1.1 + openssl python-wrapper ;; for node-gyp (supports python3) zlib)))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 01:24:35 2022 Received: (at submit) by debbugs.gnu.org; 11 Nov 2022 06:24:35 +0000 Received: from localhost ([127.0.0.1]:44933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNSt-00055d-49 for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:24:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:42228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otNSr-00055W-MG for submit@debbugs.gnu.org; Fri, 11 Nov 2022 01:24:34 -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 1otNSr-00086y-Gk for guix-patches@gnu.org; Fri, 11 Nov 2022 01:24:33 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otNSq-00079e-1a for guix-patches@gnu.org; Fri, 11 Nov 2022 01:24:33 -0500 Date: Fri, 11 Nov 2022 14:24:07 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668147870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oMnqBXg6d381CM+Wvv6qxph/T3hkVg0YnweRxwWDPGg=; b=qeN+bkfPxAC43X8w/b/ypI2tm9OnCoV9jyqXAOOq/BspJompygwqHY+faS5agro4ui5zCJ qN6kpStDQXCHNwIIH6p9h+0lzkP6hCdrcn2VTcTk+YsNVsKP3DFIF2diu0QuwE/ZgThx7s t4bbylHsBI1IPPg/A/q+m+BRpJwypiO+VaRuiJ2UzyswsqraSs6N6AsgqWuFyF5OZjTUPB x0HXaaD3u1fjntrlX2+drdfzJymIreND/2vkLPr4pFs0incqmb3ilH7z6+CSbleZSojx4w 6iSquaXZcqSsp2ddfUQfq/Ypfr+vppc4bmGaczztLU7BEzvyFv13gg/849+EQw== Message-ID: From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH v2 4/4] gnu: libnode: Use node-lts as base. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/node.scm (libnode): Use node-lts as base. * gnu/packages/cran.scm (r-v8)[arguments]<#:phases>: Adjusted accordingly. --- 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 a1702ae5f6..8f04d9ad6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -902,7 +902,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 cae7d3b0ca..0e56d12038 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -901,10 +901,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) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 16 18:38:56 2022 Received: (at submit) by debbugs.gnu.org; 16 Nov 2022 23:38:56 +0000 Received: from localhost ([127.0.0.1]:58479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovRzc-0005jJ-BV for submit@debbugs.gnu.org; Wed, 16 Nov 2022 18:38:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:43840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovRzY-0005j3-L5 for submit@debbugs.gnu.org; Wed, 16 Nov 2022 18:38:54 -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 1ovRzY-00043I-7J for guix-patches@gnu.org; Wed, 16 Nov 2022 18:38:52 -0500 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovRzV-0003FP-MF for guix-patches@gnu.org; Wed, 16 Nov 2022 18:38:51 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4A72E240103 for ; Thu, 17 Nov 2022 00:38:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1668641927; bh=+ypnf2eeUH6OOROlUzEUBC0DtiEKgpX0nqeJhtdiwIY=; h=From:To:Cc:Subject:Date:From; b=RX4fdpsYXNGnRc+gxQj8bu7AZMW/sLl9UqdbpOj1OW2VH8dRfgsVIyRckrkcsCVRE ndyMSUgcyS9JMKtBG0THtSk26w7uskX3Io1FZX45JTjsSZZWNZSO+4gPUpf+b8oHSA wVBLgsji16CnhylVxuWXIRZKgCDc/QTJxQsXu1942eC51av+Iq9j2CXcj+TJkxW11s qHVCaSMbBNH5GEYo2pLxplInKfxx2hFtVCaPyUEQGocHBRAIIuzEBjzX/lgYzIPZ/V Zbp8V5JBLWm8xsKYSdQxlo0wE6itAQ54OycAYqKGKP/JILcvHM3y82AxiwsMy5a49A 1fq8jxCiC2Ijg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NCKHp1ZPbz6tmb; Thu, 17 Nov 2022 00:38:46 +0100 (CET) References: From: Mekeor Melire To: 59188@debbugs.gnu.org Subject: Re: [bug#59188] [PATCH v2 3/4] gnu: node-lts: Update to 18.12.1. Date: Wed, 16 Nov 2022 23:31:24 +0000 In-reply-to: Message-ID: <87zgcq79ml.fsf@posteo.de> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=185.67.36.66; envelope-from=mekeor@posteo.de; helo=mout02.posteo.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Hilton Chain , guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 2022-11-11 / 14:23 / hako@ultrarare.space: > * gnu/packages/node.scm (node-lts): Update to 18.12.1. > [snippet]: Keep file deps/openssl/nodejs-openssl.cnf. > [arguments]<#: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. Thank you for this submission. As I said in the other thread, I'd suggest to decline the 53414 (which updates node to version 16.x) in favor of this patch-series (which updates to 18.x). That is because it'll save us work since there'll only be a single package-breaking upgrade (instead of two). For this submission to be merged, I'd guess we should: 1. Check if we want to adapt some patches from Debian, listed here: https://sources.debian.org/patches/nodejs/18.12.1+dfsg-2/ E.g. the "dfsg/privacy_breach.patch" looks good. 2. Make sure that packages, which depend on node, still build (and run) fine. I'm not sure how to do this. Do we need a branch for this? Kindly, Mekeor > --- gnu/packages/node.scm | 35 ++++++++++++++++++++++++----------- 1 > file changed, 24 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm > index 0af0158f45..cae7d3b0ca 100644 > --- a/gnu/packages/node.scm > +++ b/gnu/packages/node.scm > @@ -735,23 +735,28 @@ (define-public llhttp-bootstrap > (define-public node-lts > (package > (inherit node) > - (version "14.19.3") > + (version "18.12.1") > (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")) > + "11n1h54wgh61inrlqjp0j4fqcz6kl60a3iip7ya90nqdl3fp90ds")) > (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. > @@ -800,23 +805,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. > @@ -866,7 +879,7 @@ (define-public node-lts > icu4c-71 > libuv-for-node > `(,nghttp2 "lib") > - openssl-1.1 > + openssl > zlib > ;; Regular build-time dependencies. > perl > @@ -883,7 +896,7 @@ (define-public node-lts > llhttp-bootstrap > brotli > `(,nghttp2 "lib") > - openssl-1.1 > + openssl > python-wrapper ;; for node-gyp (supports python3) > zlib)))) From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 18 09:12:20 2022 Received: (at 59188) by debbugs.gnu.org; 18 Nov 2022 14:12:20 +0000 Received: from localhost ([127.0.0.1]:35903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ow26O-0000es-Gn for submit@debbugs.gnu.org; Fri, 18 Nov 2022 09:12:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ow26M-0000eg-Gn for 59188@debbugs.gnu.org; Fri, 18 Nov 2022 09:12:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ow26G-0008Dk-Ik; Fri, 18 Nov 2022 09:12:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=VbfEQd4C45v9cVELS7Y25QeZiitnyhoCxbhmgHB4ohU=; b=ehYEU8TP9/XxgE1VGQFw V+D36hB3JKQdJQKeIlmilHU/OGYmTH7VGY8ZlQg4kztSB5qR6gYUKJ72nVBbsvO0nQHfseveUHMBv UbHv5yCdiJXoDwiSKMza0Sz44xxgoOzD0Y0VSTuyOObR+g4TpmHmTc4t8sAVvA1hIIEe/8kKcAx9x 2V+KI+O8WlBEFCcKJBDVnDQSUcGEIHIxQzAqXw5BbcxgDb49cqol/yKkhU9I5XsgfnKyYVQnAnvdn C4lHbEUIJF1esI1CxmJgo/d/XMrIdLqr2leOooxoA05bPrhsfUJysQv7hJJ+r027YvDaVNAjA2O1c VXyR+rrP+tg4Kw==; Received: from [193.50.110.147] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ow26G-0004LE-5e; Fri, 18 Nov 2022 09:12:12 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Mekeor Melire Subject: Re: bug#59188: [PATCH 0/4] gnu: node-lts: Update to 18.12.1. References: <87zgcq79ml.fsf@posteo.de> Date: Fri, 18 Nov 2022 15:12:10 +0100 In-Reply-To: <87zgcq79ml.fsf@posteo.de> (Mekeor Melire's message of "Wed, 16 Nov 2022 23:31:24 +0000") Message-ID: <87bkp4bbd1.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59188 Cc: hako@ultrarare.space, Christopher Baines , 59188@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Mekeor Melire skribis: > As I said in the other thread, I'd suggest to decline the 53414 (which > updates node to version 16.x) in favor of this patch-series (which > updates to 18.x). That is because it'll save us work since there'll only > be a single package-breaking upgrade (instead of two). Sounds good to me. > For this submission to be merged, I'd guess we should: > > 1. Check if we want to adapt some patches from Debian, listed here: > https://sources.debian.org/patches/nodejs/18.12.1+dfsg-2/ > E.g. the "dfsg/privacy_breach.patch" looks good. Yes, but that can be done separately I guess. > 2. Make sure that packages, which depend on node, still build (and run) > fine. I'm not sure how to do this. Do we need a branch for this? It depends. Hilton, were you able to build everything returned by =E2=80=98guix refresh -l node=E2=80=99, except perhaps ungoogled-chromium? For some reason didn=E2=80=99t pick it up. Anything we should do to address that, Chris? Otherwise we can indeed create a branch and tell ci.guix to build it, for instance. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 19 00:18:49 2022 Received: (at 59188) by debbugs.gnu.org; 19 Nov 2022 05:18:49 +0000 Received: from localhost ([127.0.0.1]:38736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owGFc-0003CP-Bl for submit@debbugs.gnu.org; Sat, 19 Nov 2022 00:18:49 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:50160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owGFa-0003CB-8J for 59188@debbugs.gnu.org; Sat, 19 Nov 2022 00:18:46 -0500 Date: Sat, 19 Nov 2022 13:17:51 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668835119; 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=FG73OLLX5d/qWWzzKO6BpVvvTN9+xqf+3I7TL2+mK+I=; b=JV8CwCA2e97TVYIi1+hiy/Wc6EF3CaUCjtD1qhnALzPeiUY8X0nK26JtYtnJo80Ly7rLsy 8N5uvdxD+wPv9q9L1uM0JpeeBNe1fZVF2VuXgmSqBBl8KyvGxggVwsKQN5+E/7qDrlSXAf ajvx4OKDxDl9E6tSjC21Ub1FkyPm3xhcM3RM2Gyfo4dO+eZxsJ2SnY4XhiB/7CfJuJGYRZ ikx434D/u8ijYvg2qKwd/INoB8Q4DmieYlzaGuCj8JJnsGiN748jJBcxG++PS3mjRF+Y+J pjw4Z9Tvj/o/bbUxWFjr7H6nFnsQ/Yf3VvIFOM5ZeB/f8xCbVgAG5BcwGB8ttw== Message-ID: From: Hilton Chain To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Subject: Re: bug#59188: [PATCH 0/4] gnu: node-lts: Update to 18.12.1. In-Reply-To: <87bkp4bbd1.fsf_-_@gnu.org> References: <87zgcq79ml.fsf@posteo.de> <87bkp4bbd1.fsf_-_@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Mekeor Melire , Christopher Baines , 59188@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) node-acorn fails in check phase. #+RESULTS: : starting phase `check' : npm ERR! Missing script: "test" : npm ERR! : npm ERR! To see a list of scripts, run: : npm ERR! npm run : : npm ERR! A complete log of this run can be found in: : npm ERR! /tmp/guix-build-node-acorn-8.4.1.drv-0/source/npm-home-0/.npm/_logs/2022-11-19T04_28_57_471Z-debug-0.log : error: in phase 'check': uncaught exception: : %exception #<&invoke-error program: "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" arguments: ("test") exit-status: 1 term-signal: #f stop-signal: #f> : phase `check' failed after 0.2 seconds : command "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" "test" failed with status 1 Then node-uglify-js #+RESULTS: : starting phase `configure' : npm ERR! code 254 : npm ERR! path /gnu/store/969597ncg311d3kd8vbhdlniwqg4mr2k-node-acorn-8.4.1/lib/node_modules/acorn : npm ERR! command failed : npm ERR! command sh -c -- cd ..; npm run build:main && npm run build:bin : npm ERR! npm ERR! code ENOENT : npm ERR! npm ERR! syscall open : npm ERR! npm ERR! path /gnu/store/969597ncg311d3kd8vbhdlniwqg4mr2k-node-acorn-8.4.1/lib/package.json : npm ERR! npm ERR! errno -2 : npm ERR! npm ERR! enoent ENOENT: no such file or directory, open '/gnu/store/969597ncg311d3kd8vbhdlniwqg4mr2k-node-acorn-8.4.1/lib/package.json' : npm ERR! npm ERR! enoent This is related to npm not being able to find a file. : npm ERR! npm ERR! enoent : npm ERR! : npm ERR! npm ERR! A complete log of this run can be found in: : npm ERR! npm ERR! /tmp/guix-build-node-uglify-js-3.13.9.drv-0/npm-home-0/.npm/_logs/2022-11-19T04_54_25_643Z-debug-0.log : : npm ERR! A complete log of this run can be found in: : npm ERR! /tmp/guix-build-node-uglify-js-3.13.9.drv-0/npm-home-0/.npm/_logs/2022-11-19T04_54_25_343Z-debug-0.log : error: in phase 'configure': uncaught exception: : %exception #<&invoke-error program: "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" arguments: ("--offline" "--ignore-scripts" "install") exit-status: 254 term-signal: #f stop-signal: #f> : phase `configure' failed after 0.6 seconds : command "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" "--offline" "--ignore-scripts" "install" failed with status 254 One test failed after deleting node-uglify-js's configure phase. #+RESULTS: : 1 test(s) failed! : : test/reduce.js : 1) Should reduce test case which differs only in Error.message : AssertionError [ERR_ASSERTION]: Expected values to be strictly equal: : + actual - expected : : + `try{null[function(){}]}catch(e){console.log(e)}\n// output: TypeError: Cannot read properties of null (reading 'function(){}')\n// \n// minify: TypeError: Cannot read properties of null (reading 'function() {}')\n// \n// options: {\n// "compress": false,\n// "mangle": false,\n// "output": {\n// "beautify": true\n// }\n// }` : - `try{null[function(){}]}catch(e){console.log(e)}\n// output: TypeError: Cannot read property 'function(){}' of null\n// \n// minify: TypeError: Cannot read property 'function() {}' of null\n// \n// options: {\n// "compress": false,\n// "mangle": false,\n// "output": {\n// "beautify": true\n// }\n// }` : at Function. (/tmp/guix-build-node-uglify-js-3.13.9.drv-0/source/test/mocha/reduce.js:285:16) : at run (/tmp/guix-build-node-uglify-js-3.13.9.drv-0/source/test/mocha.js:79:18) : at process.processTicksAndRejections (node:internal/process/task_queues:77:11) : error: in phase 'check': uncaught exception: : %exception #<&invoke-error program: "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" arguments: ("test") exit-status: 1 term-signal: #f stop-signal: #f> : phase `check' failed after 264.2 seconds : command "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" "test" failed with status 1 Then node-string-decoder fails to install, I have no idea how to continue... #+RESULTS: : starting phase `install' : npm info using npm@8.19.2 : npm info using node@v18.12.1 : npm timing npm:load:whichnode Completed in 0ms : npm timing config:load:defaults Completed in 1ms : npm timing config:load:file:/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/lib/node_modules/npm/npmrc Completed in 2ms : npm timing config:load:builtin Completed in 3ms : npm WARN config production Use `--omit=dev` instead. : npm timing config:load:cli Completed in 1ms : npm timing config:load:env Completed in 1ms : npm timing config:load:project Completed in 0ms : npm timing config:load:file:/tmp/guix-build-node-string-decoder-1.3.0.drv-0/npm-home-0/.npmrc Completed in 0ms : npm timing config:load:user Completed in 0ms : npm timing config:load:file:/gnu/store/ansccgk9y8vzd5rwsx4iz7j2n0gp8ig8-node-string-decoder-1.3.0/etc/npmrc Completed in 2ms : npm timing config:load:global Completed in 2ms : npm timing config:load:validate Completed in 0ms : npm timing config:load:credentials Completed in 1ms : npm timing config:load:setEnvs Completed in 0ms : npm timing config:load Completed in 9ms : npm timing npm:load:configload Completed in 9ms : npm timing npm:load:mkdirpcache Completed in 1ms : npm timing npm:load:mkdirplogs Completed in 1ms : npm timing npm:load:setTitle Completed in 0ms : npm timing config:load:flatten Completed in 1ms : npm timing npm:load:display Completed in 4ms : npm timing npm:load:logFile Completed in 3ms : npm timing npm:load:timers Completed in 0ms : npm timing npm:load:configScope Completed in 0ms : npm timing npm:load Completed in 19ms : npm timing arborist:ctor Completed in 0ms : npm timing idealTree:init Completed in 4ms : npm timing idealTree:userRequests Completed in 30ms : npm timing idealTree:#root Completed in 16ms : npm timing idealTree:node_modules/string_decoder Completed in 3ms : npm timing idealTree:node_modules/string_decoder/node_modules/safe-buffer Completed in 0ms : npm timing idealTree:buildDeps Completed in 20ms : npm timing idealTree:fixDepFlags Completed in 0ms : npm timing idealTree Completed in 56ms : npm timing reify:loadTrees Completed in 57ms : npm timing reify:diffTrees Completed in 1ms : npm timing reify:retireShallow Completed in 1ms : npm timing reify:createSparse Completed in 0ms : npm timing reify:trashOmits Completed in 0ms : npm timing reify:loadBundles Completed in 0ms : npm timing reify:audit Completed in 0ms : npm timing reifyNode:node_modules/string_decoder/node_modules/safe-buffer Completed in 5ms : npm timing reifyNode:node_modules/string_decoder Completed in 12ms : npm timing reify:unpack Completed in 13ms : npm timing reify:unretire Completed in 0ms : npm timing build:queue Completed in 1ms : npm timing build:deps Completed in 1ms : npm timing build:queue Completed in 1ms : npm timing build:links Completed in 1ms : npm timing build Completed in 2ms : npm timing reify:build Completed in 2ms : npm timing reify:trash Completed in 0ms : npm timing command:install Completed in 83ms : npm ERR! Cannot set properties of null (setting 'dev') : npm timing npm Completed in 163ms : : npm ERR! A complete log of this run can be found in: : npm ERR! /tmp/guix-build-node-string-decoder-1.3.0.drv-0/npm-home-0/.npm/_logs/2022-11-19T05_09_44_366Z-debug-0.log : error: in phase 'install': uncaught exception: : %exception #<&invoke-error program: "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" arguments: ("--prefix" "/gnu/store/ansccgk9y8vzd5rwsx4iz7j2n0gp8ig8-node-string-decoder-1.3.0" "--global" "--offline" "--loglevel" "info" "--production" "install" "../package.tgz") exit-status: 1 term-signal: #f stop-signal: #f> : phase `install' failed after 0.4 seconds : command "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" "--prefix" "/gnu/store/ansccgk9y8vzd5rwsx4iz7j2n0gp8ig8-node-string-decoder-1.3.0" "--global" "--offline" "--loglevel" "info" "--production" "install" "../package.tgz" failed with status 1 From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 20 04:44:12 2022 Received: (at 59188) by debbugs.gnu.org; 20 Nov 2022 09:44:12 +0000 Received: from localhost ([127.0.0.1]:42370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owgs0-0004oM-Gk for submit@debbugs.gnu.org; Sun, 20 Nov 2022 04:44:12 -0500 Received: from mira.cbaines.net ([212.71.252.8]:41880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owgrz-0004oE-1T for 59188@debbugs.gnu.org; Sun, 20 Nov 2022 04:44:11 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 494F627BBE9; Sun, 20 Nov 2022 09:44:10 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a916ed26; Sun, 20 Nov 2022 09:44:09 +0000 (UTC) References: <87zgcq79ml.fsf@posteo.de> <87bkp4bbd1.fsf_-_@gnu.org> User-agent: mu4e 1.8.11; emacs 28.2 From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#59188: [PATCH 0/4] gnu: node-lts: Update to 18.12.1. Date: Sun, 20 Nov 2022 09:40:19 +0000 In-reply-to: <87bkp4bbd1.fsf_-_@gnu.org> Message-ID: <87bkp2x8ns.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: 59188@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > It depends. Hilton, were you able to build everything returned by > =E2=80=98guix refresh -l node=E2=80=99, except perhaps ungoogled-chromium? > > For some reason didn=E2=80=99t pick= it > up. Anything we should do to address that, Chris? For some reason, the branch existed, but the patchwork checks didn't. I've got some ideas on how to avoid that being a possibility in the future. Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmN59udfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcLjQ//StlAfSFi10Mf9HglK7fEHSKC1W28TsTX euRr/VjRfQkYzogjQOriMy9TrRh6JR0hEOaSblZmYAsrZ6foH+S8aSLcHCTh7Ar8 +EaAgw5RoUyvFUt3eQ8eLyCiFnvkAsdaDDKDw0pfNPp933+Lq+d3hUVZQQHEUVSv 7Z+XnlS0RgOzqVmDoyV/bwrOQjo2hdtUuqus+UgpUU0e6h/ATPRJ3Bxjd2efuJaY 10lCXZywTNUBL7ZMhYr2MKFReSC8vW5QibY/heIJGj/jN+44IiUVTys8SwZP+6f3 o74KP7kP2SyQ5xkf5ReMK+3VAPWAvhMBoK4wVsn43oeCLzl6584kvcPxUE3oc15g BRwBM9oll1QiBFtAEVNcEludlIT0PJ8KZtVv7mGLpG4Nqvz4GT2E0fNv9Wi6Pai2 mvbspIen3OLoNSF18GSEVjbrZLdpiSy3y2OnJBW3dlUSTdY2UrvivzYmwYQB7tj+ Z73R1rY5+K/UZJnLBJSYVTt4iVljy7nQxgEKyYPR+n9kFaYWTHjRAuuL0B171jP9 FkwdahhYyEZIcKOaans4zdTCkn77W+B/zXs+52ZIxVny0SQDqWdXS8VMFpvDDQnR acgkTCEd4IiV+NBUuhovgT+8oEGRUKR9xeqXEfQxhWOPjBphbeuW60eu33OFj+ZQ K4YMgD8yVtU= =UqCa -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 05 08:10:52 2023 Received: (at 59188) by debbugs.gnu.org; 5 Jan 2023 13:10:53 +0000 Received: from localhost ([127.0.0.1]:50503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDQ1E-0006XP-9b for submit@debbugs.gnu.org; Thu, 05 Jan 2023 08:10:52 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:47682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDQ1C-0006XG-8V for 59188@debbugs.gnu.org; Thu, 05 Jan 2023 08:10:51 -0500 From: Jelle Licht DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1672924247; 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: in-reply-to:in-reply-to:references:references; bh=JSYLIOUYlE7DgOdakw/WAQdsNreGXI5jyTizBpbe1iY=; b=YgKvuuX3QR/d2EaTew0A8JOSEF5Wahze69tK7qRzslRv6NSNkzSQmyi8lpNGIgGAuhLDAq DnE/RP07N6wpUOzZN8Sg6HlKHRvc5Kkm9S11/N31E2DL7CdccrUKdaoa/hgxjMq7r/LEVt hIZKarmH/5AIA+W8vDowqV0Og/xW5bM= To: Hilton Chain Subject: Re: bug#59188: [PATCH 0/4] gnu: node-lts: Update to 18.12.1. References: <87zgcq79ml.fsf@posteo.de> <87bkp4bbd1.fsf_-_@gnu.org> Date: Thu, 05 Jan 2023 14:10:45 +0100 In-Reply-To: (Hilton Chain's message of "Sat, 19 Nov 2022 13:17:51 +0800") Message-ID: <87bknd2kkq.fsf_-_@fsfe.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Mekeor Melire , Ludovic =?utf-8?Q?Court=C3=A8s?= , Christopher Baines , 59188@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Hilton, other folks, Hilton Chain writes: > node-acorn fails in check phase. > #+RESULTS: > : starting phase `check' > : npm ERR! Missing script: "test" > : npm ERR! > : npm ERR! To see a list of scripts, run: > : npm ERR! npm run > This is due to a change in how npm treats the 'test' command; before, having no "scripts.test" entry in package.json lead to a placeholder of "echo 'Error: no test specified'" (with a status code of 0). More recently, npm was changed to make `npm test' like any other `npm run XYZ' command. This means that all of the packages that fail like this due to upgrading node/npm should be get a `#:tests? #f'. > Then node-uglify-js > #+RESULTS: > : starting phase `configure' > : npm ERR! code 254 > : npm ERR! path /gnu/store/969597ncg311d3kd8vbhdlniwqg4mr2k-node-acorn-8.4.1/lib/node_modules/acorn > : npm ERR! command failed > : npm ERR! command sh -c -- cd ..; npm run build:main && npm run build:bin > This is due to the fact that the `prepare' scripts is being run for our installed node-acorn. Apparently, the fact that it previously did not happen was a bug that was fixed somewhere between node 14 and 18 [1][2]. I do not know what the best approach is here. Consider patching the "scripts.prepare" entry in node-acorn, and if we find we need to do this often, we can introduce a convenience function similar to `delete-dependencies' to streamline this. > One test failed after deleting node-uglify-js's configure phase. > #+RESULTS: > : 1 test(s) failed! > : > : test/reduce.js > : 1) Should reduce test case which differs only in Error.message > : AssertionError [ERR_ASSERTION]: Expected values to be strictly equal: > : + actual - expected > : > : + `try{null[function(){}]}catch(e){console.log(e)}\n// output: TypeError: Cannot read properties of null (reading 'function(){}')\n// \n// minify: TypeError: Cannot read properties of null (reading 'function() {}')\n// \n// options: {\n// "compress": false,\n// "mangle": false,\n// "output": {\n// "beautify": true\n// }\n// }` > : - `try{null[function(){}]}catch(e){console.log(e)}\n// output: TypeError: Cannot read property 'function(){}' of null\n// \n// minify: TypeError: Cannot read property 'function() {}' of null\n// \n// options: {\n// "compress": false,\n// "mangle": false,\n// "output": {\n// "beautify": true\n// }\n// }` > : at Function. (/tmp/guix-build-node-uglify-js-3.13.9.drv-0/source/test/mocha/reduce.js:285:16) > : at run (/tmp/guix-build-node-uglify-js-3.13.9.drv-0/source/test/mocha.js:79:18) > : at process.processTicksAndRejections (node:internal/process/task_queues:77:11) > : error: in phase 'check': uncaught exception: > : %exception #<&invoke-error program: "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" arguments: ("test") exit-status: 1 term-signal: #f stop-signal: #f> > : phase `check' failed after 264.2 seconds > : command "/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/bin/npm" "test" failed with status 1 > > Then node-string-decoder fails to install, I have no idea how to continue... > #+RESULTS: > : starting phase `install' > : npm info using npm@8.19.2 > : npm info using node@v18.12.1 > : npm timing npm:load:whichnode Completed in 0ms > : npm timing config:load:defaults Completed in 1ms > : npm timing config:load:file:/gnu/store/l32l0i53ik9ja3fircdd89bgq6b1v6y5-node-18.12.1/lib/node_modules/npm/npmrc Completed in 2ms > : npm timing config:load:builtin Completed in 3ms > : npm WARN config production Use `--omit=dev` instead. > : npm timing config:load:cli Completed in 1ms > : npm timing config:load:env Completed in 1ms > : npm timing config:load:project Completed in 0ms > : npm timing config:load:file:/tmp/guix-build-node-string-decoder-1.3.0.drv-0/npm-home-0/.npmrc Completed in 0ms > : npm timing config:load:user Completed in 0ms > : npm timing config:load:file:/gnu/store/ansccgk9y8vzd5rwsx4iz7j2n0gp8ig8-node-string-decoder-1.3.0/etc/npmrc Completed in 2ms > : npm timing config:load:global Completed in 2ms > : npm timing config:load:validate Completed in 0ms > : npm timing config:load:credentials Completed in 1ms > : npm timing config:load:setEnvs Completed in 0ms > : npm timing config:load Completed in 9ms > : npm timing npm:load:configload Completed in 9ms > : npm timing npm:load:mkdirpcache Completed in 1ms > : npm timing npm:load:mkdirplogs Completed in 1ms > : npm timing npm:load:setTitle Completed in 0ms > : npm timing config:load:flatten Completed in 1ms > : npm timing npm:load:display Completed in 4ms > : npm timing npm:load:logFile Completed in 3ms > : npm timing npm:load:timers Completed in 0ms > : npm timing npm:load:configScope Completed in 0ms > : npm timing npm:load Completed in 19ms > : npm timing arborist:ctor Completed in 0ms > : npm timing idealTree:init Completed in 4ms > : npm timing idealTree:userRequests Completed in 30ms > : npm timing idealTree:#root Completed in 16ms > : npm timing idealTree:node_modules/string_decoder Completed in 3ms > : npm timing idealTree:node_modules/string_decoder/node_modules/safe-buffer Completed in 0ms > : npm timing idealTree:buildDeps Completed in 20ms > : npm timing idealTree:fixDepFlags Completed in 0ms > : npm timing idealTree Completed in 56ms > : npm timing reify:loadTrees Completed in 57ms > : npm timing reify:diffTrees Completed in 1ms > : npm timing reify:retireShallow Completed in 1ms > : npm timing reify:createSparse Completed in 0ms > : npm timing reify:trashOmits Completed in 0ms > : npm timing reify:loadBundles Completed in 0ms > : npm timing reify:audit Completed in 0ms > : npm timing reifyNode:node_modules/string_decoder/node_modules/safe-buffer Completed in 5ms > : npm timing reifyNode:node_modules/string_decoder Completed in 12ms > : npm timing reify:unpack Completed in 13ms > : npm timing reify:unretire Completed in 0ms > : npm timing build:queue Completed in 1ms > : npm timing build:deps Completed in 1ms > : npm timing build:queue Completed in 1ms > : npm timing build:links Completed in 1ms > : npm timing build Completed in 2ms > : npm timing reify:build Completed in 2ms > : npm timing reify:trash Completed in 0ms > : npm timing command:install Completed in 83ms > : npm ERR! Cannot set properties of null (setting 'dev') This is due to either a newly introducded bug, or perhaps more likely, an unfortunate sequence of interactions in arborist. I've done some bisecting, and got things to work with a hack. Relevants parts of arborist were rewritten in version 6, whereas we are stuck with 5.4.XYZ, making a proper backport highly unlikely. --8<---------------cut here---------------start------------->8--- + ;; TODO: Work around issue in that is fixed in arborist@6.0.0/npm@9.0.0/node@19+ + (add-after 'patch-hardcoded-program-references + 'patch-broken-arborist + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "deps/npm/node_modules/@npmcli/arborist/lib/calc-dep-flags.js" + (("if \\(node\\.isLink\\)") + "if (node.isLink && node.target)")))) --8<---------------cut here---------------end--------------->8--- In addition it some of the packages in node-xyz.scm that involve replacing the 'configure phase are also failing. For some reason, this updated version of npm seems to want to have access to either some cached metadata or the actual npm packages for each of the specified devDependencies[3]. This can be worked around by introducing a 'patch-dependencies phase for impacted packages, and patching out all devDependencies. AFAICS this applies for (at least) these packages: - node-buffer-crc32 - node-crx3 - node-minimist - node-pbf - node-protocol-buffers-schema - node-protobuf-schema - node-ieee754 - node-yazl HTH You have my gratitude for working on this Hilton! - Jelle [1]: https://github.com/npm/cli/issues/459 [2]: https://docs.npmjs.com/cli/v9/commands/npm-install [3]: My guess: npm wants to be able to construct a 'proper' package-lock.json, for which it needs some metadata from the npm registry. I've already checked if adding '--no-package-lock' fixes the issue, but while it indeed ensures no package-lock.json is generated, it sadly doesn't address the issue. IWBN if there were some magical invocation(s) for npm that allow these packages to actually be packaged by distributions... From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 06 08:38:21 2023 Received: (at 59188) by debbugs.gnu.org; 6 Feb 2023 13:38:21 +0000 Received: from localhost ([127.0.0.1]:47619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pP1hN-0007wQ-HP for submit@debbugs.gnu.org; Mon, 06 Feb 2023 08:38:21 -0500 Received: from mout.web.de ([212.227.17.12]:58859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pP1hM-0007w2-7S for 59188@debbugs.gnu.org; Mon, 06 Feb 2023 08:38:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1675690689; bh=gZsD++nHsXp9TMQxZlMVySzkdFCrOalR8tTx+dvM+5U=; h=X-UI-Sender-Class:From:To:Subject:Date; b=o6OBDHVvroaL/w27sS8JylA7oE0wPnhsFCRP7FX0W9ZQvvtSiq8vCQugDDxebFjPT Cq7c9wiQeE19ZQB7cKwSixKxMghdXZex/EanT70Jj1PvYVU/OjzxZCVcrkjNzN3qEc XdK5j6Q4820hgGDFCEF9xsGYz4rR5Pxtm17CbfuU6oQy71k1gmVv0CuJ0XIXg5ORCS OnGkTAE8f6HkjhZh/SyL35esmWgI+gPEXoLBeNK75XSHEAImkylOUzcE50yNvu9h3o 4H1ajoPfq/sth/9j9aSN0Q9hyVFXrxcMIyzP9b1CovSV/1ImO6kGDqnqv+SIEIipD6 mGvZtrpGgtfVg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from fluss ([84.149.95.143]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MlbLM-1ohkSx2cPC-00igv1; Mon, 06 Feb 2023 14:38:09 +0100 User-agent: mu4e 1.8.13; emacs 28.1 From: "Dr. Arne Babenhauserheide" To: 59188@debbugs.gnu.org Subject: node-lts 18: progress? Date: Mon, 06 Feb 2023 14:37:19 +0100 Message-ID: <87cz6mdide.fsf@web.de> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Provags-ID: V03:K1:WqBRG0aT6O9TT8Mo6tCrtU8Wm1XkmOJiAIRSWZkxxeKKj4OMTD7 Id4SGUj16uF+IIPhyNCbCJgXS5AVzGKb9J083mdVwqa+zHq3ahF8vv0xpuJ0v23HotzZjpZ 1iMhlaQrmDboMe79DQVax740iW5HkF9+QOO4/NLZS9yIcYiUcwyCgkJXJ5A15D7z/uC9CDc kx0PxF35t9LY+HJKfmKUw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:ZoW8wmiN3lg=;rXM3OM0S7WxH5s4m77ICFRcmvtD CYD9D+WMa0Aybver1DUVeFeTpCip60CtDihSLJn5ImS3DUSJ6276CTL1seCpGJB3ymYvMrh+o fXamnSjaMgAPeq064bgdcrJcxkVONrYp0EEUtpwAWKd2psoBBktkz+5/fHPjEgnLQpKrH6eT3 KI69hzjCBjmOluSvFezMv4ignwCDIoSOEgIjQzOrbyUlBHfApMv24GReJzcYDrIjyTKn2+fn8 NIeoQZY1lZPiVAAbYIHg4zQtQqhh9AbNd6bPzAP6zaFLofRHxA2cN3gUZgmYZeyLIBKmQxpAq gAMQz11oN0QFxpsM7FX1i22oKd3xJfLhTMIG7+dZHrNgSC3lw97djrehuvgtv9SMjmN2rY0rv 5hrqX0+o3Q3Cbe8pBUqFctDM5O+WInHGR/lAJ4Qp412Fy3hTxdu1i3ku8QiO1z92ECPZv1N2x 7QmIdgsVOSs2cdmhnIqbGW9jAnxaXdX15zfcCfSKgM1lgBjfW/lUAs2H7qu2oCtxgRv69HV2J BlSYId32qDX4J0S0kKCnrnOmRe7hUAxTQrkHCsG0d5bz9VLTTWvSCuEvPjj5HBsl1MfQSa9iN qIvl35IvYnF/pwaGBt3AQwcjka5qvAdlF/s6YScXFssX4qFQgzVDEn5x7Cimx0XGe1YECb0Q6 73V8HVJUU7d3lepgzhz6RZAye6/o7uBOnvPjAe1A6FwsV9yJ4IDcxSoVGv72mCBpZm4hQjsWA PD3QcGjhT62YdZB8sCU7Td1tACZsGH6D/0zOzmENVV8oXutn/sibkEf+TWae2drtM2j+8Ywnl vvms59qgyG+F6aNkfZLTUvC7qaJ/YVSeCgh79GYwH56jIbVtn043OMTXABFdxBERWPnoaJ3d7 bCyDUDH5GX4XxDZdtufgypVzg2DIuTR0+zqTSQMxtodI/Txg65hAj0igwBq6kM4OibLgKbJ0N 6kdkYHdo1dMj5f40mbQcO9YPl3Q= X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Did you make progress with this patch? Is there a way I can help you? Best wishes, Arne =2D-=20 Unpolitisch sein hei=C3=9Ft politisch sein, ohne es zu merken. draketo.de --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCAAuFiEE801qEjXQSQPNItXAE++NRSQDw+sFAmPhAr4QHGFybmVfYmFi QHdlYi5kZQAKCRAT741FJAPD62nXEACOKHESQ9WmdwDG/rbDDbZkz97nFVnEIj+3 K3URfwYUA+NZokxrkilLvmy9OjFs7x2R72G8ncYJpbP5o/nLLS0eI6tijFaTH0vH EasXGJRaWFzpZsmLSDHPstrQweQG7qWe06pnDXv4wBY0AigYL3zMuQxcaTHuK0/a FBFDXueju8hakaIkpknbFy/8buq1ON2rr4l8QsvHc4WITWAKaxlG1c97ZKWaFram 5Z6JNSuTsyttFxspTJJZAt5hvf9QpaVJiIJJL6wtonZjmw44XURFUM4ATSqDmXfm I7/cSEFlxgEUBsDBuvYmbCPdqTIjR3k3GVpnjjqP6n34tVXgcF6AGRkYdBPJv/z6 fw/gzWb1n6JMFdOW2+vFex1qJz1l7ET2aajSsZ8+r5uEHr3/4Yc8V8bwh+9igh7V TXpFLEcJpqCvR9wAoI6/dj0p8onUnRX5nFMHKJrY1HTIkIrjgsdsuGypZe+gSW6l BHHC0G+13ymuUVuF03kpfjGCnTJ5PwBQvALtNDYslaLRY4YFfrU2y1oXKA8jiKc8 yLb2+XCL5ezUMEKxlqAPu3rtbTRoVdfBd4kpNfGlnqwTJEQRuO1v8au7i73O5rMj QkZGo3Zrr3RJVgkEnU/UdWu4f+yt6Hx3ToqftzaAsiqORuJnGBIikKpfs6tI6itr bWD6z7DjS4jEBAEBCAAuFiEE3Si95tmHXKvOSosd3M8NswvBBUgFAmPhAr4QHGFy bmVfYmFiQHdlYi5kZQAKCRDczw2zC8EFSGBEA/wNy4PQ/isb/LEZDFT6OQB0+Loa A/e/1xp3OpYGv94cqwIZ/0UBMUPAkwduPKAUTCaOWRzAoxaiLNenRWNz1JfRXrLE MR62PQ0MeWvC1idP85aK+r+4q2cbPB/xP8SRWCiO5y7+GV8h5+WhqIDILppQgQnM /qSkLkImhp2qJ8QguQ== =FUaW -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:38 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:38 +0000 Received: from localhost ([127.0.0.1]:56747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdJ-000415-Lx for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:38 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:40950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdH-00040b-G7 for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:36 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890333; 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; bh=Rk5mdthxN2Ia8Sotx3VmaenMoIWTeNeiGsi8dP12hXU=; b=FUyCfNOZTQoptbAlb9qcFCpVBqhRNeljyuTfu0lKqdFKjVLCyRf3O4gK3j8L65sajDJdq/ ibnyoQoQnWhOi1ngFFSOXS+IS9BPEfFL46goWTAj4D+4xFFQy+1lM5fHk/inMl2YQNIWcp RdfYQAqcjSh/6um5A3K/wKTijH2d2+A= To: 59188@debbugs.gnu.org Subject: [PATCH v3 00/16] Updating node-lts to 18.X Date: Wed, 8 Feb 2023 22:05:15 +0100 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht Folks, This should at least build for x86_64, and I'm sending in a 'new' patch series in the hopes of QA picking things up this time. Hilton, I've taken the liberty of adding in a copyright line for your node-lts update: I've also tweaked some versions so there would be less manual patching and backports to do, namely: * libuv-for-node to 1.44.2 * node-lts to 18.14.0 I needed to tweak some of our existing packages so they actually explicitly state which dependencies they do not care about; with the npm bundled with node < 16, things "Just Worked", but since then npm has become a bit stricter. After applying my patches they should build with either node@14 (current packaged version) or node@18 (Hilton's version). Hilton Chain (4): gnu: libuv-for-node: Update to 1.44.2. gnu: llhttp-bootstrap: Update to 6.0.10. gnu: node-lts: Update to 18.14.0. gnu: libnode: Use node-lts as base. Jelle Licht (12): gnu: node-acorn: Disable tests. gnu: node-acorn: Remove lifecycle script. gnu: node-acorn: Fix broken transpilation. gnu: node-buffer-crc32: Ignore development dependencies. gnu: node-crx3: Ignore development dependencies. gnu: node-minimist: Ignore development dependencies. gnu: node-pbf: Ignore development dependencies. gnu: node-protocol-buffers-schema: Ignore development dependencies. gnu: node-resolve-protobuf-schema: Ignore development dependencies. gnu: node-ieee754: Ignore development dependencies. gnu: node-yazl: Ignore development dependencies. gnu: node-uglify-js: Update to 3.14.2. gnu/local.mk | 1 - gnu/packages/cran.scm | 2 +- gnu/packages/libevent.scm | 4 +- gnu/packages/node-xyz.scm | 110 +++++++++++++----- gnu/packages/node.scm | 49 +++++--- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ---------------- gnu/packages/uglifyjs.scm | 4 +- 7 files changed, 121 insertions(+), 149 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch base-commit: 07e74b63d4969de0b51c48edb586f0d7d8c08db7 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:38 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:38 +0000 Received: from localhost ([127.0.0.1]:56749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdK-00041D-4s for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:38 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:40972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdH-00040e-Iy for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:36 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890335; 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=Hhzxt0i/LFXqvjXxTiOPWsH74rPHLWDQrcS4sqM7yDU=; b=QRTkGThE0LYiCIumV9lvpuJ86qZBvt+n3xYkr6PdOGJNM77eK2S3+T6a/h6uGd8re4vzXK rk0/3bQMQRSi7AzkSlIQwJ1lrsb0klZrmLNbJue1ggcxEg2IJSW6yKiLU5h8TEMsSniapB YMQxF7XEMqCJvDMLJ4HcxT7OcfnTyZU= To: 59188@debbugs.gnu.org Subject: [PATCH v3 02/16] gnu: node-acorn: Remove lifecycle script. Date: Wed, 8 Feb 2023 22:05:17 +0100 Message-Id: <3b7434500d34c7401fbfbc5221f83dadf53f8406.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 51ea110e8c..5e7e6ae4d9 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -47,11 +47,35 @@ (define-public node-acorn (build-system node-build-system) (arguments '(#:tests? #f + #:modules + ((guix build node-build-system) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "acorn")))))) + (chdir "acorn"))) + (add-before 'configure 'avoid-prepare-scripts + (lambda _ + ;; We need to remove the prepare script from "package.json", as + ;; it would try to use the build environment and would block the + ;; automatic building by other packages making use of node-acorn. + ;; TODO: Add utility function + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . pkg-meta-alist) + (cons '@ (map (match-lambda + (("scripts" @ . scripts-alist) + `("scripts" @ ,@(filter (match-lambda + (("prepare" . _) + #f) + (_ + #t)) + scripts-alist))) + (other other)) + pkg-meta-alist)))))))))) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:38 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:39 +0000 Received: from localhost ([127.0.0.1]:56752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdK-00041M-Iz for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:38 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:40964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdH-00040c-HL for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:37 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890334; 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=T70+nuTVbGVBniHLHijEiim/0uKby89EDPzh++XAfic=; b=BxU4LR/EwSLvq8M4uFlhZBfj2EdoUuIe2YKqnbK4WDqraiMvqprweivASKDYra4n+55d+b 18Pmb4pn0qHWYsBgHgib8V/J/FIS5jWMGxePiKo6GlIwX3ZaLg5hKN0JfMFBQrU/aC7uui BO4kwlW8zyOD+0tdGztx3sOgv3Nd4vM= To: 59188@debbugs.gnu.org Subject: [PATCH v3 01/16] gnu: node-acorn: Disable tests. Date: Wed, 8 Feb 2023 22:05:16 +0100 Message-Id: <8d6103e0d1eb4332a97deaa276fc019066625594.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn): Explicitly disable tests. --- gnu/packages/node-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index a1e89f1759..51ea110e8c 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -46,7 +46,8 @@ (define-public node-acorn (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) (build-system node-build-system) (arguments - '(#:phases + '(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:42 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:42 +0000 Received: from localhost ([127.0.0.1]:56758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdN-000422-VJ for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:42 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:40980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdI-00040g-IQ for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:37 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890335; 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=dq2p9+UxIbQxPAje5aHkKPxzYTUW1wTOduC8rGbT9QE=; b=tpPbRBBF3F3WXy5K2j2V+R3YomY06fM4wOOn9DOZew1qWgPFrLv/3fz9m7zAgTolXh9OeK VSsKbUaU0fBa8WCYg4SNoIkyiM3JWnFZzqVtkp6EnaXon0xr7vObJNsrTAYoMKRSYfy1yK sScJLszLK7Uo2M0c/zEIVgrs65deIU4= To: 59188@debbugs.gnu.org Subject: [PATCH v3 03/16] gnu: node-acorn: Fix broken transpilation. Date: Wed, 8 Feb 2023 22:05:18 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[native-inputs]: Add `esbuild'. [arguments]: Replace build phase by custom `esbuild' invocations. --- gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 5e7e6ae4d9..c9a853616e 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Charles ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2023 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,30 @@ (define-public node-acorn #t)) scripts-alist))) (other other)) - pkg-meta-alist)))))))))) + pkg-meta-alist))))))) + (replace 'build + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((esbuild (search-input-file (or native-inputs inputs) + "/bin/esbuild"))) + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.js" + "--format=cjs" + "--bundle" + "--platform=node") + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.mjs" + "--format=esm" + "--bundle" + "--platform=node") + (invoke esbuild + "src/bin/acorn.js" + "--outfile=dist/bin.js" + "--format=cjs" + "--platform=node"))))))) + (native-inputs + (list esbuild)) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:42 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:43 +0000 Received: from localhost ([127.0.0.1]:56761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdO-00042E-G3 for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:42 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdJ-00040t-EH for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:37 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890336; 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=uD6T/AdAupyYhzmGLHQ0OK5UiUgFWYKnHCPyyqUTF9M=; b=GFGF5JqUNTtrERGKpCy1E44dlz+/j91dYaweRbDVMXMlnUbqX24yFXkvfYTXYLkvkJay5F bcJ2VzfL9UKN/1tRAyWl2qnTBuWLp60OouO/JP5VP2jUE9HoiKMm8J5/GCBLmxTWiKolrn 9l/VEVgFRXR1Il7iuUFdc8smaipuHj8= To: 59188@debbugs.gnu.org Subject: [PATCH v3 04/16] gnu: node-buffer-crc32: Ignore development dependencies. Date: Wed, 8 Feb 2023 22:05:19 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index c9a853616e..d527e3240a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -123,10 +123,9 @@ (define-public node-buffer-crc32 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("tap"))))))) (home-page "https://github.com/brianloveswords/buffer-crc32") (synopsis "CRC32 implementation in Javascript") (description -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:43 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:43 +0000 Received: from localhost ([127.0.0.1]:56765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdP-00042P-2r for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:43 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdK-00041B-5M for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:38 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890337; 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=JbjAF+48qG/W97UllXHPI3SGZ03xnM7icgxWHTyRqXU=; b=NvYns9TjQoqX0QwPLTqaafGQabn7rfsp2wnNc2EHbJjMR2E1HrtClv3Jx0Y0gI17Y0cRmr aLfymLPTRXb3hPkzL6f7zwJ5WL7heL73s8vY0oW8W59nRJU3ZmzAnDX9Ki+G64baud2wA2 aHpZqn8leSF5Huy1ulU5DZ6pOdkocxw= To: 59188@debbugs.gnu.org Subject: [PATCH v3 05/16] gnu: node-crx3: Ignore development dependencies. Date: Wed, 8 Feb 2023 22:05:20 +0100 Message-Id: <335da332bd9956c2cd2212a433616882965fd779.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-crx3)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- gnu/packages/node-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d527e3240a..325dca84ce 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -179,10 +179,16 @@ (define-public node-crx3 (substitute* "lib/configuration.js" (("mri") "minimist")))) - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("c8" + "docdash" + "eslint" + "eslint-plugin-jsdoc" + "jsdoc" + "tap-diff" + "tape" + "tape-catch"))))))) (inputs (list node-minimist node-pbf node-yazl)) (home-page "https://github.com/ahwayakchih/crx3") (synopsis "Create CRXv3 browser extensions with Javascript") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:44 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:44 +0000 Received: from localhost ([127.0.0.1]:56767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdP-00042d-O8 for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:44 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdK-00040t-Lv for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:39 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890338; 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=EfcStERg/diJxy80YtbgU+8TEwFGSWY3IZqiH4haZvc=; b=ha1LSaE2Fc673QGVn0bvZpgf9ktPnBEEMK9KPJDCSa0DScZmnQgc6MxS7WbM1ah8oTsNaA Ks/uTqMkpfSpCcS2y4ZE6PqFZafx+Par5aW2L3gCDw0TQ/pvZNRnn9Zf+KBVk/t9Ieawv0 AgFUV29GxSIMiC7Kg85YK8af9qElOOw= To: 59188@debbugs.gnu.org Subject: [PATCH v3 06/16] gnu: node-minimist: Ignore development dependencies. Date: Wed, 8 Feb 2023 22:05:21 +0100 Message-Id: <23d89363a1d6eca76a0cad4d63223ad6b89c653f.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-minimist)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 325dca84ce..a03b9b4f1c 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -313,10 +313,9 @@ (define-public node-minimist (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("covert" "tap" "tape"))))))) (home-page "https://github.com/substack/minimist") (synopsis "Parse CLI arguments in Javascript") (description "This package can scan for CLI flags and arguments in -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:44 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:44 +0000 Received: from localhost ([127.0.0.1]:56769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdQ-00042n-2S for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:44 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdL-00041B-Do for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:39 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890339; 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=qdEiHYkpXW/Y0HxTtgd8KWBMkJVCYGry0KPA8lSUtBU=; b=b6Ht8ByFbFCymWMBiznZYyj40zD+fQkAScx5rymtNpXXS+2Ahinu6L+yDPyEQEDhP4D9uY 9EYD7GFG24U9Izcqz9mFOHiGMOjntxnzowhIKmRmjHEUDfxqqMtkMG423vTbm7OSFfuqvu qD0MeiLtyyiT3dqSSYpXenptI/eWLdg= To: 59188@debbugs.gnu.org Subject: [PATCH v3 07/16] gnu: node-pbf: Ignore development dependencies. Date: Wed, 8 Feb 2023 22:05:22 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-pbf)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- gnu/packages/node-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index a03b9b4f1c..07c5982996 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -364,10 +364,19 @@ (define-public node-pbf (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies + '("benchmark" + "browserify" + "eslint" + "eslint-config-mourner" + "mkdirp" + "protobufjs" + "protocol-buffers" + "tap" + "tile-stats-runner" + "uglify-js"))))))) (inputs (list node-ieee754 node-resolve-protobuf-schema)) (home-page "https://github.com/mapbox/pbf") (synopsis "Decode and encode protocol buffers in Javascript") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:44 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:45 +0000 Received: from localhost ([127.0.0.1]:56772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdQ-00042u-EU for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:44 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdM-00041n-Dp for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:40 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890339; 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=iaD3MqDbQjG8vKFRjowlT5R1xapgAEzIziR8lxR/+bY=; b=NBBGbzYJJOYrr/8bmSAecCTIDRb2M5qdyZiJ9gZ0DXeVZ+4mknxLyxutXJgkFrR6piB4ke 93hCDvcQRijrC3FaTgRHaXZ6OOfLo1MTADIlnt+SQwAZgELKLdIRVrlLHh58zLmMNOH090 B7s7dBwYsFwOQNvs9yvQKYOuULytNXk= To: 59188@debbugs.gnu.org Subject: [PATCH v3 08/16] gnu: node-protocol-buffers-schema: Ignore development dependencies. Date: Wed, 8 Feb 2023 22:05:23 +0100 Message-Id: <99052ac6f8db018ba30fc3f8d5e5de99a497e68d.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-protocol-buffers-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 07c5982996..e406b55b56 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -405,10 +405,9 @@ (define-public node-protocol-buffers-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (home-page "https://github.com/mafintosh/protocol-buffers-schema") (synopsis "Protocol buffers schema parser written in Javascript") (description "This package provides a protocol buffers schema parser -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:45 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:45 +0000 Received: from localhost ([127.0.0.1]:56774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdQ-000436-Tq for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:45 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdN-00041u-6E for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:41 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890340; 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=/IJsE8QEANWA9by8ZgYspe3SA1x1McCz7jdQgDjA7F8=; b=LwFmlwfwAt7EbKP1xTn4W8GLim+sv/MDUtdMieCppjSC6l63ZwFnJulEH/rhlwSMtoJIPQ tzpNAmHls6E2WI0YmSQyFLta1shxy897qXS4iMI6KTBMuUnsLuAbtEKNO4C7K8nt3HItoI x5+4AiWNCk9TUHcwOakMSIBDlJNBNpo= To: 59188@debbugs.gnu.org Subject: [PATCH v3 09/16] gnu: node-resolve-protobuf-schema: Ignore development dependencies. Date: Wed, 8 Feb 2023 22:05:24 +0100 Message-Id: <51ea54909f1d87c041aa463de133fc3c9ff91b65.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-resolve-protobuf-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e406b55b56..21b5390833 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -431,10 +431,9 @@ (define-public node-resolve-protobuf-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (inputs (list node-protocol-buffers-schema)) (home-page "https://github.com/mafintosh/resolve-protobuf-schema") (synopsis "Resolve protobuf imports") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:51 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:51 +0000 Received: from localhost ([127.0.0.1]:56779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdX-00043s-Ad for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:51 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdN-000420-S9 for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:42 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890341; 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=bB5SQZ7Hf7d8En/lPCQ0xwRvkySlrI04hNLb4e4IxGQ=; b=M7eATYMb/3luQqiO7abELriQe5no2tqZ/a8ZqIELxCoQDIDXuNNdcySYtMmBro08A/fdcS HYHdmnTsJXkZj5ME2j98uJAiWEdstNKueLzEGRG/hDcXjiJnlcxmsZmDbZMeejpY/JrCIo CFYxvRrAuH5a863+woNGcgAj9z3upQA= To: 59188@debbugs.gnu.org Subject: [PATCH v3 10/16] gnu: node-ieee754: Ignore development dependencies. Date: Wed, 8 Feb 2023 22:05:25 +0100 Message-Id: <887d7ae22c3e3630685c732b78fa07eda63b6516.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-ieee754)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 21b5390833..d8939d1469 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -623,10 +623,9 @@ (define-public node-ieee754 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "standard" "tape"))))))) (home-page "https://github.com/feross/ieee754") (synopsis "Read/write IEEE754 floating point numbers in Javascript") (description "This package can read and write IEEE754 floating point -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:52 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:52 +0000 Received: from localhost ([127.0.0.1]:56781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdX-00043w-QX for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:52 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdO-000425-GV for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:43 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890341; 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=JgqDApXuS+vWhRpUihR6SlBirH3cokjYp/xNAf99EZo=; b=bz60tMvHn+QNE5D+4Gu91O82nBVNvX+EnUbXab+Tjx/ml4CN1VGzsVKakRTGtvWpMycmzR rMUq9jXW9Ratcq+cnEaHRgdMHii0E20jLKq4oxRVlSzIK+jnFHSN06unrLXJPku+CMteF4 9pi/0C7qacTXcw6JwTUcITATYZmF0Wk= To: 59188@debbugs.gnu.org Subject: [PATCH v3 11/16] gnu: node-yazl: Ignore development dependencies. Date: Wed, 8 Feb 2023 22:05:26 +0100 Message-Id: <77007f8d7ddce77a1d8352e04d15d18b90f25b00.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-yazl)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d8939d1469..8740796a8c 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1588,10 +1588,9 @@ (define-public node-yazl (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "bl" "istanbul" "yauzl"))))))) (inputs (list node-buffer-crc32)) (home-page "https://github.com/thejoshwolfe/yazl") (synopsis "Yet another zip library for node") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:52 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:52 +0000 Received: from localhost ([127.0.0.1]:56783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdY-000443-4l for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:52 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdO-000420-Tx for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:43 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890342; 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=CtgRwVg38dW3b5ntUWi5jDNaWnbh61E3Gp/FGCkGBmo=; b=M1aH49Z9By8c/SBB2DuBZcirQjFZKcFGbMgUb2vw0tgvbN8nwiJxfrqkZpLN4H1p0J6w3d JxsEXfjAltj9JliXV2iOWQp0IHXphRp/Dl168zi1poIq7uTsoHubnUShlCOEayN/vopt+p rpTZ5Vk+dw/jQ/zbqi7okzIW8sRSjMI= To: 59188@debbugs.gnu.org Subject: [PATCH v3 12/16] gnu: node-uglify-js: Update to 3.14.2. Date: Wed, 8 Feb 2023 22:05:27 +0100 Message-Id: <6c0fc9a0ba5523ed73fa9d2fdf7a92b536951dac.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/uglifyjs.scm (node-uglify-js): Update to 3.14.2. --- gnu/packages/uglifyjs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/uglifyjs.scm b/gnu/packages/uglifyjs.scm index b65d52b8df..1bd8bb6326 100644 --- a/gnu/packages/uglifyjs.scm +++ b/gnu/packages/uglifyjs.scm @@ -25,7 +25,7 @@ (define-module (gnu packages uglifyjs) (define-public node-uglify-js (package (name "node-uglify-js") - (version "3.13.9") + (version "3.14.2") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (define-public node-uglify-js (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q1f91xwwm829cl5v727d4qkxy4yh7wri3pgl89f0m3a4y1n7hi4")))) + (base32 "1jraqpwzga4vbgq3xcn08jcfc87pm6nik7vpxvxa4rfjvz70a6k7")))) (build-system node-build-system) (native-inputs (list node-acorn node-semver)) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:53 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:54 +0000 Received: from localhost ([127.0.0.1]:56785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdZ-00044A-FN for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:53 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdQ-00042k-6Q for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:44 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890343; 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=fyzQqz4VM+YvPxElrH2W9YgdrFi9+ZXQSAmkClwuKus=; b=Ji5EKa2l3KjOc7ODTMjT7AOjjHXFxLhoDEvpVTS65e5cR05eS9abw/JOJlfSQc60gr6C3s 4u151H4QosZDVO5tnD7DpNtDommKM7+vIkRNj12wP2l8hdP6T3J8OjP9BOCvywtSTMjU1V Q7Ot+kH2q82B2wDGOtUC6bafm6OpWuI= To: 59188@debbugs.gnu.org Subject: [PATCH v3 13/16] gnu: libuv-for-node: Update to 1.44.2. Date: Wed, 8 Feb 2023 22:05:28 +0100 Message-Id: <100d5686d61fe64636c46c124ddc90c53f3e5a58.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain , Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/libevent.scm (libuv-for-node): Update to 1.44.2. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index f9722e4469..fa1e76b347 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -147,14 +147,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.44.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "1d1wy1061cf2mfygr2j6jbm0da2mhsf0l9yq4rjkqrsmijbdrz6c")))) (properties '((hidden? . #t))))) (define-public libuv-julia -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:54 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:54 +0000 Received: from localhost ([127.0.0.1]:56787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdZ-00044I-S4 for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:54 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:41992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdR-000437-6s for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:45 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890344; 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=XuBkVcRpontJAb9zvqXnYCJhAf20R+t2Q/lBR11AqwM=; b=VygNGgCHo3TmbsASt+mZh67HKKvPDEdLIHqHKHRYr2Lftbf7OTVl96SAa/L9ze9/7tVjdw lBeU7fsLw60SjPzOBIkDM0tnoQ8abTy1Gp4cZiHvelzjTAQR7+tGBHq5p62SNaKNsfxiKs lLWLLBZdbrbJJCN8Kxe0VQ/qMJ1p7RM= To: 59188@debbugs.gnu.org Subject: [PATCH v3 14/16] gnu: llhttp-bootstrap: Update to 6.0.10. Date: Wed, 8 Feb 2023 22:05:29 +0100 Message-Id: <5074a5007a93e1e730f75f9a3ccdc3f4ae41d580.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain , Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index a5f4b83961..60219dc756 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1482,7 +1482,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index be39f3b25a..de847490a3 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -668,7 +668,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -677,8 +677,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:55 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:55 +0000 Received: from localhost ([127.0.0.1]:56789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrda-00044Q-Gb for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:55 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:42008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdS-00043L-4t for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:47 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890345; 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=xKTIny2u6Rg2AWDyXMQdGlcYOqlTSW6l9c39cyOaXWQ=; b=TCJKl92f7S5Jq7V7/oXrVmNqUZJULmbAHA74k1KHl+0kPvz6ZFtu34SF07MW2u6Egy7kii FuD00Kjqs4LKXXtTvIa4daaHM343dbN0KidCoAZm21/UIAw9wQV5aVLunV2LRpJxbybOAv suFXIG5NtHnAW+2rS/HpOtXEtRra1LM= To: 59188@debbugs.gnu.org Subject: [PATCH v3 15/16] gnu: node-lts: Update to 18.14.0. Date: Wed, 8 Feb 2023 22:05:30 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain , Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (node-lts): Update to 18.14.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. --- 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..03dfa8875f 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.14.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")) + "0sscc084lbh1008zzmibaxbl7y4n6cbsnlprisckr3fc3rbdj4sa")) (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.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 08 16:05:55 2023 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:55 +0000 Received: from localhost ([127.0.0.1]:56791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdb-00044a-3E for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:55 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:42016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdS-00043R-Ty for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:47 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890346; 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=amxxBN1cgz+fnmE2eDAIPu0Q9/rBrNkynK5E7JepXP4=; b=cAYvZQSmdqHQrXtyaF6yvOWMRuD4Ef/8PxixOqUDCYXirAhnVXo5eBGvDtRDRRI424yefv EO02wFXzW7xZu2XxQ092oC/hZYv7dcZnJB/rJKu5S7u+oLACiAf94YuQYTVSB3E0kJrG/s ZFEXW55XwCk/vQTh4x7HmUCDVqZgkfI= To: 59188@debbugs.gnu.org Subject: [PATCH v3 16/16] gnu: libnode: Use node-lts as base. Date: Wed, 8 Feb 2023 22:05:31 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain , Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (libnode): Use node-lts as base. * gnu/packages/cran.scm (r-v8)[arguments]<#:phases>: Adjusted accordingly. --- 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 7ca7ab0f9a..3cbfe0c8b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1097,7 +1097,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 03dfa8875f..070a5b070b 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -906,10 +906,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) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:53:55 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:53:55 +0000 Received: from localhost ([127.0.0.1]:58613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroB-0004kz-3O for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:55 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXro8-0004kd-Uz for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:54 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797631; 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=5mP7h/zYlttH2oMAKMd/e82vDha43TF4keLOebHt0Iw=; b=H2lLgLwL4O+4qsTWBe4Fq5JEFrXPOgA7kXOYy23X04I/qz00k2cW9rrXro9bGHpvEJYRGE istoxgW/PuX6BwNvFxrHEA+Ec6xqOm3UT/1R+rSr8ICwdXyx63nq/s8wCR6f3Ft1j2Jvdm 3l5vsvB6qVM6yqLRfJR0Gbam6mg/QsU= To: 59188@debbugs.gnu.org Subject: [PATCH v4 01/16] gnu: node-acorn: Disable tests. Date: Thu, 2 Mar 2023 23:53:34 +0100 Message-Id: <9d5b77504ca1eab3f11a8edb34df78c669ab8dd8.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn): Explicitly disable tests. --- (no changes since v1) gnu/packages/node-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 991113c05b..e89117beca 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -46,7 +46,8 @@ (define-public node-acorn (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) (build-system node-build-system) (arguments - '(#:phases + '(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:53:55 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:53:56 +0000 Received: from localhost ([127.0.0.1]:58615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroB-0004l7-Gd for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:55 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXro8-0004kb-Ua for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:54 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797630; 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; bh=++k7J0MG8UurVJSCnC4bgLaBT7Zm5PjuuMTynzuaKI8=; b=MKzSqt2ZQAX4Mf28hkuo1A7mO0FWez4H9R5Fg7eACvc6AUTM7KmC33ofGp6+vmiUIhqoKf Ah9yh6plSPLpdC3aPMp3z8z4HkwkPIwYnw1iPmI8+vfnjHkTyPs6h9+mhKgchcCP/F7gv1 s/IXnuyUnzrC8lX/+qlws4X+CZXGCU4= To: 59188@debbugs.gnu.org Subject: [PATCH v4 00/16] Updating node-lts to 18.X Date: Thu, 2 Mar 2023 23:53:33 +0100 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht To prevent bitrot, I rebased and built it all locally. Changes in v4: - node-lts to 18.14.2 Hilton Chain (4): gnu: libuv-for-node: Update to 1.44.2. gnu: llhttp-bootstrap: Update to 6.0.10. gnu: node-lts: Update to 18.14.2. gnu: libnode: Use node-lts as base. Jelle Licht (12): gnu: node-acorn: Disable tests. gnu: node-acorn: Remove lifecycle script. gnu: node-acorn: Fix broken transpilation. gnu: node-buffer-crc32: Ignore development dependencies. gnu: node-crx3: Ignore development dependencies. gnu: node-minimist: Ignore development dependencies. gnu: node-pbf: Ignore development dependencies. gnu: node-protocol-buffers-schema: Ignore development dependencies. gnu: node-resolve-protobuf-schema: Ignore development dependencies. gnu: node-ieee754: Ignore development dependencies. gnu: node-yazl: Ignore development dependencies. gnu: node-uglify-js: Update to 3.14.2. gnu/local.mk | 1 - gnu/packages/cran.scm | 2 +- gnu/packages/libevent.scm | 4 +- gnu/packages/node-xyz.scm | 110 +++++++++++++----- gnu/packages/node.scm | 49 +++++--- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ---------------- gnu/packages/uglifyjs.scm | 4 +- 7 files changed, 121 insertions(+), 149 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:53:56 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:53:56 +0000 Received: from localhost ([127.0.0.1]:58618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroB-0004lE-Rt for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:56 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXro9-0004kf-7V for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:54 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797632; 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=asBYgjQHJv7/EINb8dFQtqIUeelZ9lcFp2WIw9zQg5c=; b=TLsJbCCkffRR85gu46CXCxffjVPVM/mCNFDwZFvja8UUZCedgq+9qqE0K6oaW7KJMpedqj FBVbbBSqgfccJp/zaUhaK0mmLnstSvXOrqNNsiossO+DGPkImeKYdagYDruJT+zW8yoW9w xmeFHv0XyFUNn8VEmIQpxNuu0mxHBl8= To: 59188@debbugs.gnu.org Subject: [PATCH v4 02/16] gnu: node-acorn: Remove lifecycle script. Date: Thu, 2 Mar 2023 23:53:35 +0100 Message-Id: <9e295957dc0905d874c75609d88104f6cc7e2189.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e89117beca..e3d8c7ca19 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -47,11 +47,35 @@ (define-public node-acorn (build-system node-build-system) (arguments '(#:tests? #f + #:modules + ((guix build node-build-system) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "acorn")))))) + (chdir "acorn"))) + (add-before 'configure 'avoid-prepare-scripts + (lambda _ + ;; We need to remove the prepare script from "package.json", as + ;; it would try to use the build environment and would block the + ;; automatic building by other packages making use of node-acorn. + ;; TODO: Add utility function + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . pkg-meta-alist) + (cons '@ (map (match-lambda + (("scripts" @ . scripts-alist) + `("scripts" @ ,@(filter (match-lambda + (("prepare" . _) + #f) + (_ + #t)) + scripts-alist))) + (other other)) + pkg-meta-alist)))))))))) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:53:56 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:53:56 +0000 Received: from localhost ([127.0.0.1]:58620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroC-0004lT-8B for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:56 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroA-0004ks-N5 for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:55 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797633; 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=fnJNPXGFAL3Rvxc2jBO7W+rYms9HirkB2rSfleLtkzQ=; b=HtwvL2omdCV898DXX/WsB/A1TOneB04wkXCMI4PgdOyPIMqGolUuh3Url9brgZttY7EqH0 Fcnx4FzgCL0M32BQS9NyYKZzK9cdJUe9cPEVH4Cc9COSNnrjr4RIzwPI+9jG7kovdDjocq j3wO7yHjA0/21S260zzUZsPptEstnCg= To: 59188@debbugs.gnu.org Subject: [PATCH v4 03/16] gnu: node-acorn: Fix broken transpilation. Date: Thu, 2 Mar 2023 23:53:36 +0100 Message-Id: <56d43fa5f6bb62d2d41303acd70650b64324723d.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[native-inputs]: Add `esbuild'. [arguments]: Replace build phase by custom `esbuild' invocations. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e3d8c7ca19..d75ccc199a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Charles ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2023 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,30 @@ (define-public node-acorn #t)) scripts-alist))) (other other)) - pkg-meta-alist)))))))))) + pkg-meta-alist))))))) + (replace 'build + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((esbuild (search-input-file (or native-inputs inputs) + "/bin/esbuild"))) + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.js" + "--format=cjs" + "--bundle" + "--platform=node") + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.mjs" + "--format=esm" + "--bundle" + "--platform=node") + (invoke esbuild + "src/bin/acorn.js" + "--outfile=dist/bin.js" + "--format=cjs" + "--platform=node"))))))) + (native-inputs + (list esbuild)) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:53:59 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:00 +0000 Received: from localhost ([127.0.0.1]:58626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroF-0004m6-KR for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:59 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroB-0004l5-Km for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:55 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797635; 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=E6BE4S8eiyB+hOvMevmRFU3MSG2nMIsq//sfgO/adG8=; b=mrqWHIr7HR378EGk7YJW8IfsAb21m67qfl6IkQKZ4JyaQDa8B1Xi+h5fMGzcuvpjxLXMJU CziaqEQ8c2XPl4dRKfmZf0TgNVkEGQ3HEfpDJqaqbMD8CqIz5ocz07UapV+E/FrPB5k9k9 f9/eOkD5FLVxCP4LIXfVwR8oYCy3lVs= To: 59188@debbugs.gnu.org Subject: [PATCH v4 04/16] gnu: node-buffer-crc32: Ignore development dependencies. Date: Thu, 2 Mar 2023 23:53:37 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d75ccc199a..96901e7bf8 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -123,10 +123,9 @@ (define-public node-buffer-crc32 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("tap"))))))) (home-page "https://github.com/brianloveswords/buffer-crc32") (synopsis "CRC32 implementation in Javascript") (description -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:00 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:00 +0000 Received: from localhost ([127.0.0.1]:58628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroF-0004m8-T2 for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:00 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroC-0004lR-F1 for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:56 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797635; 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=oCJ0pqRH805NLzewMQOk8hAjtJDaexid+ZzfPc5AYWU=; b=WshoZv9eEQaMI6XnR6A1EQDiRdoX51VAV1zbJ8ZS7V88I33hDNSGtUIPzEd0vPv4rqwyhr zmQnBCdaWWu7iZz1zaoKN7YzVnwm0SjFfrsnBmRkZTrfLw7dE2ku9PkgOcavNPkYzUFtd7 ufqznr9nD0zEUn2BrWlYNtqaMJMLsU8= To: 59188@debbugs.gnu.org Subject: [PATCH v4 05/16] gnu: node-crx3: Ignore development dependencies. Date: Thu, 2 Mar 2023 23:53:38 +0100 Message-Id: <531831ef068842818e34c4873116973e8954b33a.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-crx3)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 96901e7bf8..00d93d3185 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -179,10 +179,16 @@ (define-public node-crx3 (substitute* "lib/configuration.js" (("mri") "minimist")))) - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("c8" + "docdash" + "eslint" + "eslint-plugin-jsdoc" + "jsdoc" + "tap-diff" + "tape" + "tape-catch"))))))) (inputs (list node-minimist node-pbf node-yazl)) (home-page "https://github.com/ahwayakchih/crx3") (synopsis "Create CRXv3 browser extensions with Javascript") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:00 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:00 +0000 Received: from localhost ([127.0.0.1]:58631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroG-0004mH-Bk for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:00 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroD-0004lk-8i for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:57 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797636; 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=7GVn98HcYaf0m6fIi3gJgnp1OYTzWdlPsWL80tdICxQ=; b=UlBM0SfVi4jFKI4Zy0uMGSOWcr/ZokGqrL+OVYG4Gna7Cd42uo2rFe+aMzHQxtBSpbaooP 5FhzHrHRjRrXoSEgRu1EIW5eKhKyPe9DwtbPCtrTsqUM15+l4uT23EcIfLWFZgbmfTp76U Gs/cuYqmbJOhFNHj7807JalXBqA3DiM= To: 59188@debbugs.gnu.org Subject: [PATCH v4 06/16] gnu: node-minimist: Ignore development dependencies. Date: Thu, 2 Mar 2023 23:53:39 +0100 Message-Id: <92926051ffcc8e9c0ab766de6a9ffe6f66b1342e.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-minimist)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 00d93d3185..847004501a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -313,10 +313,9 @@ (define-public node-minimist (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("covert" "tap" "tape"))))))) (home-page "https://github.com/substack/minimist") (synopsis "Parse CLI arguments in Javascript") (description "This package can scan for CLI flags and arguments in -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:01 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:01 +0000 Received: from localhost ([127.0.0.1]:58634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroG-0004mU-Sp for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:01 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroE-0004lr-4y for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:58 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797637; 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=u15JSewEq8DjpOXwbP5dlwuyebhlHSIrvYJYGH0AHhQ=; b=fxZpQp8PCxRymZQw3BZqkL4hla4BSgOwR9ZgEkjB6hyWNFOdWgNDqW8BjnWcmzBYoO9eIm xnriRJpk0uf+72qC1qg+3PBpKshkobLNc/UohkOwlO+mnxMQeYhBd+bGJ4NRxdP+8qwocx Tx2QEMa3oikqMTvLOMuXoea+NAMFuG0= To: 59188@debbugs.gnu.org Subject: [PATCH v4 07/16] gnu: node-pbf: Ignore development dependencies. Date: Thu, 2 Mar 2023 23:53:40 +0100 Message-Id: <28bca9c7ddadb4fb1917b40cd27a46bded7dc48c.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-pbf)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 847004501a..680be0ad3f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -364,10 +364,19 @@ (define-public node-pbf (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies + '("benchmark" + "browserify" + "eslint" + "eslint-config-mourner" + "mkdirp" + "protobufjs" + "protocol-buffers" + "tap" + "tile-stats-runner" + "uglify-js"))))))) (inputs (list node-ieee754 node-resolve-protobuf-schema)) (home-page "https://github.com/mapbox/pbf") (synopsis "Decode and encode protocol buffers in Javascript") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:02 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:02 +0000 Received: from localhost ([127.0.0.1]:58637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroI-0004mz-9S for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:02 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroE-0004ly-Ve for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:59 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797638; 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=XpV7fY7pHa0HoVvUVxkebk/7dbz3Jih8bx6mUe8UiSA=; b=IguN0p8X7KnmrzVEkBQggeZ6vB5TjmYY5BCga43ZCqfyQRnOiizEPnOJG/2oJXoktwLYuR BAfcSf8UIP2utW/FysP0GEqkiizpyvL0LtUnRqB9SyeA/0PXdEZkP2LNf7od3G2dYp1as9 Ss9Oafpr7qXr/ONWJZDkd98gWG6+Nw0= To: 59188@debbugs.gnu.org Subject: [PATCH v4 08/16] gnu: node-protocol-buffers-schema: Ignore development dependencies. Date: Thu, 2 Mar 2023 23:53:41 +0100 Message-Id: <1913a78fdb5001b7cca8451c6fa208da68476c32.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-protocol-buffers-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 680be0ad3f..1b581cf3a7 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -405,10 +405,9 @@ (define-public node-protocol-buffers-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (home-page "https://github.com/mafintosh/protocol-buffers-schema") (synopsis "Protocol buffers schema parser written in Javascript") (description "This package provides a protocol buffers schema parser -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:03 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:03 +0000 Received: from localhost ([127.0.0.1]:58641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroI-0004n8-KW for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:03 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroF-0004m5-Ql for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:00 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797639; 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=IR6tafujir+b4/4DU3EOkCPQWO/LYlL0QU9Fug3mgaE=; b=OQyNTVw73w87+bxFgzcEBUevi59n/7WTzjwFBzzcZx2785gaGxsz6qILWY1VD6HRpMbBs4 0tZYGQRQEk9pi1fZSX6CadtLow5zesm6M++sFuMEgneZjQHgmQeF+WKp1c9jz6fShH8box Bi/dTjMGiNJnSLc50Fp0eQ6HAKpoHVI= To: 59188@debbugs.gnu.org Subject: [PATCH v4 09/16] gnu: node-resolve-protobuf-schema: Ignore development dependencies. Date: Thu, 2 Mar 2023 23:53:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-resolve-protobuf-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 1b581cf3a7..cbf2665940 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -431,10 +431,9 @@ (define-public node-resolve-protobuf-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (inputs (list node-protocol-buffers-schema)) (home-page "https://github.com/mafintosh/resolve-protobuf-schema") (synopsis "Resolve protobuf imports") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:03 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:03 +0000 Received: from localhost ([127.0.0.1]:58643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroJ-0004nO-59 for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:03 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroG-0004mQ-O8 for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:01 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797640; 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=9CtCeCO8GT2oLp0rBXtEbuX3M20KzaOEMfPfTWcBNLo=; b=paVqF2X3GM81hL7kPJDUKSv1qLj3tCmysJQ9InUS2cX2xzHOlDKLLWDsiMDDFVjLL/5nlZ Pb6DC1Vvay6L5McoC9ZG0SNxZzJZB8Vn4jT4J3AppkJlrvURd2PuvpMJrFpGH2iZ2a/LHh VCxdMiEgb2yz9T8y0UQE9u/Sy/q9np4= To: 59188@debbugs.gnu.org Subject: [PATCH v4 10/16] gnu: node-ieee754: Ignore development dependencies. Date: Thu, 2 Mar 2023 23:53:43 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-ieee754)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index cbf2665940..628fe41d28 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -623,10 +623,9 @@ (define-public node-ieee754 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "standard" "tape"))))))) (home-page "https://github.com/feross/ieee754") (synopsis "Read/write IEEE754 floating point numbers in Javascript") (description "This package can read and write IEEE754 floating point -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:06 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:06 +0000 Received: from localhost ([127.0.0.1]:58652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroL-0004oI-KA for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroH-0004ml-L4 for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:01 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797641; 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=L0/7bq4yx6kQdxx0NR/6uujuftvhTNROpH7qjHtemYU=; b=Tht8CVUFe36HxmOOqPzHmjVAo531T6ZSZi5DYBvTsBFFX6aiZjlYPS4jPhklJAS3bVZGnp RiaRw6N7hQDIN9M2PQ6cX3/dOBiI7AuT+a8V4Sah2Bmx5gyDiZZ4GpkelNMymRTeuMxVe2 qqIXPovLSibjrW3WIF+8sE40aNbkBiM= To: 59188@debbugs.gnu.org Subject: [PATCH v4 11/16] gnu: node-yazl: Ignore development dependencies. Date: Thu, 2 Mar 2023 23:53:44 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-yazl)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 628fe41d28..b85507f52f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1588,10 +1588,9 @@ (define-public node-yazl (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "bl" "istanbul" "yauzl"))))))) (inputs (list node-buffer-crc32)) (home-page "https://github.com/thejoshwolfe/yazl") (synopsis "Yet another zip library for node") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:06 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:06 +0000 Received: from localhost ([127.0.0.1]:58655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004oW-0e for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:06 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroI-0004my-FH for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:02 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797641; 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=4KtmkP0kgQwnR+htxzRQTnAoLT5Jnb3PEKuJ1V7k+vM=; b=EXbB08XwWkgSI+pfhsCZ28spcHSrO7WmaPjgCoPaZk/YKRgm9AWBVMh06zKVLO7PtV43iG KExBaNprXpaRHwsTKfGfDvgvrSDe1c26wnnTQX9qzaqH+PVwy5StUqHkWAoSh1oCitO2Kx aSXYN/LccmmmjElveUEdJQzUKTeB338= To: 59188@debbugs.gnu.org Subject: [PATCH v4 12/16] gnu: node-uglify-js: Update to 3.14.2. Date: Thu, 2 Mar 2023 23:53:45 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/uglifyjs.scm (node-uglify-js): Update to 3.14.2. --- (no changes since v1) gnu/packages/uglifyjs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/uglifyjs.scm b/gnu/packages/uglifyjs.scm index b65d52b8df..1bd8bb6326 100644 --- a/gnu/packages/uglifyjs.scm +++ b/gnu/packages/uglifyjs.scm @@ -25,7 +25,7 @@ (define-module (gnu packages uglifyjs) (define-public node-uglify-js (package (name "node-uglify-js") - (version "3.13.9") + (version "3.14.2") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (define-public node-uglify-js (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q1f91xwwm829cl5v727d4qkxy4yh7wri3pgl89f0m3a4y1n7hi4")))) + (base32 "1jraqpwzga4vbgq3xcn08jcfc87pm6nik7vpxvxa4rfjvz70a6k7")))) (build-system node-build-system) (native-inputs (list node-acorn node-semver)) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:07 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:07 +0000 Received: from localhost ([127.0.0.1]:58658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004og-Go for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroJ-0004nT-Io for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:04 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797642; 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=KMzMOaFXSymouUj6oJZN4j1G0OC/qsFrQdxWUsQ17x4=; b=DwQanzUFb9eZEB0KwW8cO5Z4WpqNyRUuPMw0lJkVbURQBzK/D/+p720ijDjMsTQnJF4ZFf W2gIoPNuczrbkdgdLy2Xc51IiQ77d+ypmB4Q2rdSHDJ2W4YVG4sY44/eHLnNbIF3UmcbKS DoVCix6eK6HUao4RN827a6kqWG3r4oE= To: 59188@debbugs.gnu.org Subject: [PATCH v4 13/16] gnu: libuv-for-node: Update to 1.44.2. Date: Thu, 2 Mar 2023 23:53:46 +0100 Message-Id: <3e4353c6b808ea254d7b95f1de8b52f9f66a536d.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/libevent.scm (libuv-for-node): Update to 1.44.2. --- (no changes since v1) gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index f9722e4469..fa1e76b347 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -147,14 +147,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.44.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "1d1wy1061cf2mfygr2j6jbm0da2mhsf0l9yq4rjkqrsmijbdrz6c")))) (properties '((hidden? . #t))))) (define-public libuv-julia -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:10 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:10 +0000 Received: from localhost ([127.0.0.1]:58667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroP-0004pl-GK for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:10 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroK-0004nz-Qn for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797643; 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=bC3yVGEHy90JP1KBlFVuGCRS/xegQrI7VptvgFffYR8=; b=Z50Wk5Xm1OzO36TuDGckz/kJ1xfCLdcPs3YeHfLJzf2B7+e1CEknp29TBTOcOno14VjZLU dFx7eXxu63f3uUGGXLCgHdeP0A3WFLXL6RyB+4K5iBOB+OAuknJjHj6bFXekVw/oliXEoJ o4YGrzAY0y3MM1RK1UnmHch0MqysUTc= To: 59188@debbugs.gnu.org Subject: [PATCH v4 14/16] gnu: llhttp-bootstrap: Update to 6.0.10. Date: Thu, 2 Mar 2023 23:53:47 +0100 Message-Id: <65e9b51985703470a4742e4bc4bf56bca0c200c2.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- (no changes since v1) gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index 69781a0b8b..aab630a216 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1489,7 +1489,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index be39f3b25a..de847490a3 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -668,7 +668,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -677,8 +677,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:11 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:11 +0000 Received: from localhost ([127.0.0.1]:58670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroQ-0004pw-9U for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:11 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004oO-0U for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797645; 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=eVocueUu9drsMKFDdIM7D/JsFUiC3VUM2VuEd9a1stU=; b=MifOWO4hOJtON/uXfbOhW3WEEBY65WVXKW4Ccgj/wMZCgOFAs6A7Otf7MZLlKMtCIAARew 9L5LBGaU48fpHf3MG7eqvRf/3Hn1x5q5/tkSPeRCgSVbeCj5PZfF+qLIcTE0s6Yt5NWkAN zjbAxksyHoBno0mqLnI1g9QiesjHzGg= To: 59188@debbugs.gnu.org Subject: [PATCH v4 15/16] gnu: node-lts: Update to 18.14.2. Date: Thu, 2 Mar 2023 23:53:48 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (node-lts): Update to 18.14.2. [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..ce05276180 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.14.2") (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")) + "0ll2j4j46ygvs39aykxr7dvi7c4pm9f34rgyxc2dkvz3g6wfn2l5")) (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.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 17:54:11 2023 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:11 +0000 Received: from localhost ([127.0.0.1]:58672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroR-0004qE-3A for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:11 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004on-TB for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797646; 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=6SNrDTuxB7uuNdleym2Lvq93pCn52+WDI+ZtO9XXxpA=; b=GXmu8/LklX3kiMKAaJg7DxxXRf+6kpMiaTQAvtKj3yPA4948MQAc/BlI3Tzjp6AwY9Fsax I4slX3m2k0Bc/tEkKA/N8lShl2C1SgIPuu+ZSnFTN0AVEf4BtzVNv7BnpZyv17OeOQ0gIJ Hx7vJTBgFaHGdAyyKjUi0hZPMXI4v68= To: 59188@debbugs.gnu.org Subject: [PATCH v4 16/16] gnu: libnode: Use node-lts as base. Date: Thu, 2 Mar 2023 23:53:49 +0100 Message-Id: <103fe522f447d27d977c9574330198901ceed2a0.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (libnode): Use node-lts as base. * gnu/packages/cran.scm (r-v8)[arguments]<#:phases>: Adjusted accordingly. --- (no changes since v1) 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 16314b33d7..d21a207f16 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1304,7 +1304,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 ce05276180..7a2eb5f280 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -906,10 +906,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) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:39 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:39 +0000 Received: from localhost ([127.0.0.1]:38732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQY-00023Q-QS for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:47010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQX-00022x-1u for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:37 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841736; 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=GLDtsTz7X+TFPFvD2Hsfc8owQgRTbST7JrVxxBAXXSg=; b=AkTclcAX/wxGfBT9bkTOEWHcDS8mW2wfXEl7I9Mc8muhyh7eD93jWZfZ585ojSOipt3nSP OqQsYB5mJJ5Ou6SGHSQwdd6KMODmC+rldEgk755pEeV9HYszgH1gF40PNGoIABMxirO2Km eL4kszQxuKlpjD/bKg6jCqgI3f7eVWY= To: 59188@debbugs.gnu.org Subject: [PATCH v5 01/17] build-system: node: Use `--install-links' with `npm install'. Date: Wed, 15 Mar 2023 01:55:16 +0100 Message-Id: <2dd7a048a9bedcd8f4f7550b7ad07556c3c65b74.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht Later versions of npm need to explicitly install a copy of local dependencies, instead of only a symlink. * guix/build/node-build-system.scm (configure): Add `--install-links' to npm install invocation. (install): Ditto. --- (no changes since v1) guix/build/node-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index bee3792e93..93f7efbb2b 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -223,7 +223,7 @@ (define* (delete-lockfiles #:key inputs #:allow-other-keys) (define* (configure #:key outputs inputs #:allow-other-keys) (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) - (invoke npm "--offline" "--ignore-scripts" "install") + (invoke npm "--offline" "--ignore-scripts" "--install-links" "install") #t)) (define* (build #:key inputs #:allow-other-keys) @@ -262,6 +262,7 @@ (define* (install #:key outputs inputs #:allow-other-keys) "--offline" "--loglevel" "info" "--production" + "--install-links" "install" "../package.tgz") #t)) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:39 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:39 +0000 Received: from localhost ([127.0.0.1]:38734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023T-2m for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:47016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQX-00022z-AY for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:37 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841736; 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=Mrd8GCaHTGJHbcymp+DS+thYn6GYM6pd9myNmXWvTG8=; b=lEr4TLNtqw549Ev0Ur14k+Gms4HXoTVGTyPKu96jKckW6sQhlQjrruI8KdkbmyrERQyb6/ 4YON+Cec7SOtTST3upUp/cRsAoEMTSH+ybJ9iN/zKzwU+KPpIHz0mD8Z3d5ofykaVAdR31 aRoNhVDLehvR7T2L8HTPNwXEpQdqbBw= To: 59188@debbugs.gnu.org Subject: [PATCH v5 02/17] gnu: node-acorn: Disable tests. Date: Wed, 15 Mar 2023 01:55:17 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn): Explicitly disable tests. --- (no changes since v1) gnu/packages/node-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 991113c05b..e89117beca 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -46,7 +46,8 @@ (define-public node-acorn (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) (build-system node-build-system) (arguments - '(#:phases + '(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:39 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:39 +0000 Received: from localhost ([127.0.0.1]:38737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023a-B6 for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:47004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQX-00022v-1w for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:38 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841734; 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; bh=ibazU37ia3XsB9TKYzPo2X58EAUSS43eIqBKlIthDxs=; b=tALKV0FKTpAH5FTFubyIRIp81XkQMPdt6LWe+e5zPgRmfYvQ4PTjyXjDiMF02c3fPIOyTG KTagn6rnXSbjwsWroImmEk87ICumti1tXXU7mzpvr6v4Izl9i4LlSBfdR9+os5K6gtdgv5 WFLV6oHzXyddnz6rlP4XX0bbI/YHXVI= To: 59188@debbugs.gnu.org Subject: [PATCH v5 00/17] Updating node-lts to 18.X Date: Wed, 15 Mar 2023 01:55:15 +0100 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht Changes in v5: - node build system needs an additional --install-links to work with newer npm. - node-lts to 18.15.0 Hilton Chain (4): gnu: libuv-for-node: Update to 1.44.2. gnu: llhttp-bootstrap: Update to 6.0.10. gnu: node-lts: Update to 18.15.0. gnu: libnode: Use node-lts as base. Jelle Licht (13): build-system: node: Use `--install-links' with `npm install'. gnu: node-acorn: Disable tests. gnu: node-acorn: Remove lifecycle script. gnu: node-acorn: Fix broken transpilation. gnu: node-buffer-crc32: Ignore development dependencies. gnu: node-crx3: Ignore development dependencies. gnu: node-minimist: Ignore development dependencies. gnu: node-pbf: Ignore development dependencies. gnu: node-protocol-buffers-schema: Ignore development dependencies. gnu: node-resolve-protobuf-schema: Ignore development dependencies. gnu: node-ieee754: Ignore development dependencies. gnu: node-yazl: Ignore development dependencies. gnu: node-uglify-js: Update to 3.14.2. gnu/local.mk | 1 - gnu/packages/cran.scm | 2 +- gnu/packages/libevent.scm | 4 +- gnu/packages/node-xyz.scm | 110 +++++++++++++----- gnu/packages/node.scm | 49 +++++--- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ---------------- gnu/packages/uglifyjs.scm | 4 +- guix/build/node-build-system.scm | 3 +- 8 files changed, 123 insertions(+), 150 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:40 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:40 +0000 Received: from localhost ([127.0.0.1]:38739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023j-OQ for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:40 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQY-00023A-59 for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:38 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841737; 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=R57KdZ9IXvfnzcde2tfINxHFrdh64sPu7+J20XdP8mM=; b=L42yJhuN0QGQM3TkmLbUFeTiPCK+SiU8Piy2K/L67db6Wq/egeaVk4UDCqCF8MXB/JDkC8 v+0pLeyt9zVP+UVXAQA1/wP+my5mBV62iKC5RYHAbmSWeaXREtD8VJlqCLn8njAKHbxl5Y YNjZGv/mM3iWygYZbojRUuYrbFbiosE= To: 59188@debbugs.gnu.org Subject: [PATCH v5 03/17] gnu: node-acorn: Remove lifecycle script. Date: Wed, 15 Mar 2023 01:55:18 +0100 Message-Id: <7b787f51f28d3b1d131ed2b21c8a3330f3e1e213.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e89117beca..e3d8c7ca19 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -47,11 +47,35 @@ (define-public node-acorn (build-system node-build-system) (arguments '(#:tests? #f + #:modules + ((guix build node-build-system) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "acorn")))))) + (chdir "acorn"))) + (add-before 'configure 'avoid-prepare-scripts + (lambda _ + ;; We need to remove the prepare script from "package.json", as + ;; it would try to use the build environment and would block the + ;; automatic building by other packages making use of node-acorn. + ;; TODO: Add utility function + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . pkg-meta-alist) + (cons '@ (map (match-lambda + (("scripts" @ . scripts-alist) + `("scripts" @ ,@(filter (match-lambda + (("prepare" . _) + #f) + (_ + #t)) + scripts-alist))) + (other other)) + pkg-meta-alist)))))))))) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:48 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:49 +0000 Received: from localhost ([127.0.0.1]:38752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQi-00025E-Ey for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:48 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023R-6D for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:39 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841738; 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=fNEZ4yUkBc5yP13Ko72GbnmGkJL6+YrT/j+sVsnm+7A=; b=GKKZhrgXuqHiQhHoIv9jWTJ7Zm4BrmUy3+XFllJgoAaG8iUxMRdUObtrsNQPNHEnGtcTtD yaQLEDLPu2yv22ynuOCuom3CFJzTNfEIPgABR2Ano8T4gi9DdpJPvIIhEVfZ1Ugwg1v6ra iMauUk33ZFBl8kPNO3WpYRRjDkW390I= To: 59188@debbugs.gnu.org Subject: [PATCH v5 04/17] gnu: node-acorn: Fix broken transpilation. Date: Wed, 15 Mar 2023 01:55:19 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[native-inputs]: Add `esbuild'. [arguments]: Replace build phase by custom `esbuild' invocations. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e3d8c7ca19..d75ccc199a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Charles ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2023 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,30 @@ (define-public node-acorn #t)) scripts-alist))) (other other)) - pkg-meta-alist)))))))))) + pkg-meta-alist))))))) + (replace 'build + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((esbuild (search-input-file (or native-inputs inputs) + "/bin/esbuild"))) + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.js" + "--format=cjs" + "--bundle" + "--platform=node") + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.mjs" + "--format=esm" + "--bundle" + "--platform=node") + (invoke esbuild + "src/bin/acorn.js" + "--outfile=dist/bin.js" + "--format=cjs" + "--platform=node"))))))) + (native-inputs + (list esbuild)) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:49 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:49 +0000 Received: from localhost ([127.0.0.1]:38754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQi-00025H-Rs for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:49 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023i-VE for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:40 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841739; 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=83ejFMFdx1SdV3V5vcJMt/zZV502QdP29+5IrrzPh/s=; b=OTzuPZ76Ex529ffwMyPsyIHZUj3lmqlHHtps65IrgU8y3HDDeyR50/yA2CyxvRYd/Ve2TV Y69UANyOp9NojhtV7G2oF1ic157GfRPc9hz31g96nUOSjelIZxPknjUBnxIw1VORwx9Uz4 7Yvvd+JOjeZC5H+sr42lX0tROhX/TAY= To: 59188@debbugs.gnu.org Subject: [PATCH v5 05/17] gnu: node-buffer-crc32: Ignore development dependencies. Date: Wed, 15 Mar 2023 01:55:20 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d75ccc199a..96901e7bf8 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -123,10 +123,9 @@ (define-public node-buffer-crc32 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("tap"))))))) (home-page "https://github.com/brianloveswords/buffer-crc32") (synopsis "CRC32 implementation in Javascript") (description -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:49 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:49 +0000 Received: from localhost ([127.0.0.1]:38756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025V-7D for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:49 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQa-000246-RR for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:41 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841740; 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=r24JfAMQpKY5K+yAc3YVWGdruWZFJTGOkNar7DWOjL4=; b=Te8+e/0/nTfvX2FNJhE7QNWe0/Tt1PnV58zsPaulXJr6TmswKm4F7tSiVa4q3CJm5cD4s1 9ZnJVnxUtc1L/qo9IOqgjxRYPVFnqqK2eGqNBhspPYmJ4aKMoSyhXUUXZelv7mqS5AtqjU FRExOJNpOgBJV6Y+avPiBK4DgSmxVv8= To: 59188@debbugs.gnu.org Subject: [PATCH v5 06/17] gnu: node-crx3: Ignore development dependencies. Date: Wed, 15 Mar 2023 01:55:21 +0100 Message-Id: <5d4337fbddb4bed582ea05b7242037dc862b42d7.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-crx3)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 96901e7bf8..00d93d3185 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -179,10 +179,16 @@ (define-public node-crx3 (substitute* "lib/configuration.js" (("mri") "minimist")))) - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("c8" + "docdash" + "eslint" + "eslint-plugin-jsdoc" + "jsdoc" + "tap-diff" + "tape" + "tape-catch"))))))) (inputs (list node-minimist node-pbf node-yazl)) (home-page "https://github.com/ahwayakchih/crx3") (synopsis "Create CRXv3 browser extensions with Javascript") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:49 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:50 +0000 Received: from localhost ([127.0.0.1]:38759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025c-IY for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:49 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQb-00024F-Ii for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:41 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841740; 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=39LwWlMPvQE/z3vhhpaO+w5NRPzIguVWG0Iz5tsY5V4=; b=MYRyzrVVkzT7Bmz7n4LB7fvcvLyxWnlqbvgjLH7L2z4l7LaZ0YRS3+P3IroaiQGrVTSFVU 3qKqHpu5nDabvD2qvSx+mijlpdrEUIcv5Dt/ht+8ECAM9txXP+BbRId8gIKLu5OgQpl1wO m+tIr4MOFOJCZZ7Faex+Uiyvl3nAZZM= To: 59188@debbugs.gnu.org Subject: [PATCH v5 07/17] gnu: node-minimist: Ignore development dependencies. Date: Wed, 15 Mar 2023 01:55:22 +0100 Message-Id: <7294ba9742e4ab9bb56fdb6e5a76ca608d9f1482.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-minimist)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 00d93d3185..847004501a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -313,10 +313,9 @@ (define-public node-minimist (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("covert" "tap" "tape"))))))) (home-page "https://github.com/substack/minimist") (synopsis "Parse CLI arguments in Javascript") (description "This package can scan for CLI flags and arguments in -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:50 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:50 +0000 Received: from localhost ([127.0.0.1]:38761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025l-UL for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:50 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQc-00024M-Bm for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:42 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841741; 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=pZw29aAgb1f9EvKKfipOyX8ROajj5xapaQ3P3BKJn5M=; b=Bt8uZLoZYt3akTmWjl4LbodiepTCw1jhUq2rOzb5/oyjBvTPQsb49m3uVzDPrliYK4svSn brSD3LmIPxoxHG/0leVy2eEeN34CE4sIVOaeaLIHjfSmyf83g4m3fmIiknwjbB2oLgAPVt wEdvfbKiN5vlGz4ErseYyDJp+2Pz7fY= To: 59188@debbugs.gnu.org Subject: [PATCH v5 08/17] gnu: node-pbf: Ignore development dependencies. Date: Wed, 15 Mar 2023 01:55:23 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-pbf)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 847004501a..680be0ad3f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -364,10 +364,19 @@ (define-public node-pbf (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies + '("benchmark" + "browserify" + "eslint" + "eslint-config-mourner" + "mkdirp" + "protobufjs" + "protocol-buffers" + "tap" + "tile-stats-runner" + "uglify-js"))))))) (inputs (list node-ieee754 node-resolve-protobuf-schema)) (home-page "https://github.com/mapbox/pbf") (synopsis "Decode and encode protocol buffers in Javascript") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:50 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:51 +0000 Received: from localhost ([127.0.0.1]:38764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQk-00025w-Dx for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:50 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQd-00024U-61 for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:43 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841742; 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=o79X55Pbg3qFRb5K3YmUmBBuAodMFpkZgvi4U0Esrxw=; b=jsOs1+xBjG2hbKOGfW4SjcWKXTehKb1oZBSJt2UrTOQWkPbD6lkxiKGTzy6idbQ9bEmma7 ZtLF/8eQ0jrRrw3xiNWczGODpAPV+cYOI9A2QeBbdwgZAMo6TwyHHdp1eNSSziqXLLVfdj v5+2KmklH6D/pKmMeyp0AmblXOQnc0Y= To: 59188@debbugs.gnu.org Subject: [PATCH v5 09/17] gnu: node-protocol-buffers-schema: Ignore development dependencies. Date: Wed, 15 Mar 2023 01:55:24 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-protocol-buffers-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 680be0ad3f..1b581cf3a7 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -405,10 +405,9 @@ (define-public node-protocol-buffers-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (home-page "https://github.com/mafintosh/protocol-buffers-schema") (synopsis "Protocol buffers schema parser written in Javascript") (description "This package provides a protocol buffers schema parser -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:51 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:51 +0000 Received: from localhost ([127.0.0.1]:38766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQk-000266-UX for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:51 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQd-00024W-Sy for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:44 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841743; 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=juOuv+uhMclvYZHJrxgk9XGdqHb6Ax8DW2lP+IGo1y8=; b=O0UzmVpJ8IP3ZND8YPDrBIxsLx2DD1WrpPdRGuh/Ge8qb+iQeqMH7KYaT1szUjxfICWELv UFFq5gNhUDzcbHqvhqkEgA9h1YhhIdb6M3ougnSSECUxF+BJQetjZa3JrEKuC+10Fcyyom PIrB2wMD9AGsyX50g1MSuUI0bCo2YrM= To: 59188@debbugs.gnu.org Subject: [PATCH v5 10/17] gnu: node-resolve-protobuf-schema: Ignore development dependencies. Date: Wed, 15 Mar 2023 01:55:25 +0100 Message-Id: <08d5c6042852749a2493f8a6dd513788f70c87d5.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-resolve-protobuf-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 1b581cf3a7..cbf2665940 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -431,10 +431,9 @@ (define-public node-resolve-protobuf-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (inputs (list node-protocol-buffers-schema)) (home-page "https://github.com/mafintosh/resolve-protobuf-schema") (synopsis "Resolve protobuf imports") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:51 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:51 +0000 Received: from localhost ([127.0.0.1]:38768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQl-00026E-9R for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:51 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQe-00024j-Kw for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:44 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841744; 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=JdbCmr915QaFnDuMfBB9Sdwga9VKdQilU02lqnad0CM=; b=QirEY3AezvVPHVyQnN03KWmyZgcn6LOFQ4YWeIH02sPtjl9xp/SYNZ+aCWKSgLqQxExjyH 6bAn62m+/tOcB2R4KWfbyYL+r4cCpGMz/mRMrM+App8Jblm9ycwuD9YEmXj9CKbqk8G2o6 XvUGM2KsPjjLNXuQeObtgY8+LiRzXCA= To: 59188@debbugs.gnu.org Subject: [PATCH v5 11/17] gnu: node-ieee754: Ignore development dependencies. Date: Wed, 15 Mar 2023 01:55:26 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-ieee754)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index cbf2665940..628fe41d28 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -623,10 +623,9 @@ (define-public node-ieee754 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "standard" "tape"))))))) (home-page "https://github.com/feross/ieee754") (synopsis "Read/write IEEE754 floating point numbers in Javascript") (description "This package can read and write IEEE754 floating point -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:52 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:52 +0000 Received: from localhost ([127.0.0.1]:38770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQl-00026L-KO for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:51 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQf-00024p-Ba for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:45 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841744; 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=oF+B17wvHHlqm3sMw+OmdqL50Lcsy3jev0X5G7vvuiM=; b=qLxyeEfJLzv9tonJEcB1Nk/4eY74KNMnk7XwqHMMiuHjJNI3dWS/Rf+8t8FGwufUkDauv4 v8vPL1WCBI9pr/heOZ51A1asZVxw1NYVzWbJQI+zz5sZbT6QN4Lb+8xpPlXNG+DS4bKDPC +lNfQI0s0ocT2e9RtSbCP9AoLFeEDeo= To: 59188@debbugs.gnu.org Subject: [PATCH v5 12/17] gnu: node-yazl: Ignore development dependencies. Date: Wed, 15 Mar 2023 01:55:27 +0100 Message-Id: <3f28812361e8a0597491ec6a822dde6f92568095.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-yazl)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 628fe41d28..b85507f52f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1588,10 +1588,9 @@ (define-public node-yazl (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "bl" "istanbul" "yauzl"))))))) (inputs (list node-buffer-crc32)) (home-page "https://github.com/thejoshwolfe/yazl") (synopsis "Yet another zip library for node") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:52 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:52 +0000 Received: from localhost ([127.0.0.1]:38772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQl-00026T-Vl for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:52 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQg-00024x-4g for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:46 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841745; 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=aHkFDMqKDlQIFugozU+88ZoGu2mwrnG6mvVQieyoWk8=; b=YRDfLY7pdEN8tmzLvWnhJafYRDXiHpXZSF1P8VNZ/KGMnCXWUdY/961dqa+gp8KSvFAtB8 XQ9rgB/E3dGCIpF6WWcATLR7T4iOA7YqnZOWo21+QPJRLOF1Rx8Av+afBJyToRC8uta5pR YTdUIWbU0/QANiGvRwfKC30nmB0jvlk= To: 59188@debbugs.gnu.org Subject: [PATCH v5 13/17] gnu: node-uglify-js: Update to 3.14.2. Date: Wed, 15 Mar 2023 01:55:28 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/uglifyjs.scm (node-uglify-js): Update to 3.14.2. --- (no changes since v1) gnu/packages/uglifyjs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/uglifyjs.scm b/gnu/packages/uglifyjs.scm index b65d52b8df..1bd8bb6326 100644 --- a/gnu/packages/uglifyjs.scm +++ b/gnu/packages/uglifyjs.scm @@ -25,7 +25,7 @@ (define-module (gnu packages uglifyjs) (define-public node-uglify-js (package (name "node-uglify-js") - (version "3.13.9") + (version "3.14.2") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (define-public node-uglify-js (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q1f91xwwm829cl5v727d4qkxy4yh7wri3pgl89f0m3a4y1n7hi4")))) + (base32 "1jraqpwzga4vbgq3xcn08jcfc87pm6nik7vpxvxa4rfjvz70a6k7")))) (build-system node-build-system) (native-inputs (list node-acorn node-semver)) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:52 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:53 +0000 Received: from localhost ([127.0.0.1]:38774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQm-00026i-Dc for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:52 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQh-000255-27 for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:47 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841746; 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=jwcWtn1seQzn9rT5kQxHrF+sXlRaMpo4VerdnRaukRg=; b=YY968fU5gKaOWKgfNhqo/yQOFUhwyn7ChiABkyRvMq9akTpzPmVh7xbUlvg/dwp4x+RwXo rrEXoaI2ummbtplhzEU7YgL0mORmBeBSWSrVPN+h8h8HYAEGxqS/1rKnwwkdulQseIP70I QwMNgoIyxNKcqHAxJO431HAje7AWwfY= To: 59188@debbugs.gnu.org Subject: [PATCH v5 14/17] gnu: libuv-for-node: Update to 1.44.2. Date: Wed, 15 Mar 2023 01:55:29 +0100 Message-Id: <1e12df5385a31b658f770b13ab11441d3255d24b.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/libevent.scm (libuv-for-node): Update to 1.44.2. --- (no changes since v1) gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index f9722e4469..fa1e76b347 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -147,14 +147,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.44.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "1d1wy1061cf2mfygr2j6jbm0da2mhsf0l9yq4rjkqrsmijbdrz6c")))) (properties '((hidden? . #t))))) (define-public libuv-julia -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:55:53 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:53 +0000 Received: from localhost ([127.0.0.1]:38776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQm-00026t-Ua for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:53 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:57126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQi-00025D-4k for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:48 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841747; 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=jDDLKBGU4JfcFwcvD9QOkqVoTsLUBXgFsZ1RFdjhgLk=; b=cvgMrBfDomh/D16IlK3EFLpeF7uhK3lcqLKdVdj6qlrdsCdtubUBGvFpLRVjspKIbE7mTr QYINe5MDrZEEEcWu6Y58pcKnYWrp3LN4Mnfh8Gx+ALwkmNlr2EmIKJdOysRhHd3SbKaGpE e4/bEboaIKAGv9y9ydGobMjUrXkrTMc= To: 59188@debbugs.gnu.org Subject: [PATCH v5 15/17] gnu: llhttp-bootstrap: Update to 6.0.10. Date: Wed, 15 Mar 2023 01:55:30 +0100 Message-Id: <482953213a4ef8e7ec19d5c9e478ecd9c3dc31a1.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- (no changes since v1) gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index 98ac6175ae..ee9949aff0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1492,7 +1492,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index be39f3b25a..de847490a3 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -668,7 +668,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -677,8 +677,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:56:12 2023 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:56:13 +0000 Received: from localhost ([127.0.0.1]:38794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFR6-00029i-HX for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:56:12 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:57136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025e-Rx for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:50 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841749; 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=F8wO0KM+Mv8CBMok72wSKukAA3N193ff0+6mLxAkv28=; b=bWL90edXN0rV64jHhEr5Y8REddUE8TbHTrHo61yAmmDF20CCNMd9EvOJ8PGKeq2JdQgmHE DL0tUEYiAplx11qc1ufDeNZCeQfJKHOLyVzj8nGCxx2BDo7DbcSSuuGleUImoSJzkWpAcE mMC71lmn+Qir0XMv/WwEW+g5TYuEXjM= To: 59188@debbugs.gnu.org Subject: [PATCH v5 17/17] gnu: libnode: Use node-lts as base. Date: Wed, 15 Mar 2023 01:55:32 +0100 Message-Id: <36884b1255aa844a6e9ec7dfa8dc35c478c031d3.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 v5: - node build system needs an additional --install-links to work with newer npm. - node-lts to 18.15.0 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 803c4e0b6e..50c055690f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1304,7 +1304,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 f9f1c13e99..53eba8460a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -906,10 +906,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) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 20:56:13 2023 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= To: 59188@debbugs.gnu.org Subject: [PATCH v5 16/17] gnu: node-lts: Update to 18.15.0. 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:31:58 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:58 +0000 Received: from localhost ([127.0.0.1]:55993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRd-0002th-Ru for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:58 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRb-0002tE-Af for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179512; 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; bh=ULBCKWs7YHKj8TG3kN8Dd8Wcg5djAsPazI6Noezk8/k=; b=BiaJ3IHA2Lhoii36w4eFzFHarNcmKnCMRRhTl5ydGlFf/gBIwk+0ioZgdLYW8Bqsv8P+56 lAHM1JqeBvwddbCDhjfEc+20Uh0fVl2QpVtgE4JLacvj9Bayeq02vpjHTU+uB7a2reAdYT FdmUTBdCH8vs5N0/rDZkbWguDNpRJLQ= To: 59188@debbugs.gnu.org Subject: [PATCH v6 00/19] Updating node-lts to 18.X Date: Thu, 30 Mar 2023 14:31:31 +0200 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht Changes in v6: - Fix build of node-openzwave-shared - Fix build of node-serialport - Rebase on master Hilton Chain (4): gnu: libuv-for-node: Update to 1.44.2. gnu: llhttp-bootstrap: Update to 6.0.10. gnu: node-lts: Update to 18.15.0. gnu: libnode: Use node-lts as base. Jelle Licht (15): build-system: node: Use `--install-links' with `npm install'. gnu: node-acorn: Disable tests. gnu: node-acorn: Remove lifecycle script. gnu: node-acorn: Fix broken transpilation. gnu: node-buffer-crc32: Ignore development dependencies. gnu: node-crx3: Ignore development dependencies. gnu: node-minimist: Ignore development dependencies. gnu: node-pbf: Ignore development dependencies. gnu: node-protocol-buffers-schema: Ignore development dependencies. gnu: node-resolve-protobuf-schema: Ignore development dependencies. gnu: node-ieee754: Ignore development dependencies. gnu: node-yazl: Ignore development dependencies. gnu: node-uglify-js: Update to 3.14.2. gnu: node-serialport: Avoid gyp rebuilds. gnu: node-openzwave-shared: Fix compilation for new versions of node gnu/local.mk | 1 - gnu/packages/cran.scm | 2 +- gnu/packages/libevent.scm | 4 +- gnu/packages/node-xyz.scm | 112 ++++++++++++++---- gnu/packages/node.scm | 49 +++++--- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ---------------- gnu/packages/uglifyjs.scm | 4 +- gnu/packages/zwave.scm | 5 + guix/build/node-build-system.scm | 3 +- 9 files changed, 130 insertions(+), 150 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:31:58 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:58 +0000 Received: from localhost ([127.0.0.1]:55995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRe-0002tk-75 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:58 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRb-0002tG-Ag for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179514; 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=GLDtsTz7X+TFPFvD2Hsfc8owQgRTbST7JrVxxBAXXSg=; b=Sw7Z5xQpXrd1rYJNmSHPOllmLHbOEaL7UQ3zv+wowd2/7XXcNT2u9W7G/9ieHi2vqVj43o 0PFXQruDK2YGS3THXO0Lx832c4Trxuq/SuX1WQA13B1GXHnd2kV01nDweqAdrQnWpDt1bU w1aCL5/wPv6oM2r5pi4Gd4J/IePjjeU= To: 59188@debbugs.gnu.org Subject: [PATCH v6 01/19] build-system: node: Use `--install-links' with `npm install'. Date: Thu, 30 Mar 2023 14:31:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht Later versions of npm need to explicitly install a copy of local dependencies, instead of only a symlink. * guix/build/node-build-system.scm (configure): Add `--install-links' to npm install invocation. (install): Ditto. --- (no changes since v1) guix/build/node-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index bee3792e93..93f7efbb2b 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -223,7 +223,7 @@ (define* (delete-lockfiles #:key inputs #:allow-other-keys) (define* (configure #:key outputs inputs #:allow-other-keys) (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) - (invoke npm "--offline" "--ignore-scripts" "install") + (invoke npm "--offline" "--ignore-scripts" "--install-links" "install") #t)) (define* (build #:key inputs #:allow-other-keys) @@ -262,6 +262,7 @@ (define* (install #:key outputs inputs #:allow-other-keys) "--offline" "--loglevel" "info" "--production" + "--install-links" "install" "../package.tgz") #t)) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:31:59 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:59 +0000 Received: from localhost ([127.0.0.1]:55998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRe-0002ts-NZ for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:59 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRb-0002tI-V6 for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179515; 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=Mrd8GCaHTGJHbcymp+DS+thYn6GYM6pd9myNmXWvTG8=; b=OqFmDvnwWQG0ruf7KF1m4rY9MR8Y+fxlgCmmE5537d3J0gvI/Q6ecbg+nN996dGMjsSNc4 44t6RlXFWXzHUymMRXT/I2IOvIuf/RdLQLLkXp4VhP/174iPco0Qegg1uEq5WCgDIzH1kf 0ejB4Qqt0Ewel5NZISc+LTYN1FYaMIQ= To: 59188@debbugs.gnu.org Subject: [PATCH v6 02/19] gnu: node-acorn: Disable tests. Date: Thu, 30 Mar 2023 14:31:33 +0200 Message-Id: <5bddbd47fb2316635af0c1168ead55c790ee039c.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn): Explicitly disable tests. --- (no changes since v1) gnu/packages/node-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 991113c05b..e89117beca 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -46,7 +46,8 @@ (define-public node-acorn (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) (build-system node-build-system) (arguments - '(#:phases + '(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:31:59 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:59 +0000 Received: from localhost ([127.0.0.1]:56000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRf-0002u7-60 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:59 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRc-0002tU-Ka for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179516; 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=R57KdZ9IXvfnzcde2tfINxHFrdh64sPu7+J20XdP8mM=; b=cZKPAMCck5/oi9QEia2Z8Ug8OTaaNtbrkxvMmEbw9wY95Clm3vdb+w2FJSH+pSayzVKZZc gNbkGSUO43SFOi4dHERCaUQZP8JKnFL8MRXbni9gww2pzROS6hcMng944H9ynLWccPQskM rQ0Yqs8Smn8e8LxaZfSI2QQEGicdyak= To: 59188@debbugs.gnu.org Subject: [PATCH v6 03/19] gnu: node-acorn: Remove lifecycle script. Date: Thu, 30 Mar 2023 14:31:34 +0200 Message-Id: <94d6260e7ee309d2075856f0c0340a91a087e58f.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e89117beca..e3d8c7ca19 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -47,11 +47,35 @@ (define-public node-acorn (build-system node-build-system) (arguments '(#:tests? #f + #:modules + ((guix build node-build-system) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "acorn")))))) + (chdir "acorn"))) + (add-before 'configure 'avoid-prepare-scripts + (lambda _ + ;; We need to remove the prepare script from "package.json", as + ;; it would try to use the build environment and would block the + ;; automatic building by other packages making use of node-acorn. + ;; TODO: Add utility function + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . pkg-meta-alist) + (cons '@ (map (match-lambda + (("scripts" @ . scripts-alist) + `("scripts" @ ,@(filter (match-lambda + (("prepare" . _) + #f) + (_ + #t)) + scripts-alist))) + (other other)) + pkg-meta-alist)))))))))) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:15 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:15 +0000 Received: from localhost ([127.0.0.1]:56017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRu-0002wU-Qp for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:15 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRe-0002ti-Bz for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:58 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179517; 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=fNEZ4yUkBc5yP13Ko72GbnmGkJL6+YrT/j+sVsnm+7A=; b=Y2ozEsY0xI+lu8kmuX82J8FGjFLHQw8aUxczzmwpSi7oKkXqBuTcvYNkiScKbpDqFh2kFm AMDHxgyEXFvkMzvhwfbJ2Pi2lHudZ9BBCmIC3MZ1mR4xUFl9UkUdJBfPCHbCTgyrEn3btA mhu+URpSgXnxlmXFTf13nmMqp013tdk= To: 59188@debbugs.gnu.org Subject: [PATCH v6 04/19] gnu: node-acorn: Fix broken transpilation. Date: Thu, 30 Mar 2023 14:31:35 +0200 Message-Id: <410d1669bcbdb03ebcf3deea90eb7746abac808a.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[native-inputs]: Add `esbuild'. [arguments]: Replace build phase by custom `esbuild' invocations. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e3d8c7ca19..d75ccc199a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Charles ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2023 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,30 @@ (define-public node-acorn #t)) scripts-alist))) (other other)) - pkg-meta-alist)))))))))) + pkg-meta-alist))))))) + (replace 'build + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((esbuild (search-input-file (or native-inputs inputs) + "/bin/esbuild"))) + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.js" + "--format=cjs" + "--bundle" + "--platform=node") + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.mjs" + "--format=esm" + "--bundle" + "--platform=node") + (invoke esbuild + "src/bin/acorn.js" + "--outfile=dist/bin.js" + "--format=cjs" + "--platform=node"))))))) + (native-inputs + (list esbuild)) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:15 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:15 +0000 Received: from localhost ([127.0.0.1]:56019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRv-0002wX-9Z for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:15 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRf-0002tx-2g for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:59 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179518; 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=83ejFMFdx1SdV3V5vcJMt/zZV502QdP29+5IrrzPh/s=; b=AeMYUwqPj4BmakwTZ8XnfZdVFQxJoxHynLxos54PRbFzrTUF1pU6c4HLIi5+jW0/orgvDn n4t3X9oY3HXGw8CAMC0wwNHLxISATXgRioUoYe9w7pmcCzNlkuOHjKnLT6yNJb7VhfLKaJ YoQQ7lI0tWf7AMMnbEPiQivS7k6ngqM= To: 59188@debbugs.gnu.org Subject: [PATCH v6 05/19] gnu: node-buffer-crc32: Ignore development dependencies. Date: Thu, 30 Mar 2023 14:31:36 +0200 Message-Id: <10166eb5e91d4fc34d630893b7e027b081f29643.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d75ccc199a..96901e7bf8 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -123,10 +123,9 @@ (define-public node-buffer-crc32 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("tap"))))))) (home-page "https://github.com/brianloveswords/buffer-crc32") (synopsis "CRC32 implementation in Javascript") (description -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:15 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:15 +0000 Received: from localhost ([127.0.0.1]:56021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRv-0002wd-Ih for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:15 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRf-0002uD-Ox for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:00 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179519; 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=r24JfAMQpKY5K+yAc3YVWGdruWZFJTGOkNar7DWOjL4=; b=LYtWduJW73uWxMXMFdtoJYQ+4DrlDQneMMXx8IXtOWn8iwkPLVFmAXit/002xvcPr6Bs9z 7w5EC45dOHwLxS8/zWjELh6Yu4QGMOWUeFue6KjmGjEqdgCElnbbVABSHVU7MRlZ6Ne24O aKrpxY8LhMSi38AlWtYNB7LNHU6nQU8= To: 59188@debbugs.gnu.org Subject: [PATCH v6 06/19] gnu: node-crx3: Ignore development dependencies. Date: Thu, 30 Mar 2023 14:31:37 +0200 Message-Id: <2a09f2f03f78fac06ff730ad53f5d839c9e25641.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-crx3)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 96901e7bf8..00d93d3185 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -179,10 +179,16 @@ (define-public node-crx3 (substitute* "lib/configuration.js" (("mri") "minimist")))) - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("c8" + "docdash" + "eslint" + "eslint-plugin-jsdoc" + "jsdoc" + "tap-diff" + "tape" + "tape-catch"))))))) (inputs (list node-minimist node-pbf node-yazl)) (home-page "https://github.com/ahwayakchih/crx3") (synopsis "Create CRXv3 browser extensions with Javascript") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:16 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:16 +0000 Received: from localhost ([127.0.0.1]:56023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRv-0002wl-R5 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:16 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRg-0002uV-GB for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:00 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179519; 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=39LwWlMPvQE/z3vhhpaO+w5NRPzIguVWG0Iz5tsY5V4=; b=BffCtiwwCu0ymF2k/fc86Dy3dFKsmF3rqeC4B346X2dbNKFNd2BeF/rb7lM2urciAphGn0 RcwcJk1by/dNIUbj6YoICdj2uRgcGdhD6t+1Mce/AJAn7a6VwSahLSw4yMSFD2oWfnQzwV NgH34Sx4ARpC9Xn3up+j9p3A/M2Nu+U= To: 59188@debbugs.gnu.org Subject: [PATCH v6 07/19] gnu: node-minimist: Ignore development dependencies. Date: Thu, 30 Mar 2023 14:31:38 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-minimist)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 00d93d3185..847004501a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -313,10 +313,9 @@ (define-public node-minimist (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("covert" "tap" "tape"))))))) (home-page "https://github.com/substack/minimist") (synopsis "Parse CLI arguments in Javascript") (description "This package can scan for CLI flags and arguments in -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:16 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:16 +0000 Received: from localhost ([127.0.0.1]:56025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRw-0002ws-3E for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:16 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRg-0002uD-U2 for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:01 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179520; 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=pZw29aAgb1f9EvKKfipOyX8ROajj5xapaQ3P3BKJn5M=; b=ju/t/gwdIVEbBdNPSIK0tJ8gMowpiR073ST2ajoEaNdPrBZoNptXt+cVmNEXfrjPzTgCKx ma1HqeQMFnCyJug+PcUIk5vuLN0UOKExNDkVb+ndv/OpOxp5SuDiIYLdElwkyllslGAxfV Rf2DtYvmyXBMuncZvBS5yyBYxALLf2k= To: 59188@debbugs.gnu.org Subject: [PATCH v6 08/19] gnu: node-pbf: Ignore development dependencies. Date: Thu, 30 Mar 2023 14:31:39 +0200 Message-Id: <504f8de18883e3190cab70480958548be30d87cc.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-pbf)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 847004501a..680be0ad3f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -364,10 +364,19 @@ (define-public node-pbf (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies + '("benchmark" + "browserify" + "eslint" + "eslint-config-mourner" + "mkdirp" + "protobufjs" + "protocol-buffers" + "tap" + "tile-stats-runner" + "uglify-js"))))))) (inputs (list node-ieee754 node-resolve-protobuf-schema)) (home-page "https://github.com/mapbox/pbf") (synopsis "Decode and encode protocol buffers in Javascript") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:16 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:16 +0000 Received: from localhost ([127.0.0.1]:56027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRw-0002wz-Bx for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:16 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRh-0002uV-LD for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:02 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179521; 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=o79X55Pbg3qFRb5K3YmUmBBuAodMFpkZgvi4U0Esrxw=; b=KJuzX9PG1uBFGfpMMkwYutNkJlXzDyyo97l5MXlCP1OGSvTM5D/D6cOgM2zQ6sDDu9yym3 feuXKOIWFPta1ZluMNDz3lCmiqHOFpQpSF+bEmjXrY+YH7H7UPXegzlMCDHIVlwMwembzp iKkEPMN8hVec2ohVInHoZcbTjt11mDs= To: 59188@debbugs.gnu.org Subject: [PATCH v6 09/19] gnu: node-protocol-buffers-schema: Ignore development dependencies. Date: Thu, 30 Mar 2023 14:31:40 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-protocol-buffers-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 680be0ad3f..1b581cf3a7 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -405,10 +405,9 @@ (define-public node-protocol-buffers-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (home-page "https://github.com/mafintosh/protocol-buffers-schema") (synopsis "Protocol buffers schema parser written in Javascript") (description "This package provides a protocol buffers schema parser -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:17 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:17 +0000 Received: from localhost ([127.0.0.1]:56029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRw-0002x6-My for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:16 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRi-0002v4-Px for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179522; 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=juOuv+uhMclvYZHJrxgk9XGdqHb6Ax8DW2lP+IGo1y8=; b=W3Ue+VdZ715SeB49WnMahOhmIJu2ZavNMMGvj6bFI5/lT2R8YKCN8VxBSnUtUjeRhB9JjF Hm4ClZA7Vae7LHEJamM6zB8i/LFQxi93rdjxYdGjJ28AxlZ7P/HWf/6Cy1Jr9qKjCY8M+M F9hwO17hd6IADQ/OJi1iK932qWvRPiE= To: 59188@debbugs.gnu.org Subject: [PATCH v6 10/19] gnu: node-resolve-protobuf-schema: Ignore development dependencies. Date: Thu, 30 Mar 2023 14:31:41 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-resolve-protobuf-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 1b581cf3a7..cbf2665940 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -431,10 +431,9 @@ (define-public node-resolve-protobuf-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (inputs (list node-protocol-buffers-schema)) (home-page "https://github.com/mafintosh/resolve-protobuf-schema") (synopsis "Resolve protobuf imports") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:17 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:17 +0000 Received: from localhost ([127.0.0.1]:56031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRw-0002xE-Vl for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:17 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRj-0002vC-G1 for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179522; 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=JdbCmr915QaFnDuMfBB9Sdwga9VKdQilU02lqnad0CM=; b=pwYjg8rDpjyDyxqZN018OIbvkjivkQyRPTplia9N6SIqHArU8MkGYI+Smq8CG/x3uH9lD9 iupNId9UgV8EQJjswE7NIKjKgpIyruHgPhdYfFwBZkZ0WgaeLl5ieHgwWqxeiRcPFHaM5k 2RpJL1FIc4ZAz1T1OCbwpj86yOOyAZc= To: 59188@debbugs.gnu.org Subject: [PATCH v6 11/19] gnu: node-ieee754: Ignore development dependencies. Date: Thu, 30 Mar 2023 14:31:42 +0200 Message-Id: <11d24051612faa2117d5499d2d31000d286a5240.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-ieee754)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index cbf2665940..628fe41d28 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -623,10 +623,9 @@ (define-public node-ieee754 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "standard" "tape"))))))) (home-page "https://github.com/feross/ieee754") (synopsis "Read/write IEEE754 floating point numbers in Javascript") (description "This package can read and write IEEE754 floating point -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:17 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:17 +0000 Received: from localhost ([127.0.0.1]:56033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRx-0002xL-8O for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:17 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRk-0002uV-2N for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:04 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179523; 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=oF+B17wvHHlqm3sMw+OmdqL50Lcsy3jev0X5G7vvuiM=; b=Pkj3inxDNTUFhpf+DvGZ0ExeeTX7FplkCN6H35Y/w/dNXZheDniygH32oYsWI3OrrPQJrd QuEByUcPy3J28P1z7DL2oiZUCOmpRs0kIbvR8bLiO9XhMKA3H+PHSlHWHIi95ZW48n50B8 RuWbif+6UwzzD83MCNX6N/3o7Tdb9I0= To: 59188@debbugs.gnu.org Subject: [PATCH v6 12/19] gnu: node-yazl: Ignore development dependencies. Date: Thu, 30 Mar 2023 14:31:43 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-yazl)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 628fe41d28..b85507f52f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1588,10 +1588,9 @@ (define-public node-yazl (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "bl" "istanbul" "yauzl"))))))) (inputs (list node-buffer-crc32)) (home-page "https://github.com/thejoshwolfe/yazl") (synopsis "Yet another zip library for node") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:17 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:18 +0000 Received: from localhost ([127.0.0.1]:56035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRx-0002xS-HY for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:17 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRl-0002vs-1O for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:05 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179524; 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=aHkFDMqKDlQIFugozU+88ZoGu2mwrnG6mvVQieyoWk8=; b=Glce5GFCKzgRk3I3XUGakU088TGqgjCiYE0FW2JvqXL9Mg9fD4BjJThv0gqGyewI7GyuOC ze/7qVWMuuvqQgPqljBHjocpTP4PZDaXbFoGPXJD4uafWNYCV+RoRqI1sNs5lP95Ci1x5E 8xZrQhjb3mhx8APtenNNqS19Txi6oIY= To: 59188@debbugs.gnu.org Subject: [PATCH v6 13/19] gnu: node-uglify-js: Update to 3.14.2. Date: Thu, 30 Mar 2023 14:31:44 +0200 Message-Id: <14caddea3c698bc80c6b6988e45178a0e8c4ed48.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/uglifyjs.scm (node-uglify-js): Update to 3.14.2. --- (no changes since v1) gnu/packages/uglifyjs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/uglifyjs.scm b/gnu/packages/uglifyjs.scm index b65d52b8df..1bd8bb6326 100644 --- a/gnu/packages/uglifyjs.scm +++ b/gnu/packages/uglifyjs.scm @@ -25,7 +25,7 @@ (define-module (gnu packages uglifyjs) (define-public node-uglify-js (package (name "node-uglify-js") - (version "3.13.9") + (version "3.14.2") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (define-public node-uglify-js (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q1f91xwwm829cl5v727d4qkxy4yh7wri3pgl89f0m3a4y1n7hi4")))) + (base32 "1jraqpwzga4vbgq3xcn08jcfc87pm6nik7vpxvxa4rfjvz70a6k7")))) (build-system node-build-system) (native-inputs (list node-acorn node-semver)) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:18 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:18 +0000 Received: from localhost ([127.0.0.1]:56037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRx-0002xb-TV for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:18 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRl-0002vu-NI for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:05 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179525; 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=rm1iQ6W0Y61FzMV6MB2+jZSsdugD6S5N12RW92LuaHc=; b=Hc24uP159lMd0KVygvfxA8YsfIl8V4ZJbYVHkjFzJogVLuhkXrMew7B2O+QO37XQyIrnAd 0MNfgMTodRvLj1FzkfzYmbBTSG99NZRhqj4d8HPGuoT8fypVjtfO7zNPM8zrrV7BbUuBqV i2zxqH4ZvwIaVJXXaZepfZpbFskSGYk= To: 59188@debbugs.gnu.org Subject: [PATCH v6 14/19] gnu: node-serialport: Avoid gyp rebuilds. Date: Thu, 30 Mar 2023 14:31:45 +0200 Message-Id: <9ce58937417bd3c79ae6efb776f646c9fee6bfc5.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-serialport)[arguments]: Explicitly disable gyp recompilation. --- (no changes since v1) gnu/packages/node-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index b85507f52f..a9784dbf7a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1384,6 +1384,8 @@ (define-public node-serialport-bindings (_ #t)) scripts-alist))) + (("gypfile" . _) + '("gypfile" . #f)) (other other)) pkg-meta-alist)))))))) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:18 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:18 +0000 Received: from localhost ([127.0.0.1]:56039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRy-0002xj-8e for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:18 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRm-0002w7-IQ for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:06 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179526; 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=bAbq506rpawc+IhDM6NgZuDAPWVA4w1ZAzJATKWs3jU=; b=PepRIxL5hSJXk1wMFx3s/NK8AKf6I38y1qmL1Fu51aArDjoNXa+p5HjRZ+W2UOxEfPxwMZ 9ujjr9zTkrT/ooAyQzs78SUMyvEI9JykSlvrz1SeJono0JV+rt8ssGChzXeD76NFYcQNms obinxdMT9diVy9Z7du2rxeNi97t3+g8= To: 59188@debbugs.gnu.org Subject: [PATCH v6 15/19] gnu: node-openzwave-shared: Fix compilation for new versions of node Date: Thu, 30 Mar 2023 14:31:46 +0200 Message-Id: <82279693ec0ec7bc5311c82bf85e872919527b4e.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/zwave.scm (node-openzwave-shared)[arguments]<#:phases>: Add patch-compiler phase to allow compilation with node versions 16 and up. --- (no changes since v1) gnu/packages/zwave.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/zwave.scm b/gnu/packages/zwave.scm index 3e99bd7687..a30199ec02 100644 --- a/gnu/packages/zwave.scm +++ b/gnu/packages/zwave.scm @@ -112,6 +112,11 @@ (define-public node-openzwave-shared (arguments `(#:phases (modify-phases %standard-phases + (add-before 'build 'patch-compiler + (lambda _ + (substitute* "binding.gyp" + (("std=c\\+\\+11") + "std=c++17")))) (replace 'build ;; For some reason, `npm install` doesn't build ;; the addon automatically, so we do it explicitly here. -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:32:57 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:57 +0000 Received: from localhost ([127.0.0.1]:56044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSb-0002yu-JR for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:57 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:45514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSZ-0002ye-G3 for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179574; 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=QNf0lIynFq9XYwkjo3V4Rm0iU0OXAYFtYVsLtQWiHpY=; b=rg3fvWekKpMW64/agebW8+QdO0j6GNTzpSVfkuyMEP0Du8DngOyTQ/n37XvgdVU/D4hcom bFFusYrGfQbALlWEG9M80bNC9M421GmnyRf4GsMDqdBhTWcsyuF4zOSIxzU7oq11Y64ieA +fy6sUoZ8DWvS3cLuXVeUZfyx6rX2ZY= To: 59188@debbugs.gnu.org Subject: [PATCH v6 16/19] gnu: libuv-for-node: Update to 1.44.2. Date: Thu, 30 Mar 2023 14:31:47 +0200 Message-Id: <7b1259164e03677c59763e7694e183821bd449e2.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/libevent.scm (libuv-for-node): Update to 1.44.2. --- (no changes since v1) gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 02b2795194..441c8a401c 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -148,14 +148,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.44.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "1d1wy1061cf2mfygr2j6jbm0da2mhsf0l9yq4rjkqrsmijbdrz6c")))) (properties '((hidden? . #t))))) (define-public libuv-for-r-httpuv -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:33:02 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:33:02 +0000 Received: from localhost ([127.0.0.1]:56049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSf-0002zN-Rs for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:02 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:45530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSa-0002yn-GR for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:57 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179575; 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=K1dPw/RTA8nbToK/+EXoAuPqxWptPFECYHf9bGO+3t8=; b=tBCYo/BN1RlSmjBf1M4Q1uMagp3JAP1U84mrz6dlf496HPBX2K+dz6UJwVn0kOP0OsxLBE eO+9GRotV/LQifzB+XGrkS/hTYFZY9sABBUgHaOaQGMfHKM7pHaS+hPQIWdJnj4tMxwdFZ HqDqgqKvWMus/JW/kC6YTCbL1kIBPFQ= To: 59188@debbugs.gnu.org Subject: [PATCH v6 17/19] gnu: llhttp-bootstrap: Update to 6.0.10. Date: Thu, 30 Mar 2023 14:31:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- (no changes since v1) gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index aee0b8a645..7deb8d8cd7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1498,7 +1498,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 6137ed1dd3..f613844a13 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -668,7 +668,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -677,8 +677,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:33:03 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:33:03 +0000 Received: from localhost ([127.0.0.1]:56052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSg-0002za-PZ for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:03 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:52490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSc-0002z2-7X for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:58 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179576; 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=SmRKRq0Pii5qfXVPQdBRbm6gMohwd3y+oH05dT+UZEA=; b=iwRq1HtB2WYXd1ZHashgqE6O9XEhpAXJspDxpWVI3dg6+wtTiYaBqtVu5NkhJXBqjxJTOi 4bioMoDHJNktPhlknvLVn6PPn1vGVlY4WaFzWHMOcwOm1ZeUNIdsnEdfgvRujIx8qs+mCK z4WUi8pO+THxTySj6KNC5Cj9gwR0V6M= To: 59188@debbugs.gnu.org Subject: [PATCH v6 18/19] gnu: node-lts: Update to 18.15.0. Date: Thu, 30 Mar 2023 14:31:49 +0200 Message-Id: <5a889a04e8cf03299ee4f43d9cf1718a98e334a5.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 f613844a13..a9c4f463c8 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 zlib)))) (define-public libnode -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 08:33:04 2023 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:33:04 +0000 Received: from localhost ([127.0.0.1]:56055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSh-0002zs-JY for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:04 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:52500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSd-0002z3-1S for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:59 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179578; 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=HHHtCsaeXpy6LOiCEdKYY3nDrZeOLJAT33C9GOzcpSs=; b=sxOvHBANN7X2haCza5FRL8DBYXIeAfHhf/qVXMPQFOoCYrhHQ+NlUOYRhJ102iXJpV9gYi MFA5Z0Dt2gLrEtDRMySBJgADu2Kh1Fkp0pfpISrx+RjdQ6BYLiLT6d4Sh1ONO6UBnwS0S8 3/KLMQPZtD6QgXYfdEj20y2CVN3zIhw= To: 59188@debbugs.gnu.org Subject: [PATCH v6 19/19] gnu: libnode: Use node-lts as base. Date: Thu, 30 Mar 2023 14:31:50 +0200 Message-Id: <6ebc7c7ef6f1093d0bbeaf7257fc9683be0f9529.1680179491.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 v6: - Fix build of node-openzwave-shared - Fix build of node-serialport - Rebase on master 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 c1786b7848..60336a5246 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1334,7 +1334,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 a9c4f463c8..399c5ff794 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) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 13 11:55:45 2023 Received: (at 59188) by debbugs.gnu.org; 13 Apr 2023 15:55:45 +0000 Received: from localhost ([127.0.0.1]:44480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmzIT-0008Hd-RI for submit@debbugs.gnu.org; Thu, 13 Apr 2023 11:55:45 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:44799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmzIR-0008HO-VW for 59188@debbugs.gnu.org; Thu, 13 Apr 2023 11:55:40 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 6563B3200909; Thu, 13 Apr 2023 11:55:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 13 Apr 2023 11:55:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=mesmtp; t=1681401332; x=1681487732; bh=yKyQe+4pCmFWyAAvAd1kP8PBFp/9iXdtZW8Kxj4ondE=; b= ejxIsnakj13qmtqD3ECF0XZSJ9EOlDfKYMOyipCPUI6MPQzr78Vphp7fUxqAnWBf rlI7a90Drb8d/zuchWdlHh2ArJPpFsMxTqzW46+ApxA89nZvdre6yPT9IumJH1p4 63qhZPbJJnJXRcWzSobGyHRfAUHoPVOvsXPSPj1VPdM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1681401332; x=1681487732; bh=yKyQe+4pCmFWy AAvAd1kP8PBFp/9iXdtZW8Kxj4ondE=; b=RLZ8OVNyCbua2sm3pmo/0xj1TSWHw 1YbqTvaoUjVsjL4G7pydUUy8HHHJESW/sAbzkD0V4gbqvlowPChpwzD5cPv8LFSh 1DXfY6isJmR265v+wNTvYac69tLkTj2uwm9RW97YzFRrvhc9FEg9mBzv2zMXNJKM n9sIZmGvtBZ40g7DJUrtrZ4QtjI07DlQ1Dw/Dh4P2yLYCfJee9YcV74pJM4Bhd1J JktomWBcCRTopUboWuhZF3h2TZgs/7/+ecP/khSzUuk3IvX1x5iGsNxZuOpFL3EG 24wafMOhcIaaqW4Ufq3NISpKcwJQVy1E5htT1J9ObIT/1ypoL+lCI5WqQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdekkedgleehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvvefukfhfgggtuggjsehttd ertddttddvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeeiteduheefkeeufeelgeduhfejgf elheefleeuhfeffffgueduleehvdejleeiteenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Apr 2023 11:55:31 -0400 (EDT) Date: Thu, 13 Apr 2023 11:55:29 -0400 From: Leo Famulari To: jlicht@fsfe.org Subject: Re: [bug#59188] [PATCH v6 00/19] Updating node-lts to 18.X Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , 59188@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, Mar 30, 2023 at 02:31:31PM +0200, jlicht@fsfe.org wrote: > From: Jelle Licht > Changes in v6: > - Fix build of node-openzwave-shared > - Fix build of node-serialport > - Rebase on master Thanks! I think that if the patches are working for you and there are no outstanding problems, you should feel free to push. From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:28 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:29 +0000 Received: from localhost ([127.0.0.1]:55630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCW-0008RM-Is for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:28 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCT-0008R1-Ux for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:26 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743085; 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=GLDtsTz7X+TFPFvD2Hsfc8owQgRTbST7JrVxxBAXXSg=; b=NmftCK9T4OLiOH6Zz6lvemHyEq+lLISSVhVkXjq50P2YBSdV0CFC74psnwRYoHAzNmywoq OM/x7P0NETQgi1tIQbR4fPW6TKPK7Npb60qCHRWZBg+W4sTWQEet9MyrAi61xKEIEi+Xj/ Rv69RNCV4U5ug0KYe8+JC58EEdmV+3E= To: 59188@debbugs.gnu.org Subject: [PATCH v7 01/20] build-system: node: Use `--install-links' with `npm install'. Date: Mon, 17 Apr 2023 16:51:03 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht Later versions of npm need to explicitly install a copy of local dependencies, instead of only a symlink. * guix/build/node-build-system.scm (configure): Add `--install-links' to npm install invocation. (install): Ditto. --- (no changes since v1) guix/build/node-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index bee3792e93..93f7efbb2b 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -223,7 +223,7 @@ (define* (delete-lockfiles #:key inputs #:allow-other-keys) (define* (configure #:key outputs inputs #:allow-other-keys) (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) - (invoke npm "--offline" "--ignore-scripts" "install") + (invoke npm "--offline" "--ignore-scripts" "--install-links" "install") #t)) (define* (build #:key inputs #:allow-other-keys) @@ -262,6 +262,7 @@ (define* (install #:key outputs inputs #:allow-other-keys) "--offline" "--loglevel" "info" "--production" + "--install-links" "install" "../package.tgz") #t)) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:29 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:29 +0000 Received: from localhost ([127.0.0.1]:55632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCW-0008RY-W8 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:29 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCU-0008R3-TA for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:27 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743086; 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=Mrd8GCaHTGJHbcymp+DS+thYn6GYM6pd9myNmXWvTG8=; b=YxvIVm19xrF02oTKYJgvNuSgG3/8/STkK0ALMBKLcD6ix2BZPrfwh4joc71vaDj0jU+l87 2tMVfjre/HN1Dd9olp4OzlkQFAOuCS9E3maebdaZpnm7r9uKbliHqHaB6HApkCKSt7Q8JE n17wuTk5kVj+YdCChqesF5QFCFodNWY= To: 59188@debbugs.gnu.org Subject: [PATCH v7 02/20] gnu: node-acorn: Disable tests. Date: Mon, 17 Apr 2023 16:51:04 +0200 Message-Id: <6446eca1e6899e3773c64c5ba1e0d9f9e4120c0d.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn): Explicitly disable tests. --- (no changes since v1) gnu/packages/node-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 991113c05b..e89117beca 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -46,7 +46,8 @@ (define-public node-acorn (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) (build-system node-build-system) (arguments - '(#:phases + '(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:34 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:34 +0000 Received: from localhost ([127.0.0.1]:55639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCc-0008SG-98 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:34 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCV-0008RF-OC for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:28 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743087; 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=R57KdZ9IXvfnzcde2tfINxHFrdh64sPu7+J20XdP8mM=; b=piNqqPkqXBkLpzzSOK3JPtQzAqQ59/Q1SvsSvmlzt6SBPDi4mJasTGlXsNFoyPGZOtKIcm 1hocpG0D0aN8wQFtnncBBqsdRdaHNIXk5IYIMNNw0IuoWMX7Ayb26KtvrFKfhcZUNeE0Hl 7xlqoda1cTE+YCpy4XBThxiPfrNpqSI= To: 59188@debbugs.gnu.org Subject: [PATCH v7 03/20] gnu: node-acorn: Remove lifecycle script. Date: Mon, 17 Apr 2023 16:51:05 +0200 Message-Id: <00e6ff270ed168911261ff7718e36d73ee000e6a.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e89117beca..e3d8c7ca19 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -47,11 +47,35 @@ (define-public node-acorn (build-system node-build-system) (arguments '(#:tests? #f + #:modules + ((guix build node-build-system) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "acorn")))))) + (chdir "acorn"))) + (add-before 'configure 'avoid-prepare-scripts + (lambda _ + ;; We need to remove the prepare script from "package.json", as + ;; it would try to use the build environment and would block the + ;; automatic building by other packages making use of node-acorn. + ;; TODO: Add utility function + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . pkg-meta-alist) + (cons '@ (map (match-lambda + (("scripts" @ . scripts-alist) + `("scripts" @ ,@(filter (match-lambda + (("prepare" . _) + #f) + (_ + #t)) + scripts-alist))) + (other other)) + pkg-meta-alist)))))))))) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:35 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:35 +0000 Received: from localhost ([127.0.0.1]:55641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCc-0008SM-Iy for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:34 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCT-0008Qz-Qy for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:28 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743083; 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; bh=1uDlZ6PWt/tiVpEJk8uoNAXKGvVDHRa/1t8RX3PX9mw=; b=IqNz8cBSqpR5M/qrsZM2mAxVaEoWeSlbZFFHZZMRHC81SIjqqH46Kw/6O8D4gwEoxXhreZ 2EuDpN/F/sUITf4MyBp3CSBsBq5hkA6ZtYlMG7a8L4TlmLP+9PPAJqrSO4L9JxIZ52CVIY dJkPdMUH7TC7z3x9qHg92A+25uM/Yxs= To: 59188@debbugs.gnu.org Subject: [PATCH v7 00/20] Updating node-lts to 18.X Date: Mon, 17 Apr 2023 16:51:02 +0200 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , Jelle Licht , Liliana Marie Prikler , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht Node-based things are broken on armhf, but that has been the case for a good while already. If nobody objects, I'm planning to push this to master after a 'green light' (modulo armhf results) from the QA service, somewhere in the coming days. Changes in v7: - Build emacs-nodejs-repl with node-lts - Rebase on master - Update node-lts to 18.16.0 Hilton Chain (4): gnu: libuv-for-node: Update to 1.44.2. gnu: llhttp-bootstrap: Update to 6.0.10. gnu: node-lts: Update to 18.16.0. gnu: libnode: Use node-lts as base. Jelle Licht (16): build-system: node: Use `--install-links' with `npm install'. gnu: node-acorn: Disable tests. gnu: node-acorn: Remove lifecycle script. gnu: node-acorn: Fix broken transpilation. gnu: node-buffer-crc32: Ignore development dependencies. gnu: node-crx3: Ignore development dependencies. gnu: node-minimist: Ignore development dependencies. gnu: node-pbf: Ignore development dependencies. gnu: node-protocol-buffers-schema: Ignore development dependencies. gnu: node-resolve-protobuf-schema: Ignore development dependencies. gnu: node-ieee754: Ignore development dependencies. gnu: node-yazl: Ignore development dependencies. gnu: node-uglify-js: Update to 3.14.2. gnu: node-serialport: Avoid gyp rebuilds. gnu: node-openzwave-shared: Fix compilation for new versions of node gnu: emacs-nodejs-repl: Build with node-lts. gnu/local.mk | 1 - gnu/packages/cran.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/libevent.scm | 4 +- gnu/packages/node-xyz.scm | 112 ++++++++++++++---- gnu/packages/node.scm | 49 +++++--- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ---------------- gnu/packages/uglifyjs.scm | 4 +- gnu/packages/zwave.scm | 5 + guix/build/node-build-system.scm | 3 +- 10 files changed, 131 insertions(+), 151 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:37 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:37 +0000 Received: from localhost ([127.0.0.1]:55644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCd-0008SV-30 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:37 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCX-0008RT-7w for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:29 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743088; 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=fNEZ4yUkBc5yP13Ko72GbnmGkJL6+YrT/j+sVsnm+7A=; b=h7DaydHZOSGe6rPGGqFN9HhTX2cWWxVHygEZcT0SfrUGKs8pFeq6ya8eJ1n0j6lOFf+OFO 2iy+xgWz/1NMzkRkA7qnBOQSVnkcefITOnQw4ijh1qTE9w6BDTAwHNdahCuiHXxurRKstL TYr9KlkyXNisZ7fPSDklOvW7uhKhPAM= To: 59188@debbugs.gnu.org Subject: [PATCH v7 04/20] gnu: node-acorn: Fix broken transpilation. Date: Mon, 17 Apr 2023 16:51:06 +0200 Message-Id: <2ad99c459741e202b1e7f17e99b6725189b9a0dc.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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[native-inputs]: Add `esbuild'. [arguments]: Replace build phase by custom `esbuild' invocations. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e3d8c7ca19..d75ccc199a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Charles ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2023 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,30 @@ (define-public node-acorn #t)) scripts-alist))) (other other)) - pkg-meta-alist)))))))))) + pkg-meta-alist))))))) + (replace 'build + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((esbuild (search-input-file (or native-inputs inputs) + "/bin/esbuild"))) + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.js" + "--format=cjs" + "--bundle" + "--platform=node") + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.mjs" + "--format=esm" + "--bundle" + "--platform=node") + (invoke esbuild + "src/bin/acorn.js" + "--outfile=dist/bin.js" + "--format=cjs" + "--platform=node"))))))) + (native-inputs + (list esbuild)) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:37 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:38 +0000 Received: from localhost ([127.0.0.1]:55649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCf-0008Sz-Lk for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:37 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCY-0008Rm-PN for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:31 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743089; 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=83ejFMFdx1SdV3V5vcJMt/zZV502QdP29+5IrrzPh/s=; b=oZ48emr8Em9KAwK331s2IbLbmqAxiiJEPJkwsaNESDNTx5OIdJyZ9oLnRUb6XK8pUnLMFM KCE4mzD+CvuB9QBNuv0ry7njXcjao6R2V5kDaka6vWly7xkoPNMNvNlVV5saR9npLPi1VY acyeT9N7T6LPU7184k+NXTdLdUoWUgA= To: 59188@debbugs.gnu.org Subject: [PATCH v7 05/20] gnu: node-buffer-crc32: Ignore development dependencies. Date: Mon, 17 Apr 2023 16:51:07 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d75ccc199a..96901e7bf8 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -123,10 +123,9 @@ (define-public node-buffer-crc32 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("tap"))))))) (home-page "https://github.com/brianloveswords/buffer-crc32") (synopsis "CRC32 implementation in Javascript") (description -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:38 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:38 +0000 Received: from localhost ([127.0.0.1]:55651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCf-0008T2-VA for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:38 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCZ-0008Rt-Lg for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:31 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743091; 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=r24JfAMQpKY5K+yAc3YVWGdruWZFJTGOkNar7DWOjL4=; b=H9UlCLkvacTSRD7GjXe1gJYIp/KTPnkEgSePyq3xU0JloIUs+J+IuaeNozgJ9mMsdxGaw3 CRwF9TS33jj7C9okCgnlh88OTKotC9lBqwJjOEg2F06ZmDpIK3nxP1EymSUJ9KC4WlPWSZ esBxOjEVGqOeNKGkAmaV0+fyBVRc+Cw= To: 59188@debbugs.gnu.org Subject: [PATCH v7 06/20] gnu: node-crx3: Ignore development dependencies. Date: Mon, 17 Apr 2023 16:51:08 +0200 Message-Id: <68f30d135723c8cfa7d400935069b9b39b055bce.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-crx3)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 96901e7bf8..00d93d3185 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -179,10 +179,16 @@ (define-public node-crx3 (substitute* "lib/configuration.js" (("mri") "minimist")))) - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("c8" + "docdash" + "eslint" + "eslint-plugin-jsdoc" + "jsdoc" + "tap-diff" + "tape" + "tape-catch"))))))) (inputs (list node-minimist node-pbf node-yazl)) (home-page "https://github.com/ahwayakchih/crx3") (synopsis "Create CRXv3 browser extensions with Javascript") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:38 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:39 +0000 Received: from localhost ([127.0.0.1]:55654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCg-0008TA-A6 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:38 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCa-0008S1-KM for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:33 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743092; 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=39LwWlMPvQE/z3vhhpaO+w5NRPzIguVWG0Iz5tsY5V4=; b=sjVDuEBEGzHkuFHuMRAJJ0xsMEK7UTsQNDWjjBmOVx7L2XYK2b04s5xm3yoAaU5Pn5TmBn vLTxRkyf3/I7HZjHhsCPIEdjABd2JkIKQw7bHZJAlFXCudjEIXRwpT4XYeFHXupqkGm+sp Mus5IKGoIzplwKhUe26WWpRN+p+CPMQ= To: 59188@debbugs.gnu.org Subject: [PATCH v7 07/20] gnu: node-minimist: Ignore development dependencies. Date: Mon, 17 Apr 2023 16:51:09 +0200 Message-Id: <7f76bf7b834feb2cbb4dd8f4b4ab516a2afdcb78.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-minimist)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 00d93d3185..847004501a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -313,10 +313,9 @@ (define-public node-minimist (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("covert" "tap" "tape"))))))) (home-page "https://github.com/substack/minimist") (synopsis "Parse CLI arguments in Javascript") (description "This package can scan for CLI flags and arguments in -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:39 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:39 +0000 Received: from localhost ([127.0.0.1]:55656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCg-0008TT-U3 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCb-0008S8-Hq for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:33 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743092; 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=pZw29aAgb1f9EvKKfipOyX8ROajj5xapaQ3P3BKJn5M=; b=hizn3eXPbrJvwT7jgrL/uFFsBjfNtqeTOWX9GogfnUAdnTtwEkBg27Yb8G6jh72Nu95wDD QTh6vTnaSL1YC3+wSJ5a4tmIO1z4hqLw1ykqIV2bkJrFBEP4xXaOUsWUvYrBSfXimz2vIX YHc7ox/17s8b2lluLDhEyYmk4uLEeFk= To: 59188@debbugs.gnu.org Subject: [PATCH v7 08/20] gnu: node-pbf: Ignore development dependencies. Date: Mon, 17 Apr 2023 16:51:10 +0200 Message-Id: <8668c9ff5d3f9d8e2ed946e1d01339d1ef08d1a0.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-pbf)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 847004501a..680be0ad3f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -364,10 +364,19 @@ (define-public node-pbf (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies + '("benchmark" + "browserify" + "eslint" + "eslint-config-mourner" + "mkdirp" + "protobufjs" + "protocol-buffers" + "tap" + "tile-stats-runner" + "uglify-js"))))))) (inputs (list node-ieee754 node-resolve-protobuf-schema)) (home-page "https://github.com/mapbox/pbf") (synopsis "Decode and encode protocol buffers in Javascript") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:39 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:39 +0000 Received: from localhost ([127.0.0.1]:55659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCh-0008Ta-7Z for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCc-0008SF-HW for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:34 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743093; 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=o79X55Pbg3qFRb5K3YmUmBBuAodMFpkZgvi4U0Esrxw=; b=BzH0zE15IBIX7uwCNMtPu7HvG3lbYFA3BtlESmlERew5ZOEzK6+1Y75kNOwdbf4opuNOlC Rm+8fswzc2fJFenjVM3EjY4tFGAkp13p0l1wbWkEG3yWqZ6DEzXjdd3+1bKyB62Rp89cWr p3dKUcN4XHY8p1XI8Zn9htNG1chCums= To: 59188@debbugs.gnu.org Subject: [PATCH v7 09/20] gnu: node-protocol-buffers-schema: Ignore development dependencies. Date: Mon, 17 Apr 2023 16:51:11 +0200 Message-Id: <2cdf085703e2cc53f73a6167071333bd9dae6805.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-protocol-buffers-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 680be0ad3f..1b581cf3a7 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -405,10 +405,9 @@ (define-public node-protocol-buffers-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (home-page "https://github.com/mafintosh/protocol-buffers-schema") (synopsis "Protocol buffers schema parser written in Javascript") (description "This package provides a protocol buffers schema parser -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:40 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:40 +0000 Received: from localhost ([127.0.0.1]:55661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCh-0008To-Lw for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCd-0008Sb-Di for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:35 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743094; 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=juOuv+uhMclvYZHJrxgk9XGdqHb6Ax8DW2lP+IGo1y8=; b=aI3qDRR3wJSBeY5n73dsE+1iWHI+GQ+fISaLAokyNo2aVthla3XX9RBbgxiPlreS+FtwQf xspRjIrQGIGO7G5U/WL3VxzRVRgDaRy84d5vuaWdnwlvprI/rnvNwE4h1kIdmuYjsQF9O/ IFIRxDmLPXKul4Lukw8TGjTZvidTfpk= To: 59188@debbugs.gnu.org Subject: [PATCH v7 10/20] gnu: node-resolve-protobuf-schema: Ignore development dependencies. Date: Mon, 17 Apr 2023 16:51:12 +0200 Message-Id: <277c0e4790777fcc28607621de32d7ca473dcba7.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-resolve-protobuf-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 1b581cf3a7..cbf2665940 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -431,10 +431,9 @@ (define-public node-resolve-protobuf-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (inputs (list node-protocol-buffers-schema)) (home-page "https://github.com/mafintosh/resolve-protobuf-schema") (synopsis "Resolve protobuf imports") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:40 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:40 +0000 Received: from localhost ([127.0.0.1]:55664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCi-0008Tw-0O for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:40 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCe-0008Sj-Bp for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:36 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743095; 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=JdbCmr915QaFnDuMfBB9Sdwga9VKdQilU02lqnad0CM=; b=V/ITxVWNEAaZwV9c+kbDsLRcInY8pGC45nZGH7w42WZgfS14+eU1261mhmwHWUrmeRmJLy A+Jlfpm5qtoxv85aQPFgFnHCe6U5xqutu1iTpTqHVkWLkHB6QUNQk3eP0DKijdptTPX3g4 RmNIoyML0Fn0usSJxCc98M6X0RTvVsI= To: 59188@debbugs.gnu.org Subject: [PATCH v7 11/20] gnu: node-ieee754: Ignore development dependencies. Date: Mon, 17 Apr 2023 16:51:13 +0200 Message-Id: <3669976ff6f1e4a787d57fac254b6bd9fb7aee9a.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-ieee754)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index cbf2665940..628fe41d28 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -623,10 +623,9 @@ (define-public node-ieee754 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "standard" "tape"))))))) (home-page "https://github.com/feross/ieee754") (synopsis "Read/write IEEE754 floating point numbers in Javascript") (description "This package can read and write IEEE754 floating point -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:53 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:53 +0000 Received: from localhost ([127.0.0.1]:55671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCv-0008Uz-FR for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:53 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCf-0008Sr-8E for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:38 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743096; 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=oF+B17wvHHlqm3sMw+OmdqL50Lcsy3jev0X5G7vvuiM=; b=EVrRhQLC0xvxVDMHebAdOuJ3eHY+N/idbRtHQzNNOHaphmX6jZ5kgJkVHQEiZPEYy4gmNx M3eFwCnFWnl/tyDtuhxVK2QXLga5nM7beV221LPmXuV7CZS8QF99kMLSb6YE3Qy2bRFnzb V3EgFk3pQR4l76hnVj6zQZQNEPwGwjY= To: 59188@debbugs.gnu.org Subject: [PATCH v7 12/20] gnu: node-yazl: Ignore development dependencies. Date: Mon, 17 Apr 2023 16:51:14 +0200 Message-Id: <03c9608cd8f8ac3d22660242de6e53517d0a1cbc.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-yazl)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 628fe41d28..b85507f52f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1588,10 +1588,9 @@ (define-public node-yazl (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "bl" "istanbul" "yauzl"))))))) (inputs (list node-buffer-crc32)) (home-page "https://github.com/thejoshwolfe/yazl") (synopsis "Yet another zip library for node") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:54 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:54 +0000 Received: from localhost ([127.0.0.1]:55673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCv-0008V2-Rl for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:54 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCg-0008T0-3J for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:38 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743097; 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=aHkFDMqKDlQIFugozU+88ZoGu2mwrnG6mvVQieyoWk8=; b=MdbVCdGnB1bGbYoRLD353d5+AoPEn0JNcs/R0CtHjA9vd4yTV/oLdyr7ApB4A//2wisk2E fkWpvWPLQ85vPr+rfnIL0hxl/rO6VpBZ83314LKfm+ZCt81vofGSDeKNDfPmRcxvQy+A4H P53ujnPXUdokCfcVJnYzww8827YVfq8= To: 59188@debbugs.gnu.org Subject: [PATCH v7 13/20] gnu: node-uglify-js: Update to 3.14.2. Date: Mon, 17 Apr 2023 16:51:15 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/uglifyjs.scm (node-uglify-js): Update to 3.14.2. --- (no changes since v1) gnu/packages/uglifyjs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/uglifyjs.scm b/gnu/packages/uglifyjs.scm index b65d52b8df..1bd8bb6326 100644 --- a/gnu/packages/uglifyjs.scm +++ b/gnu/packages/uglifyjs.scm @@ -25,7 +25,7 @@ (define-module (gnu packages uglifyjs) (define-public node-uglify-js (package (name "node-uglify-js") - (version "3.13.9") + (version "3.14.2") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (define-public node-uglify-js (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q1f91xwwm829cl5v727d4qkxy4yh7wri3pgl89f0m3a4y1n7hi4")))) + (base32 "1jraqpwzga4vbgq3xcn08jcfc87pm6nik7vpxvxa4rfjvz70a6k7")))) (build-system node-build-system) (native-inputs (list node-acorn node-semver)) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:54 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:54 +0000 Received: from localhost ([127.0.0.1]:55675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCw-0008V9-43 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:54 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCh-0008TR-09 for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:39 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743098; 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=rm1iQ6W0Y61FzMV6MB2+jZSsdugD6S5N12RW92LuaHc=; b=k2erkCY6URio2wyOVjcqjvJ5xsA+vQC3zS+MUo+pR14gLG8moKWqiRuOnRmjSxbgVwHJKJ c+0mkKnE5xdTn/8sYNmLbuGXi3FeUYiVJC+lzTB/LlLF7X+u4RhTdWiMz4agCEis4yojoR UBYKPAqG3xntQ1R6+IgWoizP/RjIbUI= To: 59188@debbugs.gnu.org Subject: [PATCH v7 14/20] gnu: node-serialport: Avoid gyp rebuilds. Date: Mon, 17 Apr 2023 16:51:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/node-xyz.scm (node-serialport)[arguments]: Explicitly disable gyp recompilation. --- (no changes since v1) gnu/packages/node-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index b85507f52f..a9784dbf7a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1384,6 +1384,8 @@ (define-public node-serialport-bindings (_ #t)) scripts-alist))) + (("gypfile" . _) + '("gypfile" . #f)) (other other)) pkg-meta-alist)))))))) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:54 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:54 +0000 Received: from localhost ([127.0.0.1]:55677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCw-0008VG-EC for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:54 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCh-0008Tm-S9 for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:40 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743099; 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=bAbq506rpawc+IhDM6NgZuDAPWVA4w1ZAzJATKWs3jU=; b=of2rpe6zPerRh9va9mZqaKhSG7NebdLVliuiueqKofqzjCKI3SeQ7KPXkS4MmOzAzgNaQ6 XYIYZMl1xrtOkhqaLTF0Oo6MHDnKzAAamdGym+YCKwkk4Swqvl0Gm42VYUKF6Xm6HYtquc JgfyJmOTLGjK+/MjEdNP+tS29cnJ9+M= To: 59188@debbugs.gnu.org Subject: [PATCH v7 15/20] gnu: node-openzwave-shared: Fix compilation for new versions of node Date: Mon, 17 Apr 2023 16:51:17 +0200 Message-Id: <90996e0ab7b395edc0e223a32a1394ea2d4311f4.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/zwave.scm (node-openzwave-shared)[arguments]<#:phases>: Add patch-compiler phase to allow compilation with node versions 16 and up. --- (no changes since v1) gnu/packages/zwave.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/zwave.scm b/gnu/packages/zwave.scm index 3e99bd7687..a30199ec02 100644 --- a/gnu/packages/zwave.scm +++ b/gnu/packages/zwave.scm @@ -112,6 +112,11 @@ (define-public node-openzwave-shared (arguments `(#:phases (modify-phases %standard-phases + (add-before 'build 'patch-compiler + (lambda _ + (substitute* "binding.gyp" + (("std=c\\+\\+11") + "std=c++17")))) (replace 'build ;; For some reason, `npm install` doesn't build ;; the addon automatically, so we do it explicitly here. -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:51:55 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:55 +0000 Received: from localhost ([127.0.0.1]:55679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCw-0008VN-QD for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:55 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCi-0008UB-Qy for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:41 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743100; 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=81AtZybI+7bUFK9HTiOcEmO8yAjvEmzvIxq2LV5XhIw=; b=sFrI5+iUQiQpnRgC5+bJVoWYt57yxX1MSn4hR2lnJxn/V3KH0ag7w2kg+C6D5kGqugU8YH 1QQ2+Ra36vgJCeNzlN8Mib8JN1MrD8ZVH1ZtJRKGS2HV90CwU3lP8i3eKM8qSudbAJW+LJ zfp0LKnUBUcWuF3opUqoyYQ6EPyfTbk= To: 59188@debbugs.gnu.org Subject: [PATCH v7 16/20] gnu: emacs-nodejs-repl: Build with node-lts. Date: Mon, 17 Apr 2023 16:51:18 +0200 Message-Id: <4809ad315243309fdef56f2860032e8f2573c6ec.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Jelle Licht , Liliana Marie Prikler , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Jelle Licht * gnu/packages/emacs-xyz.scm (emacs-nodejs-repl)[inputs]: Replace NODE by NODE-LTS. --- (no changes since v1) gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c1748e7f36..7282c03dfe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12803,7 +12803,7 @@ (define-public emacs-nodejs-repl "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx")))) (build-system emacs-build-system) (inputs - (list node)) + (list node-lts)) (native-inputs (list emacs-ert-expectations)) (arguments -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:52:02 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:52:02 +0000 Received: from localhost ([127.0.0.1]:55681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQD4-0008Vq-3N for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:52:02 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCj-0008UJ-Vq for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:42 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743101; 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=QNf0lIynFq9XYwkjo3V4Rm0iU0OXAYFtYVsLtQWiHpY=; b=VtPIXlij6sv9Jk0hGvKxqIxM5P3ZqTQ2vytULmgry9URHOqx9fD8szW6AG10W1ofoKPIks 49dlJ0ysfXmirA4hdJlfg1O0f/6J2+Df9pEb4ZH+zCXgP/GLyw1ZWznPZ/72mXFN+ULgHQ enusYJp+jgmpPWCQ0JmlU3rm6b/GdKo= To: 59188@debbugs.gnu.org Subject: [PATCH v7 17/20] gnu: libuv-for-node: Update to 1.44.2. Date: Mon, 17 Apr 2023 16:51:19 +0200 Message-Id: <6eef740c67c64831549887756011c868e293b815.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/libevent.scm (libuv-for-node): Update to 1.44.2. --- (no changes since v1) gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 02b2795194..441c8a401c 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -148,14 +148,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.44.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "1d1wy1061cf2mfygr2j6jbm0da2mhsf0l9yq4rjkqrsmijbdrz6c")))) (properties '((hidden? . #t))))) (define-public libuv-for-r-httpuv -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:52:03 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:52:03 +0000 Received: from localhost ([127.0.0.1]:55684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQD4-0008Vz-Ez for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCl-0008UR-5V for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:43 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743102; 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=epg+vkzy9lkIIzRDxiC4Dzs4OroNgnt9103m9MZRhfs=; b=CCQv01WD5ay8es/ntGRg0M3xB6g39d9JaJt6Pmuo4ezyKzPI+zX6swMgNug/D8OimJzCSk AnhunBlq1iyV2JfJOSupGV7BVV2KPQ9GPVQlywD+AjIgXzQmhCE6MOXZ2EEjeNOrNTBOvq PjG3e7nBIjHW5PCelDZc5J7gwG6ZdS0= To: 59188@debbugs.gnu.org Subject: [PATCH v7 18/20] gnu: llhttp-bootstrap: Update to 6.0.10. Date: Mon, 17 Apr 2023 16:51:20 +0200 Message-Id: <285ecfa86af35308c8489f6533c4736c0f782c08.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Hilton Chain * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- (no changes since v1) gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1241ab09c0..0f79acd639 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1501,7 +1501,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 6137ed1dd3..f613844a13 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -668,7 +668,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -677,8 +677,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:52:04 2023 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= To: 59188@debbugs.gnu.org Subject: [PATCH v7 19/20] gnu: node-lts: Update to 18.16.0. 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 10:52:04 2023 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= To: 59188@debbugs.gnu.org Subject: [PATCH v7 20/20] gnu: libnode: Use node-lts as base. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Ricardo Wurmus , Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 11:37:58 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 15:37:58 +0000 Received: from localhost ([127.0.0.1]:55834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQvV-0001WP-OW for submit@debbugs.gnu.org; Mon, 17 Apr 2023 11:37:57 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:59643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQvT-0001W8-TL for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 11:37:56 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-94a34d3812cso594819566b.2 for <59188@debbugs.gnu.org>; Mon, 17 Apr 2023 08:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681745870; x=1684337870; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=+UP9wOjHe44iqoQydvm0oOx8HBh3IsSmwLVH+4V+GE4=; b=CVyUoc8kp55Tmd/9i2FUEETyViE7UBNzy1R3Nz0g1nlW/LEVitg7Z2eZKz0QT9mykM i4TQwxqJYzKIDBPdK8MlvnLXWlHncpvwH9oZbO69EyUC0j8+omf7iRSFLzqGlI2S6uI1 uVlv67jjtUyHffqB3vjmsniDm9YdHAC6cxf7Z7MnGnLJVV0Pz9989RdEwpur73wOvTj3 C/kYQoVqGzf5NMXb1mcSR4KzoOKsPQrtYuZJMO/XKC1YIPgH/RKOOmCfAyM/wLRLO7LM D5xCD+/QQi8WTSbI9gSTsYUZ/sBEQYvgr5X1Alx4IjBKezpgsbK/y7e9LNSpkLq1udNI i6MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681745870; x=1684337870; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+UP9wOjHe44iqoQydvm0oOx8HBh3IsSmwLVH+4V+GE4=; b=kIt83KltWBLnsSUVXeedaM0lndyrq8HFaKwSMflxkSO2mV0bMxDW/L7QUjJuqH9olR vQ+XKog0LWid1DwloYNPi1DExXul/K8NqY8giTVpsKmx+S+C0Rq6TcS2iKa724EyKt+M jhW3p4h3lM9U+w/SOcQXCY+y0atw0/fIwGupmOW2Kd5YfPJzAS/Z7Avqbs/z6cm0LF2H TK3yznK5GaJ25S1P4rpwB4n483MiyNCrwWA5atrW3AO9rXM57g5kfv3LbqztuiOai/cg UnWsnV6r42gIoRCXrgdKoV5DoxVQ6B1iNhWZDyik5tZTd0APNPCY8jKCuQUWAzLtDSyp csnw== X-Gm-Message-State: AAQBX9dMDgjcO0a1OTEQJ7KLZRaRYG+shX5pqau1caTDNIeGnxHbMW58 vu32Rd+eB1ohMKV/76+hcqY= X-Google-Smtp-Source: AKy350bOBTp85ZjZmqjq6xkASyw5oPTFj4FOnjS8FFBNWLyxxBzzki8JyguvLqeYhgV9xsZbsf4FZA== X-Received: by 2002:a05:6402:120a:b0:506:85d1:35cd with SMTP id c10-20020a056402120a00b0050685d135cdmr11146545edw.4.1681745869666; Mon, 17 Apr 2023 08:37:49 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u15-20020aa7d88f000000b005067d6b06efsm4872361edq.17.2023.04.17.08.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 08:37:49 -0700 (PDT) Message-ID: <9a1f88d3c90e7518a91fe7f76569b43be84bddfc.camel@gmail.com> Subject: Re: [PATCH v7 16/20] gnu: emacs-nodejs-repl: Build with node-lts. From: Liliana Marie Prikler To: jlicht@fsfe.org, 59188@debbugs.gnu.org Date: Mon, 17 Apr 2023 17:37:48 +0200 In-Reply-To: <4809ad315243309fdef56f2860032e8f2573c6ec.1681742871.git.jlicht@fsfe.org> References: <4809ad315243309fdef56f2860032e8f2573c6ec.1681742871.git.jlicht@fsfe.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 17.04.2023 um 16:51 +0200 schrieb jlicht@fsfe.org: > From: Jelle Licht >=20 > * gnu/packages/emacs-xyz.scm (emacs-nodejs-repl)[inputs]: Replace > NODE by NODE-LTS. I think lowercase would be better. > --- >=20 > (no changes since v1) Where is v1? > =C2=A0gnu/packages/emacs-xyz.scm | 2 +- > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index c1748e7f36..7282c03dfe 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -12803,7 +12803,7 @@ (define-public emacs-nodejs-repl > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 > "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx")))) > =C2=A0=C2=A0=C2=A0=C2=A0 (build-system emacs-build-system) > =C2=A0=C2=A0=C2=A0=C2=A0 (inputs > -=C2=A0=C2=A0=C2=A0=C2=A0 (list node)) > +=C2=A0=C2=A0=C2=A0=C2=A0 (list node-lts)) LGTM, I guess. Is it expected that node-lts will see fewer rebuilds than the other node package going forward? Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 12:03:33 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 16:03:33 +0000 Received: from localhost ([127.0.0.1]:55874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poRKH-0002Wq-1Z for submit@debbugs.gnu.org; Mon, 17 Apr 2023 12:03:33 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:51474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poRKF-0002Wb-2r for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 12:03:31 -0400 From: Jelle Licht DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681747407; 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=5EepZtILDsMrVGzFZL0MiCi4REbedW6pIYXICournn8=; b=uvmibGJ8G30KlQT8YfagOJt6mOvIzjgIXgzpKM54WcDCk4OhUNcELF/8AoX80ni9K0CBiN A2evPXvf42raI2flPmNrFa2dTd8lYfJMOrlm+70P7kdqiArbGbwP2w1ph43L+R5nG4QhgY EOiLfnQiwJckL28T2Ld3WJjv/mU67D0= To: Liliana Marie Prikler , 59188@debbugs.gnu.org Subject: Re: [PATCH v7 16/20] gnu: emacs-nodejs-repl: Build with node-lts. In-Reply-To: <9a1f88d3c90e7518a91fe7f76569b43be84bddfc.camel@gmail.com> References: <4809ad315243309fdef56f2860032e8f2573c6ec.1681742871.git.jlicht@fsfe.org> <9a1f88d3c90e7518a91fe7f76569b43be84bddfc.camel@gmail.com> Date: Mon, 17 Apr 2023 18:03:26 +0200 Message-ID: <87edoiv6lt.fsf@fsfe.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188 Cc: Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Liliana Marie Prikler writes: > Am Montag, dem 17.04.2023 um 16:51 +0200 schrieb jlicht@fsfe.org: >> From: Jelle Licht >>=20 >> * gnu/packages/emacs-xyz.scm (emacs-nodejs-repl)[inputs]: Replace >> NODE by NODE-LTS. > I think lowercase would be better. Addressed locally, and will take into account when applying.=20 > >> --- >>=20 >> (no changes since v1) > Where is v1? There is no v1. This blurb is generated by patman, I do not know how to disable this. Tips very much welcome. Since I started using patman, I've listed changes in each cover letter instead, as that's much easier to manage. >> =C2=A0gnu/packages/emacs-xyz.scm | 2 +- >> =C2=A01 file changed, 1 insertion(+), 1 deletion(-) >>=20 >> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm >> index c1748e7f36..7282c03dfe 100644 >> --- a/gnu/packages/emacs-xyz.scm >> +++ b/gnu/packages/emacs-xyz.scm >> @@ -12803,7 +12803,7 @@ (define-public emacs-nodejs-repl >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 >> "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx")))) >> =C2=A0=C2=A0=C2=A0=C2=A0 (build-system emacs-build-system) >> =C2=A0=C2=A0=C2=A0=C2=A0 (inputs >> -=C2=A0=C2=A0=C2=A0=C2=A0 (list node)) >> +=C2=A0=C2=A0=C2=A0=C2=A0 (list node-lts)) > LGTM, I guess. Is it expected that node-lts will see fewer rebuilds > than the other node package going forward? No, if anything the hope is that there will be more going on with the node-lts package :-). Our current "node" package should not be used, as it's an ancient (and unsupported) version. Restructuring the node/node-lts/node-bootstrap triad (and making sure older versions are not exposed to users) will be my next node-related venture. > Cheers Thanks for the review! - Jelle From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 17 18:11:47 2023 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 22:11:47 +0000 Received: from localhost ([127.0.0.1]:57126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poX4c-00076U-Rv for submit@debbugs.gnu.org; Mon, 17 Apr 2023 18:11:47 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poX4a-00076G-RG for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 18:11:45 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DE7F22401E0 for <59188@debbugs.gnu.org>; Tue, 18 Apr 2023 00:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1681769498; bh=p4sc9W0709VsCaAI+9WwD7hZ11vcYYwNkvoQ0i3scbg=; h=From:To:Cc:Subject:Date:From; b=WmZNkYj8Odf034tbO0TCCp0alXaGgFvtnJqOMwcWiDJtwkZR7FrK/4VFXLtT8ByRO p0wD0UyyJ+lnklmFR4g1mvDKKuHAtjtOL3NP5d/T4XZvNki0VrbseSaSUcbX0nCVZj RGuVmLwPGSC8XhKqvloyUInI1NCGkeGnfUCGMCUiTVzsTTYFP1dBXvbBeYeV1cKNtQ PvaWJdHLjpNJGvlQIjkE2d5fyRAqOAXfWK7dLlXi58j+zX041l/gBPxRDheRIq7NuG gUUvHtFaDWfvz/DqExl1d5Affv+jZ0O0o4vRoPXegui78/Womjj7fseynKQS+4les0 oX3k/qdWAwEoQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Q0h960lHFz9rxG; Tue, 18 Apr 2023 00:11:38 +0200 (CEST) References: From: Mekeor Melire To: jlicht@fsfe.org Subject: Re: [bug#59188] [PATCH v7 00/20] Updating node-lts to 18.X Date: Mon, 17 Apr 2023 22:08:29 +0000 In-reply-to: Message-ID: <87bkjmnorr.fsf@posteo.de> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59188 Cc: 59188@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 2023-04-17 16:51 jlicht@fsfe.org: > From: Jelle Licht > > Node-based things are broken on armhf, but that has been the > case for a good while already. If nobody objects, I'm planning > to push this to master after a 'green light' (modulo armhf > results) from the QA service, somewhere in the coming days. Thank you very much for all the hard work! I'm looking forward to this. I've been guix-pulling from this branch already for some weeks, and everything has been working fine for me. From debbugs-submit-bounces@debbugs.gnu.org Sat May 06 08:50:36 2023 Received: (at 59188-done) by debbugs.gnu.org; 6 May 2023 12:50:36 +0000 Received: from localhost ([127.0.0.1]:59630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvHMy-0007Ez-HE for submit@debbugs.gnu.org; Sat, 06 May 2023 08:50:36 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:44846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvHMw-0007El-RO for 59188-done@debbugs.gnu.org; Sat, 06 May 2023 08:50:35 -0400 From: Jelle Licht DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1683377431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=2tkM2h6fkhglymasMBT2Si4eqSvhjrd0Ju58i78RDV4=; b=hkRSEaBaRRhL2Cw+Cd039WobYWp1IHbHCxKH19h1gXi2EyCnrR7zBWY5eVtROZmakMJ8A9 ngvS18WJPvTgsMRou6kLCkVx1mraa6yN9Am3U/r5GR4dEh6qQSjlkz+EebjKDWCF6EFYXU LT7MCCKyd9jEf2goCRAs/LoJjCUH/Es= To: 59188-done@debbugs.gnu.org Subject: Updating node-lts to 18.X Date: Sat, 06 May 2023 14:50:28 +0200 Message-ID: <87wn1l8vzf.fsf@fsfe.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59188-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Pushed to master, with some minor adjustments to make things work after the core-updates merge. Thanks for the patience and feedback! - Jelle From unknown Sat Sep 20 14:55:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 04 Jun 2023 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator