nodePackages.parsoid: pin service-runner to 2.3.0

service-runner had a backwards incompatible update, and parsoid 0.9.0
doesn't work with current stable MediaWiki. Instead use as a source
a repository with 0.8.0 and pinned service-runner version.
This commit is contained in:
Nikolay Amiantov 2018-04-02 22:36:03 +03:00
parent 5a6291f1a6
commit 37546be900
3 changed files with 93 additions and 88 deletions

View file

@ -6,6 +6,8 @@ let
cfg = config.services.parsoid;
parsoid = pkgs.nodePackages."parsoid-git://github.com/abbradar/parsoid#stable";
confTree = {
worker_heartbeat_timeout = 300000;
logging = { level = "info"; };
@ -93,7 +95,7 @@ in
after = [ "network.target" ];
serviceConfig = {
User = "nobody";
ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
ExecStart = "${parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
};
};

View file

@ -73,7 +73,7 @@
, "npm-check-updates"
, "nsp"
, "ocaml-language-server"
, "parsoid"
, { "parsoid": "git://github.com/abbradar/parsoid#stable" }
, "peerflix"
, "peerflix-server"
, "phantomjs"

View file

@ -4351,13 +4351,13 @@ let
sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582";
};
};
"cli-spinners-1.1.0" = {
"cli-spinners-1.3.0" = {
name = "cli-spinners";
packageName = "cli-spinners";
version = "1.1.0";
version = "1.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz";
sha1 = "f1847b168844d917a671eb9d147e3df497c90d06";
url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.0.tgz";
sha512 = "36fw6sfxv4nwbywjns5fvwflfdimmngjc44ri9xhmqq8cb64b0p19fk30m7ywhr9m9bac8a9jnkb22bs2h0bskv6y5spnqny6mzf6ka";
};
};
"cli-table-0.3.1" = {
@ -5494,12 +5494,12 @@ let
sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4";
};
};
"content-type-git+https://github.com/wikimedia/content-type.git#master" = {
"content-type-git+https://github.com/wikimedia/content-type#master" = {
name = "content-type";
packageName = "content-type";
version = "1.0.1";
src = fetchgit {
url = "https://github.com/wikimedia/content-type.git";
url = "https://github.com/wikimedia/content-type";
rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
};
@ -7304,6 +7304,15 @@ let
sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
};
};
"diff-1.4.0" = {
name = "diff";
packageName = "diff";
version = "1.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
};
};
"diff-3.2.0" = {
name = "diff";
packageName = "diff";
@ -7637,13 +7646,13 @@ let
sha1 = "892e47000a99be55bbf3774ffea0561d8879c259";
};
};
"domino-2.0.2" = {
"domino-1.0.30" = {
name = "domino";
packageName = "domino";
version = "2.0.2";
version = "1.0.30";
src = fetchurl {
url = "https://registry.npmjs.org/domino/-/domino-2.0.2.tgz";
sha512 = "1a0ns7fggllfrkgr3xv2wjpxrai04ikz2bi61n9mnkz6pblw8q2b4i1ivxx9k5kryziqbg9imia3i6sr3xkfss4lwsrphqlm58s8g5z";
url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz";
sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla";
};
};
"domutils-1.4.3" = {
@ -8610,13 +8619,13 @@ let
sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
};
};
"esquery-1.0.0" = {
"esquery-1.0.1" = {
name = "esquery";
packageName = "esquery";
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz";
sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa";
url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz";
sha512 = "0s9lxfan3qbvpprj71ldy70x9sz4xkpakhr3pymkm13bx40px4kp4xcgipscn8m21qigddin5mkr52bicbm34g46dapyn68kikv4s2a";
};
};
"esrecurse-4.2.1" = {
@ -9159,13 +9168,13 @@ let
sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
};
};
"external-editor-2.1.0" = {
"external-editor-2.2.0" = {
name = "external-editor";
packageName = "external-editor";
version = "2.1.0";
version = "2.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz";
sha512 = "366albydy3glqs8h6y7rdpdhmyffn7vaig5snw8cb1zmn22mgvfywr08jfbmqjiqc9pyjyaaqv6xz5sfy2j1y18590l4f8mji7j53hk";
url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz";
sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd";
};
};
"extglob-0.3.2" = {
@ -17427,12 +17436,12 @@ let
sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
};
};
"negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
"negotiator-git+https://github.com/arlolra/negotiator#full-parse-access" = {
name = "negotiator";
packageName = "negotiator";
version = "0.6.1";
src = fetchgit {
url = "https://github.com/arlolra/negotiator.git";
url = "https://github.com/arlolra/negotiator";
rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
};
@ -18869,13 +18878,13 @@ let
sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5";
};
};
"p-cancelable-0.4.0" = {
"p-cancelable-0.4.1" = {
name = "p-cancelable";
packageName = "p-cancelable";
version = "0.4.0";
version = "0.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.0.tgz";
sha512 = "3bd5qxdbz8icpcdb0mnhbfb5p4vzqx0jf02ii71prl6kgnaiki21agp84imr0id9fiwk0h8yi0wchmsy749r98ldscg3jxmyyl1s2pw";
url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw";
};
};
"p-finally-1.0.0" = {
@ -19643,12 +19652,12 @@ let
sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd";
};
};
"pegjs-git+https://github.com/tstarling/pegjs.git#fork" = {
"pegjs-git+https://github.com/tstarling/pegjs#fork" = {
name = "pegjs";
packageName = "pegjs";
version = "0.8.0";
src = fetchgit {
url = "https://github.com/tstarling/pegjs.git";
url = "https://github.com/tstarling/pegjs";
rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584";
sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905";
};
@ -19860,15 +19869,6 @@ let
sha512 = "2ihaln20qjx82jx73wgzirbyp8mfmhxr75am1h0w8n5hy2gsbgvw9dricv7h57ycxzax84bma96wjscmdszs5mr2lsyxpfjvhwl2601";
};
};
"pn-1.1.0" = {
name = "pn";
packageName = "pn";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz";
sha512 = "2fgy9i99qaapk6lrqsf0i396i0hw5prvpn2wwsccs7j9jz8960r59vjz98kjhfiif2pyf4fiizrwpminc29rdhpld2v8m7n18hxm8fs";
};
};
"po2json-0.4.5" = {
name = "po2json";
packageName = "po2json";
@ -22668,13 +22668,13 @@ let
sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
};
};
"service-runner-2.5.2" = {
"service-runner-2.3.0" = {
name = "service-runner";
packageName = "service-runner";
version = "2.5.2";
version = "2.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.2.tgz";
sha1 = "3a1b8f85625d0cb9154dcbe34d578142c95f1cc7";
url = "https://registry.npmjs.org/service-runner/-/service-runner-2.3.0.tgz";
sha1 = "09039dfdcc40cdbd0259dd3f982916675838cb59";
};
};
"set-blocking-2.0.0" = {
@ -26035,13 +26035,13 @@ let
sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
};
};
"uglify-js-3.3.17" = {
"uglify-js-3.3.18" = {
name = "uglify-js";
packageName = "uglify-js";
version = "3.3.17";
version = "3.3.18";
src = fetchurl {
url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.17.tgz";
sha512 = "2s1i1lv9gz5lj30vyiprcl20sri8vf3ils387k90wxag5689dxy01x1xccs1rwx4hdcfl0h1rv9154449h2qrapkw64rlg47hx3gxhs";
url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.18.tgz";
sha512 = "3vg4gpamx95s8md0lsnx3njijc8x5z8nifn2c204w261w09h7d65zjkm9mxy4v3scrab7nhd6qypdq5jgf8nkbvzvqp8akpzwbch62n";
};
};
"uglify-js-3.3.6" = {
@ -28421,13 +28421,13 @@ let
sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
};
};
"yeoman-environment-2.0.5" = {
"yeoman-environment-2.0.6" = {
name = "yeoman-environment";
packageName = "yeoman-environment";
version = "2.0.5";
version = "2.0.6";
src = fetchurl {
url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.5.tgz";
sha512 = "3kfwj39dplgp9w79zmk9p5hm4dfw21304srx68f0hzxhak45iql4j8gzxj4l3q9p4jcmwf25ar0ak4sm57rzx46bv4z2f3q3vybpxgb";
url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.6.tgz";
sha512 = "0z4544lfc7gzyp98fihqwi42p0j2dqwgrcl99i1d0b04qkslfv3im5r0xvp8rvapiqlwjg48b63kr5p1japcz3548wg445w7i6w2ccg";
};
};
"yosay-2.0.2" = {
@ -29886,7 +29886,7 @@ in
sources."axios-0.17.1"
sources."chalk-2.3.2"
sources."cli-cursor-2.1.0"
sources."cli-spinners-1.1.0"
sources."cli-spinners-1.3.0"
sources."cli-table2-0.2.0"
sources."code-point-at-1.1.0"
sources."color-convert-1.9.1"
@ -31757,11 +31757,11 @@ in
sources."eslint-visitor-keys-1.0.0"
sources."espree-3.5.4"
sources."esprima-4.0.0"
sources."esquery-1.0.0"
sources."esquery-1.0.1"
sources."esrecurse-4.2.1"
sources."estraverse-4.2.0"
sources."esutils-2.0.2"
sources."external-editor-2.1.0"
sources."external-editor-2.2.0"
sources."fast-deep-equal-1.1.0"
sources."fast-json-stable-stringify-2.0.0"
sources."fast-levenshtein-2.0.6"
@ -31939,11 +31939,11 @@ in
sources."eslint-visitor-keys-1.0.0"
sources."espree-3.5.4"
sources."esprima-4.0.0"
sources."esquery-1.0.0"
sources."esquery-1.0.1"
sources."esrecurse-4.2.1"
sources."estraverse-4.2.0"
sources."esutils-2.0.2"
sources."external-editor-2.1.0"
sources."external-editor-2.2.0"
sources."fast-deep-equal-1.1.0"
sources."fast-json-stable-stringify-2.0.0"
sources."fast-levenshtein-2.0.6"
@ -32093,7 +32093,7 @@ in
sources."caseless-0.12.0"
sources."chalk-1.1.3"
sources."cli-cursor-1.0.2"
sources."cli-spinners-1.1.0"
sources."cli-spinners-1.3.0"
sources."co-4.6.0"
sources."color-convert-1.9.1"
sources."color-name-1.1.3"
@ -33091,7 +33091,7 @@ in
sources."param-case-2.1.1"
sources."relateurl-0.2.7"
sources."source-map-0.5.7"
(sources."uglify-js-3.3.17" // {
(sources."uglify-js-3.3.18" // {
dependencies = [
sources."source-map-0.6.1"
];
@ -33207,7 +33207,7 @@ in
];
})
sources."extend-3.0.1"
sources."external-editor-2.1.0"
sources."external-editor-2.2.0"
sources."extglob-0.3.2"
sources."faye-websocket-0.10.0"
sources."figures-2.0.0"
@ -35008,7 +35008,7 @@ in
sources."error-ex-1.3.1"
sources."escape-string-regexp-1.0.5"
sources."execa-0.8.0"
sources."external-editor-2.1.0"
sources."external-editor-2.2.0"
sources."figures-2.0.0"
sources."find-up-2.1.0"
sources."fs-extra-4.0.3"
@ -38193,7 +38193,7 @@ in
sources."es6-promisify-5.0.0"
sources."escape-string-regexp-1.0.5"
sources."execa-0.7.0"
sources."external-editor-2.1.0"
sources."external-editor-2.2.0"
sources."figures-2.0.0"
sources."find-up-2.1.0"
sources."get-caller-file-1.0.2"
@ -38337,13 +38337,14 @@ in
production = true;
bypassCache = false;
};
parsoid = nodeEnv.buildNodePackage {
"parsoid-git://github.com/abbradar/parsoid#stable" = nodeEnv.buildNodePackage {
name = "parsoid";
packageName = "parsoid";
version = "0.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/parsoid/-/parsoid-0.9.0.tgz";
sha512 = "3lvlzvg1anfd8awwwwygwb3s9k6la04asyf6i20wcjmhv328ccx9sicq52w2lqdbyk0x323vk761z1izyd3qbl32rvh7z2657ls9j6x";
version = "0.8.0";
src = fetchgit {
url = "git://github.com/abbradar/parsoid";
rev = "89958e4f9e5583e0fdc5447103392e3d749d500b";
sha256 = "1af850ced5bd8db64e20ad30bf59d99c14624efba3127759ca1c34088a0aadd7";
};
dependencies = [
sources."accepts-1.3.5"
@ -38356,7 +38357,7 @@ in
sources."asap-2.0.6"
sources."asn1-0.2.3"
sources."assert-plus-1.0.0"
sources."async-1.5.2"
sources."async-0.9.2"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.6.0"
@ -38367,6 +38368,7 @@ in
sources."bluebird-3.5.1"
(sources."body-parser-1.18.2" // {
dependencies = [
sources."content-type-1.0.4"
sources."setprototypeof-1.0.3"
];
})
@ -38391,7 +38393,7 @@ in
sources."concat-map-0.0.1"
sources."connect-busboy-0.0.2"
sources."content-disposition-0.5.2"
sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
sources."content-type-git+https://github.com/wikimedia/content-type#master"
sources."cookie-0.3.1"
sources."cookie-signature-1.0.6"
sources."core-js-2.5.4"
@ -38409,15 +38411,15 @@ in
sources."depd-1.1.2"
sources."destroy-1.0.4"
sources."dicer-0.2.5"
sources."diff-1.4.0"
sources."dnscache-1.0.1"
sources."dom-storage-2.1.0"
sources."domino-2.0.2"
sources."domino-1.0.30"
sources."dtrace-provider-0.8.6"
sources."ecc-jsbn-0.1.1"
sources."ee-first-1.1.1"
sources."encodeurl-1.0.2"
sources."entities-1.1.1"
sources."errno-0.1.7"
sources."error-ex-1.3.1"
sources."escape-html-1.0.3"
sources."esprima-4.0.0"
@ -38425,10 +38427,12 @@ in
(sources."express-4.16.3" // {
dependencies = [
sources."content-type-1.0.4"
sources."statuses-1.4.0"
];
})
(sources."express-handlebars-3.0.0" // {
dependencies = [
sources."async-1.5.2"
sources."wordwrap-0.0.2"
sources."yargs-3.10.0"
];
@ -38437,7 +38441,11 @@ in
sources."extsprintf-1.3.0"
sources."fast-deep-equal-1.1.0"
sources."fast-json-stable-stringify-2.0.0"
sources."finalhandler-1.1.1"
(sources."finalhandler-1.1.1" // {
dependencies = [
sources."statuses-1.4.0"
];
})
sources."find-up-1.1.2"
sources."foreach-2.0.5"
sources."forever-agent-0.6.1"
@ -38512,7 +38520,7 @@ in
sources."mv-2.1.1"
sources."nan-2.10.0"
sources."ncp-2.0.0"
sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
sources."negotiator-git+https://github.com/arlolra/negotiator#full-parse-access"
sources."normalize-package-data-2.4.0"
sources."number-is-nan-1.0.1"
sources."oauth-sign-0.8.2"
@ -38529,17 +38537,15 @@ in
sources."path-is-absolute-1.0.1"
sources."path-to-regexp-0.1.7"
sources."path-type-1.1.0"
sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
sources."pegjs-git+https://github.com/tstarling/pegjs#fork"
sources."performance-now-2.1.0"
sources."pify-2.3.0"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
sources."pn-1.1.0"
sources."prfun-2.1.5"
sources."process-nextick-args-2.0.0"
sources."promise-7.3.1"
sources."proxy-addr-2.0.3"
sources."prr-1.0.1"
sources."punycode-1.4.1"
sources."qs-6.5.1"
sources."range-parser-1.2.0"
@ -38568,9 +38574,8 @@ in
];
})
sources."serve-static-1.13.2"
(sources."service-runner-2.5.2" // {
(sources."service-runner-2.3.0" // {
dependencies = [
sources."async-0.9.2"
sources."isarray-1.0.0"
sources."minimist-0.0.8"
sources."ms-0.7.3"
@ -38589,7 +38594,7 @@ in
sources."spdx-license-ids-3.0.0"
sources."sprintf-js-1.0.3"
sources."sshpk-1.14.1"
sources."statuses-1.4.0"
sources."statuses-1.5.0"
sources."streamsearch-0.1.2"
sources."string-width-1.0.2"
sources."string_decoder-0.10.31"
@ -38616,7 +38621,6 @@ in
sources."which-module-1.0.0"
sources."window-size-0.1.0"
sources."wordwrap-0.0.3"
sources."worker-farm-1.6.0"
sources."wrap-ansi-2.1.0"
sources."wrappy-1.0.2"
sources."y18n-3.2.1"
@ -38631,7 +38635,6 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Mediawiki parser for the VisualEditor.";
homepage = "https://github.com/wikimedia/parsoid#readme";
license = "GPL-2.0+";
};
production = true;
@ -41896,10 +41899,10 @@ in
uglify-js = nodeEnv.buildNodePackage {
name = "uglify-js";
packageName = "uglify-js";
version = "3.3.17";
version = "3.3.18";
src = fetchurl {
url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.17.tgz";
sha512 = "2s1i1lv9gz5lj30vyiprcl20sri8vf3ils387k90wxag5689dxy01x1xccs1rwx4hdcfl0h1rv9154449h2qrapkw64rlg47hx3gxhs";
url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.18.tgz";
sha512 = "3vg4gpamx95s8md0lsnx3njijc8x5z8nifn2c204w261w09h7d65zjkm9mxy4v3scrab7nhd6qypdq5jgf8nkbvzvqp8akpzwbch62n";
};
dependencies = [
sources."commander-2.15.1"
@ -42380,7 +42383,7 @@ in
sources."chalk-2.3.2"
sources."chardet-0.4.2"
sources."cli-cursor-2.1.0"
sources."cli-spinners-1.1.0"
sources."cli-spinners-1.3.0"
sources."cli-width-2.2.0"
sources."cliui-2.1.0"
sources."clone-1.0.4"
@ -42435,7 +42438,7 @@ in
sources."esprima-4.0.0"
sources."extend-3.0.1"
sources."extend-shallow-2.0.1"
sources."external-editor-2.1.0"
sources."external-editor-2.2.0"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-1.1.0"
sources."fast-json-stable-stringify-2.0.0"
@ -43527,7 +43530,7 @@ in
sources."eslint-visitor-keys-1.0.0"
sources."espree-3.5.4"
sources."esprima-3.1.3"
sources."esquery-1.0.0"
sources."esquery-1.0.1"
sources."esrecurse-4.2.1"
sources."estraverse-4.2.0"
sources."esutils-2.0.2"
@ -43542,7 +43545,7 @@ in
})
sources."extend-3.0.1"
sources."extend-shallow-3.0.2"
sources."external-editor-2.1.0"
sources."external-editor-2.2.0"
(sources."extglob-2.0.4" // {
dependencies = [
sources."define-property-1.0.0"
@ -44386,7 +44389,7 @@ in
sources."execall-1.0.0"
sources."exit-hook-1.1.1"
sources."extend-3.0.1"
sources."external-editor-2.1.0"
sources."external-editor-2.2.0"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-1.1.0"
sources."fast-json-stable-stringify-2.0.0"
@ -44569,7 +44572,7 @@ in
sources."osenv-0.1.5"
sources."osx-release-1.1.0"
sources."p-any-1.1.0"
sources."p-cancelable-0.4.0"
sources."p-cancelable-0.4.1"
sources."p-finally-1.0.0"
sources."p-is-promise-1.1.0"
sources."p-limit-1.2.0"
@ -44747,7 +44750,7 @@ in
sources."onetime-1.1.0"
];
})
(sources."yeoman-environment-2.0.5" // {
(sources."yeoman-environment-2.0.6" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.3.2"