public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-07-01 13:38:17 -07:00
parent 05aa0c0990 87836a2a21
commit 7eae48871f
83 changed files with 894 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/web/nodejs/default.nix
View File

@@ -63,7 +63,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.havvy ];
maintainers = [ maintainers.goibhniu maintainers.havvy ];
platforms = platforms.linux ++ platforms.darwin;
};
}

2
pkgs/development/web/nodejs/v0_10.nix
View File

@@ -60,7 +60,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 ];
platforms = platforms.linux ++ platforms.darwin;
};
}