Merge branch 'bower2nix-3.1.1' of git://github.com/rvl/nixpkgs

pkgs/development/node-packages/default-v4.nix

···
   npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
     postInstall = "npm run-script prepublish";
   };
+
+  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+    postInstall = ''
+      for prog in bower2nix fetch-bower; do
+        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+      done
+    '';
+  });
 }

pkgs/development/node-packages/default-v5.nix

···
     
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
   });
+
+  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+    postInstall = ''
+      for prog in bower2nix fetch-bower; do
+        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+      done
+    '';
+  });
 }

pkgs/development/node-packages/default-v6.nix

···
     
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
   });
+
+  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+    postInstall = ''
+      for prog in bower2nix fetch-bower; do
+        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+      done
+    '';
+  });
 }

pkgs/development/node-packages/node-packages-v4.nix

···
   bower2nix = nodeEnv.buildNodePackage {
     name = "bower2nix";
     packageName = "bower2nix";
-    version = "3.1.0";
+    version = "3.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz";
-      sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b";
+      url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz";
+      sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p";
     };
     dependencies = [
       (sources."argparse-1.0.4" // {
···
     };
     production = true;
   };
-}
+}

pkgs/development/node-packages/node-packages-v5.nix

···
   bower2nix = nodeEnv.buildNodePackage {
     name = "bower2nix";
     packageName = "bower2nix";
-    version = "3.1.0";
+    version = "3.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz";
-      sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b";
+      url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz";
+      sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p";
     };
     dependencies = [
       sources."argparse-1.0.4"
···
     };
     production = true;
   };
-}
+}

pkgs/top-level/node-packages-generated.nix

···
     cpu = [ ];
   };
   by-spec."bower2nix"."*" =
-    self.by-version."bower2nix"."3.0.1";
-  by-version."bower2nix"."3.0.1" = self.buildNodePackage {
-    name = "bower2nix-3.0.1";
-    version = "3.0.1";
+    self.by-version."bower2nix"."3.1.1";
+  by-version."bower2nix"."3.1.1" = self.buildNodePackage {
+    name = "bower2nix-3.1.1";
+    version = "3.1.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz";
-      name = "bower2nix-3.0.1.tgz";
-      sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44";
+      url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz";
+      name = "bower2nix-3.1.1.tgz";
+      sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p";
     };
     deps = {
       "argparse-1.0.4" = self.by-version."argparse"."1.0.4";