summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/node.scm26
1 files changed, 10 insertions, 16 deletions
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index c60c6de7772..f6664893b91 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -748,14 +748,14 @@ source files.")
748(define-public node-lts 748(define-public node-lts
749 (package 749 (package
750 (inherit node-bootstrap) 750 (inherit node-bootstrap)
751 (version "24.0.1") 751 (version "24.2.0")
752 (source (origin 752 (source (origin
753 (method url-fetch) 753 (method url-fetch)
754 (uri (string-append "https://nodejs.org/dist/v" version 754 (uri (string-append "https://nodejs.org/dist/v" version
755 "/node-v" version ".tar.gz")) 755 "/node-v" version ".tar.gz"))
756 (sha256 756 (sha256
757 (base32 757 (base32
758 "024mr7260zk8n0ny1rdlf9qlmxwrkh0pcbkzcms4dxsnzv9jlbz0")) 758 "0ac9l5azz2jf5w59n55s68d8h7ccn9iz1afdhxjl6aapqknrlwys"))
759 (modules '((guix build utils))) 759 (modules '((guix build utils)))
760 (snippet 760 (snippet
761 '(begin 761 '(begin
@@ -771,13 +771,17 @@ source files.")
771 "deps/icu-small" 771 "deps/icu-small"
772 "deps/nghttp2" 772 "deps/nghttp2"
773 "deps/ngtcp2" 773 "deps/ngtcp2"
774 "deps/llhttp"
774 "deps/uv" 775 "deps/uv"
775 "deps/zlib")))))) 776 "deps/zlib"
777 "deps/zstd"))))))
776 (arguments 778 (arguments
777 (substitute-keyword-arguments arguments 779 (substitute-keyword-arguments arguments
778 ((#:configure-flags configure-flags) 780 ((#:configure-flags configure-flags)
779 ''("--shared-cares" 781 ''("--shared-cares"
780 "--shared-libuv" 782 "--shared-libuv"
783 "--shared-http-parser"
784 "--shared-http-parser-libname=llhttp"
781 "--shared-nghttp2" 785 "--shared-nghttp2"
782 "--shared-openssl" 786 "--shared-openssl"
783 "--shared-zlib" 787 "--shared-zlib"
@@ -785,6 +789,7 @@ source files.")
785 "--with-intl=system-icu" 789 "--with-intl=system-icu"
786 "--shared-ngtcp2" 790 "--shared-ngtcp2"
787 "--shared-nghttp3" 791 "--shared-nghttp3"
792 "--shared-zstd"
788 ;;Needed for correct snapshot checksums 793 ;;Needed for correct snapshot checksums
789 "--v8-enable-snapshot-compression")) 794 "--v8-enable-snapshot-compression"))
790 ((#:phases phases) 795 ((#:phases phases)
@@ -902,18 +907,6 @@ source files.")
902 "test/parallel/test-http2-invalid-last-stream-id.js") 907 "test/parallel/test-http2-invalid-last-stream-id.js")
903 (("client\\.connect\\(address\\)") 908 (("client\\.connect\\(address\\)")
904 "client.connect(address.port)")))) 909 "client.connect(address.port)"))))
905 (add-after 'delete-problematic-tests 'replace-llhttp-sources
906 (lambda* (#:key inputs #:allow-other-keys)
907 ;; Replace pre-generated llhttp sources
908 (let ((llhttp (assoc-ref inputs "llhttp")))
909 (copy-file (string-append llhttp "/src/llhttp.c")
910 "deps/llhttp/src/llhttp.c")
911 (copy-file (string-append llhttp "/src/api.c")
912 "deps/llhttp/src/api.c")
913 (copy-file (string-append llhttp "/src/http.c")
914 "deps/llhttp/src/http.c")
915 (copy-file (string-append llhttp "/include/llhttp.h")
916 "deps/llhttp/include/llhttp.h"))))
917 ;; npm installs dependencies by copying their files over a tar 910 ;; npm installs dependencies by copying their files over a tar
918 ;; stream. A file with more than one hardlink is marked as a 911 ;; stream. A file with more than one hardlink is marked as a
919 ;; "Link". pacote/lib/fetcher.js calls node-tar's extractor with a 912 ;; "Link". pacote/lib/fetcher.js calls node-tar's extractor with a
@@ -991,7 +984,8 @@ fi"
991 nghttp3 984 nghttp3
992 `(,nghttp2 "lib") 985 `(,nghttp2 "lib")
993 openssl-3.0 986 openssl-3.0
994 zlib)) 987 zlib
988 `(,zstd-1.5.7 "lib")))
995 (supported-systems 989 (supported-systems
996 (cons "riscv64-linux" (package-supported-systems node-bootstrap))) 990 (cons "riscv64-linux" (package-supported-systems node-bootstrap)))
997 (properties (alist-delete 'hidden? (package-properties node-bootstrap))))) 991 (properties (alist-delete 'hidden? (package-properties node-bootstrap)))))