From 952c477f901f35a99758bcc8fdf8b685ad8fa3e0 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 15 Sep 2016 00:51:56 +0100 Subject: nodePackages.bower2nix: Add back PATH wrapping bower2nix and fetch-bower need git in the PATH to operate. This wrapping got lost with the nodePackages updates. (Fixes #18454) --- pkgs/development/node-packages/default-v4.nix | 9 +++++++++ pkgs/development/node-packages/default-v5.nix | 9 +++++++++ pkgs/development/node-packages/default-v6.nix | 9 +++++++++ 3 files changed, 27 insertions(+) (limited to 'pkgs/development/node-packages') 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 + ''; + }); } -- cgit 1.4.1 From 131b8d4edb39d302db64ff284a7f5863d2d53522 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 15 Sep 2016 01:20:49 +0100 Subject: nodePackages.bower2nix: 3.0.1 -> 3.1.1 --- pkgs/development/node-packages/node-packages-v4.nix | 8 ++++---- pkgs/development/node-packages/node-packages-v5.nix | 8 ++++---- pkgs/top-level/node-packages-generated.nix | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'pkgs/development/node-packages') diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 55ab1b898ccd..a8c10a596a43 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -18570,10 +18570,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" // { @@ -36452,4 +36452,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 9e8bf6f99351..6d6d1b9f8843 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -18101,10 +18101,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" @@ -26676,4 +26676,4 @@ in }; production = true; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index dbaa35cf7a6a..432a367d1535 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -5381,15 +5381,15 @@ 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"; -- cgit 1.4.1