From patchwork Sat Jun 15 21:52:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 65386 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 12F0927BBE9; Sat, 15 Jun 2024 22:53:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DB89027BBE2 for ; Sat, 15 Jun 2024 22:53:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sIbKZ-0007rJ-TO; Sat, 15 Jun 2024 17:53:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sIbKY-0007qc-5I for guix-patches@gnu.org; Sat, 15 Jun 2024 17:53:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sIbKX-0004CW-T3 for guix-patches@gnu.org; Sat, 15 Jun 2024 17:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sIbKY-00023e-LJ for guix-patches@gnu.org; Sat, 15 Jun 2024 17:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71581] [PATCH 1/2] gnu: llhttp-bootstrap: Update to 6.1.0. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jun 2024 21:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71581@debbugs.gnu.org Cc: Ashvith Shetty X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17184883767890 (code B ref -1); Sat, 15 Jun 2024 21:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jun 2024 21:52:56 +0000 Received: from localhost ([127.0.0.1]:53027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIbKR-00023A-7s for submit@debbugs.gnu.org; Sat, 15 Jun 2024 17:52:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:56386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIbKO-00022x-9X for submit@debbugs.gnu.org; Sat, 15 Jun 2024 17:52:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sIbKM-0007pS-W0 for guix-patches@gnu.org; Sat, 15 Jun 2024 17:52:51 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sIbKJ-0004AV-Q7 for guix-patches@gnu.org; Sat, 15 Jun 2024 17:52:50 -0400 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2c508ea0cc5so343107a91.1 for ; Sat, 15 Jun 2024 14:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718488365; x=1719093165; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+m/7Zvh7vyU63mUbl11cy4UKhfdkEJ5DiFxtEhpJCOo=; b=WSGTU8xuliMxYDkIUV8jw7z2+KpT5HStPMN37/Cx2oJZJh/iAbXNKi8N41XeFVDb8z 2zchpcYuCYfRch9778+vOxBKFUeE6LdLoPJp+7xgljWA6AO/4+DVU50jJMvZA48G5OmA VBOP/blbVMi5T4aqxfu/Gz7yj0OqWVaqjJYoa2luAL4TZikYbVVQoqxG9zFYyqJ/Kwq1 eRAHWaEgUFI6nYC65/z4keNY3KXV4ca0f0hWNEynVpBscg+fbwkbwe5Dn6teMqyryhV6 tztsht789t//nCBmUykraDvbwAXvE21tHGn5XWqgwnxe7OR7r++9HwNiqMa38sqSH6c2 lEYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718488365; x=1719093165; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+m/7Zvh7vyU63mUbl11cy4UKhfdkEJ5DiFxtEhpJCOo=; b=IfjKzK/YCZgNGh8FK73r6NhsbwUD7ytl7LnzUFM65A8EQdI+JRx3hniQ7nPOBbU1jQ LwVBK+oksPmYXMXk6A87RAnvdbkLL3RVSCIzWugBCZLj1dan1n7rBeGqjrIe2SRxedPz KcTkk7xrZFH+TKVwPPp8ibJK7QZG4q4LHQb3G53rHe0AgnYaackXIdvWVDVuuG5J0otS MW4M+tsdZ67hDKDxMxk7greeGo/uLvHCHbQT4Qfh7YUTH8JtCfedSBAv9lZGwDyQbpJf pmtkSWgZSbvElHTIUmJKJXx4YG4x9vxeptbpl/Gj4L8bEZJbfdO70KCNzGf6P9id+V3X EF5A== X-Gm-Message-State: AOJu0Yxc98PsA0e5t9TBBQ6OpVmIUu6FDSHo+XMZJ0z4YBQVod32cOaZ C8jQMkv3WmQU7ZVhHcm39+8XpO7F530HdLG/r1vSo/F547ixo8ng8dk+5w== X-Google-Smtp-Source: AGHT+IH9wuDIoR4rQzLALFjgudfJO5h88R4BtRd28+S1RHzV9GfGyrPtskth2SJ1Oxxsvl9qzJUP7w== X-Received: by 2002:a17:90a:ce96:b0:2c2:e023:23f6 with SMTP id 98e67ed59e1d1-2c4dbd354d8mr5581979a91.39.1718488365052; Sat, 15 Jun 2024 14:52:45 -0700 (PDT) Received: from glory-lily.bbrouter ([150.129.60.164]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2c4c45ac015sm6291859a91.1.2024.06.15.14.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jun 2024 14:52:44 -0700 (PDT) From: Ashvith Shetty Date: Sun, 16 Jun 2024 03:22:26 +0530 Message-ID: <361a358ac968efb4148512054e62f0f211abf7f7.1718488151.git.ashvithshetty10@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=ashvithshetty10@gmail.com; helo=mail-pj1-x1034.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.1.0. Change-Id: I05d49f74bbc3818ee008b2d6337077c3e14bfaab --- gnu/packages/node.scm | 69 ++----------------------------------------- 1 file changed, 3 insertions(+), 66 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a9d4e5ab13..92aba7b376 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -668,72 +668,9 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package - (name "llhttp") - (version "6.0.11") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nodejs/llhttp.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16gaylka6nx9bsff9xga3s8xihxm3k7svrb88lr4dj2s4pzlfga9")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fix imports for esbuild. - ;; https://github.com/evanw/esbuild/issues/477 - (substitute* "src/llhttp/http.ts" - (("\\* as assert") "assert")) - (substitute* "Makefile" - (("npx ts-node bin/generate.ts") - "node bin/generate.js")) - #t)))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no tests - #:make-flags (list (string-append "CLANG=" ,(cc-for-target)) - (string-append "DESTDIR=" (assoc-ref %outputs "out")) - "PREFIX=") - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((esbuild (search-input-file (or native-inputs inputs) - "/bin/esbuild"))) - (invoke esbuild - "--platform=node" - "--outfile=bin/generate.js" - "--bundle" "bin/generate.ts")))) - (add-before 'install 'create-install-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (dir) - (mkdir-p (string-append out dir))) - (list "/lib" "/include" "/src")) - #t))) - (add-after 'install 'install-src - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (src-dir (string-append out "/src"))) - (install-file "build/c/llhttp.c" src-dir) - (install-file "src/native/api.c" src-dir) - (install-file "src/native/http.c" src-dir) - #t)))))) - (native-inputs - `(("esbuild" ,esbuild) - ("node" ,node-bootstrap) - ("node-semver" ,node-semver-bootstrap) - ("node-llparse-bootstrap" ,node-llparse-bootstrap))) - (home-page "https://github.com/nodejs/llhttp") - (properties '((hidden? . #t))) - (synopsis "Parser for HTTP messages") - (description "This is a rewrite of -@url{https://github.com/nodejs/http-parser, http-parser} using -@url{https://github.com/nodejs/llparse, llparse} to generate the C -source files.") - (license license:expat))) + (inherit llhttp) + (version "6.1.0") + (properties '((hidden? . #t))))) (define-public node-lts (package base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280 -- 2.45.1 From c0c47b25ffa1f8f9520661568b1d394bb745d721 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: <361a358ac968efb4148512054e62f0f211abf7f7.1718488151.git.ashvithshetty10@gmail.com> References: <361a358ac968efb4148512054e62f0f211abf7f7.1718488151.git.ashvithshetty10@gmail.com> From: Ashvith Shetty Date: Sun, 16 Jun 2024 03:12:48 +0530 Subject: [PATCH 2/2] gnu: node-lts: Update to 18.19.1. * gnu/packages/node.scm (node-lts): Update to 18.19.1. [arguments]: Remove obsolete 'delete-problematic-tests phase. Change-Id: I533490d0ebdb28e2fbffc5ce5bfee7100319ff1a --- gnu/packages/node.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 92aba7b376..52e719cdb0 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -675,14 +675,14 @@ (define-public llhttp-bootstrap (define-public node-lts (package (inherit node) - (version "18.19.0") + (version "18.19.1") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "05qc1dgmrms73073n4l36jrcxf6ygqj959d3cngy5qclrg0isk6x")) + "028bqb9006v1k859jdan0ycvcamq8w3j5pjdgmjk79x5g7vs6yk3")) (modules '((guix build utils))) (snippet '(begin @@ -800,18 +800,6 @@ (define-public node-lts (for-each delete-file '("test/parallel/test-tls-passphrase.js" "test/parallel/test-tls-server-verify.js")))) - (add-after 'delete-problematic-tests 'replace-llhttp-sources - (lambda* (#:key inputs #:allow-other-keys) - ;; Replace pre-generated llhttp sources - (let ((llhttp (assoc-ref inputs "llhttp"))) - (copy-file (string-append llhttp "/src/llhttp.c") - "deps/llhttp/src/llhttp.c") - (copy-file (string-append llhttp "/src/api.c") - "deps/llhttp/src/api.c") - (copy-file (string-append llhttp "/src/http.c") - "deps/llhttp/src/http.c") - (copy-file (string-append llhttp "/include/llhttp.h") - "deps/llhttp/include/llhttp.h")))) ;; npm installs dependencies by copying their files over a tar ;; stream. A file with more than one hardlink is marked as a ;; "Link". pacote/lib/fetcher.js calls node-tar's extractor with a