gnu: node: Update to 10.15.3.

* gnu/packages/libevent.scm (libuv-1.19): Remove variable.
* gnu/packages/node.scm (node): Update to 10.15.3.
[source]: Use XZ-compressed tarball.
[arguments]: Add #:test-target.  Use DELETE-FILE instead of DELETE-IF-EXISTS.
Remove obsolete test deletions.
[inputs]: Change OPENSSL to OPENSSL-NEXT.  Change LIBUV-1.19 to LIBUV.
(node-lts): Remove variable.
This commit is contained in:
Marius Bakke 2019-05-26 14:21:19 +02:00
parent 0d3dbe3f56
commit 7024846181
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 11 additions and 50 deletions

View file

@ -150,19 +150,6 @@ (define-public libuv
;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'. ;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'.
(license (list expat cc-by4.0)))) (license (list expat cc-by4.0))))
;; This version is required for Node versions < 10.
(define-public libuv-1.19
(package
(inherit libuv)
(version "1.19.2")
(source (origin
(method url-fetch)
(uri (string-append "https://dist.libuv.org/dist/v" version
"/libuv-v" version ".tar.gz"))
(sha256
(base32
"1msk9ac1z69whww88ibrwjqkd1apdla6l77cm2fwy5kigq0z5g3w"))))))
(define-public perl-anyevent (define-public perl-anyevent
(package (package
(name "perl-anyevent") (name "perl-anyevent")

View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -45,14 +45,14 @@ (define-module (gnu packages node)
(define-public node (define-public node
(package (package
(name "node") (name "node")
(version "9.11.1") (version "10.15.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://nodejs.org/dist/v" version (uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.gz")) "/node-v" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1vjh9zvw7wkdz6b0l99ya7mqjk0l8lbg9isr1q8rxwp400dhkk32")) "1mcijznh481s44i59p571a38bfvcxm9f8x2l0l1005aly0kdj8jf"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
@ -83,18 +83,14 @@ (define-public node
"--shared-zlib" "--shared-zlib"
"--without-snapshot" "--without-snapshot"
"--with-intl=system-icu") "--with-intl=system-icu")
;; Run only the CI tests. The default test target requires additional
;; add-ons from NPM that are not distributed with the source.
#:test-target "test-ci-js"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-files (add-before 'configure 'patch-files
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; This phase is inherited by Node LTS, which does not have all
;; the files listed here. Use this helper for convenience.
(define (delete-if-exists file)
(if (file-exists? file)
(delete-file file)
'()))
;; Fix hardcoded /bin/sh references. ;; Fix hardcoded /bin/sh references.
(substitute* '("lib/child_process.js" (substitute* '("lib/child_process.js"
"lib/internal/v8_prof_polyfill.js" "lib/internal/v8_prof_polyfill.js"
@ -110,17 +106,9 @@ (define (delete-if-exists file)
(("'/usr/bin/env'") (("'/usr/bin/env'")
(string-append "'" (which "env") "'"))) (string-append "'" (which "env") "'")))
;; FIXME: These tests depend on being able to install eslint.
;; See https://github.com/nodejs/node/issues/17098.
(for-each delete-if-exists
'("test/parallel/test-eslint-alphabetize-errors.js"
"test/parallel/test-eslint-buffer-constructor.js"
"test/parallel/test-eslint-documented-errors.js"
"test/parallel/test-eslint-inspector-check.js"))
;; FIXME: These tests fail in the build container, but they don't ;; FIXME: These tests fail in the build container, but they don't
;; seem to be indicative of real problems in practice. ;; seem to be indicative of real problems in practice.
(for-each delete-if-exists (for-each delete-file
'("test/async-hooks/test-ttywrap.readstream.js" '("test/async-hooks/test-ttywrap.readstream.js"
"test/parallel/test-util-inspect.js" "test/parallel/test-util-inspect.js"
"test/parallel/test-v8-serdes.js" "test/parallel/test-v8-serdes.js"
@ -132,14 +120,13 @@ (define (delete-if-exists file)
"test/parallel/test-net-listen-after-destroying-stdin.js" "test/parallel/test-net-listen-after-destroying-stdin.js"
"test/parallel/test-npm-install.js" "test/parallel/test-npm-install.js"
"test/sequential/test-child-process-emfile.js" "test/sequential/test-child-process-emfile.js"
"test/sequential/test-benchmark-child-process.js"
"test/sequential/test-http-regr-gh-2928.js")) "test/sequential/test-http-regr-gh-2928.js"))
;; These tests have an expiry date: they depend on the validity of ;; These tests have an expiry date: they depend on the validity of
;; TLS certificates that are bundled with the source. We want this ;; TLS certificates that are bundled with the source. We want this
;; package to be reproducible forever, so remove those. ;; package to be reproducible forever, so remove those.
;; TODO: Regenerate certs instead. ;; TODO: Regenerate certs instead.
(for-each delete-if-exists (for-each delete-file
'("test/parallel/test-tls-passphrase.js" '("test/parallel/test-tls-passphrase.js"
"test/parallel/test-tls-server-verify.js")) "test/parallel/test-tls-server-verify.js"))
#t)) #t))
@ -184,9 +171,9 @@ (define (delete-if-exists file)
`(("c-ares" ,c-ares) `(("c-ares" ,c-ares)
("http-parser" ,http-parser) ("http-parser" ,http-parser)
("icu4c" ,icu4c) ("icu4c" ,icu4c)
("libuv" ,libuv-1.19) ("libuv" ,libuv)
("nghttp2" ,nghttp2 "lib") ("nghttp2" ,nghttp2 "lib")
("openssl" ,openssl) ("openssl" ,openssl-next)
("zlib" ,zlib))) ("zlib" ,zlib)))
(synopsis "Evented I/O for V8 JavaScript") (synopsis "Evented I/O for V8 JavaScript")
(description "Node.js is a platform built on Chrome's JavaScript runtime (description "Node.js is a platform built on Chrome's JavaScript runtime
@ -197,16 +184,3 @@ (define (delete-if-exists file)
(home-page "https://nodejs.org/") (home-page "https://nodejs.org/")
(license expat) (license expat)
(properties '((timeout . 3600))))) ; 1 h (properties '((timeout . 3600))))) ; 1 h
(define-public node-lts
(package
(inherit node)
(name "node-lts")
(version "8.12.0")
(source (origin
(inherit (package-source node))
(uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.xz"))
(sha256
(base32
"16j1rrxkhmvpcw689ndw1raql1gz4jqn7n82z55zn63c05cgz7as"))))))