Package: guix-patches;
Reported by: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Sat, 15 Jun 2024 21:53:02 UTC
Severity: normal
Tags: patch
Done: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71581 in the body.
You can then email your comments to 71581 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Sat, 15 Jun 2024 21:53:02 GMT) Full text and rfc822 format available.Ashvith Shetty <ashvithshetty10 <at> gmail.com>:guix-patches <at> gnu.org.
(Sat, 15 Jun 2024 21:53:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: guix-patches <at> gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 1/2] gnu: llhttp-bootstrap: Update to 6.1.0. Date: Sun, 16 Jun 2024 03:22:26 +0530
* 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: <c0c47b25ffa1f8f9520661568b1d394bb745d721.1718488151.git.ashvithshetty10 <at> gmail.com>
In-Reply-To: <361a358ac968efb4148512054e62f0f211abf7f7.1718488151.git.ashvithshetty10 <at> gmail.com>
References: <361a358ac968efb4148512054e62f0f211abf7f7.1718488151.git.ashvithshetty10 <at> gmail.com>
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
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
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 08:38:01 GMT) Full text and rfc822 format available.Message #8 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 1/8] gnu: Remove node-semver-bootstrap. Date: Tue, 18 Jun 2024 14:05:55 +0530
* gnu/packages/node.scm (node-semver-bootstrap): Delete variable.
Change-Id: I1fb1252bf8cd019ccc68efdfde68faf2abfb8911
---
gnu/packages/node.scm | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 52e719cdb0..c8b8cc69a9 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -334,37 +334,6 @@ (define-public node
(define-public node-bootstrap
(hidden-package node))
-;; Duplicate of node-semver
-(define-public node-semver-bootstrap
- (package
- (name "node-semver")
- (version "7.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/npm/node-semver")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "06biknqb05r9xsmcflm3ygh50pjvdk84x6r79w43kmck4fn3qn5p"))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies '("tap")))))))
- (home-page "https://github.com/npm/node-semver")
- (properties '((hidden? . #t)))
- (synopsis "Parses semantic versions strings")
- (description
- "@code{node-semver} is a JavaScript implementation of the
-@uref{https://semver.org/, SemVer.org} specification.")
- (license license:isc)))
-
(define-public node-ms-bootstrap
(package
(name "node-ms")
base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280
prerequisite-patch-id: a2c4661b4faa4a67c030905eee678a55a877d1a3
prerequisite-patch-id: 59f02e242a315495ea7047c6386ed4f8a686e0c2
--
2.45.1
From 058f3dd55c8c1df7adc1634f25abcb439cc295f0 Mon Sep 17 00:00:00 2001
Message-ID: <058f3dd55c8c1df7adc1634f25abcb439cc295f0.1718694047.git.ashvithshetty10 <at> gmail.com>
In-Reply-To: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
References: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Tue, 18 Jun 2024 10:46:35 +0530
Subject: [PATCH 2/8] gnu: Remove node-llparse-bootstrap.
* gnu/packages/node.scm (node-llparse-bootstrap): Delete variable.
Change-Id: I414164d3d69cba067659c2f81d6c93f09b96f5f6
---
gnu/packages/node.scm | 64 -------------------------------------------
1 file changed, 64 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index c8b8cc69a9..3474f2eabb 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -571,70 +571,6 @@ (define-public node-llparse-frontend-bootstrap
(description "This package is a frontend for the llparse compiler.")
(license license:expat)))
-(define-public node-llparse-bootstrap
- (package
- (name "node-llparse")
- (version "7.1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/indutny/llparse.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "10da273iy2if88hp79cwms6c8qpsl1fkgzll6gmqyx5yxv5mkyp6"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Fix imports for esbuild.
- ;; https://github.com/evanw/esbuild/issues/477
- (substitute* '("src/compiler/index.ts"
- "src/implementation/c/node/base.ts"
- "src/implementation/c/node/table-lookup.ts"
- "src/implementation/c/compilation.ts"
- "src/implementation/c/helpers/match-sequence.ts"
- "src/implementation/c/code/mul-add.ts")
- (("\\* as assert") "assert")
- (("\\* as debugAPI") "debugAPI"))
- #t))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies `("@types/debug"
- "@types/mocha"
- "@types/node"
- "esm"
- "llparse-test-fixture"
- "mocha"
- "ts-node"
- "tslint"
- "typescript"))))
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((esbuild (search-input-file inputs "/bin/esbuild")))
- (invoke esbuild
- "--platform=node"
- "--outfile=lib/api.js"
- "--bundle"
- "src/api.ts")))))))
- (inputs
- (list node-debug-bootstrap node-llparse-frontend-bootstrap))
- (native-inputs
- (list esbuild))
- (home-page "https://github.com/nodejs/llparse#readme")
- (properties '((hidden? . #t)))
- (synopsis "Compile incremental parsers to C code")
- (description "This package offers an API for compiling an incremental
-parser definition into a C output.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
From 57d153fd217dc3cce4aff2d4a75ba12c4d2f7b7a Mon Sep 17 00:00:00 2001
Message-ID: <57d153fd217dc3cce4aff2d4a75ba12c4d2f7b7a.1718694047.git.ashvithshetty10 <at> gmail.com>
In-Reply-To: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
References: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Tue, 18 Jun 2024 10:50:49 +0530
Subject: [PATCH 3/8] gnu: Remove node-llparse-frontend-bootstrap.
* gnu/packages/node.scm (node-llparse-frontend-bootstrap): Delete variable.
Change-Id: I8ac4906741fcb49a1a794c37db75735098369729
---
gnu/packages/node.scm | 62 -------------------------------------------
1 file changed, 62 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 3474f2eabb..923332d518 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -509,68 +509,6 @@ (define-public node-llparse-builder-bootstrap
(description "This package builds graphs for consumption by llparse.")
(license license:expat)))
-(define-public node-llparse-frontend-bootstrap
- (package
- (name "node-llparse-frontend")
- (version "3.0.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/indutny/llparse-frontend.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1rm9g4ifyip30svm5cgnf0gx7d45jgh4mpf2hkd092xhngmfvicc"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Fix imports for esbuild.
- ;; https://github.com/evanw/esbuild/issues/477
- (substitute* '("src/frontend.ts"
- "src/code/field-value.ts"
- "src/container/index.ts"
- "src/container/wrap.ts"
- "src/node/sequence.ts"
- "src/node/single.ts"
- "src/node/table-lookup.ts"
- "src/trie/index.ts")
- (("\\* as assert") "assert")
- (("\\* as debugAPI") "debugAPI"))
- #t))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies `("@types/debug"
- "@types/mocha"
- "@types/node"
- "mocha"
- "ts-node"
- "tslint"
- "typescript"))))
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((esbuild (search-input-file inputs "/bin/esbuild")))
- (invoke esbuild
- "--platform=node"
- "--outfile=lib/frontend.js"
- "--bundle"
- "src/frontend.ts")))))))
- (inputs
- (list node-debug-bootstrap node-llparse-builder-bootstrap))
- (native-inputs
- (list esbuild))
- (home-page "https://github.com/indutny/llparse-frontend#readme")
- (properties '((hidden? . #t)))
- (synopsis "Frontend for the llparse compiler")
- (description "This package is a frontend for the llparse compiler.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
From 1676d27d96c543364617f581ac682e32c75464b7 Mon Sep 17 00:00:00 2001
Message-ID: <1676d27d96c543364617f581ac682e32c75464b7.1718694047.git.ashvithshetty10 <at> gmail.com>
In-Reply-To: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
References: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Tue, 18 Jun 2024 10:53:54 +0530
Subject: [PATCH 4/8] gnu: Remove node-llparse-builder-bootstrap.
* gnu/packages/node.scm (node-llparse-builder-bootstrap): Delete variable.
Change-Id: I397762b1a0a0d3d249ad78633360b77d7c12cc9e
---
gnu/packages/node.scm | 70 -------------------------------------------
1 file changed, 70 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 923332d518..f984790678 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -439,76 +439,6 @@ (define-public node-debug-bootstrap
Node.js and web browsers.")
(license license:expat)))
-(define-public node-llparse-builder-bootstrap
- (package
- (name "node-llparse-builder")
- (version "1.5.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/indutny/llparse-builder.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0r82iiwqsb73k2fxw7842rjjiixllxpyc6yl9cq4ma6ybkf6xmzm"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; FIXME: Unneeded runtime dependency.
- ;; https://github.com/indutny/llparse-builder/pull/2
- (substitute* "package.json"
- (("\"@types/debug.*,") ""))
- ;; Fix imports for esbuild.
- ;; https://github.com/evanw/esbuild/issues/477
- (substitute* '("src/node/invoke.ts"
- "src/node/base.ts"
- "src/node/consume.ts"
- "src/node/match.ts"
- "src/node/error.ts"
- "src/node/pause.ts"
- "src/edge.ts"
- "src/utils.ts"
- "src/loop-checker/index.ts"
- "src/loop-checker/lattice.ts"
- "src/code/field.ts"
- "src/span-allocator.ts")
- (("\\* as assert") "assert")
- (("\\* as debugAPI") "debugAPI"))
- #t))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda _
- (delete-dependencies `("@types/mocha"
- "@types/node"
- "mocha"
- "ts-node"
- "tslint"
- "typescript"))))
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((esbuild (search-input-file inputs "/bin/esbuild")))
- (invoke esbuild
- "--platform=node"
- "--outfile=lib/builder.js"
- "--bundle"
- "src/builder.ts")))))))
- (inputs
- (list node-binary-search-bootstrap node-debug-bootstrap))
- (native-inputs
- (list esbuild))
- (home-page "https://github.com/indutny/llparse-builder#readme")
- (properties '((hidden? . #t)))
- (synopsis "Graph builder for consumption by llparse")
- (description "This package builds graphs for consumption by llparse.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
From b240d0be9d922d1950917f551328f577963287a0 Mon Sep 17 00:00:00 2001
Message-ID: <b240d0be9d922d1950917f551328f577963287a0.1718694047.git.ashvithshetty10 <at> gmail.com>
In-Reply-To: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
References: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Tue, 18 Jun 2024 10:56:37 +0530
Subject: [PATCH 5/8] gnu: Remove node-debug-bootstrap.
* gnu/packages/node.scm (node-debug-bootstrap): Delete variable.
Change-Id: I09a1da904c604c05ad99a9475b1465f62bcb534c
---
gnu/packages/node.scm | 42 ------------------------------------------
1 file changed, 42 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index f984790678..806f33533a 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -397,48 +397,6 @@ (define-public node-binary-search-bootstrap
(description "This package is a binary search function for Node.js.")
(license license:cc0)))
-(define-public node-debug-bootstrap
- (package
- (name "node-debug")
- (version "4.3.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/visionmedia/debug.git")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "08g52r1d4yqcsfdfb7n5if33d4cghaq75gx5n9hj6m6fd8jfp2pi"))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies `("brfs"
- "browserify"
- "coveralls"
- "istanbul"
- "karma"
- "karma-browserify"
- "karma-chrome-launcher"
- "karma-mocha"
- "mocha"
- "mocha-lcov-reporter"
- "xo")))))))
- (inputs (list node-ms-bootstrap))
- (home-page "https://github.com/visionmedia/debug#readme")
- (properties '((hidden? . #t)))
- (synopsis "Small debugging utility")
- (description "This package contains a tiny JavaScript debugging
-utility modelled after Node.js core's debugging technique. It works in
-Node.js and web browsers.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
From 2f0f201865550795fc16cd72983e333aa56d6557 Mon Sep 17 00:00:00 2001
Message-ID: <2f0f201865550795fc16cd72983e333aa56d6557.1718694047.git.ashvithshetty10 <at> gmail.com>
In-Reply-To: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
References: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Tue, 18 Jun 2024 10:59:35 +0530
Subject: [PATCH 6/8] gnu: Remove node-binary-search-bootstrap.
* gnu/packages/node.scm (node-binary-search-bootstrap): Delete variable.
Change-Id: I10402c840ed794d0bfba17a4033454de8a06a170
---
gnu/packages/node.scm | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 806f33533a..33f868e84e 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -368,35 +368,6 @@ (define-public node-ms-bootstrap
formats to milliseconds.")
(license license:expat)))
-(define-public node-binary-search-bootstrap
- (package
- (name "node-binary-search")
- (version "1.3.6")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/darkskyapp/binary-search.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xr2msdc143cd3xwgq7n3rhzy7j8wrnaidxl0r6l6b6g3mpbpjig"))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies `("chai" "mocha")))))))
- (home-page "https://github.com/darkskyapp/binary-search#readme")
- (properties '((hidden? . #t)))
- (synopsis "Tiny binary search function with comparators")
- (description "This package is a binary search function for Node.js.")
- (license license:cc0)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
From 2b85e5b54589ee39e645ea2a98a0d2452a6fb51d Mon Sep 17 00:00:00 2001
Message-ID: <2b85e5b54589ee39e645ea2a98a0d2452a6fb51d.1718694047.git.ashvithshetty10 <at> gmail.com>
In-Reply-To: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
References: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Tue, 18 Jun 2024 11:03:07 +0530
Subject: [PATCH 7/8] gnu: Remove node-ms-bootstrap.
* gnu/packages/node.scm (node-ms-bootstrap): Delete variable.
Change-Id: I8700591f516819fe848b77e936c89057708a4225
---
gnu/packages/node.scm | 34 ----------------------------------
1 file changed, 34 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 33f868e84e..800cb6b1c9 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -334,40 +334,6 @@ (define-public node
(define-public node-bootstrap
(hidden-package node))
-(define-public node-ms-bootstrap
- (package
- (name "node-ms")
- (version "2.1.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vercel/ms.git")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1pjxzbi4j8pinlsc7yxvfrh0b47kb2dc4lfc2rjq4wx5bdwl33fj"))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies '("eslint"
- "expect.js"
- "husky"
- "lint-staged"
- "mocha")))))))
- (home-page "https://github.com/zeit/ms#readme")
- (properties '((hidden? . #t)))
- (synopsis "Tiny millisecond conversion utility")
- (description "Use this package to easily convert various time
-formats to milliseconds.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
From c94d790c6c75ae87d7c79068cbf5f75c8ae49b02 Mon Sep 17 00:00:00 2001
Message-ID: <c94d790c6c75ae87d7c79068cbf5f75c8ae49b02.1718694047.git.ashvithshetty10 <at> gmail.com>
In-Reply-To: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
References: <28992bda8dae74e665bfc7b7c5b877a04afd31f4.1718694047.git.ashvithshetty10 <at> gmail.com>
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Tue, 18 Jun 2024 11:19:28 +0530
Subject: [PATCH 8/8] gnu: llhttp-bootstrap: Move to web and rename to
llhttp-node-lts.
* gnu/packages/node.scm (llhttp-bootstrap): Move
from here ...
* gnu/packages/web.scm: ... to here and rename to llhttp-node-lts.
Change-Id: Iaec111d69b157de924d7809f9d11d6878a9860b7
---
gnu/packages/node.scm | 8 +-------
gnu/packages/web.scm | 6 ++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 800cb6b1c9..b6e3ccc00c 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -334,12 +334,6 @@ (define-public node
(define-public node-bootstrap
(hidden-package node))
-(define-public llhttp-bootstrap
- (package
- (inherit llhttp)
- (version "6.1.0")
- (properties '((hidden? . #t)))))
-
(define-public node-lts
(package
(inherit node)
@@ -537,7 +531,7 @@ (define-public node-lts
c-ares-for-node
icu4c
libuv
- llhttp-bootstrap
+ llhttp-node-lts
brotli
`(,nghttp2 "lib")
openssl
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b9991bb9c1..95a9ae79ec 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6937,6 +6937,12 @@ (define-public llhttp
efficient where possible.")
(license license:expat)))
+(define-public llhttp-node-lts
+ (package
+ (inherit llhttp)
+ (version "6.1.0")
+ (properties '((hidden? . #t)))))
+
(define-public python-httpretty
(package
(name "python-httpretty")
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 09:18:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 09:51:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:40:01 GMT) Full text and rfc822 format available.Message #17 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 01/10] gnu: llhttp-bootstrap: Update to 6.1.0. Date: Tue, 18 Jun 2024 18:08:03 +0530
* 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
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:02 GMT) Full text and rfc822 format available.Message #20 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 02/10] gnu: node-lts: Update to 18.19.1. Date: Tue, 18 Jun 2024 18:08:04 +0530
* 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
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:02 GMT) Full text and rfc822 format available.Message #23 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 03/10] gnu: Remove node-semver-bootstrap. Date: Tue, 18 Jun 2024 18:08:05 +0530
* gnu/packages/node.scm (node-semver-bootstrap): Delete variable.
Change-Id: I1fb1252bf8cd019ccc68efdfde68faf2abfb8911
---
gnu/packages/node.scm | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 52e719cdb0..c8b8cc69a9 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -334,37 +334,6 @@ (define-public node
(define-public node-bootstrap
(hidden-package node))
-;; Duplicate of node-semver
-(define-public node-semver-bootstrap
- (package
- (name "node-semver")
- (version "7.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/npm/node-semver")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "06biknqb05r9xsmcflm3ygh50pjvdk84x6r79w43kmck4fn3qn5p"))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies '("tap")))))))
- (home-page "https://github.com/npm/node-semver")
- (properties '((hidden? . #t)))
- (synopsis "Parses semantic versions strings")
- (description
- "@code{node-semver} is a JavaScript implementation of the
-@uref{https://semver.org/, SemVer.org} specification.")
- (license license:isc)))
-
(define-public node-ms-bootstrap
(package
(name "node-ms")
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:03 GMT) Full text and rfc822 format available.Message #26 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 04/10] gnu: Remove node-llparse-bootstrap. Date: Tue, 18 Jun 2024 18:08:06 +0530
* gnu/packages/node.scm (node-llparse-bootstrap): Delete variable.
Change-Id: I414164d3d69cba067659c2f81d6c93f09b96f5f6
---
gnu/packages/node.scm | 64 -------------------------------------------
1 file changed, 64 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index c8b8cc69a9..3474f2eabb 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -571,70 +571,6 @@ (define-public node-llparse-frontend-bootstrap
(description "This package is a frontend for the llparse compiler.")
(license license:expat)))
-(define-public node-llparse-bootstrap
- (package
- (name "node-llparse")
- (version "7.1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/indutny/llparse.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "10da273iy2if88hp79cwms6c8qpsl1fkgzll6gmqyx5yxv5mkyp6"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Fix imports for esbuild.
- ;; https://github.com/evanw/esbuild/issues/477
- (substitute* '("src/compiler/index.ts"
- "src/implementation/c/node/base.ts"
- "src/implementation/c/node/table-lookup.ts"
- "src/implementation/c/compilation.ts"
- "src/implementation/c/helpers/match-sequence.ts"
- "src/implementation/c/code/mul-add.ts")
- (("\\* as assert") "assert")
- (("\\* as debugAPI") "debugAPI"))
- #t))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies `("@types/debug"
- "@types/mocha"
- "@types/node"
- "esm"
- "llparse-test-fixture"
- "mocha"
- "ts-node"
- "tslint"
- "typescript"))))
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((esbuild (search-input-file inputs "/bin/esbuild")))
- (invoke esbuild
- "--platform=node"
- "--outfile=lib/api.js"
- "--bundle"
- "src/api.ts")))))))
- (inputs
- (list node-debug-bootstrap node-llparse-frontend-bootstrap))
- (native-inputs
- (list esbuild))
- (home-page "https://github.com/nodejs/llparse#readme")
- (properties '((hidden? . #t)))
- (synopsis "Compile incremental parsers to C code")
- (description "This package offers an API for compiling an incremental
-parser definition into a C output.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:03 GMT) Full text and rfc822 format available.Message #29 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 05/10] gnu: Remove node-llparse-frontend-bootstrap. Date: Tue, 18 Jun 2024 18:08:07 +0530
* gnu/packages/node.scm (node-llparse-frontend-bootstrap): Delete variable.
Change-Id: I8ac4906741fcb49a1a794c37db75735098369729
---
gnu/packages/node.scm | 62 -------------------------------------------
1 file changed, 62 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 3474f2eabb..923332d518 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -509,68 +509,6 @@ (define-public node-llparse-builder-bootstrap
(description "This package builds graphs for consumption by llparse.")
(license license:expat)))
-(define-public node-llparse-frontend-bootstrap
- (package
- (name "node-llparse-frontend")
- (version "3.0.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/indutny/llparse-frontend.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1rm9g4ifyip30svm5cgnf0gx7d45jgh4mpf2hkd092xhngmfvicc"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Fix imports for esbuild.
- ;; https://github.com/evanw/esbuild/issues/477
- (substitute* '("src/frontend.ts"
- "src/code/field-value.ts"
- "src/container/index.ts"
- "src/container/wrap.ts"
- "src/node/sequence.ts"
- "src/node/single.ts"
- "src/node/table-lookup.ts"
- "src/trie/index.ts")
- (("\\* as assert") "assert")
- (("\\* as debugAPI") "debugAPI"))
- #t))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies `("@types/debug"
- "@types/mocha"
- "@types/node"
- "mocha"
- "ts-node"
- "tslint"
- "typescript"))))
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((esbuild (search-input-file inputs "/bin/esbuild")))
- (invoke esbuild
- "--platform=node"
- "--outfile=lib/frontend.js"
- "--bundle"
- "src/frontend.ts")))))))
- (inputs
- (list node-debug-bootstrap node-llparse-builder-bootstrap))
- (native-inputs
- (list esbuild))
- (home-page "https://github.com/indutny/llparse-frontend#readme")
- (properties '((hidden? . #t)))
- (synopsis "Frontend for the llparse compiler")
- (description "This package is a frontend for the llparse compiler.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:03 GMT) Full text and rfc822 format available.Message #32 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 06/10] gnu: Remove node-llparse-builder-bootstrap. Date: Tue, 18 Jun 2024 18:08:08 +0530
* gnu/packages/node.scm (node-llparse-builder-bootstrap): Delete variable.
Change-Id: I397762b1a0a0d3d249ad78633360b77d7c12cc9e
---
gnu/packages/node.scm | 70 -------------------------------------------
1 file changed, 70 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 923332d518..f984790678 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -439,76 +439,6 @@ (define-public node-debug-bootstrap
Node.js and web browsers.")
(license license:expat)))
-(define-public node-llparse-builder-bootstrap
- (package
- (name "node-llparse-builder")
- (version "1.5.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/indutny/llparse-builder.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0r82iiwqsb73k2fxw7842rjjiixllxpyc6yl9cq4ma6ybkf6xmzm"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; FIXME: Unneeded runtime dependency.
- ;; https://github.com/indutny/llparse-builder/pull/2
- (substitute* "package.json"
- (("\"@types/debug.*,") ""))
- ;; Fix imports for esbuild.
- ;; https://github.com/evanw/esbuild/issues/477
- (substitute* '("src/node/invoke.ts"
- "src/node/base.ts"
- "src/node/consume.ts"
- "src/node/match.ts"
- "src/node/error.ts"
- "src/node/pause.ts"
- "src/edge.ts"
- "src/utils.ts"
- "src/loop-checker/index.ts"
- "src/loop-checker/lattice.ts"
- "src/code/field.ts"
- "src/span-allocator.ts")
- (("\\* as assert") "assert")
- (("\\* as debugAPI") "debugAPI"))
- #t))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda _
- (delete-dependencies `("@types/mocha"
- "@types/node"
- "mocha"
- "ts-node"
- "tslint"
- "typescript"))))
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((esbuild (search-input-file inputs "/bin/esbuild")))
- (invoke esbuild
- "--platform=node"
- "--outfile=lib/builder.js"
- "--bundle"
- "src/builder.ts")))))))
- (inputs
- (list node-binary-search-bootstrap node-debug-bootstrap))
- (native-inputs
- (list esbuild))
- (home-page "https://github.com/indutny/llparse-builder#readme")
- (properties '((hidden? . #t)))
- (synopsis "Graph builder for consumption by llparse")
- (description "This package builds graphs for consumption by llparse.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:04 GMT) Full text and rfc822 format available.Message #35 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 07/10] gnu: Remove node-debug-bootstrap. Date: Tue, 18 Jun 2024 18:08:09 +0530
* gnu/packages/node.scm (node-debug-bootstrap): Delete variable.
Change-Id: I09a1da904c604c05ad99a9475b1465f62bcb534c
---
gnu/packages/node.scm | 42 ------------------------------------------
1 file changed, 42 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index f984790678..806f33533a 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -397,48 +397,6 @@ (define-public node-binary-search-bootstrap
(description "This package is a binary search function for Node.js.")
(license license:cc0)))
-(define-public node-debug-bootstrap
- (package
- (name "node-debug")
- (version "4.3.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/visionmedia/debug.git")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "08g52r1d4yqcsfdfb7n5if33d4cghaq75gx5n9hj6m6fd8jfp2pi"))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies `("brfs"
- "browserify"
- "coveralls"
- "istanbul"
- "karma"
- "karma-browserify"
- "karma-chrome-launcher"
- "karma-mocha"
- "mocha"
- "mocha-lcov-reporter"
- "xo")))))))
- (inputs (list node-ms-bootstrap))
- (home-page "https://github.com/visionmedia/debug#readme")
- (properties '((hidden? . #t)))
- (synopsis "Small debugging utility")
- (description "This package contains a tiny JavaScript debugging
-utility modelled after Node.js core's debugging technique. It works in
-Node.js and web browsers.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:04 GMT) Full text and rfc822 format available.Message #38 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 08/10] gnu: Remove node-binary-search-bootstrap. Date: Tue, 18 Jun 2024 18:08:10 +0530
* gnu/packages/node.scm (node-binary-search-bootstrap): Delete variable.
Change-Id: I10402c840ed794d0bfba17a4033454de8a06a170
---
gnu/packages/node.scm | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 806f33533a..33f868e84e 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -368,35 +368,6 @@ (define-public node-ms-bootstrap
formats to milliseconds.")
(license license:expat)))
-(define-public node-binary-search-bootstrap
- (package
- (name "node-binary-search")
- (version "1.3.6")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/darkskyapp/binary-search.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xr2msdc143cd3xwgq7n3rhzy7j8wrnaidxl0r6l6b6g3mpbpjig"))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies `("chai" "mocha")))))))
- (home-page "https://github.com/darkskyapp/binary-search#readme")
- (properties '((hidden? . #t)))
- (synopsis "Tiny binary search function with comparators")
- (description "This package is a binary search function for Node.js.")
- (license license:cc0)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:05 GMT) Full text and rfc822 format available.Message #41 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 09/10] gnu: Remove node-ms-bootstrap. Date: Tue, 18 Jun 2024 18:08:11 +0530
* gnu/packages/node.scm (node-ms-bootstrap): Delete variable.
Change-Id: I8700591f516819fe848b77e936c89057708a4225
---
gnu/packages/node.scm | 34 ----------------------------------
1 file changed, 34 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 33f868e84e..800cb6b1c9 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -334,40 +334,6 @@ (define-public node
(define-public node-bootstrap
(hidden-package node))
-(define-public node-ms-bootstrap
- (package
- (name "node-ms")
- (version "2.1.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vercel/ms.git")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1pjxzbi4j8pinlsc7yxvfrh0b47kb2dc4lfc2rjq4wx5bdwl33fj"))))
- (build-system node-build-system)
- (arguments
- `(#:node ,node-bootstrap
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda args
- (delete-dependencies '("eslint"
- "expect.js"
- "husky"
- "lint-staged"
- "mocha")))))))
- (home-page "https://github.com/zeit/ms#readme")
- (properties '((hidden? . #t)))
- (synopsis "Tiny millisecond conversion utility")
- (description "Use this package to easily convert various time
-formats to milliseconds.")
- (license license:expat)))
-
(define-public llhttp-bootstrap
(package
(inherit llhttp)
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 12:43:05 GMT) Full text and rfc822 format available.Message #44 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 10/10] gnu: llhttp-bootstrap: Move to web and rename to llhttp-node-lts. Date: Tue, 18 Jun 2024 18:08:12 +0530
* gnu/packages/node.scm (llhttp-bootstrap): Move
from here ...
* gnu/packages/web.scm: ... to here and rename to llhttp-node-lts.
Change-Id: Iaec111d69b157de924d7809f9d11d6878a9860b7
---
gnu/packages/node.scm | 8 +-------
gnu/packages/web.scm | 6 ++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 800cb6b1c9..b6e3ccc00c 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -334,12 +334,6 @@ (define-public node
(define-public node-bootstrap
(hidden-package node))
-(define-public llhttp-bootstrap
- (package
- (inherit llhttp)
- (version "6.1.0")
- (properties '((hidden? . #t)))))
-
(define-public node-lts
(package
(inherit node)
@@ -537,7 +531,7 @@ (define-public node-lts
c-ares-for-node
icu4c
libuv
- llhttp-bootstrap
+ llhttp-node-lts
brotli
`(,nghttp2 "lib")
openssl
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b9991bb9c1..95a9ae79ec 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6937,6 +6937,12 @@ (define-public llhttp
efficient where possible.")
(license license:expat)))
+(define-public llhttp-node-lts
+ (package
+ (inherit llhttp)
+ (version "6.1.0")
+ (properties '((hidden? . #t)))))
+
(define-public python-httpretty
(package
(name "python-httpretty")
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Tue, 18 Jun 2024 19:07:02 GMT) Full text and rfc822 format available.Message #47 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: [PATCH 11/11] gnu: Remove node-bootstrap. Date: Wed, 19 Jun 2024 00:35:01 +0530
* gnu/packages/node.scm (node-bootstrap): Delete variable.
Change-Id: I634b79ab744597a2bf141d644db680b043f07f09
---
gnu/packages/node.scm | 5 -----
1 file changed, 5 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index b6e3ccc00c..d560faa042 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -329,11 +329,6 @@ (define-public node
(timeout . 21600) ;6h
(cpe-name . "node.js")))))
-;; This should be the latest version of node that still builds without
-;; depending on llhttp.
-(define-public node-bootstrap
- (hidden-package node))
-
(define-public node-lts
(package
(inherit node)
--
2.45.1
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Wed, 19 Jun 2024 08:07:02 GMT) Full text and rfc822 format available.Message #50 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Jelle Licht <jlicht <at> fsfe.org> To: Ashvith Shetty <ashvithshetty10 <at> gmail.com>, 71581 <at> debbugs.gnu.org Cc: Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: Re: [bug#71581] [PATCH 11/11] gnu: Remove node-bootstrap. Date: Wed, 19 Jun 2024 10:06:04 +0200
Hi Ashvith, Thank you for working on Node.js related things in guix. My apologies for not looking into your set of contributions earlier, I have an longer train ride coming up where I can set aside some time for proper reviews. Ashvith Shetty <ashvithshetty10 <at> gmail.com> writes: > * gnu/packages/node.scm (node-bootstrap): Delete variable. It seems there has been a misunderstanding (not on your side!) about the construction of the llhttp package. It is a bunch of javascript that generates code in C, which can subsequently be compiled by any C compiler. This means that the llhttp package that is currently included in guix does not meet our packaging criteria, and should be patched and/or removed. I'll send a bug report for this separate issue later. (IMHO this will boil down to it being built like llhttp-bootstrap, but perhaps using the node package instead of the node-lts package. Either way, the node-bootstrap and llhttp-bootstrap packages would still be needed) Provided I didn't misread the situation, this makes your patches require rework; perhaps we could discuss a way forward that respects your time as much as possible. It might make sense to jump up to the latest Node.js LTS version (20.x.y) instead of the 18 series. I even think we could patch more modern llhttp versions so that we could still build them with Node.js 14 (node-bootstrap), in which case we could move towards the Node.js 22 series. Kind regards, Jelle
guix-patches <at> gnu.org:bug#71581; Package guix-patches.
(Wed, 19 Jun 2024 10:54:02 GMT) Full text and rfc822 format available.Message #53 received at 71581 <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: Jelle Licht <jlicht <at> fsfe.org> Cc: 71581 <at> debbugs.gnu.org Subject: Re: [bug#71581] [PATCH 11/11] gnu: Remove node-bootstrap. Date: Wed, 19 Jun 2024 10:52:24 +0000
Hello, I'm not really an expert in build, so I'd really appreciate someone guiding me with this. Also unfortunately, I cannot diagnose NodeJS properly, because building it takes almost more than a day on my potato PC, only for the build to fail because some parallel tests don't work on Guix. So far, the minor bump to 18.20.0 has worked fine for me, and I was planning to leave it to the last version, so that anyone else looking for NodeJS 18 could use inferiors to package their project. I grew tired of having to do this every time, so right now, I'm packing all the dependencies - `simdutf`, `uvwasi`, `ngtcp2`, while also removing dependencies in NodeJS that also exist in Guix, like for example, sqlite. One advantage I see to this is that the builds will be cached for a particular dependency, and also shared between them - at least in my idea, this would be great for Electron, Chromium forks, Node and also Deno. Right now, there's a few roadblocks: - V8 shared library support was removed around 2015, meaning that I'd have to use a patch to get around this. - Support for shared libraries for tinier dependencies like simdutf, uvwasi and ada does not exist in the file `configure.py` - There's no way to build a project that uses bazel, because it does not exist on Guix at the moment. The first two issues can probably be dealt with, using patches over nodejs. However, I'm pretty sure working on the third one would require working on adding bazel as a build system and at least for the time being, we will have to use internal v8. For JS-based dependencies like acorn, acorn-walk, undici, etc, is it not possible to use txiki.js instead? I was thinking of eliminating all node-based bootstraps, using this tiny JS runtime to build main dependencies. That, or perhaps, a node-minimal package that is free of extra, unneeded stuff. Regards, Ashvith
Ashvith Shetty <ashvithshetty10 <at> gmail.com>:Ashvith Shetty <ashvithshetty10 <at> gmail.com>:Message #58 received at 71581-done <at> debbugs.gnu.org (full text, mbox):
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 71581-done <at> debbugs.gnu.org Cc: Jelle Licht <jlicht <at> fsfe.org>, Ashvith Shetty <ashvithshetty10 <at> gmail.com> Subject: Re: [PATCH 1/2] gnu: llhttp-bootstrap: Update to 6.1.0. Date: Fri, 06 Dec 2024 00:30:35 +0530
Closing this in favour of the patches at https://issues.guix.gnu.org/74187.
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Fri, 03 Jan 2025 12:24:10 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.