From b4481f2df1ac0e24a41a06671e99e88a5e2c9d2d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Feb 2020 20:39:44 +0100 Subject: gnu: node: Increase build timeouts. * gnu/packages/node.scm (node)[properties]: Add MAX-SILENT-TIME. Increase TIMEOUT from 3600 seconds to 14400. --- gnu/packages/node.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/node.scm') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 1494e2ecfe..ee35d76852 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -182,4 +182,5 @@ perfect for data-intensive real-time applications that run across distributed devices.") (home-page "https://nodejs.org/") (license expat) - (properties '((timeout . 3600))))) ; 1 h + (properties '((max-silent-time . 7200) ;2h, needed on ARM + (timeout . 21600))))) ;6h -- cgit v1.2.3 From 458c3ff552005cbf69ed4a1daee3529214ae73cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 16:16:29 +0100 Subject: gnu: node: Update to 10.19.0. * gnu/packages/node.scm (node): Update to 10.19.0. [inputs]: Remove LIBUV and NGHTTP2:LIB. Add LIBUV/LATEST and NGHTTP2-1.40:LIB. --- gnu/packages/node.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/node.scm') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ee35d76852..296a5e1980 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019 Marius Bakke +;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,14 +45,14 @@ (define-public node (package (name "node") - (version "10.16.0") + (version "10.19.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq")) + "0sginvcsf7lrlzsnpahj4bj1f673wfvby8kaxgvzlrbb7sy229v2")) (modules '((guix build utils))) (snippet `(begin @@ -170,8 +170,8 @@ `(("c-ares" ,c-ares) ("http-parser" ,http-parser) ("icu4c" ,icu4c) - ("libuv" ,libuv) - ("nghttp2" ,nghttp2 "lib") + ("libuv" ,libuv/latest) + ("nghttp2" ,nghttp2-1.40 "lib") ("openssl" ,openssl) ("zlib" ,zlib))) (synopsis "Evented I/O for V8 JavaScript") -- cgit v1.2.3 From 5cfc6a88e9fbb9f34855ebd43264266b0201ce50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 17:22:22 +0100 Subject: gnu: node: Disable failing tests on armhf-linux. * gnu/packages/node.scm (node)[arguments]: When building on armhf-linux, disable several zlib tests. --- gnu/packages/node.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu/packages/node.scm') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 296a5e1980..eb8c83d831 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -74,8 +74,7 @@ #t)))) (build-system gnu-build-system) (arguments - ;; TODO: Purge the bundled copies from the source. - '(#:configure-flags '("--shared-cares" + `(#:configure-flags '("--shared-cares" "--shared-http-parser" "--shared-libuv" "--shared-nghttp2" @@ -121,6 +120,20 @@ ;; https://github.com/nodejs/node/issues/31213 (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js") + ;; FIXME: These tests fail on armhf-linux: + ;; https://github.com/nodejs/node/issues/31970 + ,@(if (string-prefix? "arm" (%current-system)) + '((for-each delete-file + '("test/parallel/test-zlib.js" + "test/parallel/test-zlib-brotli.js" + "test/parallel/test-zlib-brotli-flush.js" + "test/parallel/test-zlib-brotli-from-brotli.js" + "test/parallel/test-zlib-brotli-from-string.js" + "test/parallel/test-zlib-convenience-methods.js" + "test/parallel/test-zlib-random-byte-pipes.js" + "test/parallel/test-zlib-write-after-flush.js"))) + '()) + ;; These tests have an expiry date: they depend on the validity of ;; TLS certificates that are bundled with the source. We want this ;; package to be reproducible forever, so remove those. -- cgit v1.2.3