Update npm packages to latest npm2nix

Signed-off-by: Shea Levy <shea@shealevy.com>

pkgs/top-level/node-packages.nix

@@ -1,6 +1,6 @@
-{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self, generated ? ./node-packages-generated.nix }:
+{ pkgs, stdenv, nodejs, fetchurl, fetchgit, neededNatives, self, generated ? ./node-packages-generated.nix }:
 
-{
+rec {
   nativeDeps = {
     "node-expat" = [ pkgs.expat ];
     "rbytes" = [ pkgs.openssl ];
@@ -12,15 +12,18 @@
     inherit (pkgs) runCommand;
   };
 
-  patchLatest = srcAttrs:
-    let src = fetchurl srcAttrs; in pkgs.runCommand src.name {} ''
+  patchSource = fn: srcAttrs:
+    let src = fn srcAttrs; in pkgs.runCommand src.name {} ''
       mkdir unpack
       cd unpack
-      tar xf ${src}
+      unpackFile ${src}
       mv */ package 2>/dev/null || true
-      sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json
-      tar cf $out *
+      sed -i -e "s/: \"latest\"/: \"*\"/" -e "s/: \"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json
+      mv * $out
     '';
 
+  # Backwards compat
+  patchLatest = patchSource fetchurl;
+
   /* Put manual packages below here (ideally eventually managed by npm2nix */
-} // import generated { inherit self fetchurl; inherit (pkgs) lib; }
+} // import generated { inherit self fetchurl fetchgit; inherit (pkgs) lib; }