nodePackages: switch to 12

Signed-off-by: Christian Albrecht <christian.albrecht@mayflower.de>

doc/languages-frameworks/node.section.md

@@ -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-v10.nix`:
+requires `node-gyp-build`, so we override its expression in `default-v12.nix`:
 
 ```nix
 dat = nodePackages.dat.override (oldAttrs: {
@@ -36,14 +36,14 @@ dat = nodePackages.dat.override (oldAttrs: {
 
 To add a package from NPM to nixpkgs:
 
- 1. Modify `pkgs/development/node-packages/node-packages-v10.json` to add, update
+ 1. Modify `pkgs/development/node-packages/node-packages-v12.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>`.
-    To build against a specific Node.js version (e.g. 10.x):
+    To build against a specific Node.js version (e.g. 12.x):
-    `nix-build -A nodePackages_10_x.<new-or-updated-package>`
+    `nix-build -A nodePackages_12_x.<new-or-updated-package>`
  4. Add and commit all modified and generated files.
 
 For more information about the generation process, consult the

pkgs/development/mobile/titaniumenv/default.nix

@@ -13,7 +13,7 @@ rec {
 
   buildApp = import ./build-app.nix {
     inherit (pkgs) stdenv python which file jdk nodejs;
-    inherit (pkgs.nodePackages_10_x) alloy titanium;
+    inherit (pkgs.nodePackages) alloy titanium;
     inherit (androidenv) composeAndroidPackages;
     inherit (xcodeenv) composeXcodeWrapper;
     inherit titaniumsdk;

pkgs/development/node-packages/default-v10.nix

@@ -1,132 +0,0 @@
-{ pkgs, nodejs, stdenv }:
-
-let
-  nodePackages = import ./composition-v10.nix {
-    inherit pkgs nodejs;
-    inherit (stdenv.hostPlatform) system;
-  };
-in
-nodePackages // {
-  "@angular/cli" = nodePackages."@angular/cli".override {
-    prePatch = ''
-      export NG_CLI_ANALYTICS=false
-    '';
-  };
-  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 pkgs.libtool pkgs.autoconf pkgs.automake ];
-  };
-
-  dnschain = nodePackages.dnschain.override {
-    buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
-    postInstall = ''
-      wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
-    '';
-  };
-
-  bitwarden-cli = pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: {
-    name = "bitwarden-cli-${drv.version}";
-  });
-
-  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 ];
-  };
-
-  insect = nodePackages.insect.override (drv: {
-    nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package pkgs.purescript nodePackages.pulp ];
-  });
-
-  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 ]}
-    '';
-  };
-
-  pnpm = nodePackages.pnpm.override {
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-
-    preRebuild = ''
-      sed 's/"link:/"file:/g' --in-place package.json
-    '';
-
-    postInstall = let
-      pnpmLibPath = stdenv.lib.makeBinPath [
-        nodejs.passthru.python
-        nodejs
-      ];
-    in ''
-      for prog in $out/bin/*; do
-        wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
-      done
-    '';
-  };
-
-  ssb-server = nodePackages.ssb-server.override {
-    buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ];
-  };
-
-  tedicross = nodePackages."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-    postInstall = ''
-      makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
-        --add-flags "$out/lib/node_modules/tedicross/main.js"
-    '';
-  };
-
-  webtorrent-cli = nodePackages.webtorrent-cli.override {
-    buildInputs = [ nodePackages.node-gyp-build ];
-  };
-
-  joplin = nodePackages.joplin.override {
-    nativeBuildInputs = [ pkgs.pkg-config ];
-    buildInputs = with pkgs; [
-      # required by sharp
-      # https://sharp.pixelplumbing.com/install
-      vips
-
-      nodePackages.node-pre-gyp
-    ];
-  };
-
-  thelounge = nodePackages.thelounge.override {
-    buildInputs = [ nodePackages.node-pre-gyp ];
-    postInstall = ''
-      echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
-    '';
-  };
-}

pkgs/development/node-packages/default-v12.nix

@@ -7,10 +7,123 @@ let
   };
 in
 nodePackages // {
+  "@angular/cli" = nodePackages."@angular/cli".override {
+    prePatch = ''
+      export NG_CLI_ANALYTICS=false
+    '';
+  };
+  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 pkgs.libtool pkgs.autoconf pkgs.automake ];
+  };
+
+  dnschain = nodePackages.dnschain.override {
+    buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
+    postInstall = ''
+      wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
+    '';
+  };
+
+  bitwarden-cli = pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: {
+    name = "bitwarden-cli-${drv.version}";
+  });
+
+  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 ];
+  };
+
+  insect = nodePackages.insect.override (drv: {
+    nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package pkgs.purescript nodePackages.pulp ];
+  });
+
+  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 ]}
     '';
   };
+
+  pnpm = nodePackages.pnpm.override {
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+
+    preRebuild = ''
+      sed 's/"link:/"file:/g' --in-place package.json
+    '';
+
+    postInstall = let
+      pnpmLibPath = stdenv.lib.makeBinPath [
+        nodejs.passthru.python
+        nodejs
+      ];
+    in ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
+      done
+    '';
+  };
+
+  ssb-server = nodePackages.ssb-server.override {
+    buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ];
+  };
+
+  tedicross = nodePackages."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+    postInstall = ''
+      makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
+        --add-flags "$out/lib/node_modules/tedicross/main.js"
+    '';
+  };
+
+  webtorrent-cli = nodePackages.webtorrent-cli.override {
+    buildInputs = [ nodePackages.node-gyp-build ];
+  };
+
+  joplin = nodePackages.joplin.override {
+    nativeBuildInputs = [ pkgs.pkg-config ];
+    buildInputs = with pkgs; [
+      # required by sharp
+      # https://sharp.pixelplumbing.com/install
+      vips
+
+      nodePackages.node-pre-gyp
+    ];
+  };
+
+  thelounge = nodePackages.thelounge.override {
+    buildInputs = [ nodePackages.node-pre-gyp ];
+  };
 }

pkgs/development/node-packages/generate.sh

@@ -6,6 +6,6 @@ node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix)
 
 cd ${DIR}
 rm -f ./node-env.nix
-for version in 10 12 13; do
+for version in 12 13; do
   "${node2nix}/bin/node2nix" --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix
 done

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

@@ -1,205 +0,0 @@
-[
-  "@angular/cli"
-, "@antora/cli"
-, "@antora/site-generator-default"
-, "@bitwarden/cli"
-, "@vue/cli"
-, "@webassemblyjs/cli"
-, "@webassemblyjs/repl"
-, "@webassemblyjs/wasm-strip"
-, "@webassemblyjs/wasm-text-gen"
-, "@webassemblyjs/wast-refmt"
-, "alloy"
-, "asar"
-, "bash-language-server"
-, "bower"
-, "bower2nix"
-, "browserify"
-, "castnow"
-, "clean-css"
-, "coc-css"
-, "coc-emmet"
-, "coc-eslint"
-, "coc-git"
-, "coc-go"
-, "coc-highlight"
-, "coc-html"
-, "coc-imselect"
-, "coc-java"
-, "coc-jest"
-, "coc-json"
-, "coc-lists"
-, "coc-metals"
-, "coc-pairs"
-, "coc-prettier"
-, "coc-python"
-, "coc-r-lsp"
-, "coc-rls"
-, "coc-rust-analyzer"
-, "coc-smartf"
-, "coc-snippets"
-, "coc-solargraph"
-, "coc-stylelint"
-, "coc-tabnine"
-, "coc-tslint"
-, "coc-tslint-plugin"
-, "coc-tsserver"
-, "coc-vetur"
-, "coc-vimtex"
-, "coc-wxml"
-, "coc-yaml"
-, "coc-yank"
-, "coffee-script"
-, "coinmon"
-, "configurable-http-proxy"
-, "cordova"
-, "cpy-cli"
-, "create-cycle-app"
-, "create-react-app"
-, "create-react-native-app"
-, "csslint"
-, "dat"
-, "dhcp"
-, "dnschain"
-, "dockerfile-language-server-nodejs"
-, "elasticdump"
-, "elm-oracle"
-, "emoj"
-, "emojione"
-, "eslint"
-, "eslint_d"
-, {"fast-cli": "1.x"}
-, "fkill-cli"
-, "forever"
-, "git-run"
-, "git-ssb"
-, "git-standup"
-, "gitmoji-cli"
-, "graphql-cli"
-, "grunt-cli"
-, "gtop"
-, "gulp"
-, "gulp-cli"
-, "html-minifier"
-, "htmlhint"
-, "http-server"
-, "hueadm"
-, "imapnotify"
-, "indium"
-, "insect"
-, "ionic"
-, "ios-deploy"
-, { "iosevka-build-deps": "../../data/fonts/iosevka" }
-, "jake"
-, "javascript-typescript-langserver"
-, "joplin"
-, "js-beautify"
-, "js-yaml"
-, "jsdoc"
-, "jshint"
-, "json"
-, "json-diff"
-, "json-refs"
-, "json-server"
-, "jsonlint"
-, "karma"
-, "lcov-result-merger"
-, "leetcode-cli"
-, "lerna"
-, "less"
-, "less-plugin-clean-css"
-, "live-server"
-, "livedown"
-, {"lumo-build-deps": "../interpreters/clojurescript/lumo" }
-, "madoko"
-, "markdown-link-check"
-, "mathjax"
-, "meat"
-, "meguca"
-, "mocha"
-, "multi-file-swagger"
-, "neovim"
-, "nijs"
-, "node-gyp"
-, "node-gyp-build"
-, "node-inspector"
-, "node-pre-gyp"
-, "node-red"
-, "node2nix"
-, "nodemon"
-, "npm"
-, "npm-check-updates"
-, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
-, "ocaml-language-server"
-, "parcel-bundler"
-, "parsoid"
-, "peerflix"
-, "peerflix-server"
-, "pnpm"
-, "postcss-cli"
-, "prettier"
-, "pscid"
-, "pulp"
-, "purescript-psa"
-, "react-native-cli"
-, "react-tools"
-, "reveal.js"
-, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
-, "s3http"
-, "semver"
-, "serve"
-, "serverless"
-, "shout"
-, "sloc"
-, "smartdc"
-, "snyk"
-, "socket.io"
-, "speed-test"
-, "ssb-server"
-, "stackdriver-statsd-backend"
-, "stf"
-, "svgo"
-, "swagger"
-, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
-, "tern"
-, "textlint"
-, "textlint-plugin-latex"
-, "textlint-rule-abbr-within-parentheses"
-, "textlint-rule-alex"
-, "textlint-rule-common-misspellings"
-, "textlint-rule-diacritics"
-, "textlint-rule-en-max-word-count"
-, "textlint-rule-max-comma"
-, "textlint-rule-no-start-duplicated-conjunction"
-, "textlint-rule-period-in-list-item"
-, "textlint-rule-stop-words"
-, "textlint-rule-terminology"
-, "textlint-rule-unexpanded-acronym"
-, "textlint-rule-write-good"
-, "thelounge"
-, "three"
-, "tiddlywiki"
-, "titanium"
-, "triton"
-, "tsun"
-, "ttf2eot"
-, "typescript"
-, "typescript-language-server"
-, "uglify-js"
-, "ungit"
-, "vscode-css-languageserver-bin"
-, "vscode-html-languageserver-bin"
-, "vue-cli"
-, "vue-language-server"
-, "web-ext"
-, "webpack"
-, "webpack-cli"
-, "webpack-dev-server"
-, "copy-webpack-plugin"
-, "webtorrent-cli"
-, "wring"
-, "write-good"
-, "yaml-language-server"
-, "yarn"
-, "yo"
-]

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

@@ -1,9 +1,203 @@
 [
-  "coffee-script"
+  "@angular/cli"
+, "@antora/cli"
+, "@antora/site-generator-default"
+, "@bitwarden/cli"
+, "@webassemblyjs/cli"
+, "@webassemblyjs/repl"
+, "@webassemblyjs/wasm-strip"
+, "@webassemblyjs/wasm-text-gen"
+, "@webassemblyjs/wast-refmt"
+, "alloy"
+, "asar"
+, "bash-language-server"
+, "bower"
+, "bower2nix"
+, "browserify"
+, "castnow"
+, "clean-css"
+, "coc-css"
+, "coc-emmet"
+, "coc-eslint"
+, "coc-git"
+, "coc-go"
+, "coc-highlight"
+, "coc-html"
+, "coc-imselect"
+, "coc-java"
+, "coc-jest"
+, "coc-json"
+, "coc-lists"
+, "coc-metals"
+, "coc-pairs"
+, "coc-prettier"
+, "coc-python"
+, "coc-r-lsp"
+, "coc-rls"
+, "coc-smartf"
+, "coc-snippets"
+, "coc-solargraph"
+, "coc-stylelint"
+, "coc-tabnine"
+, "coc-tslint"
+, "coc-tslint-plugin"
+, "coc-tsserver"
+, "coc-vetur"
+, "coc-vimtex"
+, "coc-wxml"
+, "coc-yaml"
+, "coc-yank"
+, "coffee-script"
+, "coinmon"
+, "configurable-http-proxy"
+, "cordova"
+, "cpy-cli"
+, "create-cycle-app"
+, "create-react-app"
+, "create-react-native-app"
+, "csslint"
+, "dat"
+, "dhcp"
+, "dnschain"
+, "dockerfile-language-server-nodejs"
+, "elasticdump"
+, "elm-oracle"
+, "emoj"
+, "emojione"
+, "eslint"
+, "eslint_d"
+, {"fast-cli": "1.x"}
+, "fkill-cli"
+, "forever"
+, "git-run"
+, "git-ssb"
+, "git-standup"
+, "gitmoji-cli"
+, "graphql-cli"
 , "grunt-cli"
+, "gtop"
+, "gulp"
+, "gulp-cli"
+, "html-minifier"
+, "htmlhint"
+, "http-server"
+, "hueadm"
+, "imapnotify"
+, "indium"
+, "insect"
+, "ionic"
+, "ios-deploy"
+, { "iosevka-build-deps": "../../data/fonts/iosevka" }
+, "jake"
+, "javascript-typescript-langserver"
+, "joplin"
+, "js-beautify"
+, "js-yaml"
+, "jsdoc"
+, "jshint"
+, "json"
+, "json-diff"
+, "json-refs"
+, "json-server"
+, "jsonlint"
+, "karma"
+, "lcov-result-merger"
+, "leetcode-cli"
+, "lerna"
+, "less"
+, "less-plugin-clean-css"
+, "live-server"
+, "livedown"
+, {"lumo-build-deps": "../interpreters/clojurescript/lumo" }
+, "madoko"
+, "markdown-link-check"
+, "mathjax"
+, "meat"
+, "meguca"
+, "mocha"
+, "multi-file-swagger"
+, "neovim"
 , "nijs"
-, "node2nix"
 , "node-gyp"
 , "node-gyp-build"
+, "node-inspector"
 , "node-pre-gyp"
+, "node-red"
+, "node2nix"
+, "nodemon"
+, "npm"
+, "npm-check-updates"
+, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
+, "ocaml-language-server"
+, "parcel-bundler"
+, "parsoid"
+, "peerflix"
+, "peerflix-server"
+, "pnpm"
+, "postcss-cli"
+, "prettier"
+, "pscid"
+, "pulp"
+, "purescript-psa"
+, "react-native-cli"
+, "react-tools"
+, "reveal.js"
+, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
+, "s3http"
+, "semver"
+, "serve"
+, "serverless"
+, "shout"
+, "sloc"
+, "smartdc"
+, "snyk"
+, "socket.io"
+, "speed-test"
+, "ssb-server"
+, "stackdriver-statsd-backend"
+, "stf"
+, "svgo"
+, "swagger"
+, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
+, "tern"
+, "textlint"
+, "textlint-plugin-latex"
+, "textlint-rule-abbr-within-parentheses"
+, "textlint-rule-alex"
+, "textlint-rule-common-misspellings"
+, "textlint-rule-diacritics"
+, "textlint-rule-en-max-word-count"
+, "textlint-rule-max-comma"
+, "textlint-rule-no-start-duplicated-conjunction"
+, "textlint-rule-period-in-list-item"
+, "textlint-rule-stop-words"
+, "textlint-rule-terminology"
+, "textlint-rule-unexpanded-acronym"
+, "textlint-rule-write-good"
+, "thelounge"
+, "three"
+, "tiddlywiki"
+, "titanium"
+, "triton"
+, "tsun"
+, "ttf2eot"
+, "typescript"
+, "typescript-language-server"
+, "uglify-js"
+, "ungit"
+, "vscode-css-languageserver-bin"
+, "vscode-html-languageserver-bin"
+, "vue-cli"
+, "vue-language-server"
+, "web-ext"
+, "webpack"
+, "webpack-cli"
+, "webpack-dev-server"
+, "copy-webpack-plugin"
+, "webtorrent-cli"
+, "wring"
+, "write-good"
+, "yaml-language-server"
+, "yarn"
+, "yo"
 ]

pkgs/development/node-packages/node-packages-v13.nix

@@ -13,13 +13,13 @@ let
         sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
-    "ajv-6.12.0" = {
+    "ajv-6.12.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.0";
+      version = "6.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz";
-        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
+        sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -895,13 +895,13 @@ let
         sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "resolve-1.16.0" = {
+    "resolve-1.16.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.16.0";
+      version = "1.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz";
-        sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA==";
+        sha512 = "rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==";
       };
     };
     "retry-0.10.1" = {
@@ -1030,13 +1030,13 @@ let
         sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
       };
     };
-    "spdx-exceptions-2.2.0" = {
+    "spdx-exceptions-2.3.0" = {
       name = "spdx-exceptions";
       packageName = "spdx-exceptions";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
-        sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
+        sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
       };
     };
     "spdx-expression-parse-3.0.0" = {
@@ -1268,7 +1268,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.12.0"
+      sources."ajv-6.12.2"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -1393,7 +1393,7 @@ in
         ];
       })
       sources."request-2.88.2"
-      sources."resolve-1.16.0"
+      sources."resolve-1.16.1"
       sources."retry-0.10.1"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.0"
@@ -1404,7 +1404,7 @@ in
       sources."slasp-0.0.4"
       sources."slide-1.1.6"
       sources."spdx-correct-3.1.0"
-      sources."spdx-exceptions-2.2.0"
+      sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.5"
       sources."sshpk-1.16.1"
@@ -1441,7 +1441,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Generate Nix expressions to build NPM packages";
-      homepage = "https://github.com/svanderburg/node2nix";
+      homepage = https://github.com/svanderburg/node2nix;
       license = "MIT";
     };
     production = true;

pkgs/development/tools/documentation/antora/default.nix

@@ -1,14 +1,14 @@
-{ stdenv, nodePackages_10_x }:
+{ stdenv, nodePackages }:
 
 let
   linkNodeDeps = ({ pkg, deps, name ? "" }:
     let
       targetModule = if name != "" then name else stdenv.lib.getName pkg;
-    in nodePackages_10_x.${pkg}.override (oldAttrs: {
+    in nodePackages.${pkg}.override (oldAttrs: {
       postInstall = ''
         mkdir -p $out/lib/node_modules/${targetModule}/node_modules
         ${stdenv.lib.concatStringsSep "\n" (map (dep: ''
-          ln -s ${nodePackages_10_x.${dep}}/lib/node_modules/${stdenv.lib.getName dep} \
+          ln -s ${nodePackages.${dep}}/lib/node_modules/${stdenv.lib.getName dep} \
             $out/lib/node_modules/${targetModule}/node_modules/${stdenv.lib.getName dep}
         '') deps
         )}

pkgs/misc/vscode-extensions/rust-analyzer/default.nix

@@ -1,5 +1,5 @@
 # Update script: pkgs/development/tools/rust/rust-analyzer/update.sh
-{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages_10_x
+{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages
 , setDefaultServerPath ? true
 }:
 
@@ -10,7 +10,7 @@ let
   # Follow the unstable version of rust-analyzer, since the extension is not stable yet.
   inherit (rust-analyzer) version;
 
-  build-deps = nodePackages_10_x."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps";
+  build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps";
   # FIXME: Making a new derivation to link `node_modules` and run `npm run package`
   # will cause a build failure.
   vsix = build-deps.override {

pkgs/top-level/all-packages.nix

@@ -4825,7 +4825,7 @@ in
 
   nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
 
-  nodejs = hiPrio nodejs-10_x;
+  nodejs = hiPrio nodejs-12_x;
 
   nodejs-slim = nodejs-slim-10_x;
 
@@ -4859,11 +4859,7 @@ in
     nodejs = pkgs.nodejs-12_x;
   });
 
-  nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix {
+  nodePackages = nodePackages_12_x;
-    nodejs = pkgs.nodejs-10_x;
-  });
-
-  nodePackages = nodePackages_10_x;
 
   now-cli = callPackage ../development/web/now-cli {};