diff options
author | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
---|---|---|
committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
commit | 1828958db52d0019a7f3d763b07e64f78afa2cbf (patch) | |
tree | 8bdff27c5b3dc088d923e91a14a38f6a6b9fa661 /gnu/packages/node.scm | |
parent | 7e463dd16b7e273011f0beafa57a89fa2d525f8b (diff) | |
parent | 23744435613aa040beacc61a0825cc72280da80a (diff) |
Merge branch 'wip-lisp' into staging
Diffstat (limited to 'gnu/packages/node.scm')
-rw-r--r-- | gnu/packages/node.scm | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ed0b5c4f16..f0b989b88a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -25,6 +25,7 @@ (define-module (gnu packages node) #:use-module ((guix licenses) #:select (expat)) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix download) @@ -47,14 +48,14 @@ (define-public node (package (name "node") - (version "10.22.0") + (version "10.20.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "1nz18fa550li10r0kzsm28c2rvvq61nq8bqdygip0rmvbi2paxg0")) + "0cvjwnl0wkcsyw3kannbdv01s235wrnp11n2s6swzjx95gpichfi")) (modules '((guix build utils))) (snippet `(begin @@ -186,7 +187,7 @@ ("http-parser" ,http-parser) ("icu4c" ,icu4c) ("libuv" ,libuv) - ("nghttp2" ,nghttp2-1.41 "lib") + ("nghttp2" ,nghttp2 "lib") ("openssl" ,openssl) ("zlib" ,zlib))) (synopsis "Evented I/O for V8 JavaScript") @@ -200,6 +201,24 @@ devices.") (properties '((max-silent-time . 7200) ;2h, needed on ARM (timeout . 21600))))) ;6h +;; TODO: Make this the default node on core-updates. This cannot be done on +;; master since this version of node requires a newer nghttp2 library at link +;; time. +(define-public node-10.22 + (package + (inherit node) + (version "10.22.0") + (source (origin + (inherit (package-source node)) + (uri (string-append "https://nodejs.org/dist/v" version + "/node-v" version ".tar.xz")) + (sha256 + (base32 + "1nz18fa550li10r0kzsm28c2rvvq61nq8bqdygip0rmvbi2paxg0")))) + (inputs + (alist-replace "nghttp2" (list nghttp2-1.41 "lib") + (package-inputs node))))) + (define-public libnode (package (inherit node) |