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

nodejs: fix naming of nodejs to fit into their versioning model, fixes #11497

Browse Source
This commit is contained in:
Rok Garbas 2015-12-06 15:48:15 +01:00
parent a6982cc525
commit c90d26a2e2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/web/nodejs/default.nix → pkgs/development/web/nodejs/v4.nix
View File

0
pkgs/development/web/nodejs/v5_0.nix → pkgs/development/web/nodejs/v5.nix
View File

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

@ -2067,12 +2067,12 @@ let
ninka = callPackage ../development/tools/misc/ninka { }; ninka = callPackage ../development/tools/misc/ninka { };
nodejs-5_0 = callPackage ../development/web/nodejs/v5_0.nix { nodejs-5_x = callPackage ../development/web/nodejs/v5.nix {
libtool = darwin.cctools; libtool = darwin.cctools;
openssl = openssl_1_0_2; openssl = openssl_1_0_2;
}; };
nodejs-4_2 = callPackage ../development/web/nodejs { nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {
libtool = darwin.cctools; libtool = darwin.cctools;
openssl = openssl_1_0_2; openssl = openssl_1_0_2;
}; };
@ -2085,9 +2085,11 @@ let
nodejs = if stdenv.system == "armv5tel-linux" then nodejs = if stdenv.system == "armv5tel-linux" then
nodejs-0_10 nodejs-0_10
else else
nodejs-4_2; nodejs-4_x;
nodePackages_4_2 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_2; nodejs = nodejs-4_2; }); nodePackages_5_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; });
nodePackages_4_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; });
nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };