pyrox.dev / nixpkgs
lol
fork atom

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

Shea Levy bca7b782 a3228163

+42 -15
unified split
+9
pkgs/development/node-packages/default-v4.nix
··· 38 npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { 39 postInstall = "npm run-script prepublish"; 40 }; 41 }
··· 38 npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { 39 postInstall = "npm run-script prepublish"; 40 }; 41 + 42 + bower2nix = nodePackages.bower2nix.override (oldAttrs: { 43 + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; 44 + postInstall = '' 45 + for prog in bower2nix fetch-bower; do 46 + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" 47 + done 48 + ''; 49 + }); 50 }
+9
pkgs/development/node-packages/default-v5.nix
··· 32 33 dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. 34 }); 35 }
··· 32 33 dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. 34 }); 35 + 36 + bower2nix = nodePackages.bower2nix.override (oldAttrs: { 37 + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; 38 + postInstall = '' 39 + for prog in bower2nix fetch-bower; do 40 + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" 41 + done 42 + ''; 43 + }); 44 }
+9
pkgs/development/node-packages/default-v6.nix
··· 32 33 dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. 34 }); 35 }
··· 32 33 dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. 34 }); 35 + 36 + bower2nix = nodePackages.bower2nix.override (oldAttrs: { 37 + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; 38 + postInstall = '' 39 + for prog in bower2nix fetch-bower; do 40 + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" 41 + done 42 + ''; 43 + }); 44 }
+4 -4
pkgs/development/node-packages/node-packages-v4.nix
··· 18678 bower2nix = nodeEnv.buildNodePackage { 18679 name = "bower2nix"; 18680 packageName = "bower2nix"; 18681 - version = "3.1.0"; 18682 src = fetchurl { 18683 - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz"; 18684 - sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b"; 18685 }; 18686 dependencies = [ 18687 (sources."argparse-1.0.4" // { ··· 36765 }; 36766 production = true; 36767 }; 36768 - }
··· 18678 bower2nix = nodeEnv.buildNodePackage { 18679 name = "bower2nix"; 18680 packageName = "bower2nix"; 18681 + version = "3.1.1"; 18682 src = fetchurl { 18683 + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; 18684 + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; 18685 }; 18686 dependencies = [ 18687 (sources."argparse-1.0.4" // { ··· 36765 }; 36766 production = true; 36767 }; 36768 + }
+4 -4
pkgs/development/node-packages/node-packages-v5.nix
··· 18209 bower2nix = nodeEnv.buildNodePackage { 18210 name = "bower2nix"; 18211 packageName = "bower2nix"; 18212 - version = "3.1.0"; 18213 src = fetchurl { 18214 - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz"; 18215 - sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b"; 18216 }; 18217 dependencies = [ 18218 sources."argparse-1.0.4" ··· 26874 }; 26875 production = true; 26876 }; 26877 - }
··· 18209 bower2nix = nodeEnv.buildNodePackage { 18210 name = "bower2nix"; 18211 packageName = "bower2nix"; 18212 + version = "3.1.1"; 18213 src = fetchurl { 18214 + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; 18215 + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; 18216 }; 18217 dependencies = [ 18218 sources."argparse-1.0.4" ··· 26874 }; 26875 production = true; 26876 }; 26877 + }
+7 -7
pkgs/top-level/node-packages-generated.nix
··· 5381 cpu = [ ]; 5382 }; 5383 by-spec."bower2nix"."*" = 5384 - self.by-version."bower2nix"."3.0.1"; 5385 - by-version."bower2nix"."3.0.1" = self.buildNodePackage { 5386 - name = "bower2nix-3.0.1"; 5387 - version = "3.0.1"; 5388 bin = true; 5389 src = fetchurl { 5390 - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; 5391 - name = "bower2nix-3.0.1.tgz"; 5392 - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; 5393 }; 5394 deps = { 5395 "argparse-1.0.4" = self.by-version."argparse"."1.0.4";
··· 5381 cpu = [ ]; 5382 }; 5383 by-spec."bower2nix"."*" = 5384 + self.by-version."bower2nix"."3.1.1"; 5385 + by-version."bower2nix"."3.1.1" = self.buildNodePackage { 5386 + name = "bower2nix-3.1.1"; 5387 + version = "3.1.1"; 5388 bin = true; 5389 src = fetchurl { 5390 + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; 5391 + name = "bower2nix-3.1.1.tgz"; 5392 + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; 5393 }; 5394 deps = { 5395 "argparse-1.0.4" = self.by-version."argparse"."1.0.4";