--- Begin Message ---
Subject: |
[PATCH] gnu: node: Update to 8.9.1. |
Date: |
Sat, 25 Nov 2017 20:45:40 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Let me know if there is a better way to accomplish removing the
`doc-only' invocation as part of the `check' target. It invokes npm and
attempts to download `js-yaml', so I figured we may as well just skip it
altogether since it isn't otherwise used.
From 918303981e0dd3212f1e0c1f1f87fc8ca608cc5e Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <address@hidden>
Date: Sat, 25 Nov 2017 20:34:12 -0500
Subject: [PATCH] gnu: node: Update to 8.9.1.
* gnu/packages/node.scm (node): Update to 8.9.1.
[arguments]: Skip 'doc-only' target in 'check', which attempts to use
npm to retrieve 'js-yaml' package. Remove test/doctool/test-make-doc.js.
Do not remove now-missing test case. Remove new test case that fails in
containers due to networking.
---
gnu/packages/node.scm | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index e354130ad..4e2990ca3 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -40,14 +40,14 @@
(define-public node
(package
(name "node")
- (version "8.7.0")
+ (version "8.9.1")
(source (origin
(method url-fetch)
(uri (string-append "http://nodejs.org/dist/v" version
"/node-v" version ".tar.gz"))
(sha256
(base32
- "1a0ginagx3pav6v7adyp76jisia4qgbsq6pz3als4kshwlk4a667"))))
+ "1qbiz7hgwlirhwpd71c8yzcbwsyi5bjlfp6lxb6v55j6rizinj9j"))))
(build-system gnu-build-system)
(arguments
;; TODO: Purge the bundled copies from the source.
@@ -76,6 +76,10 @@
(("'/usr/bin/env'")
(string-append "'" (which "env") "'")))
+
+ ;; test-make-doc needs doc-only target, which is inhibited below
+ (for-each delete-file
+ '("test/doctool/test-make-doc.js"))
;; FIXME: This test seems to depends on files that are not
;; available in the bundled v8. See
;; https://github.com/nodejs/node/issues/13344
@@ -88,12 +92,12 @@
"test/parallel/test-util-inspect.js"
"test/parallel/test-v8-serdes.js"
"test/parallel/test-dgram-membership.js"
-
"test/parallel/test-dgram-multicast-set-interface-lo.js"
"test/parallel/test-dns-cancel-reverse-lookup.js"
"test/parallel/test-dns-resolveany.js"
"test/parallel/test-cluster-master-error.js"
"test/parallel/test-cluster-master-kill.js"
"test/parallel/test-npm-install.js"
+ "test/parallel/test-regress-GH-746.js"
"test/sequential/test-child-process-emfile.js"
"test/sequential/test-benchmark-child-process.js"
"test/sequential/test-http-regr-gh-2928.js"))
@@ -115,6 +119,14 @@
(string-append (assoc-ref inputs "python")
"/bin/python")
"configure" flags)))))
+ (add-before 'check 'skip-check-doc-only
+ (lambda _
+ (substitute* "Makefile"
+ ;; requires js-yaml, which is not part of the distribution,
+ ;; and falls back to using npm to download it
+ (("\\$\\(MAKE\\) doc-only" all)
+ (string-append "#" all)))
+ #t))
(add-after 'patch-shebangs 'patch-npm-shebang
(lambda* (#:key outputs #:allow-other-keys)
(let* ((bindir (string-append (assoc-ref outputs "out")
--
2.15.0
signature.asc
Description: PGP signature
--
Mike Gerwitz
Free Software Hacker+Activist | GNU Maintainer & Volunteer
GPG: D6E9 B930 028A 6C38 F43B 2388 FEF6 3574 5E6F 6D05
https://mikegerwitz.com
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#29449] [PATCH] gnu: node: Update to 8.9.1. |
Date: |
Tue, 28 Nov 2017 10:05:16 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Mike Gerwitz <address@hidden> skribis:
> From a07f3f92a0768661dbcb2a4b87fe08dd04149190 Mon Sep 17 00:00:00 2001
> From: Mike Gerwitz <address@hidden>
> Date: Sat, 25 Nov 2017 20:34:12 -0500
> Subject: [PATCH] gnu: node: Update to 8.9.1.
>
> * gnu/packages/node.scm (node): Update to 8.9.1.
> [source]: Apply 'node-test-http2-server-rst-stream.patch'.
> [arguments]: Skip 'doc-only' target in 'check', which attempts to use
> npm to retrieve 'js-yaml' package. Remove test/doctool/test-make-doc.js.
> Do not remove now-missing test case. Remove new test case that fails in
> containers due to networking.
> * gnu/packages/patches/node-test-http2-server-rst-stream.patch: New file.
Perfect. Applied, thanks!
Ludo’.
--- End Message ---