summary refs log tree commit diff
diff options
context:
space:
mode:
authorlethalman <lucabru@src.gnome.org>2015-06-01 16:52:04 +0200
committerlethalman <lucabru@src.gnome.org>2015-06-01 16:52:04 +0200
commitea83ebff86bd4f68c3198511cc7f8de931c4a0d9 (patch)
tree7471056646bb8a31382f762ed12d77a0d5b57409
parentd8e5067126703bdac53382237c26b905f917b64c (diff)
parent9cb7239f1283c5a8d2498bef4e2ff1d6009946b2 (diff)
downloadnixpkgs-ea83ebff86bd4f68c3198511cc7f8de931c4a0d9.tar
nixpkgs-ea83ebff86bd4f68c3198511cc7f8de931c4a0d9.tar.gz
nixpkgs-ea83ebff86bd4f68c3198511cc7f8de931c4a0d9.tar.bz2
nixpkgs-ea83ebff86bd4f68c3198511cc7f8de931c4a0d9.tar.lz
nixpkgs-ea83ebff86bd4f68c3198511cc7f8de931c4a0d9.tar.xz
nixpkgs-ea83ebff86bd4f68c3198511cc7f8de931c4a0d9.tar.zst
nixpkgs-ea83ebff86bd4f68c3198511cc7f8de931c4a0d9.zip
Merge pull request #8115 from Havvy/iojs
Update io.js to v.2.2.1
-rw-r--r--lib/maintainers.nix1
-rw-r--r--pkgs/development/web/iojs/default.nix5
-rw-r--r--pkgs/development/web/nodejs/default.nix2
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fb39e174b0b..174eced43c2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -92,6 +92,7 @@
   goibhniu = "Cillian de RĂ³iste <cillian.deroiste@gmail.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
+  havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hiberno = "Christian Lask <mail@elfsechsundzwanzig.de>";
diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index b3b9881559d..2ed6e1adade 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.1.0";
+  version = "2.2.1";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "0v6jzsrq3ym0nqy7nb9chn8ij79agifwdvsp5nysgr609na7617i";
+    sha256 = "1ylmj69nwhqqwn1grphlrzny9dp4bspx4172q41izr6dyk29rrsm";
   };
 
   prePatch = ''
@@ -31,5 +31,6 @@ in stdenv.mkDerivation {
     homepage = https://iojs.org/;
     license = licenses.mit;
     platforms = platforms.linux;
+    maintainers = [ maintainers.havvy ];
   };
 }
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 56b8e952e80..f91a7c3b41d 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -62,7 +62,7 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.shlevy ];
+    maintainers = [ maintainers.goibhniu maintainers.shlevy maintainers.havvy ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }