From 25d6dc99bba66c77cef93b0ec7b1b6cb8f30a8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Nov 2018 21:31:44 +0000 Subject: [PATCH] nodePackages: 8_x -> 10_x --- .../development/node-packages/default-v10.nix | 72 +++++++++++ pkgs/development/node-packages/default-v8.nix | 74 ----------- .../node-packages/node-packages-v10.json | 118 +++++++++++++++++- .../node-packages/node-packages-v8.json | 118 +----------------- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 191 insertions(+), 193 deletions(-) diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index a438c961513..f57659de9a6 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -7,6 +7,70 @@ let }; in nodePackages // { + 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 + ''; + }; + + jshint = nodePackages.jshint.override { + buildInputs = [ pkgs.phantomjs2 ]; + }; + + 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 + ''; + }; + + ios-deploy = nodePackages.ios-deploy.override (drv: { + nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ]; + 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 ]; + }; + + git-ssb = nodePackages.git-ssb.override { + buildInputs = [ nodePackages.node-gyp-build ]; + }; + + node-inspector = nodePackages.node-inspector.override { + buildInputs = [ nodePackages.node-pre-gyp ]; + }; + + node2nix = nodePackages.node2nix.override { + buildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + ''; + }; + + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { + postInstall = "npm run-script prepublish"; + }; + + phantomjs = nodePackages.phantomjs.override { + buildInputs = [ pkgs.phantomjs2 ]; + }; pnpm = nodePackages.pnpm.override { nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -22,4 +86,12 @@ nodePackages // { ''; }; + scuttlebot = nodePackages.scuttlebot.override { + buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ]; + }; + + webtorrent-cli = nodePackages.webtorrent-cli.override { + buildInputs = [ nodePackages.node-gyp-build ]; + }; + } diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index 8fadacaa257..ce54a966611 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -7,71 +7,6 @@ let }; in nodePackages // { - 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 - ''; - }; - - jshint = nodePackages.jshint.override { - buildInputs = [ pkgs.phantomjs2 ]; - }; - - 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 - ''; - }; - - ios-deploy = nodePackages.ios-deploy.override (drv: { - nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ]; - 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 ]; - }; - - git-ssb = nodePackages.git-ssb.override { - buildInputs = [ nodePackages.node-gyp-build ]; - }; - - node-inspector = nodePackages.node-inspector.override { - buildInputs = [ nodePackages.node-pre-gyp ]; - }; - - node2nix = nodePackages.node2nix.override { - buildInputs = [ pkgs.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} - ''; - }; - - npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { - postInstall = "npm run-script prepublish"; - }; - - phantomjs = nodePackages.phantomjs.override { - buildInputs = [ pkgs.phantomjs2 ]; - }; - pnpm = nodePackages.pnpm.override { nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = let @@ -85,13 +20,4 @@ nodePackages // { done ''; }; - - scuttlebot = nodePackages.scuttlebot.override { - buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ]; - }; - - webtorrent-cli = nodePackages.webtorrent-cli.override { - buildInputs = [ nodePackages.node-gyp-build ]; - }; - } diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 65921b0eee8..73b1cf43dbc 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -1,10 +1,126 @@ [ - "bower" + "alloy" +, "asar" +, "azure-cli" +, "azure-functions-core-tools" +, "bower" +, "bower2nix" +, "browserify" +, "castnow" +, "clean-css" , "coffee-script" +, "coinmon" +, "configurable-http-proxy" +, "cordova" +, "create-cycle-app" +, "create-react-app" +, "create-react-native-app" +, "csslint" +, "dat" +, "dhcp" +, "dnschain" +, "elasticdump" +, "elm-oracle" +, "elm-test" +, "emoj" +, "eslint" +, "eslint_d" +, "emojione" +, { "fast-cli": "1.x" } +, "forever" +, "git-run" +, "git-ssb" +, "git-standup" +, "graphql-cli" , "grunt-cli" +, "gulp" +, "gulp-cli" +, "htmlhint" +, "html-minifier" +, "http-server" +, "ionic" +, "ios-deploy" +, "imapnotify" +, "jake" +, "javascript-typescript-langserver" +, "jsdoc" +, "jshint" +, "json" +, "js-beautify" +, "jsonlint" +, "json-diff" +, "json-refs" +, "json-server" +, "js-yaml" +, "karma" +, "lcov-result-merger" +, "leetcode-cli" +, "lerna" +, "less" +, "less-plugin-clean-css" +, "live-server" +, "livedown" +, { "lumo-build-deps": "../interpreters/clojurescript/lumo" } +, "madoko" +, "mathjax" +, "meat" +, "meguca" +, "mocha" +, "multi-file-swagger" +, "neovim" +, "nijs" +, "node2nix" , "node-gyp" , "node-gyp-build" +, "node-inspector" , "node-pre-gyp" +, "nodemon" +, "node-red" +, "npm" +, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" } +, "npm-check-updates" +, "ocaml-language-server" +, "peerflix" +, "peerflix-server" , "pnpm" , "parcel-bundler" +, "prettier" +, "pulp" +, "quassel-webserver" +, "react-tools" +, "react-native-cli" +, "s3http" +, "scuttlebot" +, "semver" +, "serve" +, "shout" +, "sloc" +, "smartdc" +, "snyk" +, "socket.io" +, "stackdriver-statsd-backend" +, "svgo" +, "swagger" +, "tern" +, "three" +, "tiddlywiki" +, "titanium" +, "triton" +, "ttf2eot" +, "typescript" +, "uglify-js" +, "ungit" +, "vue-cli" +, "@vue/cli" +, "@webassemblyjs/cli" +, "@webassemblyjs/repl" +, "@webassemblyjs/wasm-strip" +, "@webassemblyjs/wasm-text-gen" +, "@webassemblyjs/wast-refmt" +, "webpack" +, "webtorrent-cli" +, "web-ext" +, "wring" +, "yarn" +, "yo" ] diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 276b802b71f..088ff9aa6f2 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -1,125 +1,9 @@ [ - "alloy" -, "asar" -, "azure-cli" -, "azure-functions-core-tools" -, "bower" -, "bower2nix" -, "browserify" -, "castnow" -, "clean-css" + "bower" , "coffee-script" -, "coinmon" -, "configurable-http-proxy" -, "cordova" -, "create-cycle-app" -, "create-react-app" -, "create-react-native-app" -, "csslint" -, "dat" -, "dhcp" -, "dnschain" -, "elasticdump" -, "elm-oracle" -, "elm-test" -, "emoj" -, "eslint" -, "eslint_d" -, "emojione" -, { "fast-cli": "1.x" } -, "forever" -, "git-run" -, "git-ssb" -, "git-standup" -, "graphql-cli" , "grunt-cli" -, "gulp" -, "gulp-cli" -, "htmlhint" -, "html-minifier" -, "http-server" -, "ionic" -, "ios-deploy" -, "imapnotify" -, "jake" -, "javascript-typescript-langserver" -, "jsdoc" -, "jshint" -, "json" -, "js-beautify" -, "jsonlint" -, "json-diff" -, "json-refs" -, "json-server" -, "js-yaml" -, "karma" -, "lcov-result-merger" -, "leetcode-cli" -, "lerna" -, "less" -, "less-plugin-clean-css" -, "live-server" -, "livedown" -, { "lumo-build-deps": "../interpreters/clojurescript/lumo" } -, "madoko" -, "mathjax" -, "meat" -, "meguca" -, "mocha" -, "multi-file-swagger" -, "neovim" -, "nijs" -, "node2nix" , "node-gyp" , "node-gyp-build" -, "node-inspector" , "node-pre-gyp" -, "nodemon" -, "node-red" -, "npm" -, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" } -, "npm-check-updates" -, "ocaml-language-server" -, "peerflix" -, "peerflix-server" , "pnpm" -, "prettier" -, "pulp" -, "quassel-webserver" -, "react-tools" -, "react-native-cli" -, "s3http" -, "scuttlebot" -, "semver" -, "serve" -, "shout" -, "sloc" -, "smartdc" -, "snyk" -, "socket.io" -, "stackdriver-statsd-backend" -, "svgo" -, "swagger" -, "tern" -, "three" -, "tiddlywiki" -, "titanium" -, "triton" -, "ttf2eot" -, "typescript" -, "uglify-js" -, "ungit" -, "vue-cli" -, "@vue/cli" -, "@webassemblyjs/cli" -, "@webassemblyjs/repl" -, "@webassemblyjs/wasm-strip" -, "@webassemblyjs/wasm-text-gen" -, "@webassemblyjs/wast-refmt" -, "webpack" -, "webtorrent-cli" -, "web-ext" -, "wring" -, "yarn" -, "yo" ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47a8470af1a..e6f920e6af2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3846,7 +3846,7 @@ with pkgs; nodejs = pkgs.nodejs-6_x; }; - nodePackages = nodePackages_8_x; + nodePackages = nodePackages_10_x; npm2nix = nodePackages.npm2nix;