Merge pull request #50451 from Mic92/node-springclean-vol2

nodePackages: springclean take 2
This commit is contained in:
Jörg Thalheim 2018-11-16 15:29:21 +00:00 committed by GitHub
commit 9c050202a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 114 additions and 2430 deletions

View File

@ -90,25 +90,6 @@ nodePackages // {
buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ];
};
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.
};
webtorrent-cli = nodePackages.webtorrent-cli.override {
buildInputs = [ nodePackages.node-gyp-build ];
};

View File

@ -1,6 +1,8 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
set -eu -o pipefail
rm -f node-env.nix
node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix
node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix

View File

@ -2519,10 +2519,10 @@ in
node-pre-gyp = nodeEnv.buildNodePackage {
name = "node-pre-gyp";
packageName = "node-pre-gyp";
version = "0.11.0";
version = "0.12.0";
src = fetchurl {
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz";
sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==";
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz";
sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==";
};
dependencies = [
sources."abbrev-1.1.1"

View File

@ -2519,10 +2519,10 @@ in
node-pre-gyp = nodeEnv.buildNodePackage {
name = "node-pre-gyp";
packageName = "node-pre-gyp";
version = "0.11.0";
version = "0.12.0";
src = fetchurl {
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz";
sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==";
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz";
sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==";
};
dependencies = [
sources."abbrev-1.1.1"

View File

@ -19,7 +19,6 @@
, "dat"
, "dhcp"
, "dnschain"
, "docker-registry-server"
, "elasticdump"
, "elm-oracle"
, "elm-test"
@ -34,7 +33,6 @@
, "git-standup"
, "graphql-cli"
, "grunt-cli"
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
, "gulp"
, "gulp-cli"
, "htmlhint"
@ -78,15 +76,12 @@
, "node-pre-gyp"
, "nodemon"
, "node-red"
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
, "npm"
, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
, "npm-check-updates"
, "ocaml-language-server"
, { "parsoid": "git://github.com/abbradar/parsoid#stable" }
, "peerflix"
, "peerflix-server"
, "phantomjs"
, "pnpm"
, "prettier"
, "pulp"
@ -121,7 +116,6 @@
, "@webassemblyjs/wasm-strip"
, "@webassemblyjs/wasm-text-gen"
, "@webassemblyjs/wast-refmt"
, "webdrvr"
, "webpack"
, "webtorrent-cli"
, "web-ext"

File diff suppressed because it is too large Load Diff