diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-01 09:09:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-01 09:09:24 +0100 |
commit | 4a74aca868b4e3c7bb8c186ae5c6e103b5e8ca78 (patch) | |
tree | a34bafbd3a7b619bb476a803643d16ad7d685290 /pkgs/development/node-packages/default-v6.nix | |
parent | 04519fbf06778ea0be5c92252e3022af1c99046e (diff) | |
parent | ca0260e2df6d1db7c848160f7c01ae3315e34aa3 (diff) | |
download | nixlib-4a74aca868b4e3c7bb8c186ae5c6e103b5e8ca78.tar nixlib-4a74aca868b4e3c7bb8c186ae5c6e103b5e8ca78.tar.gz nixlib-4a74aca868b4e3c7bb8c186ae5c6e103b5e8ca78.tar.bz2 nixlib-4a74aca868b4e3c7bb8c186ae5c6e103b5e8ca78.tar.lz nixlib-4a74aca868b4e3c7bb8c186ae5c6e103b5e8ca78.tar.xz nixlib-4a74aca868b4e3c7bb8c186ae5c6e103b5e8ca78.tar.zst nixlib-4a74aca868b4e3c7bb8c186ae5c6e103b5e8ca78.zip |
Merge pull request #45700 from Mic92/node-packages-v8
nodePackages: 6_x -> 8_x
Diffstat (limited to 'pkgs/development/node-packages/default-v6.nix')
-rw-r--r-- | pkgs/development/node-packages/default-v6.nix | 81 |
1 files changed, 10 insertions, 71 deletions
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index f4e28d0fd341..878672d32e20 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -7,78 +7,17 @@ let }; in nodePackages // { - dat = nodePackages.dat.override { - buildInputs = [ nodePackages.node-gyp-build ]; - }; - - 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 { - buildInputs = [ nodePackages.node-pre-gyp ]; - }; - - phantomjs = nodePackages.phantomjs.override { - buildInputs = [ pkgs.phantomjs2 ]; - }; - - webdrvr = nodePackages.webdrvr.override { - buildInputs = [ pkgs.phantomjs ]; - - preRebuild = '' - mkdir $TMPDIR/webdrvr - - ln -s ${pkgs.fetchurl { - url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; - sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; - }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar - ln -s ${pkgs.fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; - sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; - }} $TMPDIR/webdrvr/chromedriver_linux64.zip - ''; - - 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 { - buildInputs = [ pkgs.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} + pnpm = nodePackages.pnpm.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = let + pnpmLibPath = stdenv.lib.makeBinPath [ + nodejs.passthru.python + nodejs + ]; + in '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} done ''; }; - - 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 { - 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 = [ pkgs.phantomjs2 ]; - }; - - node2nix = nodePackages.node2nix.override { - buildInputs = [ pkgs.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} - ''; - }; } |