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

nodejs: 4.1.2 -> 4.2.2

Browse Source
This commit is contained in:
Domen Kožar 2015-11-11 11:53:38 +01:00
parent cb21b77ff1
commit 4d1129828a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
assert stdenv.system != "armv5tel-linux";
let
version = "4.1.2";
version = "4.2.2";
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 = "0j9ca1fjgljzh4m9l9d8g81510j0ljvaf031qij9psiz79qc7gpy";
sha256 = "1c8c45b39fg2mz1c88jl0q0yhpxixdr25rpmpfskdd1m6hshkrq0";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

8
pkgs/top-level/all-packages.nix
View File

@ -2032,7 +2032,7 @@ let
ninka = callPackage ../development/tools/misc/ninka { };
nodejs-4_1 = callPackage ../development/web/nodejs {
nodejs-4_2 = callPackage ../development/web/nodejs {
libtool = darwin.cctools;
};
@ -2044,16 +2044,16 @@ let
nodejs = if stdenv.system == "armv5tel-linux" then
nodejs-0_10
else
nodejs-4_1;
nodejs-4_2;
nodePackages_4_1 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; });
nodePackages_4_2 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_2; nodejs = nodejs-4_2; });
nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
nodePackages = if stdenv.system == "armv5tel-linux" then
nodePackages_0_10
else
nodePackages_4_1;
nodePackages_4_2;
npm2nix = nodePackages.npm2nix;