1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-16 17:13:21 +00:00

Merge pull request #7551 from offlinehacker/pkgs/node-packages/add

node-packages: updates
This commit is contained in:
Domen Kožar 2015-04-25 21:55:25 +02:00
commit 600d73df41
4 changed files with 9595 additions and 6030 deletions

View file

@ -1835,12 +1835,18 @@ let
nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };
nodePackages = callPackage ./node-packages.nix { self = nodePackages; };
nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; };
nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
nodePackages = nodePackages_0_12;
iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };
iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
npm2nix = nodePackages_0_10.npm2nix;
ldapvi = callPackage ../tools/misc/ldapvi { };
ldns = callPackage ../development/libraries/ldns { };

File diff suppressed because it is too large Load diff

View file

@ -31,7 +31,7 @@
, "browserchannel"
, "node-gyp"
, "semver"
, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.11.0" }
, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
, "ansi-remover"
, "mkdirp"
, "jshint"
@ -66,7 +66,7 @@
, "flatiron"
, "ironhorse"
, "fs-walk"
, "statsd"
, { "statsd": "https://github.com/etsy/statsd/tarball/23b331895cc4b22b64a19fd0e7b6def6f6f30d9e"}
, "statsd-librato-backend"
, "stackdriver-statsd-backend"
, "statsd-influxdb-backend"
@ -147,7 +147,7 @@
, "empty-trash"
, "castnow"
, "parsoid"
, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy" }
, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
, "react-tools"
, "json"
, "bipio"
@ -192,4 +192,6 @@
, "bip-pod-github"
, "sleep"
, "node-red"
, "sinopia"
, "docker-registry-server"
]

View file

@ -63,7 +63,6 @@ in rec {
sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
}} ../webdrvr/chromedriver_linux64.zip
'';
statsd.skipOptionalDependencies = ["hashring" "node-syslog"];
} // args.overrides or {};
# Apply overrides and back compatiblity transformations