git.iko.soy/typeable/nixpkgs
on master help sign in
nodePackages: switch to 12

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

commit6602f87384eb0e6f8caf0a23eca48f896fedb8b7 authorJörg Thalheim <joerg@thalheim.io> dateWed 22 Apr 2020, 12:26 (7 years ago) parent33f1160
13 files changed+83940−90755
doc/languages-frameworks/node.section.md+4−4 pkgs/development/mobile/titaniumenv/default.nix+1−1 pkgs/development/node-packages/default-v10.nix−132 pkgs/development/node-packages/default-v12.nix+114−1 pkgs/development/node-packages/generate.sh+1−1 pkgs/development/node-packages/node-packages-v10.json−205 pkgs/development/node-packages/node-packages-v10.nix−88276 pkgs/development/node-packages/node-packages-v12.json+196−2 pkgs/development/node-packages/node-packages-v12.nix+83600−2105 pkgs/development/node-packages/node-packages-v13.nix+17−17 pkgs/development/tools/documentation/antora/default.nix+3−3 pkgs/misc/vscode-extensions/rust-analyzer/default.nix+2−2 pkgs/top-level/all-packages.nix+2−6
doc/languages-frameworks/node.section.md+4−4
@@ -26,7 +26,7 @@ build system it uses. Here are some examples:
2626
2727After you have identified the correct system, you need to override your package
2828expression while adding in build system as a build input. For example, `dat`
29−requires `node-gyp-build`, so we override its expression in `default-v10.nix`:
29+requires `node-gyp-build`, so we override its expression in `default-v12.nix`:
3030
3131```nix
3232dat = nodePackages.dat.override (oldAttrs: {
@@ -36,14 +36,14 @@ dat = nodePackages.dat.override (oldAttrs: {
3636
3737To add a package from NPM to nixpkgs:
3838
39− 1. Modify `pkgs/development/node-packages/node-packages-v10.json` to add, update
39+ 1. Modify `pkgs/development/node-packages/node-packages-v12.json` to add, update
4040 or remove package entries. (Or `pkgs/development/node-packages/node-packages-v8.json`
4141 for packages depending on Node.js 8.x)
4242 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
4343 3. Build your new package to test your changes:
4444 `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
45− To build against a specific Node.js version (e.g. 10.x):
46− `nix-build -A nodePackages_10_x.<new-or-updated-package>`
45+ To build against a specific Node.js version (e.g. 12.x):
46+ `nix-build -A nodePackages_12_x.<new-or-updated-package>`
4747 4. Add and commit all modified and generated files.
4848
4949For more information about the generation process, consult the
pkgs/development/mobile/titaniumenv/default.nix+1−1
@@ -13,7 +13,7 @@ rec {
1313
1414 buildApp = import ./build-app.nix {
1515 inherit (pkgs) stdenv python which file jdk nodejs;
16− inherit (pkgs.nodePackages_10_x) alloy titanium;
16+ inherit (pkgs.nodePackages) alloy titanium;
1717 inherit (androidenv) composeAndroidPackages;
1818 inherit (xcodeenv) composeXcodeWrapper;
1919 inherit titaniumsdk;
pkgs/development/node-packages/default-v10.nixdeleted−132
@@ -1,132 +0,0 @@
1−{ pkgs, nodejs, stdenv }:
2−
3−let
4− nodePackages = import ./composition-v10.nix {
5− inherit pkgs nodejs;
6− inherit (stdenv.hostPlatform) system;
7− };
8−in
9−nodePackages // {
10− "@angular/cli" = nodePackages."@angular/cli".override {
11− prePatch = ''
12− export NG_CLI_ANALYTICS=false
13− '';
14− };
15− bower2nix = nodePackages.bower2nix.override {
16− buildInputs = [ pkgs.makeWrapper ];
17− postInstall = ''
18− for prog in bower2nix fetch-bower; do
19− wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
20− done
21− '';
22− };
23−
24− jshint = nodePackages.jshint.override {
25− buildInputs = [ pkgs.phantomjs2 ];
26− };
27−
28− dat = nodePackages.dat.override {
29− buildInputs = [ nodePackages.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ];
30− };
31−
32− dnschain = nodePackages.dnschain.override {
33− buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
34− postInstall = ''
35− wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
36− '';
37− };
38−
39− bitwarden-cli = pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: {
40− name = "bitwarden-cli-${drv.version}";
41− });
42−
43− ios-deploy = nodePackages.ios-deploy.override (drv: {
44− nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ];
45− preRebuild = ''
46− LD=$CC
47− tmp=$(mktemp -d)
48− ln -s /usr/bin/xcodebuild $tmp
49− export PATH="$PATH:$tmp"
50− '';
51− });
52−
53− fast-cli = nodePackages."fast-cli-1.x".override {
54− preRebuild = ''
55− # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
56− 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
57− '';
58− buildInputs = [ pkgs.phantomjs2 ];
59− };
60−
61− git-ssb = nodePackages.git-ssb.override {
62− buildInputs = [ nodePackages.node-gyp-build ];
63− };
64−
65− insect = nodePackages.insect.override (drv: {
66− nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package pkgs.purescript nodePackages.pulp ];
67− });
68−
69− node-inspector = nodePackages.node-inspector.override {
70− buildInputs = [ nodePackages.node-pre-gyp ];
71− };
72−
73− node2nix = nodePackages.node2nix.override {
74− buildInputs = [ pkgs.makeWrapper ];
75− postInstall = ''
76− wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
77− '';
78− };
79−
80− pnpm = nodePackages.pnpm.override {
81− nativeBuildInputs = [ pkgs.makeWrapper ];
82−
83− preRebuild = ''
84− sed 's/"link:/"file:/g' --in-place package.json
85− '';
86−
87− postInstall = let
88− pnpmLibPath = stdenv.lib.makeBinPath [
89− nodejs.passthru.python
90− nodejs
91− ];
92− in ''
93− for prog in $out/bin/*; do
94− wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
95− done
96− '';
97− };
98−
99− ssb-server = nodePackages.ssb-server.override {
100− buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ];
101− };
102−
103− tedicross = nodePackages."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
104− nativeBuildInputs = [ pkgs.makeWrapper ];
105− postInstall = ''
106− makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
107− --add-flags "$out/lib/node_modules/tedicross/main.js"
108− '';
109− };
110−
111− webtorrent-cli = nodePackages.webtorrent-cli.override {
112− buildInputs = [ nodePackages.node-gyp-build ];
113− };
114−
115− joplin = nodePackages.joplin.override {
116− nativeBuildInputs = [ pkgs.pkg-config ];
117− buildInputs = with pkgs; [
118− # required by sharp
119− # https://sharp.pixelplumbing.com/install
120− vips
121−
122− nodePackages.node-pre-gyp
123− ];
124− };
125−
126− thelounge = nodePackages.thelounge.override {
127− buildInputs = [ nodePackages.node-pre-gyp ];
128− postInstall = ''
129− echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
130− '';
131− };
132−}
pkgs/development/node-packages/default-v12.nix+114−1
@@ -7,10 +7,123 @@ let
77 };
88in
99nodePackages // {
10− node2nix = nodePackages.node2nix.override {
10+ "@angular/cli" = nodePackages."@angular/cli".override {
11+ prePatch = ''
12+ export NG_CLI_ANALYTICS=false
13+ '';
14+ };
15+ bower2nix = nodePackages.bower2nix.override {
16+ buildInputs = [ pkgs.makeWrapper ];
17+ postInstall = ''
18+ for prog in bower2nix fetch-bower; do
19+ wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
20+ done
21+ '';
22+ };
23+
24+ jshint = nodePackages.jshint.override {
25+ buildInputs = [ pkgs.phantomjs2 ];
26+ };
27+
28+ dat = nodePackages.dat.override {
29+ buildInputs = [ nodePackages.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ];
30+ };
31+
32+ dnschain = nodePackages.dnschain.override {
33+ buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
34+ postInstall = ''
35+ wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
36+ '';
37+ };
38+
39+ bitwarden-cli = pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: {
40+ name = "bitwarden-cli-${drv.version}";
41+ });
42+
43+ ios-deploy = nodePackages.ios-deploy.override (drv: {
44+ nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ];
45+ preRebuild = ''
46+ LD=$CC
47+ tmp=$(mktemp -d)
48+ ln -s /usr/bin/xcodebuild $tmp
49+ export PATH="$PATH:$tmp"
50+ '';
51+ });
52+
53+ fast-cli = nodePackages."fast-cli-1.x".override {
54+ preRebuild = ''
55+ # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
56+ 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
57+ '';
58+ buildInputs = [ pkgs.phantomjs2 ];
59+ };
60+
61+ git-ssb = nodePackages.git-ssb.override {
62+ buildInputs = [ nodePackages.node-gyp-build ];
63+ };
64+
65+ insect = nodePackages.insect.override (drv: {
66+ nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package pkgs.purescript nodePackages.pulp ];
67+ });
68+
69+ node-inspector = nodePackages.node-inspector.override {
70+ buildInputs = [ nodePackages.node-pre-gyp ];
71+ };
72+
73+ node2nix = nodePackages.node2nix.override {
1174 buildInputs = [ pkgs.makeWrapper ];
1275 postInstall = ''
1376 wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
1477 '';
1578 };
79+
80+ pnpm = nodePackages.pnpm.override {
81+ nativeBuildInputs = [ pkgs.makeWrapper ];
82+
83+ preRebuild = ''
84+ sed 's/"link:/"file:/g' --in-place package.json
85+ '';
86+
87+ postInstall = let
88+ pnpmLibPath = stdenv.lib.makeBinPath [
89+ nodejs.passthru.python
90+ nodejs
91+ ];
92+ in ''
93+ for prog in $out/bin/*; do
94+ wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
95+ done
96+ '';
97+ };
98+
99+ ssb-server = nodePackages.ssb-server.override {
100+ buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ];
101+ };
102+
103+ tedicross = nodePackages."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
104+ nativeBuildInputs = [ pkgs.makeWrapper ];
105+ postInstall = ''
106+ makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
107+ --add-flags "$out/lib/node_modules/tedicross/main.js"
108+ '';
109+ };
110+
111+ webtorrent-cli = nodePackages.webtorrent-cli.override {
112+ buildInputs = [ nodePackages.node-gyp-build ];
113+ };
114+
115+ joplin = nodePackages.joplin.override {
116+ nativeBuildInputs = [ pkgs.pkg-config ];
117+ buildInputs = with pkgs; [
118+ # required by sharp
119+ # https://sharp.pixelplumbing.com/install
120+ vips
121+
122+ nodePackages.node-pre-gyp
123+ ];
124+ };
125+
126+ thelounge = nodePackages.thelounge.override {
127+ buildInputs = [ nodePackages.node-pre-gyp ];
128+ };
16129}
pkgs/development/node-packages/generate.sh+1−1
@@ -6,6 +6,6 @@ node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix)
66
77cd ${DIR}
88rm -f ./node-env.nix
9−for version in 10 12 13; do
9+for version in 12 13; do
1010 "${node2nix}/bin/node2nix" --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix
1111done
pkgs/development/node-packages/node-packages-v10.jsondeleted−205
@@ -1,205 +0,0 @@
1−[
2− "@angular/cli"
3−, "@antora/cli"
4−, "@antora/site-generator-default"
5−, "@bitwarden/cli"
6−, "@vue/cli"
7−, "@webassemblyjs/cli"
8−, "@webassemblyjs/repl"
9−, "@webassemblyjs/wasm-strip"
10−, "@webassemblyjs/wasm-text-gen"
11−, "@webassemblyjs/wast-refmt"
12−, "alloy"
13−, "asar"
14−, "bash-language-server"
15−, "bower"
16−, "bower2nix"
17−, "browserify"
18−, "castnow"
19−, "clean-css"
20−, "coc-css"
21−, "coc-emmet"
22−, "coc-eslint"
23−, "coc-git"
24−, "coc-go"
25−, "coc-highlight"
26−, "coc-html"
27−, "coc-imselect"
28−, "coc-java"
29−, "coc-jest"
30−, "coc-json"
31−, "coc-lists"
32−, "coc-metals"
33−, "coc-pairs"
34−, "coc-prettier"
35−, "coc-python"
36−, "coc-r-lsp"
37−, "coc-rls"
38−, "coc-rust-analyzer"
39−, "coc-smartf"
40−, "coc-snippets"
41−, "coc-solargraph"
42−, "coc-stylelint"
43−, "coc-tabnine"
44−, "coc-tslint"
45−, "coc-tslint-plugin"
46−, "coc-tsserver"
47−, "coc-vetur"
48−, "coc-vimtex"
49−, "coc-wxml"
50−, "coc-yaml"
51−, "coc-yank"
52−, "coffee-script"
53−, "coinmon"
54−, "configurable-http-proxy"
55−, "cordova"
56−, "cpy-cli"
57−, "create-cycle-app"
58−, "create-react-app"
59−, "create-react-native-app"
60−, "csslint"
61−, "dat"
62−, "dhcp"
63−, "dnschain"
64−, "dockerfile-language-server-nodejs"
65−, "elasticdump"
66−, "elm-oracle"
67−, "emoj"
68−, "emojione"
69−, "eslint"
70−, "eslint_d"
71−, {"fast-cli": "1.x"}
72−, "fkill-cli"
73−, "forever"
74−, "git-run"
75−, "git-ssb"
76−, "git-standup"
77−, "gitmoji-cli"
78−, "graphql-cli"
79−, "grunt-cli"
80−, "gtop"
81−, "gulp"
82−, "gulp-cli"
83−, "html-minifier"
84−, "htmlhint"
85−, "http-server"
86−, "hueadm"
87−, "imapnotify"
88−, "indium"
89−, "insect"
90−, "ionic"
91−, "ios-deploy"
92−, { "iosevka-build-deps": "../../data/fonts/iosevka" }
93−, "jake"
94−, "javascript-typescript-langserver"
95−, "joplin"
96−, "js-beautify"
97−, "js-yaml"
98−, "jsdoc"
99−, "jshint"
100−, "json"
101−, "json-diff"
102−, "json-refs"
103−, "json-server"
104−, "jsonlint"
105−, "karma"
106−, "lcov-result-merger"
107−, "leetcode-cli"
108−, "lerna"
109−, "less"
110−, "less-plugin-clean-css"
111−, "live-server"
112−, "livedown"
113−, {"lumo-build-deps": "../interpreters/clojurescript/lumo" }
114−, "madoko"
115−, "markdown-link-check"
116−, "mathjax"
117−, "meat"
118−, "meguca"
119−, "mocha"
120−, "multi-file-swagger"
121−, "neovim"
122−, "nijs"
123−, "node-gyp"
124−, "node-gyp-build"
125−, "node-inspector"
126−, "node-pre-gyp"
127−, "node-red"
128−, "node2nix"
129−, "nodemon"
130−, "npm"
131−, "npm-check-updates"
132−, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
133−, "ocaml-language-server"
134−, "parcel-bundler"
135−, "parsoid"
136−, "peerflix"
137−, "peerflix-server"
138−, "pnpm"
139−, "postcss-cli"
140−, "prettier"
141−, "pscid"
142−, "pulp"
143−, "purescript-psa"
144−, "react-native-cli"
145−, "react-tools"
146−, "reveal.js"
147−, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
148−, "s3http"
149−, "semver"
150−, "serve"
151−, "serverless"
152−, "shout"
153−, "sloc"
154−, "smartdc"
155−, "snyk"
156−, "socket.io"
157−, "speed-test"
158−, "ssb-server"
159−, "stackdriver-statsd-backend"
160−, "stf"
161−, "svgo"
162−, "swagger"
163−, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
164−, "tern"
165−, "textlint"
166−, "textlint-plugin-latex"
167−, "textlint-rule-abbr-within-parentheses"
168−, "textlint-rule-alex"
169−, "textlint-rule-common-misspellings"
170−, "textlint-rule-diacritics"
171−, "textlint-rule-en-max-word-count"
172−, "textlint-rule-max-comma"
173−, "textlint-rule-no-start-duplicated-conjunction"
174−, "textlint-rule-period-in-list-item"
175−, "textlint-rule-stop-words"
176−, "textlint-rule-terminology"
177−, "textlint-rule-unexpanded-acronym"
178−, "textlint-rule-write-good"
179−, "thelounge"
180−, "three"
181−, "tiddlywiki"
182−, "titanium"
183−, "triton"
184−, "tsun"
185−, "ttf2eot"
186−, "typescript"
187−, "typescript-language-server"
188−, "uglify-js"
189−, "ungit"
190−, "vscode-css-languageserver-bin"
191−, "vscode-html-languageserver-bin"
192−, "vue-cli"
193−, "vue-language-server"
194−, "web-ext"
195−, "webpack"
196−, "webpack-cli"
197−, "webpack-dev-server"
198−, "copy-webpack-plugin"
199−, "webtorrent-cli"
200−, "wring"
201−, "write-good"
202−, "yaml-language-server"
203−, "yarn"
204−, "yo"
205−]
pkgs/development/node-packages/node-packages-v10.nixdeleted−88276

This diff is too big to show here.

pkgs/development/node-packages/node-packages-v12.json+196−2

This diff is too big to show here.

pkgs/development/node-packages/node-packages-v12.nix+83600−2105

This diff is too big to show here.

pkgs/development/node-packages/node-packages-v13.nix+17−17

This diff is too big to show here.

pkgs/development/tools/documentation/antora/default.nix+3−3

This diff is too big to show here.

pkgs/misc/vscode-extensions/rust-analyzer/default.nix+2−2

This diff is too big to show here.

pkgs/top-level/all-packages.nix+2−6

This diff is too big to show here.