public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Shea Levy 2016-09-15 08:16:07 -04:00
parent a32281639e 131b8d4edb
commit bca7b782ae
6 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/node-packages/default-v4.nix
View File

@ -38,4 +38,13 @@ nodePackages // {
npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
postInstall = "npm run-script prepublish"; 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
'';
});
} }

9
pkgs/development/node-packages/default-v5.nix
View File

@ -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. 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
'';
});
} }

9
pkgs/development/node-packages/default-v6.nix
View File

@ -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. 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
'';
});
} }

8
pkgs/development/node-packages/node-packages-v4.nix
View File

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

8
pkgs/development/node-packages/node-packages-v5.nix
View File

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

14
pkgs/top-level/node-packages-generated.nix
View File

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