Change to non-versioned node-packages generate.sh

pkgs/development/node-packages/composition.nix

@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.8.0. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+
+let
+  nodeEnv = import ./node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages.nix {
+  inherit (pkgs) fetchurl fetchgit;
+  inherit nodeEnv;
+}

pkgs/development/node-packages/default.nix

@@ -0,0 +1,129 @@
+{ pkgs, nodejs, stdenv }:
+
+let
+  nodePackages = import ./composition.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 ];
+  };
+}

pkgs/development/node-packages/generate.sh

@@ -6,6 +6,4 @@ node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix)
 
 cd ${DIR}
 rm -f ./node-env.nix
-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
+${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix

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

@@ -0,0 +1,203 @@
+[
+  "@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"
+, "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"
+]