From c56256709bcba7182b0820fe697abf0fc703d64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Sun, 8 Feb 2015 18:35:15 +0100 Subject: [PATCH 1/3] Add io.js --- pkgs/development/web/iojs/default.nix | 31 +++++++++++++++++++ .../web/nodejs/build-node-package.nix | 2 +- pkgs/top-level/all-packages.nix | 7 +++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/web/iojs/default.nix diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix new file mode 100644 index 000000000000..bb596b3060fb --- /dev/null +++ b/pkgs/development/web/iojs/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, python, utillinux, nightly ? false }: + +let + version = if nightly then "1.1.1-nightly201502072c3121c606" else "1.1.0"; + inherit (stdenv.lib) optional maintainers licenses platforms; +in stdenv.mkDerivation { + name = "iojs-${version}"; + + src = fetchurl { + url = if nightly + then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz" + else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; + sha256 = if nightly + then "1jjh5f8kpcgdjjib9q1f2hqvrs6p4m4fyfbfy6dsdbzl2hglajvw" + else "0yvz3rw7d73snc1g447l4amqbbyydbyzr9ynykmyld7l3gdsif7h"; + }; + + prePatch = '' + sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure + ''; + + buildInputs = [ python ] ++ (optional stdenv.isLinux utillinux); + setupHook = ../nodejs/setup-hook.sh; + + meta = { + description = "A friendly fork of Node.js with an open governance model"; + homepage = https://iojs.org/; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 1965521ba818..4b9e057243c0 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -38,7 +38,7 @@ let sources = runCommand "node-sources" {} '' tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv *node* $out + mv $(find . -type d -mindepth 1 -maxdepth 1) $out ''; # Convert deps to attribute set diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766d2a3a3cc6..40fc5a102998 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1729,6 +1729,13 @@ let callPackage ./node-packages.nix { self = nodePackages; } ); + iojs = callPackage ../development/web/iojs { }; + iojs-nightly = callPackage ../development/web/iojs { nightly = true; }; + + iojsPackages = recurseIntoAttrs ( + callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; } + ); + ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { }; From 7fcac2e8e1efaa5cc2d042f9ded1bda1a39296de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Sun, 15 Feb 2015 11:00:24 +0100 Subject: [PATCH 2/3] Update iojs --- pkgs/development/web/iojs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index bb596b3060fb..58368ac7d913 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, utillinux, nightly ? false }: let - version = if nightly then "1.1.1-nightly201502072c3121c606" else "1.1.0"; + version = if nightly then "1.2.1-nightly20150213f0296933f8" else "1.2.0"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; @@ -11,8 +11,8 @@ in stdenv.mkDerivation { then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz" else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; sha256 = if nightly - then "1jjh5f8kpcgdjjib9q1f2hqvrs6p4m4fyfbfy6dsdbzl2hglajvw" - else "0yvz3rw7d73snc1g447l4amqbbyydbyzr9ynykmyld7l3gdsif7h"; + then "0v9njaggddi128v58rd34qknph8pn9c653gqd4y29l1mwjvqg62s" + else "17axqswpl252gliak1wjc2l9jk6n5jqdfa9f1vv7x9acj776yrik"; }; prePatch = '' From 62b17c8bf1f866d1483fd6884136f5c10af31451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Sun, 22 Feb 2015 12:00:34 +0100 Subject: [PATCH 3/3] io.js: shared libraries @lethalman courtesy . --- pkgs/development/web/iojs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index 58368ac7d913..3129b10f7b80 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, utillinux, nightly ? false }: +{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, nightly ? false }: let version = if nightly then "1.2.1-nightly20150213f0296933f8" else "1.2.0"; @@ -19,7 +19,9 @@ in stdenv.mkDerivation { sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure ''; - buildInputs = [ python ] ++ (optional stdenv.isLinux utillinux); + configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" ]; + + buildInputs = [ python openssl http-parser zlib ] ++ (optional stdenv.isLinux utillinux); setupHook = ../nodejs/setup-hook.sh; meta = {