Makefile

@@ -154,12 +154,12 @@ test-npm: node
 	cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
 	     npm_config_prefix="$(shell pwd)/npm-prefix" \
 	     npm_config_tmp="$(shell pwd)/npm-tmp" \
-	     ../../node cli.js install
+	     PATH="../../:${PATH}" node cli.js install
 	cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
 	     npm_config_prefix="$(shell pwd)/npm-prefix" \
 	     npm_config_tmp="$(shell pwd)/npm-tmp" \
-	     ../../node cli.js run-script test-all && \
-	     ../../node cli.js prune --prod && \
+	     PATH="../../:${PATH}" node cli.js run-script test-all && \
+	     PATH="../../:${PATH}" node cli.js prune --prod && \
 	     cd ../.. && \
 	     rm -rf npm-cache npm-tmp npm-prefix
 

deps/npm/.mailmap

@@ -1,16 +1,16 @@
-Arlo Breault <arlolra@gmail.com>
 Alex K. Wolfe <alexkwolfe@gmail.com>
 Andrew Bradley <cspotcode@gmail.com>
 Andrew Lunny <alunny@gmail.com>
+Arlo Breault <arlolra@gmail.com>
 Benjamin Coe <bencoe@gmail.com>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Charlie Robbins <charlie.robbins@gmail.com>
 Dalmais Maxence <root@ip-10-195-202-5.ec2.internal>
 David Beitey <david@davidjb.com>
 Domenic Denicola <domenic@domenicdenicola.com>
 Einar Otto Stangvik <einaros@gmail.com>
-Evan Lucas <evan@btc.com> <evanlucas@me.com>
 Evan Lucas <evan@btc.com> <evan.lucas@hattiesburgclinic.com>
+Evan Lucas <evan@btc.com> <evanlucas@me.com>
 Faiq Raza <faiqrazarizvi@gmail.com>
 Forbes Lindesay <forbes@lindesay.co.uk>
 Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
@@ -22,16 +22,20 @@ Jake Verbaten <raynos2@gmail.com>
 James Sanders <jimmyjazz14@gmail.com>
 Jason Smith <jhs@iriscouch.com>
 Jonas Weber <github@jonasw.de>
+Julien Meddah <julien.meddah@deveryware.com>
 Kris Windham <kriswindham@gmail.com>
 Lin Clark <lin.w.clark@gmail.com>
 Maciej Małecki <me@mmalecki.com> <maciej.malecki@notimplemented.org>
-Maximilian Antoni <mail@maxantoni.de> <maximilian.antoni@juliusbaer.com>
-Maxim Bogushevich <boga1@mail.ru>
 Max Goodman <c@chromakode.com>
+Maxim Bogushevich <boga1@mail.ru>
+Maximilian Antoni <mail@maxantoni.de> <maximilian.antoni@juliusbaer.com>
 Nicolas Morel <marsup@gmail.com>
 Olivier Melcher <olivier.melcher@gmail.com>
+Ra'Shaun Stovall <rashaunstovall@gmail.com>
+Rebecca Turner <me@re-becca.org> <turner@mikomi.org>
 Ryan Emery <seebees@gmail.com>
 Sam Mikes <smikes@cubane.com>
+Takaya Kobayashi <jigsaw@live.jp>
 Tony <zearin@gonk.net>
 Visnu Pitiyanuvath <visnupx@gmail.com>
 Will Elwood <w.elwood08@gmail.com>

deps/npm/.travis.yml

@@ -8,7 +8,7 @@ env:
   - DEPLOY_VERSION=testing
 before_install:
   - "npm config set spin false"
-  - "npm install -g npm@~2"
+  - "npm install -g npm/npm"
   - "sudo mkdir -p /var/run/couchdb"
 script: "npm run-script test-all"
 notifications:

deps/npm/AUTHORS

@@ -201,7 +201,7 @@ Chulki Lee <chulki.lee@gmail.com>
 dead_horse <dead_horse@qq.com>
 Kenan Yildirim <kenan@kenany.me>
 Laurie Voss <git@seldo.com>
-Rebecca Turner <turner@mikomi.org>
+Rebecca Turner <me@re-becca.org>
 Hunter Loftis <hunter@hunterloftis.com>
 Peter Richardson <github@zoomy.net>
 Jussi Kalliokoski <jussi.kalliokoski@gmail.com>
@@ -264,3 +264,10 @@ Oli Evans <oli@zilla.org.uk>
 Matt Brennan <mattyb1000@gmail.com>
 Jeff Barczewski <jeff.barczewski@gmail.com>
 Danny Fritz <dannyfritz@gmail.com>
+Takaya Kobayashi <jigsaw@live.jp>
+Ra'Shaun Stovall <rashaunstovall@gmail.com>
+Julien Meddah <julien.meddah@deveryware.com>
+Michiel Sikma <michiel@wedemandhtml.com>
+Jakob Krigovsky <jakob.krigovsky@gmail.com>
+Charmander <~@charmander.me>
+erik wienhold <git@ewie.name>