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

Merge master into closure-size

Browse Source 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
This commit is contained in:
Vladimír Čunát
2016-03-08 09:57:58 +01:00
parent f306e67e15 0ee75214f3
commit 09af15654f
1276 changed files with 78548 additions and 29166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
}:
let
version = "0.10.41";
version = "0.10.42";
# !!! Should we also do shared libuv?
deps = {
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "15f9n9pydfb3f6gbbxnh6qqmkmwr0j3gcs8cbnvl69f4lpi99xkr";
sha256 = "01g19mq8b3b828f59x7bv79973w5sw4133ll1dxml37qk0vdbhgb";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++

4
pkgs/development/web/nodejs/v4.nix
View File

@@ -7,7 +7,7 @@
assert stdenv.system != "armv5tel-linux";
let
version = "4.2.3";
version = "4.3.1";
deps = {
inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "0ksmbln5qhrr7qhdz3npwmyz44y1vpznpxk3j7sqkc5lzvjss22h";
sha256 = "0wzf5sirbph5kaik3pm9i2dxbjwqh5qlnqn71azrsv0vhs7dbqk1";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

4
pkgs/development/web/nodejs/v5.nix
View File

@@ -7,7 +7,7 @@
assert stdenv.system != "armv5tel-linux";
let
version = "5.5.0";
version = "5.7.1";
deps = {
inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "0cmlk13skwag9gn1198h0ql64rv1jwwqbysq911kb6k94361i6yn";
sha256 = "16016cjycg0filh15nqfh3k1fdw3kaykl87xf8dnzf666mirbm7c";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];