Merge pull request #50003 from Mic92/node-10

nodePackages: 8_x -> 10_x

doc/languages-frameworks/node.section.md

@@ -14,7 +14,7 @@ project.
 
 The package set also provides support for multiple Node.js versions. The policy
 is that a new package should be added to the collection for the latest stable LTS
-release (which is currently 8.x), unless there is an explicit reason to support
+release (which is currently 10.x), unless there is an explicit reason to support
 a different release.
 
 If your package uses native addons, you need to examine what kind of native
@@ -26,7 +26,7 @@ build system it uses. Here are some examples:
 
 After you have identified the correct system, you need to override your package
 expression while adding in build system as a build input. For example, `dat`
-requires `node-gyp-build`, so we override its expression in `default-v8.nix`:
+requires `node-gyp-build`, so we override its expression in `default-v10.nix`:
 
 ```nix
 dat = nodePackages.dat.override (oldAttrs: {
@@ -36,9 +36,9 @@ dat = nodePackages.dat.override (oldAttrs: {
 
 To add a package from NPM to nixpkgs:
 
- 1. Modify `pkgs/development/node-packages/node-packages-v8.json` to add, update
-    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v10.json`
-    for packages depending on Node.js 10.x)
+ 1. Modify `pkgs/development/node-packages/node-packages-v10.json` to add, update
+    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v8.json`
+    for packages depending on Node.js 8.x)
  2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
  3. Build your new package to test your changes:
     `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.

pkgs/applications/science/math/sage/default.nix

@@ -3,7 +3,7 @@
 }:
 
 let
-  inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x;
+  inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages;
 
   # https://trac.sagemath.org/ticket/15980 for tracking of python3 support
   python = nixpkgs.python2.override {
@@ -26,7 +26,7 @@ let
       };
 
       sagenb = self.callPackage ./sagenb.nix {
-        mathjax = nodePackages_8_x.mathjax;
+        mathjax = nodePackages.mathjax;
       };
 
       sagedoc = self.callPackage ./sagedoc.nix {
@@ -36,8 +36,8 @@ let
       env-locations = self.callPackage ./env-locations.nix {
         inherit pari_data ecl;
         inherit singular;
-        three = nodePackages_8_x.three;
-        mathjax = nodePackages_8_x.mathjax;
+        three = nodePackages.three;
+        mathjax = nodePackages.mathjax;
       };
 
       sage-env = self.callPackage ./sage-env.nix {
@@ -49,7 +49,7 @@ let
         inherit pythonEnv;
         inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
-        three = nodePackages_8_x.three;
+        three = nodePackages.three;
       };
 
       sage = self.callPackage ./sage.nix { };

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 ];
+  };
+
 }

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 ];
-  };
-
 }

pkgs/development/node-packages/node-packages-v10.json

@@ -1,10 +1,128 @@
 [
-  "bower"
+  "alloy"
+, "asar"
+, "azure-cli"
+, "azure-functions-core-tools"
+, "bower"
+, "bower2nix"
+, "browserify"
+, "castnow"
+, "clean-css"
 , "coffee-script"
+, "coinmon"
+, "configurable-http-proxy"
+, "cordova"
+, "cpy-cli"
+, "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" }
+, "fkill-cli"
+, "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"
 ]

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"
 ]

pkgs/top-level/all-packages.nix

@@ -2078,7 +2078,7 @@ with pkgs;
 
   crackxls = callPackage ../tools/security/crackxls { };
 
-  create-cycle-app = nodePackages_8_x.create-cycle-app;
+  create-cycle-app = nodePackages.create-cycle-app;
 
   createrepo_c = callPackage ../tools/package-management/createrepo_c { };
 
@@ -3846,7 +3846,7 @@ with pkgs;
     nodejs = pkgs.nodejs-6_x;
   };
 
-  nodePackages = nodePackages_8_x;
+  nodePackages = nodePackages_10_x;
 
   npm2nix = nodePackages.npm2nix;