From 9556fc13a77d2619cfd1e861f0269bccf0a58986 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Sep 2018 13:12:23 +0200 Subject: [PATCH] gnu: Add Node LTS. * gnu/packages/libevent.scm (libuv-1.19): New public variable. * gnu/packages/node.scm (node)[arguments]: Adjust 'patch-files' phase to ignore missing files. (node-lts): New public variable. --- gnu/packages/libevent.scm | 13 +++++++++++++ gnu/packages/node.scm | 30 +++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index bc7f6c670..053824bce 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -152,6 +152,19 @@ resolution, asynchronous file system operations, and threading primitives.") ;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'. (license (list expat cc-by4.0)))) +;; Node 8.x require this version. +(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 (package (name "perl-anyevent") diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index d1de7a536..50b1c2b34 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -39,7 +39,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (srfi srfi-1)) (define-public node (package @@ -86,6 +87,14 @@ (modify-phases %standard-phases (add-before 'configure 'patch-files (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) + #t)) + ;; Fix hardcoded /bin/sh references. (substitute* '("lib/child_process.js" "lib/internal/v8_prof_polyfill.js" @@ -103,7 +112,7 @@ ;; FIXME: These tests depend on being able to install eslint. ;; See https://github.com/nodejs/node/issues/17098. - (for-each delete-file + (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" @@ -111,7 +120,7 @@ ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. - (for-each delete-file + (for-each delete-if-exists '("test/async-hooks/test-ttywrap.readstream.js" "test/parallel/test-util-inspect.js" "test/parallel/test-v8-serdes.js" @@ -180,3 +189,18 @@ devices.") (home-page "https://nodejs.org/") (license expat) (properties '((timeout . 3600))))) ; 1 h + +(define-public node-lts + (package + (inherit node) + (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")))) + (inputs + `(("libuv" ,libuv-1.19) + ,@(alist-delete "libuv" (package-inputs node)))))) -- 2.19.0