diff options
| author | Shea Levy <shea@shealevy.com> | 2016-09-15 08:16:07 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-09-15 08:16:07 -0400 |
| commit | bca7b782ae00e6f8f2be0d59bc473b7d00b745fc (patch) | |
| tree | cb70163c52cb0311ddd5c07b743b194537fc5e68 /pkgs/development/node-packages | |
| parent | a32281639e196fb03680c2b3ad4ef835a7f6b76d (diff) | |
| parent | 131b8d4edb39d302db64ff284a7f5863d2d53522 (diff) | |
| download | nixlib-bca7b782ae00e6f8f2be0d59bc473b7d00b745fc.tar nixlib-bca7b782ae00e6f8f2be0d59bc473b7d00b745fc.tar.gz nixlib-bca7b782ae00e6f8f2be0d59bc473b7d00b745fc.tar.bz2 nixlib-bca7b782ae00e6f8f2be0d59bc473b7d00b745fc.tar.lz nixlib-bca7b782ae00e6f8f2be0d59bc473b7d00b745fc.tar.xz nixlib-bca7b782ae00e6f8f2be0d59bc473b7d00b745fc.tar.zst nixlib-bca7b782ae00e6f8f2be0d59bc473b7d00b745fc.zip | |
Merge branch 'bower2nix-3.1.1' of git://github.com/rvl/nixpkgs
Diffstat (limited to 'pkgs/development/node-packages')
5 files changed, 35 insertions, 8 deletions
diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index be5a0abc4fca..99cb7ca40441 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -38,4 +38,13 @@ nodePackages // { 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 + ''; + }); } diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix index c858c580d2a4..00dce5966aae 100644 --- a/pkgs/development/node-packages/default-v5.nix +++ b/pkgs/development/node-packages/default-v5.nix @@ -32,4 +32,13 @@ nodePackages // { 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 + ''; + }); } diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index c858c580d2a4..00dce5966aae 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -32,4 +32,13 @@ nodePackages // { 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 + ''; + }); } diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 8367eff07a33..d98359053370 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -18678,10 +18678,10 @@ in 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" // { @@ -36765,4 +36765,4 @@ in }; production = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v5.nix index d2d3fd63eb72..3431273d7c73 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -18209,10 +18209,10 @@ in 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" @@ -26874,4 +26874,4 @@ in }; production = true; }; -} \ No newline at end of file +} |