diff options
author | Sander van der Burg <svanderburg@gmail.com> | 2018-06-28 23:26:44 +0200 |
---|---|---|
committer | Sander van der Burg <svanderburg@gmail.com> | 2018-06-28 23:26:44 +0200 |
commit | 0068fea88cf6d9e1efe031753f9e48a424967ef8 (patch) | |
tree | 083283bdbaa0311b1691713461d0bbd51902d76a /pkgs/development/node-packages/default-v6.nix | |
parent | 9849a3725c4e4b64f4aaac0b4eb344a50d1a3de4 (diff) | |
download | nixlib-0068fea88cf6d9e1efe031753f9e48a424967ef8.tar nixlib-0068fea88cf6d9e1efe031753f9e48a424967ef8.tar.gz nixlib-0068fea88cf6d9e1efe031753f9e48a424967ef8.tar.bz2 nixlib-0068fea88cf6d9e1efe031753f9e48a424967ef8.tar.lz nixlib-0068fea88cf6d9e1efe031753f9e48a424967ef8.tar.xz nixlib-0068fea88cf6d9e1efe031753f9e48a424967ef8.tar.zst nixlib-0068fea88cf6d9e1efe031753f9e48a424967ef8.zip |
nodePackages: regenerate with node2nix 1.6.0
Diffstat (limited to 'pkgs/development/node-packages/default-v6.nix')
-rw-r--r-- | pkgs/development/node-packages/default-v6.nix | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 97f759ef0cbe..6b508b6f0cce 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -6,27 +6,27 @@ let }; in nodePackages // { - dat = nodePackages.dat.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; - }); + dat = nodePackages.dat.override { + buildInputs = [ nodePackages.node-gyp-build ]; + }; - dnschain = nodePackages.dnschain.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + dnschain = nodePackages.dnschain.override { + buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ]; postInstall = '' wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin ''; - }); + }; - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); + node-inspector = nodePackages.node-inspector.override { + buildInputs = [ nodePackages.node-pre-gyp ]; + }; - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + phantomjs = nodePackages.phantomjs.override { + buildInputs = [ pkgs.phantomjs2 ]; + }; - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + webdrvr = nodePackages.webdrvr.override { + buildInputs = [ pkgs.phantomjs ]; preRebuild = '' mkdir $TMPDIR/webdrvr @@ -42,42 +42,42 @@ nodePackages // { ''; dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. - }); + }; 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 ]; + bower2nix = nodePackages.bower2nix.override { + buildInputs = [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; - }); + }; - ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + ios-deploy = nodePackages.ios-deploy.override { preRebuild = '' LD=$CC tmp=$(mktemp -d) ln -s /usr/bin/xcodebuild $tmp export PATH="$PATH:$tmp" ''; - }); + }; - fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { + fast-cli = nodePackages."fast-cli-1.x".override { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js ''; - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + buildInputs = [ pkgs.phantomjs2 ]; + }; - node2nix = nodePackages.node2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + node2nix = nodePackages.node2nix.override { + buildInputs = [ pkgs.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} ''; - }); + }; } |