git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #141189 from piegamesde/update-appservice-irc

matrix-appservice-irc 0.26.1 -> 0.30.0

commitea58baa275afe79dc1a60a149bb9c164fbbd48ff authorAndreas Rammhold <andreas@rammhold.de> dateFri 5 Nov 2021, 23:54 (5 years ago) parent48fe29f0385773
8 files changed+586−547
compare with master
unifiedsplit
nixos/tests/matrix-appservice-irc.nix+98−43 pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION+1 pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix+11−5 pkgs/servers/matrix-synapse/matrix-appservice-irc/generate-dependencies.sh+2−2 pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix+1−1 pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix+397−491 pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json+69−3 pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh+7−2
nixos/tests/matrix-appservice-irc.nix+98−43
@@ -25,7 +25,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
2525 "bind_address" = "";
2626 "port" = 8448;
2727 "resources" = [
28− { "compress" = true; "names" = [ "client" "webclient" ]; }
28+ { "compress" = true; "names" = [ "client" ]; }
2929 { "compress" = false; "names" = [ "federation" ]; }
3030 ];
3131 "tls" = false;
@@ -85,52 +85,108 @@ import ./make-test-python.nix ({ pkgs, ... }:
8585 client = { pkgs, ... }: {
8686 environment.systemPackages = [
8787 (pkgs.writers.writePython3Bin "do_test"
88− { libraries = [ pkgs.python3Packages.matrix-client ]; } ''
89− import socket
90− from matrix_client.client import MatrixClient
91− from time import sleep
92−
93− matrix = MatrixClient("${homeserverUrl}")
94− matrix.register_with_password(username="alice", password="foobar")
95−
96− irc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
97− irc.connect(("ircd", 6667))
98− irc.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
99− irc.send(b"USER bob bob bob :bob\n")
100− irc.send(b"NICK bob\n")
101−
102− m_room = matrix.join_room("#irc_#test:homeserver")
103− irc.send(b"JOIN #test\n")
104−
105− # plenty of time for the joins to happen
106− sleep(10)
107−
108− m_room.send_text("hi from matrix")
109− irc.send(b"PRIVMSG #test :hi from irc \r\n")
110−
111− print("Waiting for irc message...")
112− while True:
113− buf = irc.recv(10000)
114− if b"hi from matrix" in buf:
115− break
116−
117− print("Waiting for matrix message...")
118−
119−
120− def callback(room, e):
121− if "hi from irc" in e['content']['body']:
122− exit(0)
123−
124−
125− m_room.add_listener(callback, "m.room.message")
126− matrix.listen_forever()
127− ''
88+ {
89+ libraries = [ pkgs.python3Packages.matrix-nio ];
90+ flakeIgnore = [
91+ # We don't live in the dark ages anymore.
92+ # Languages like Python that are whitespace heavy will overrun
93+ # 79 characters..
94+ "E501"
95+ ];
96+ } ''
97+ import sys
98+ import socket
99+ import functools
100+ from time import sleep
101+ import asyncio
102+
103+ from nio import AsyncClient, RoomMessageText, JoinResponse
104+
105+
106+ async def matrix_room_message_text_callback(matrix: AsyncClient, msg: str, _r, e):
107+ print("Received matrix text message: ", e)
108+ if msg in e.body:
109+ print("Received hi from IRC")
110+ await matrix.close()
111+ exit(0) # Actual exit point
112+
113+
114+ class IRC:
115+ def __init__(self):
116+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
117+ sock.connect(("ircd", 6667))
118+ sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
119+ sock.send(b"USER bob bob bob :bob\n")
120+ sock.send(b"NICK bob\n")
121+ self.sock = sock
122+
123+ def join(self, room: str):
124+ self.sock.send(f"JOIN {room}\n".encode())
125+
126+ def privmsg(self, room: str, msg: str):
127+ self.sock.send(f"PRIVMSG {room} :{msg}\n".encode())
128+
129+ def expect_msg(self, body: str):
130+ buffer = ""
131+ while True:
132+ buf = self.sock.recv(1024).decode()
133+ buffer += buf
134+ if body in buffer:
135+ return
136+
137+
138+ async def run(homeserver: str):
139+ irc = IRC()
140+
141+ matrix = AsyncClient(homeserver)
142+ response = await matrix.register("alice", "foobar")
143+ print("Matrix register response: ", response)
144+
145+ response = await matrix.join("#irc_#test:homeserver")
146+ print("Matrix join room response:", response)
147+ assert isinstance(response, JoinResponse)
148+ room_id = response.room_id
149+
150+ irc.join("#test")
151+ # FIXME: what are we waiting on here? Matrix? IRC? Both?
152+ # 10s seem bad for busy hydra machines.
153+ sleep(10)
154+
155+ # Exchange messages
156+ print("Sending text message to matrix room")
157+ response = await matrix.room_send(
158+ room_id=room_id,
159+ message_type="m.room.message",
160+ content={"msgtype": "m.text", "body": "hi from matrix"},
161+ )
162+ print("Matrix room send response: ", response)
163+ irc.privmsg("#test", "hi from irc")
164+
165+ print("Waiting for the matrix message to appear on the IRC side...")
166+ irc.expect_msg("hi from matrix")
167+
168+ callback = functools.partial(
169+ matrix_room_message_text_callback, matrix, "hi from irc"
170+ )
171+ matrix.add_event_callback(callback, RoomMessageText)
172+
173+ print("Waiting for matrix message...")
174+ await matrix.sync_forever()
175+
176+ exit(1) # Unreachable
177+
178+
179+ if __name__ == "__main__":
180+ asyncio.run(run(sys.argv[1]))
181+ ''
128182 )
129183 ];
130184 };
131185 };
132186
133187 testScript = ''
188+ import pathlib
189+
134190 start_all()
135191
136192 ircd.wait_for_unit("ngircd.service")
@@ -156,7 +212,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
156212 homeserver.wait_for_open_port(8448)
157213
158214 with subtest("ensure messages can be exchanged"):
159− client.succeed("do_test")
215+ client.succeed("do_test ${homeserverUrl} >&2")
160216 '';
161−
162217 })
pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISIONnew file+1
@@ -0,0 +1 @@
1+0.30.0
pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix+11−5
@@ -1,16 +1,22 @@
1−{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, ... }:
1+{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub }:
22
33let
4−
5− packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json));
6−
74 ourNodePackages = import ./node-composition.nix {
85 inherit pkgs nodejs;
96 inherit (stdenv.hostPlatform) system;
107 };
8+ version = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./REVISION);
119in
12−ourNodePackages."${packageName}".override {
10+ourNodePackages.package.override {
1311 pname = "matrix-appservice-irc";
12+ inherit version;
13+
14+ src = fetchFromGitHub {
15+ owner = "matrix-org";
16+ repo = "matrix-appservice-irc";
17+ rev = version;
18+ sha256 = "sha256-EncodJKptrLC54B5XipkiHXFgJ5cD+crcT3SOPOc+7M=";
19+ };
1420
1521 nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ];
1622
pkgs/servers/matrix-synapse/matrix-appservice-irc/generate-dependencies.sh+2−2
@@ -3,9 +3,9 @@
33ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)"
44
55$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
6− --nodejs-12 \
6+ --nodejs-14 \
77 --node-env ../../../development/node-packages/node-env.nix \
88 --development \
9− --input package.json \
9+ --lock ./package-lock-temp.json \
1010 --output node-packages.nix \
1111 --composition node-composition.nix
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix+1−1
@@ -2,7 +2,7 @@
22
33{pkgs ? import <nixpkgs> {
44 inherit system;
5− }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
5+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
66
77let
88 nodeEnv = import ../../../development/node-packages/node-env.nix {
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix+397−491
@@ -76,13 +76,13 @@ let
7676 sha512 = "YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==";
7777 };
7878 };
79− "@babel/parser-7.14.4" = {
79+ "@babel/parser-7.14.3" = {
8080 name = "_at_babel_slash_parser";
8181 packageName = "@babel/parser";
82− version = "7.14.4";
82+ version = "7.14.3";
8383 src = fetchurl {
84− url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz";
85− sha512 = "ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==";
84+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz";
85+ sha512 = "7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==";
8686 };
8787 };
8888 "@babel/runtime-7.14.0" = {
@@ -112,13 +112,13 @@ let
112112 sha512 = "TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==";
113113 };
114114 };
115− "@babel/types-7.14.4" = {
115+ "@babel/types-7.14.2" = {
116116 name = "_at_babel_slash_types";
117117 packageName = "@babel/types";
118− version = "7.14.4";
118+ version = "7.14.2";
119119 src = fetchurl {
120− url = "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz";
121− sha512 = "lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==";
120+ url = "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz";
121+ sha512 = "SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==";
122122 };
123123 };
124124 "@dabh/diagnostics-2.0.2" = {
@@ -130,103 +130,103 @@ let
130130 sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
131131 };
132132 };
133− "@eslint/eslintrc-0.4.2" = {
133+ "@eslint/eslintrc-0.4.1" = {
134134 name = "_at_eslint_slash_eslintrc";
135135 packageName = "@eslint/eslintrc";
136− version = "0.4.2";
136+ version = "0.4.1";
137137 src = fetchurl {
138− url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz";
139− sha512 = "8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==";
138+ url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz";
139+ sha512 = "5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==";
140140 };
141141 };
142− "@nodelib/fs.scandir-2.1.5" = {
142+ "@nodelib/fs.scandir-2.1.4" = {
143143 name = "_at_nodelib_slash_fs.scandir";
144144 packageName = "@nodelib/fs.scandir";
145− version = "2.1.5";
145+ version = "2.1.4";
146146 src = fetchurl {
147− url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz";
148− sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==";
147+ url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
148+ sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
149149 };
150150 };
151− "@nodelib/fs.stat-2.0.5" = {
151+ "@nodelib/fs.stat-2.0.4" = {
152152 name = "_at_nodelib_slash_fs.stat";
153153 packageName = "@nodelib/fs.stat";
154− version = "2.0.5";
154+ version = "2.0.4";
155155 src = fetchurl {
156− url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz";
157− sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==";
156+ url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
157+ sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
158158 };
159159 };
160− "@nodelib/fs.walk-1.2.7" = {
160+ "@nodelib/fs.walk-1.2.6" = {
161161 name = "_at_nodelib_slash_fs.walk";
162162 packageName = "@nodelib/fs.walk";
163− version = "1.2.7";
163+ version = "1.2.6";
164164 src = fetchurl {
165− url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz";
166− sha512 = "BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==";
165+ url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
166+ sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
167167 };
168168 };
169− "@sentry/core-5.30.0" = {
169+ "@sentry/core-5.27.1" = {
170170 name = "_at_sentry_slash_core";
171171 packageName = "@sentry/core";
172− version = "5.30.0";
172+ version = "5.27.1";
173173 src = fetchurl {
174− url = "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz";
175− sha512 = "TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==";
174+ url = "https://registry.npmjs.org/@sentry/core/-/core-5.27.1.tgz";
175+ sha512 = "n5CxzMbOAT6HZK4U4cOUAAikkRnnHhMNhInrjfZh7BoiuX1k63Hru2H5xk5WDuEaTTr5RaBA/fqPl7wxHySlwQ==";
176176 };
177177 };
178− "@sentry/hub-5.30.0" = {
178+ "@sentry/hub-5.27.1" = {
179179 name = "_at_sentry_slash_hub";
180180 packageName = "@sentry/hub";
181− version = "5.30.0";
181+ version = "5.27.1";
182182 src = fetchurl {
183− url = "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz";
184− sha512 = "2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==";
183+ url = "https://registry.npmjs.org/@sentry/hub/-/hub-5.27.1.tgz";
184+ sha512 = "RBHo3T92s6s4Ian1pZcPlmNtFqB+HAP6xitU+ZNA48bYUK+R1vvqEcI8Xs83FyNaRGCgclp9erDFQYyAuxY4vw==";
185185 };
186186 };
187− "@sentry/minimal-5.30.0" = {
187+ "@sentry/minimal-5.27.1" = {
188188 name = "_at_sentry_slash_minimal";
189189 packageName = "@sentry/minimal";
190− version = "5.30.0";
190+ version = "5.27.1";
191191 src = fetchurl {
192− url = "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz";
193− sha512 = "BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==";
192+ url = "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.27.1.tgz";
193+ sha512 = "MHXCeJdA1NAvaJuippcM8nrWScul8iTN0Q5nnFkGctGIGmmiZHTXAYkObqJk7H3AK+CP7r1jqN2aQj5Nd9CtyA==";
194194 };
195195 };
196− "@sentry/node-5.30.0" = {
196+ "@sentry/node-5.27.1" = {
197197 name = "_at_sentry_slash_node";
198198 packageName = "@sentry/node";
199− version = "5.30.0";
199+ version = "5.27.1";
200200 src = fetchurl {
201− url = "https://registry.npmjs.org/@sentry/node/-/node-5.30.0.tgz";
202− sha512 = "Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==";
201+ url = "https://registry.npmjs.org/@sentry/node/-/node-5.27.1.tgz";
202+ sha512 = "OJCpUK6bbWlDCqiTZVP4ybQQDSly2EafbvvO7hoQ5ktr87WkRCgLpTNI7Doa5ANGuLNnVUvRNIsIH1DJqLZLNg==";
203203 };
204204 };
205− "@sentry/tracing-5.30.0" = {
205+ "@sentry/tracing-5.27.1" = {
206206 name = "_at_sentry_slash_tracing";
207207 packageName = "@sentry/tracing";
208− version = "5.30.0";
208+ version = "5.27.1";
209209 src = fetchurl {
210− url = "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.30.0.tgz";
211− sha512 = "dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw==";
210+ url = "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.27.1.tgz";
211+ sha512 = "GBmdR8Ky/nv4KOa6+DEnOSBkFOFhM+asR8Y/gw2qSUWCwzKuWHh9BEnDwxtSI8CMvgUwOIZ5wiiqJGc1unYfCw==";
212212 };
213213 };
214− "@sentry/types-5.30.0" = {
214+ "@sentry/types-5.27.1" = {
215215 name = "_at_sentry_slash_types";
216216 packageName = "@sentry/types";
217− version = "5.30.0";
217+ version = "5.27.1";
218218 src = fetchurl {
219− url = "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz";
220− sha512 = "R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==";
219+ url = "https://registry.npmjs.org/@sentry/types/-/types-5.27.1.tgz";
220+ sha512 = "g1aX0V0fz5BTo0mjgSVY9XmPLGZ6p+8OEzq3ubKzDUf59VHl+Vt8viZ8VXw/vsNtfAjBHn7BzSuzJo7cXJJBtA==";
221221 };
222222 };
223− "@sentry/utils-5.30.0" = {
223+ "@sentry/utils-5.27.1" = {
224224 name = "_at_sentry_slash_utils";
225225 packageName = "@sentry/utils";
226− version = "5.30.0";
226+ version = "5.27.1";
227227 src = fetchurl {
228− url = "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz";
229− sha512 = "zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==";
228+ url = "https://registry.npmjs.org/@sentry/utils/-/utils-5.27.1.tgz";
229+ sha512 = "VIzK8utuvFO9EogZcKJPgmLnlJtYbaPQ0jCw7od9HRw1ckrSBc84sA0uuuY6pB6KSM+7k6EjJ5IdIBaCz5ep/A==";
230230 };
231231 };
232232 "@sindresorhus/is-0.14.0" = {
@@ -247,13 +247,13 @@ let
247247 sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
248248 };
249249 };
250− "@types/bluebird-3.5.35" = {
250+ "@types/bluebird-3.5.32" = {
251251 name = "_at_types_slash_bluebird";
252252 packageName = "@types/bluebird";
253− version = "3.5.35";
253+ version = "3.5.32";
254254 src = fetchurl {
255− url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.35.tgz";
256− sha512 = "2WeeXK7BuQo7yPI4WGOBum90SzF/f8rqlvpaXx4rjeTmNssGRDHWf7fgDUH90xMB3sUOu716fUK5d+OVx0+ncQ==";
255+ url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.32.tgz";
256+ sha512 = "dIOxFfI0C+jz89g6lQ+TqhGgPQ0MxSnh/E4xuC0blhFtyW269+mPG5QeLgbdwst/LvdP8o1y0o/Gz5EHXLec/g==";
257257 };
258258 };
259259 "@types/body-parser-1.19.0" = {
@@ -274,22 +274,22 @@ let
274274 sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==";
275275 };
276276 };
277− "@types/express-4.17.12" = {
277+ "@types/express-4.17.8" = {
278278 name = "_at_types_slash_express";
279279 packageName = "@types/express";
280− version = "4.17.12";
280+ version = "4.17.8";
281281 src = fetchurl {
282− url = "https://registry.npmjs.org/@types/express/-/express-4.17.12.tgz";
283− sha512 = "pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q==";
282+ url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz";
283+ sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==";
284284 };
285285 };
286− "@types/express-serve-static-core-4.17.21" = {
286+ "@types/express-serve-static-core-4.17.19" = {
287287 name = "_at_types_slash_express-serve-static-core";
288288 packageName = "@types/express-serve-static-core";
289− version = "4.17.21";
289+ version = "4.17.19";
290290 src = fetchurl {
291− url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz";
292− sha512 = "gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA==";
291+ url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz";
292+ sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==";
293293 };
294294 };
295295 "@types/extend-3.0.1" = {
@@ -337,13 +337,13 @@ let
337337 sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw==";
338338 };
339339 };
340− "@types/node-15.12.2" = {
340+ "@types/node-12.12.54" = {
341341 name = "_at_types_slash_node";
342342 packageName = "@types/node";
343− version = "15.12.2";
343+ version = "12.12.54";
344344 src = fetchurl {
345− url = "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz";
346− sha512 = "zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww==";
345+ url = "https://registry.npmjs.org/@types/node/-/node-12.12.54.tgz";
346+ sha512 = "ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w==";
347347 };
348348 };
349349 "@types/nopt-3.0.29" = {
@@ -400,67 +400,67 @@ let
400400 sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
401401 };
402402 };
403− "@typescript-eslint/eslint-plugin-4.26.1" = {
403+ "@typescript-eslint/eslint-plugin-4.16.1" = {
404404 name = "_at_typescript-eslint_slash_eslint-plugin";
405405 packageName = "@typescript-eslint/eslint-plugin";
406− version = "4.26.1";
406+ version = "4.16.1";
407407 src = fetchurl {
408− url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz";
409− sha512 = "aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==";
408+ url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz";
409+ sha512 = "SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ==";
410410 };
411411 };
412− "@typescript-eslint/experimental-utils-4.26.1" = {
412+ "@typescript-eslint/experimental-utils-4.16.1" = {
413413 name = "_at_typescript-eslint_slash_experimental-utils";
414414 packageName = "@typescript-eslint/experimental-utils";
415− version = "4.26.1";
415+ version = "4.16.1";
416416 src = fetchurl {
417− url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz";
418− sha512 = "sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==";
417+ url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz";
418+ sha512 = "0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==";
419419 };
420420 };
421− "@typescript-eslint/parser-4.26.1" = {
421+ "@typescript-eslint/parser-4.16.1" = {
422422 name = "_at_typescript-eslint_slash_parser";
423423 packageName = "@typescript-eslint/parser";
424− version = "4.26.1";
424+ version = "4.16.1";
425425 src = fetchurl {
426− url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz";
427− sha512 = "q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==";
426+ url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.16.1.tgz";
427+ sha512 = "/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg==";
428428 };
429429 };
430− "@typescript-eslint/scope-manager-4.26.1" = {
430+ "@typescript-eslint/scope-manager-4.16.1" = {
431431 name = "_at_typescript-eslint_slash_scope-manager";
432432 packageName = "@typescript-eslint/scope-manager";
433− version = "4.26.1";
433+ version = "4.16.1";
434434 src = fetchurl {
435− url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz";
436− sha512 = "TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==";
435+ url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz";
436+ sha512 = "6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==";
437437 };
438438 };
439− "@typescript-eslint/types-4.26.1" = {
439+ "@typescript-eslint/types-4.16.1" = {
440440 name = "_at_typescript-eslint_slash_types";
441441 packageName = "@typescript-eslint/types";
442− version = "4.26.1";
442+ version = "4.16.1";
443443 src = fetchurl {
444− url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz";
445− sha512 = "STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==";
444+ url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz";
445+ sha512 = "nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==";
446446 };
447447 };
448− "@typescript-eslint/typescript-estree-4.26.1" = {
448+ "@typescript-eslint/typescript-estree-4.16.1" = {
449449 name = "_at_typescript-eslint_slash_typescript-estree";
450450 packageName = "@typescript-eslint/typescript-estree";
451− version = "4.26.1";
451+ version = "4.16.1";
452452 src = fetchurl {
453− url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz";
454− sha512 = "l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==";
453+ url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz";
454+ sha512 = "m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==";
455455 };
456456 };
457− "@typescript-eslint/visitor-keys-4.26.1" = {
457+ "@typescript-eslint/visitor-keys-4.16.1" = {
458458 name = "_at_typescript-eslint_slash_visitor-keys";
459459 packageName = "@typescript-eslint/visitor-keys";
460− version = "4.26.1";
460+ version = "4.16.1";
461461 src = fetchurl {
462− url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz";
463− sha512 = "IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==";
462+ url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz";
463+ sha512 = "s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==";
464464 };
465465 };
466466 "abbrev-1.1.1" = {
@@ -517,13 +517,13 @@ let
517517 sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
518518 };
519519 };
520− "ajv-8.6.0" = {
520+ "ajv-8.4.0" = {
521521 name = "ajv";
522522 packageName = "ajv";
523− version = "8.6.0";
523+ version = "8.4.0";
524524 src = fetchurl {
525− url = "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz";
526− sha512 = "cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==";
525+ url = "https://registry.npmjs.org/ajv/-/ajv-8.4.0.tgz";
526+ sha512 = "7QD2l6+KBSLwf+7MuYocbWvRPdOu63/trReTLu2KFwkgctnub1auoF+Y1WYcm09CTM7quuscrzqmASaLHC/K4Q==";
527527 };
528528 };
529529 "another-json-0.2.0" = {
@@ -1246,13 +1246,13 @@ let
12461246 sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
12471247 };
12481248 };
1249− "debug-4.3.2" = {
1249+ "debug-4.3.1" = {
12501250 name = "debug";
12511251 packageName = "debug";
1252− version = "4.3.2";
1252+ version = "4.3.1";
12531253 src = fetchurl {
1254− url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
1255− sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
1254+ url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
1255+ sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
12561256 };
12571257 };
12581258 "decamelize-1.2.0" = {
@@ -1408,13 +1408,13 @@ let
14081408 sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==";
14091409 };
14101410 };
1411− "domutils-2.7.0" = {
1411+ "domutils-2.6.0" = {
14121412 name = "domutils";
14131413 packageName = "domutils";
1414− version = "2.7.0";
1414+ version = "2.6.0";
14151415 src = fetchurl {
1416− url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz";
1417− sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==";
1416+ url = "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz";
1417+ sha512 = "y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==";
14181418 };
14191419 };
14201420 "dot-prop-5.3.0" = {
@@ -1561,15 +1561,6 @@ let
15611561 sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
15621562 };
15631563 };
1564− "escape-string-regexp-2.0.0" = {
1565− name = "escape-string-regexp";
1566− packageName = "escape-string-regexp";
1567− version = "2.0.0";
1568− src = fetchurl {
1569− url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz";
1570− sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==";
1571− };
1572− };
15731564 "escape-string-regexp-4.0.0" = {
15741565 name = "escape-string-regexp";
15751566 packageName = "escape-string-regexp";
@@ -1579,13 +1570,13 @@ let
15791570 sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
15801571 };
15811572 };
1582− "eslint-7.28.0" = {
1573+ "eslint-7.21.0" = {
15831574 name = "eslint";
15841575 packageName = "eslint";
1585− version = "7.28.0";
1576+ version = "7.21.0";
15861577 src = fetchurl {
1587− url = "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz";
1588− sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==";
1578+ url = "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz";
1579+ sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==";
15891580 };
15901581 };
15911582 "eslint-scope-5.1.1" = {
@@ -1606,15 +1597,6 @@ let
16061597 sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==";
16071598 };
16081599 };
1609− "eslint-utils-3.0.0" = {
1610− name = "eslint-utils";
1611− packageName = "eslint-utils";
1612− version = "3.0.0";
1613− src = fetchurl {
1614− url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz";
1615− sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==";
1616− };
1617− };
16181600 "eslint-visitor-keys-1.3.0" = {
16191601 name = "eslint-visitor-keys";
16201602 packageName = "eslint-visitor-keys";
@@ -1723,15 +1705,6 @@ let
17231705 sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
17241706 };
17251707 };
1726− "extend-2.0.2" = {
1727− name = "extend";
1728− packageName = "extend";
1729− version = "2.0.2";
1730− src = fetchurl {
1731− url = "https://registry.npmjs.org/extend/-/extend-2.0.2.tgz";
1732− sha512 = "AgFD4VU+lVLP6vjnlNfF7OeInLTyeyckCNPEsuxz1vi786UuK/nk6ynPuhn/h+Ju9++TQyr5EpLRI14fc1QtTQ==";
1733− };
1734− };
17351708 "extend-3.0.2" = {
17361709 name = "extend";
17371710 packageName = "extend";
@@ -1750,13 +1723,13 @@ let
17501723 sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
17511724 };
17521725 };
1753− "fast-deep-equal-3.1.3" = {
1726+ "fast-deep-equal-3.1.1" = {
17541727 name = "fast-deep-equal";
17551728 packageName = "fast-deep-equal";
1756− version = "3.1.3";
1729+ version = "3.1.1";
17571730 src = fetchurl {
1758− url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
1759− sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
1731+ url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
1732+ sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
17601733 };
17611734 };
17621735 "fast-glob-3.2.5" = {
@@ -1930,13 +1903,13 @@ let
19301903 sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
19311904 };
19321905 };
1933− "forwarded-0.2.0" = {
1906+ "forwarded-0.1.2" = {
19341907 name = "forwarded";
19351908 packageName = "forwarded";
1936− version = "0.2.0";
1909+ version = "0.1.2";
19371910 src = fetchurl {
1938− url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz";
1939− sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==";
1911+ url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz";
1912+ sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
19401913 };
19411914 };
19421915 "fresh-0.5.2" = {
@@ -2092,13 +2065,13 @@ let
20922065 sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
20932066 };
20942067 };
2095− "globals-13.9.0" = {
2068+ "globals-12.4.0" = {
20962069 name = "globals";
20972070 packageName = "globals";
2098− version = "13.9.0";
2071+ version = "12.4.0";
20992072 src = fetchurl {
2100− url = "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz";
2101− sha512 = "74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==";
2073+ url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz";
2074+ sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==";
21022075 };
21032076 };
21042077 "globby-11.0.3" = {
@@ -2119,13 +2092,13 @@ let
21192092 sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
21202093 };
21212094 };
2122− "graceful-fs-4.2.6" = {
2095+ "graceful-fs-4.2.3" = {
21232096 name = "graceful-fs";
21242097 packageName = "graceful-fs";
2125− version = "4.2.6";
2098+ version = "4.2.3";
21262099 src = fetchurl {
2127− url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz";
2128− sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==";
2100+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
2101+ sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
21292102 };
21302103 };
21312104 "har-schema-2.0.0" = {
@@ -2299,15 +2272,6 @@ let
22992272 sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==";
23002273 };
23012274 };
2302− "iconv-2.3.5" = {
2303− name = "iconv";
2304− packageName = "iconv";
2305− version = "2.3.5";
2306− src = fetchurl {
2307− url = "https://registry.npmjs.org/iconv/-/iconv-2.3.5.tgz";
2308− sha512 = "U5ajDbtDfadp7pvUMC0F2XbkP5vQn9Xrwa6UptePl+cK8EILxapAt3sXers9B3Gxagk+zVjL2ELKuzQvyqOwug==";
2309− };
2310− };
23112275 "iconv-lite-0.4.24" = {
23122276 name = "iconv-lite";
23132277 packageName = "iconv-lite";
@@ -2407,6 +2371,15 @@ let
24072371 sha1 = "633c2c83e3da42a502f52466022480f4208261de";
24082372 };
24092373 };
2374+ "inherits-2.0.4" = {
2375+ name = "inherits";
2376+ packageName = "inherits";
2377+ version = "2.0.4";
2378+ src = fetchurl {
2379+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
2380+ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
2381+ };
2382+ };
24102383 "ini-1.3.7" = {
24112384 name = "ini";
24122385 packageName = "ini";
@@ -2434,16 +2407,6 @@ let
24342407 sha512 = "HtszKchBQTcqw1DC09uD7i7vvMayHGM1OCo6AHt5pkgZEyo99ClhHTMJdf+Ezc9ovuNNxcH89QfyclGthjZJOw==";
24352408 };
24362409 };
2437− "irc-git+https://matrix-org@github.com/matrix-org/node-irc.git#9028c2197c216dd8e6fc2cb3cc07ce2d6bf741a7" = {
2438− name = "irc";
2439− packageName = "irc";
2440− version = "0.3.12";
2441− src = fetchgit {
2442− url = "https://matrix-org@github.com/matrix-org/node-irc.git";
2443− rev = "9028c2197c216dd8e6fc2cb3cc07ce2d6bf741a7";
2444− sha256 = "0785d44389d34d7e7c614437c8c8e108f32b5d5022e6f29c47a6a40090d277a7";
2445− };
2446− };
24472410 "is-arrayish-0.2.1" = {
24482411 name = "is-arrayish";
24492412 packageName = "is-arrayish";
@@ -2741,22 +2704,22 @@ let
27412704 sha512 = "uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==";
27422705 };
27432706 };
2744− "jasmine-3.7.0" = {
2707+ "jasmine-3.6.2" = {
27452708 name = "jasmine";
27462709 packageName = "jasmine";
2747− version = "3.7.0";
2710+ version = "3.6.2";
27482711 src = fetchurl {
2749− url = "https://registry.npmjs.org/jasmine/-/jasmine-3.7.0.tgz";
2750− sha512 = "wlzGQ+cIFzMEsI+wDqmOwvnjTvolLFwlcpYLCqSPPH0prOQaW3P+IzMhHYn934l1imNvw07oCyX+vGUv3wmtSQ==";
2712+ url = "https://registry.npmjs.org/jasmine/-/jasmine-3.6.2.tgz";
2713+ sha512 = "Uc0o2MRnC8TS1MjDrB8jE1umKEo2mflzGvdg0Ncs+yuLtOJ+uz/Wz8VmGsNGtuASr8+E0LDgPkOpvdoC76m5WQ==";
27512714 };
27522715 };
2753− "jasmine-core-3.7.1" = {
2716+ "jasmine-core-3.6.0" = {
27542717 name = "jasmine-core";
27552718 packageName = "jasmine-core";
2756− version = "3.7.1";
2719+ version = "3.6.0";
27572720 src = fetchurl {
2758− url = "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.7.1.tgz";
2759− sha512 = "DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==";
2721+ url = "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz";
2722+ sha512 = "8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==";
27602723 };
27612724 };
27622725 "js-tokens-4.0.0" = {
@@ -2768,13 +2731,13 @@ let
27682731 sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
27692732 };
27702733 };
2771− "js-yaml-3.14.1" = {
2734+ "js-yaml-3.14.0" = {
27722735 name = "js-yaml";
27732736 packageName = "js-yaml";
2774− version = "3.14.1";
2737+ version = "3.14.0";
27752738 src = fetchurl {
2776− url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
2777− sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
2739+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
2740+ sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
27782741 };
27792742 };
27802743 "js-yaml-4.1.0" = {
@@ -2993,15 +2956,6 @@ let
29932956 sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2";
29942957 };
29952958 };
2996− "lodash.merge-4.6.2" = {
2997− name = "lodash.merge";
2998− packageName = "lodash.merge";
2999− version = "4.6.2";
3000− src = fetchurl {
3001− url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz";
3002− sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==";
3003− };
3004− };
30052959 "lodash.truncate-4.4.2" = {
30062960 name = "lodash.truncate";
30072961 packageName = "lodash.truncate";
@@ -3155,13 +3109,13 @@ let
31553109 sha512 = "JFIMJPNGGqi0myzIlN94SQReUbCrWi1TW5PZih1OGXzUj2wXYz3puktV/f64HZYn6D1ZKcwxZdLuNCG8cRuCyw==";
31563110 };
31573111 };
3158− "matrix-org-irc-1.0.0-alpha4" = {
3112+ "matrix-org-irc-1.2.0" = {
31593113 name = "matrix-org-irc";
31603114 packageName = "matrix-org-irc";
3161− version = "1.0.0-alpha4";
3115+ version = "1.2.0";
31623116 src = fetchurl {
3163− url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.0.0-alpha4.tgz";
3164− sha512 = "2wKzQSpITrG9vChfw9d0goDcQZgKdaL7hgPzQwaybO9NF96HLarXFhznaFtngJiaaBAN52jkEetsQKV/lEfPqA==";
3117+ url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.0.tgz";
3118+ sha512 = "RnfeR9FimJJD/iOWw0GiV7NIPRmBJobvFasUgjVmGre9A4qJ9klHIDOlQ5vXIoPPMjzG8XXuAf4WHgMCNBfZkQ==";
31653119 };
31663120 };
31673121 "media-typer-0.3.0" = {
@@ -3227,22 +3181,22 @@ let
32273181 sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
32283182 };
32293183 };
3230− "mime-db-1.48.0" = {
3184+ "mime-db-1.47.0" = {
32313185 name = "mime-db";
32323186 packageName = "mime-db";
3233− version = "1.48.0";
3187+ version = "1.47.0";
32343188 src = fetchurl {
3235− url = "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz";
3236− sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==";
3189+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz";
3190+ sha512 = "QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==";
32373191 };
32383192 };
3239− "mime-types-2.1.31" = {
3193+ "mime-types-2.1.30" = {
32403194 name = "mime-types";
32413195 packageName = "mime-types";
3242− version = "2.1.31";
3196+ version = "2.1.30";
32433197 src = fetchurl {
3244− url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz";
3245− sha512 = "XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==";
3198+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz";
3199+ sha512 = "crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==";
32463200 };
32473201 };
32483202 "mimic-response-1.0.1" = {
@@ -3344,15 +3298,6 @@ let
33443298 sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
33453299 };
33463300 };
3347− "nan-2.14.2" = {
3348− name = "nan";
3349− packageName = "nan";
3350− version = "2.14.2";
3351− src = fetchurl {
3352− url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz";
3353− sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
3354− };
3355− };
33563301 "nanoid-3.1.23" = {
33573302 name = "nanoid";
33583303 packageName = "nanoid";
@@ -3542,15 +3487,6 @@ let
35423487 sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==";
35433488 };
35443489 };
3545− "optimist-0.3.7" = {
3546− name = "optimist";
3547− packageName = "optimist";
3548− version = "0.3.7";
3549− src = fetchurl {
3550− url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
3551− sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
3552− };
3553− };
35543490 "optionator-0.9.1" = {
35553491 name = "optionator";
35563492 packageName = "optionator";
@@ -3722,13 +3658,13 @@ let
37223658 sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==";
37233659 };
37243660 };
3725− "path-parse-1.0.7" = {
3661+ "path-parse-1.0.6" = {
37263662 name = "path-parse";
37273663 packageName = "path-parse";
3728− version = "1.0.7";
3664+ version = "1.0.6";
37293665 src = fetchurl {
3730− url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz";
3731− sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==";
3666+ url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
3667+ sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
37323668 };
37333669 };
37343670 "path-to-regexp-0.1.7" = {
@@ -3830,13 +3766,22 @@ let
38303766 sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==";
38313767 };
38323768 };
3833− "picomatch-2.3.0" = {
3769+ "picomatch-2.2.2" = {
38343770 name = "picomatch";
38353771 packageName = "picomatch";
3836− version = "2.3.0";
3772+ version = "2.2.2";
3773+ src = fetchurl {
3774+ url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
3775+ sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
3776+ };
3777+ };
3778+ "picomatch-2.2.3" = {
3779+ name = "picomatch";
3780+ packageName = "picomatch";
3781+ version = "2.2.3";
38373782 src = fetchurl {
3838− url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz";
3839− sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==";
3783+ url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz";
3784+ sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==";
38403785 };
38413786 };
38423787 "pify-3.0.0" = {
@@ -3965,13 +3910,13 @@ let
39653910 sha512 = "jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng==";
39663911 };
39673912 };
3968− "proxy-addr-2.0.7" = {
3913+ "proxy-addr-2.0.6" = {
39693914 name = "proxy-addr";
39703915 packageName = "proxy-addr";
3971− version = "2.0.7";
3916+ version = "2.0.6";
39723917 src = fetchurl {
3973− url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz";
3974− sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==";
3918+ url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
3919+ sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
39753920 };
39763921 };
39773922 "proxyquire-1.8.0" = {
@@ -4154,22 +4099,13 @@ let
41544099 sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
41554100 };
41564101 };
4157− "rebuild-0.1.2" = {
4158− name = "rebuild";
4159− packageName = "rebuild";
4160− version = "0.1.2";
4161− src = fetchurl {
4162− url = "https://registry.npmjs.org/rebuild/-/rebuild-0.1.2.tgz";
4163− sha1 = "03acdea5515130b479092746e093daf8cf883e93";
4164− };
4165− };
4166− "regenerator-runtime-0.13.8" = {
4102+ "regenerator-runtime-0.13.7" = {
41674103 name = "regenerator-runtime";
41684104 packageName = "regenerator-runtime";
4169− version = "0.13.8";
4105+ version = "0.13.7";
41704106 src = fetchurl {
4171− url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.8.tgz";
4172− sha512 = "o/ASGwgZ6UiVjspr4YnzHKF1NbBdX+mCPkSeymofk/d7I+csCYn3ZgZMMVtXeecpT8DBiI2nAlYkHd+xNCqu4A==";
4107+ url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz";
4108+ sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==";
41734109 };
41744110 };
41754111 "regexpp-3.1.0" = {
@@ -4487,13 +4423,13 @@ let
44874423 sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==";
44884424 };
44894425 };
4490− "signal-exit-3.0.3" = {
4426+ "signal-exit-3.0.2" = {
44914427 name = "signal-exit";
44924428 packageName = "signal-exit";
4493− version = "3.0.3";
4429+ version = "3.0.2";
44944430 src = fetchurl {
4495− url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
4496− sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
4431+ url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
4432+ sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
44974433 };
44984434 };
44994435 "simple-swizzle-0.2.2" = {
@@ -4586,13 +4522,13 @@ let
45864522 sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
45874523 };
45884524 };
4589− "spdx-license-ids-3.0.9" = {
4525+ "spdx-license-ids-3.0.8" = {
45904526 name = "spdx-license-ids";
45914527 packageName = "spdx-license-ids";
4592− version = "3.0.9";
4528+ version = "3.0.8";
45934529 src = fetchurl {
4594− url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz";
4595− sha512 = "Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==";
4530+ url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.8.tgz";
4531+ sha512 = "NDgA96EnaLSvtbM7trJj+t1LUR3pirkDCcz9nOUlPb5DMBGsH7oES6C3hs3j7R9oHEa1EMvReS/BUAIT5Tcr0g==";
45964532 };
45974533 };
45984534 "split2-3.2.2" = {
@@ -4883,13 +4819,13 @@ let
48834819 sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==";
48844820 };
48854821 };
4886− "tslib-1.14.1" = {
4822+ "tslib-1.11.1" = {
48874823 name = "tslib";
48884824 packageName = "tslib";
4889− version = "1.14.1";
4825+ version = "1.11.1";
48904826 src = fetchurl {
4891− url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
4892− sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
4827+ url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
4828+ sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
48934829 };
48944830 };
48954831 "tsutils-3.21.0" = {
@@ -4928,15 +4864,6 @@ let
49284864 sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==";
49294865 };
49304866 };
4931− "type-fest-0.20.2" = {
4932− name = "type-fest";
4933− packageName = "type-fest";
4934− version = "0.20.2";
4935− src = fetchurl {
4936− url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz";
4937− sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==";
4938− };
4939− };
49404867 "type-fest-0.8.1" = {
49414868 name = "type-fest";
49424869 packageName = "type-fest";
@@ -4964,13 +4891,13 @@ let
49644891 sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
49654892 };
49664893 };
4967− "typescript-4.3.2" = {
4894+ "typescript-4.2.3" = {
49684895 name = "typescript";
49694896 packageName = "typescript";
4970− version = "4.3.2";
4897+ version = "4.2.3";
49714898 src = fetchurl {
4972− url = "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz";
4973− sha512 = "zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==";
4899+ url = "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz";
4900+ sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==";
49744901 };
49754902 };
49764903 "undefsafe-2.0.3" = {
@@ -5027,13 +4954,13 @@ let
50274954 sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==";
50284955 };
50294956 };
5030− "uri-js-4.4.1" = {
4957+ "uri-js-4.2.2" = {
50314958 name = "uri-js";
50324959 packageName = "uri-js";
5033− version = "4.4.1";
4960+ version = "4.2.2";
50344961 src = fetchurl {
5035− url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
5036− sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
4962+ url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
4963+ sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
50374964 };
50384965 };
50394966 "url-parse-lax-3.0.0" = {
@@ -5189,15 +5116,6 @@ let
51895116 sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
51905117 };
51915118 };
5192− "wordwrap-0.0.3" = {
5193− name = "wordwrap";
5194− packageName = "wordwrap";
5195− version = "0.0.3";
5196− src = fetchurl {
5197− url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
5198− sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
5199− };
5200− };
52015119 "wrap-ansi-5.1.0" = {
52025120 name = "wrap-ansi";
52035121 packageName = "wrap-ansi";
@@ -5307,17 +5225,11 @@ let
53075225 };
53085226 };
53095227 };
5310−in
5311−{
5312− "matrix-appservice-irc-git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.1" = nodeEnv.buildNodePackage {
5228+ args = {
53135229 name = "matrix-appservice-irc";
53145230 packageName = "matrix-appservice-irc";
5315− version = "0.26.1";
5316− src = fetchgit {
5317− url = "https://github.com/matrix-org/matrix-appservice-irc.git";
5318− rev = "4edab6f7b02e0f08e7c3b24f72441be25b30b5b8";
5319− sha256 = "3715ba3e80d79cea98ceb108e1df87b4d864d4f9149f147df0f3b78c691f00d6";
5320− };
5231+ version = "0.30.0";
5232+ src = ./.;
53215233 dependencies = [
53225234 sources."@babel/code-frame-7.12.11"
53235235 (sources."@babel/generator-7.14.3" // {
@@ -5329,18 +5241,8 @@ in
53295241 sources."@babel/helper-get-function-arity-7.12.13"
53305242 sources."@babel/helper-split-export-declaration-7.12.13"
53315243 sources."@babel/helper-validator-identifier-7.14.0"
5332− (sources."@babel/highlight-7.14.0" // {
5333− dependencies = [
5334− sources."ansi-styles-3.2.1"
5335− sources."chalk-2.4.2"
5336− sources."color-convert-1.9.3"
5337− sources."color-name-1.1.3"
5338− sources."escape-string-regexp-1.0.5"
5339− sources."has-flag-3.0.0"
5340− sources."supports-color-5.5.0"
5341− ];
5342− })
5343− sources."@babel/parser-7.14.4"
5244+ sources."@babel/highlight-7.14.0"
5245+ sources."@babel/parser-7.14.3"
53445246 sources."@babel/runtime-7.14.0"
53455247 (sources."@babel/template-7.12.13" // {
53465248 dependencies = [
@@ -5353,37 +5255,36 @@ in
53535255 sources."globals-11.12.0"
53545256 ];
53555257 })
5356− sources."@babel/types-7.14.4"
5258+ sources."@babel/types-7.14.2"
53575259 sources."@dabh/diagnostics-2.0.2"
5358− (sources."@eslint/eslintrc-0.4.2" // {
5260+ (sources."@eslint/eslintrc-0.4.1" // {
53595261 dependencies = [
53605262 sources."ignore-4.0.6"
5361− sources."strip-json-comments-3.1.1"
53625263 ];
53635264 })
5364− sources."@nodelib/fs.scandir-2.1.5"
5365− sources."@nodelib/fs.stat-2.0.5"
5366− sources."@nodelib/fs.walk-1.2.7"
5367− sources."@sentry/core-5.30.0"
5368− sources."@sentry/hub-5.30.0"
5369− sources."@sentry/minimal-5.30.0"
5370− sources."@sentry/node-5.30.0"
5371− sources."@sentry/tracing-5.30.0"
5372− sources."@sentry/types-5.30.0"
5373− sources."@sentry/utils-5.30.0"
5265+ sources."@nodelib/fs.scandir-2.1.4"
5266+ sources."@nodelib/fs.stat-2.0.4"
5267+ sources."@nodelib/fs.walk-1.2.6"
5268+ sources."@sentry/core-5.27.1"
5269+ sources."@sentry/hub-5.27.1"
5270+ sources."@sentry/minimal-5.27.1"
5271+ sources."@sentry/node-5.27.1"
5272+ sources."@sentry/tracing-5.27.1"
5273+ sources."@sentry/types-5.27.1"
5274+ sources."@sentry/utils-5.27.1"
53745275 sources."@sindresorhus/is-0.14.0"
53755276 sources."@szmarczak/http-timer-1.1.2"
5376− sources."@types/bluebird-3.5.35"
5277+ sources."@types/bluebird-3.5.32"
53775278 sources."@types/body-parser-1.19.0"
53785279 sources."@types/connect-3.4.34"
5379− sources."@types/express-4.17.12"
5380− sources."@types/express-serve-static-core-4.17.21"
5280+ sources."@types/express-4.17.8"
5281+ sources."@types/express-serve-static-core-4.17.19"
53815282 sources."@types/extend-3.0.1"
53825283 sources."@types/he-1.1.1"
53835284 sources."@types/json-schema-7.0.7"
53845285 sources."@types/mime-1.3.2"
53855286 sources."@types/nedb-1.8.11"
5386− sources."@types/node-15.12.2"
5287+ sources."@types/node-12.12.54"
53875288 sources."@types/nopt-3.0.29"
53885289 sources."@types/pg-8.6.0"
53895290 sources."@types/qs-6.9.6"
@@ -5395,25 +5296,25 @@ in
53955296 ];
53965297 })
53975298 sources."@types/serve-static-1.13.9"
5398− (sources."@typescript-eslint/eslint-plugin-4.26.1" // {
5299+ (sources."@typescript-eslint/eslint-plugin-4.16.1" // {
53995300 dependencies = [
54005301 sources."lru-cache-6.0.0"
54015302 sources."semver-7.3.5"
54025303 sources."yallist-4.0.0"
54035304 ];
54045305 })
5405− sources."@typescript-eslint/experimental-utils-4.26.1"
5406− sources."@typescript-eslint/parser-4.26.1"
5407− sources."@typescript-eslint/scope-manager-4.26.1"
5408− sources."@typescript-eslint/types-4.26.1"
5409− (sources."@typescript-eslint/typescript-estree-4.26.1" // {
5306+ sources."@typescript-eslint/experimental-utils-4.16.1"
5307+ sources."@typescript-eslint/parser-4.16.1"
5308+ sources."@typescript-eslint/scope-manager-4.16.1"
5309+ sources."@typescript-eslint/types-4.16.1"
5310+ (sources."@typescript-eslint/typescript-estree-4.16.1" // {
54105311 dependencies = [
54115312 sources."lru-cache-6.0.0"
54125313 sources."semver-7.3.5"
54135314 sources."yallist-4.0.0"
54145315 ];
54155316 })
5416− sources."@typescript-eslint/visitor-keys-4.26.1"
5317+ sources."@typescript-eslint/visitor-keys-4.16.1"
54175318 sources."abbrev-1.1.1"
54185319 sources."accepts-1.3.7"
54195320 sources."acorn-7.4.1"
@@ -5421,14 +5322,14 @@ in
54215322 sources."agent-base-6.0.2"
54225323 sources."ajv-6.12.6"
54235324 sources."another-json-0.2.0"
5424− (sources."ansi-align-3.0.0" // {
5325+ sources."ansi-align-3.0.0"
5326+ sources."ansi-colors-4.1.1"
5327+ sources."ansi-regex-4.1.0"
5328+ (sources."ansi-styles-4.3.0" // {
54255329 dependencies = [
5426− sources."string-width-3.1.0"
5330+ sources."color-convert-2.0.1"
54275331 ];
54285332 })
5429− sources."ansi-colors-4.1.1"
5430− sources."ansi-regex-4.1.0"
5431− sources."ansi-styles-4.3.0"
54325333 sources."anymatch-3.1.2"
54335334 sources."append-transform-1.0.0"
54345335 sources."archy-1.0.0"
@@ -5453,12 +5354,18 @@ in
54535354 (sources."body-parser-1.19.0" // {
54545355 dependencies = [
54555356 sources."debug-2.6.9"
5357+ sources."iconv-lite-0.4.24"
54565358 sources."ms-2.0.0"
54575359 ];
54585360 })
54595361 (sources."boxen-4.2.0" // {
54605362 dependencies = [
5363+ sources."ansi-regex-5.0.0"
54615364 sources."chalk-3.0.0"
5365+ sources."has-flag-4.0.0"
5366+ sources."string-width-4.2.2"
5367+ sources."strip-ansi-6.0.0"
5368+ sources."supports-color-7.2.0"
54625369 ];
54635370 })
54645371 sources."brace-expansion-1.1.11"
@@ -5473,35 +5380,30 @@ in
54735380 sources."lowercase-keys-2.0.0"
54745381 ];
54755382 })
5476− (sources."caching-transform-3.0.2" // {
5477− dependencies = [
5478− sources."make-dir-2.1.0"
5479− sources."pify-4.0.1"
5480− sources."write-file-atomic-2.4.3"
5481− ];
5482− })
5383+ sources."caching-transform-3.0.2"
54835384 sources."call-bind-1.0.2"
54845385 sources."callsites-3.1.0"
54855386 sources."camelcase-5.3.1"
54865387 sources."caseless-0.12.0"
5487− sources."chalk-4.1.1"
5388+ (sources."chalk-2.4.2" // {
5389+ dependencies = [
5390+ sources."ansi-styles-3.2.1"
5391+ sources."escape-string-regexp-1.0.5"
5392+ sources."supports-color-5.5.0"
5393+ ];
5394+ })
54885395 sources."chardet-1.3.0"
54895396 sources."chokidar-3.5.1"
54905397 sources."ci-info-2.0.0"
54915398 sources."cli-boxes-2.2.1"
5492− (sources."cliui-5.0.0" // {
5493− dependencies = [
5494− sources."string-width-3.1.0"
5495− ];
5496− })
5399+ sources."cliui-5.0.0"
54975400 sources."clone-response-1.0.2"
5498− (sources."color-3.0.0" // {
5401+ sources."color-3.0.0"
5402+ (sources."color-convert-1.9.3" // {
54995403 dependencies = [
5500− sources."color-convert-1.9.3"
55015404 sources."color-name-1.1.3"
55025405 ];
55035406 })
5504− sources."color-convert-2.0.1"
55055407 sources."color-name-1.1.4"
55065408 sources."color-string-1.5.5"
55075409 sources."colorette-1.2.2"
@@ -5510,7 +5412,12 @@ in
55105412 sources."combined-stream-1.0.8"
55115413 sources."commondir-1.0.1"
55125414 sources."concat-map-0.0.1"
5513− sources."configstore-5.0.1"
5415+ (sources."configstore-5.0.1" // {
5416+ dependencies = [
5417+ sources."make-dir-3.1.0"
5418+ sources."write-file-atomic-3.0.3"
5419+ ];
5420+ })
55145421 sources."content-disposition-0.5.3"
55155422 sources."content-type-1.0.4"
55165423 sources."convert-source-map-1.7.0"
@@ -5519,14 +5426,13 @@ in
55195426 sources."core-util-is-1.0.2"
55205427 (sources."cp-file-6.2.0" // {
55215428 dependencies = [
5522− sources."make-dir-2.1.0"
55235429 sources."pify-4.0.1"
55245430 ];
55255431 })
55265432 sources."cross-spawn-7.0.3"
55275433 sources."crypto-random-string-2.0.0"
55285434 sources."dashdash-1.14.1"
5529− sources."debug-4.3.2"
5435+ sources."debug-4.3.1"
55305436 sources."decamelize-1.2.0"
55315437 sources."decompress-response-3.3.0"
55325438 sources."deep-extend-0.6.0"
@@ -5546,7 +5452,7 @@ in
55465452 })
55475453 sources."domelementtype-2.2.0"
55485454 sources."domhandler-3.3.0"
5549− (sources."domutils-2.7.0" // {
5455+ (sources."domutils-2.6.0" // {
55505456 dependencies = [
55515457 sources."domhandler-4.2.0"
55525458 ];
@@ -5555,7 +5461,7 @@ in
55555461 sources."duplexer3-0.1.4"
55565462 sources."ecc-jsbn-0.1.2"
55575463 sources."ee-first-1.1.1"
5558− sources."emoji-regex-7.0.3"
5464+ sources."emoji-regex-8.0.0"
55595465 sources."enabled-2.0.0"
55605466 sources."encodeurl-1.0.2"
55615467 sources."end-of-stream-1.4.4"
@@ -5569,26 +5475,26 @@ in
55695475 sources."es6-error-4.1.1"
55705476 sources."escape-goat-2.1.1"
55715477 sources."escape-html-1.0.3"
5572− sources."escape-string-regexp-2.0.0"
5573− (sources."eslint-7.28.0" // {
5478+ sources."escape-string-regexp-4.0.0"
5479+ (sources."eslint-7.21.0" // {
55745480 dependencies = [
55755481 sources."ansi-regex-5.0.0"
5576− sources."escape-string-regexp-4.0.0"
5577− (sources."eslint-utils-2.1.0" // {
5578− dependencies = [
5579− sources."eslint-visitor-keys-1.3.0"
5580− ];
5581− })
5482+ sources."chalk-4.1.1"
5483+ sources."has-flag-4.0.0"
55825484 sources."ignore-4.0.6"
55835485 sources."lru-cache-6.0.0"
55845486 sources."semver-7.3.5"
55855487 sources."strip-ansi-6.0.0"
5586− sources."strip-json-comments-3.1.1"
5488+ sources."supports-color-7.2.0"
55875489 sources."yallist-4.0.0"
55885490 ];
55895491 })
55905492 sources."eslint-scope-5.1.1"
5591− sources."eslint-utils-3.0.0"
5493+ (sources."eslint-utils-2.1.0" // {
5494+ dependencies = [
5495+ sources."eslint-visitor-keys-1.3.0"
5496+ ];
5497+ })
55925498 sources."eslint-visitor-keys-2.1.0"
55935499 (sources."espree-7.3.1" // {
55945500 dependencies = [
@@ -5617,9 +5523,9 @@ in
56175523 sources."ms-2.0.0"
56185524 ];
56195525 })
5620− sources."extend-2.0.2"
5526+ sources."extend-3.0.2"
56215527 sources."extsprintf-1.3.0"
5622− sources."fast-deep-equal-3.1.3"
5528+ sources."fast-deep-equal-3.1.1"
56235529 sources."fast-glob-3.2.5"
56245530 sources."fast-json-stable-stringify-2.1.0"
56255531 sources."fast-levenshtein-2.0.6"
@@ -5636,12 +5542,7 @@ in
56365542 sources."ms-2.0.0"
56375543 ];
56385544 })
5639− (sources."find-cache-dir-2.1.0" // {
5640− dependencies = [
5641− sources."make-dir-2.1.0"
5642− sources."pify-4.0.1"
5643− ];
5644− })
5545+ sources."find-cache-dir-2.1.0"
56455546 sources."find-up-3.0.0"
56465547 sources."flat-cache-3.0.4"
56475548 sources."flatted-3.1.1"
@@ -5656,7 +5557,7 @@ in
56565557 })
56575558 sources."forever-agent-0.6.1"
56585559 sources."form-data-2.3.3"
5659− sources."forwarded-0.2.0"
5560+ sources."forwarded-0.1.2"
56605561 sources."fresh-0.5.2"
56615562 sources."fs.realpath-1.0.0"
56625563 sources."fsevents-2.3.2"
@@ -5672,18 +5573,18 @@ in
56725573 sources."glob-parent-5.1.2"
56735574 sources."glob-to-regexp-0.4.1"
56745575 sources."global-dirs-2.1.0"
5675− (sources."globals-13.9.0" // {
5676− dependencies = [
5677− sources."type-fest-0.20.2"
5678− ];
5679− })
5576+ sources."globals-12.4.0"
56805577 sources."globby-11.0.3"
56815578 sources."got-9.6.0"
5682− sources."graceful-fs-4.2.6"
5579+ sources."graceful-fs-4.2.3"
56835580 sources."har-schema-2.0.0"
5684− sources."har-validator-5.1.5"
5581+ (sources."har-validator-5.1.5" // {
5582+ dependencies = [
5583+ sources."ajv-6.12.6"
5584+ ];
5585+ })
56855586 sources."has-1.0.3"
5686− sources."has-flag-4.0.0"
5587+ sources."has-flag-3.0.0"
56875588 sources."has-symbols-1.0.2"
56885589 sources."has-yarn-2.1.0"
56895590 sources."hash.js-1.1.7"
@@ -5698,11 +5599,14 @@ in
56985599 sources."htmlencode-0.0.4"
56995600 sources."htmlparser2-4.1.0"
57005601 sources."http-cache-semantics-4.1.0"
5701− sources."http-errors-1.7.2"
5602+ (sources."http-errors-1.7.2" // {
5603+ dependencies = [
5604+ sources."inherits-2.0.3"
5605+ ];
5606+ })
57025607 sources."http-signature-1.2.0"
57035608 sources."https-proxy-agent-5.0.0"
5704− sources."iconv-2.3.5"
5705− sources."iconv-lite-0.4.24"
5609+ sources."iconv-lite-0.6.3"
57065610 sources."ignore-5.1.8"
57075611 sources."ignore-by-default-1.0.1"
57085612 sources."immediate-3.0.6"
@@ -5710,17 +5614,16 @@ in
57105614 sources."import-lazy-2.1.0"
57115615 sources."imurmurhash-0.1.4"
57125616 sources."inflight-1.0.6"
5713− sources."inherits-2.0.3"
5617+ sources."inherits-2.0.4"
57145618 sources."ini-1.3.7"
57155619 sources."ipaddr.js-1.9.1"
5716− sources."irc-git+https://matrix-org@github.com/matrix-org/node-irc.git#9028c2197c216dd8e6fc2cb3cc07ce2d6bf741a7"
57175620 sources."irc-colors-1.5.0"
57185621 sources."is-arrayish-0.3.2"
57195622 sources."is-binary-path-2.1.0"
57205623 sources."is-ci-2.0.0"
57215624 sources."is-core-module-2.4.0"
57225625 sources."is-extglob-2.1.1"
5723− sources."is-fullwidth-code-point-2.0.0"
5626+ sources."is-fullwidth-code-point-3.0.0"
57245627 sources."is-glob-4.0.1"
57255628 sources."is-installed-globally-0.3.2"
57265629 sources."is-my-ip-valid-1.0.0"
@@ -5741,31 +5644,18 @@ in
57415644 sources."isstream-0.1.2"
57425645 sources."istanbul-lib-coverage-2.0.5"
57435646 sources."istanbul-lib-hook-2.0.7"
5744− (sources."istanbul-lib-instrument-3.3.0" // {
5745− dependencies = [
5746− sources."semver-6.3.0"
5747− ];
5748− })
5749− (sources."istanbul-lib-report-2.0.8" // {
5750− dependencies = [
5751− sources."has-flag-3.0.0"
5752− sources."make-dir-2.1.0"
5753− sources."pify-4.0.1"
5754− sources."supports-color-6.1.0"
5755− ];
5756− })
5647+ sources."istanbul-lib-instrument-3.3.0"
5648+ sources."istanbul-lib-report-2.0.8"
57575649 (sources."istanbul-lib-source-maps-3.0.6" // {
57585650 dependencies = [
5759− sources."make-dir-2.1.0"
5760− sources."pify-4.0.1"
57615651 sources."rimraf-2.7.1"
57625652 ];
57635653 })
57645654 sources."istanbul-reports-2.2.7"
5765− sources."jasmine-3.7.0"
5766− sources."jasmine-core-3.7.1"
5655+ sources."jasmine-3.6.2"
5656+ sources."jasmine-core-3.6.0"
57675657 sources."js-tokens-4.0.0"
5768− sources."js-yaml-3.14.1"
5658+ sources."js-yaml-3.14.0"
57695659 sources."jsbn-0.1.1"
57705660 sources."jsesc-2.5.2"
57715661 sources."json-buffer-3.0.0"
@@ -5788,7 +5678,6 @@ in
57885678 sources."lodash-4.17.21"
57895679 sources."lodash.clonedeep-4.5.0"
57905680 sources."lodash.flattendeep-4.4.0"
5791− sources."lodash.merge-4.6.2"
57925681 sources."lodash.truncate-4.4.2"
57935682 sources."logform-2.2.0"
57945683 sources."loglevel-1.7.1"
@@ -5796,24 +5685,43 @@ in
57965685 sources."lowercase-keys-1.0.1"
57975686 sources."lru-cache-5.1.1"
57985687 sources."lru_map-0.3.3"
5799− (sources."make-dir-3.1.0" // {
5688+ (sources."make-dir-2.1.0" // {
58005689 dependencies = [
5801− sources."semver-6.3.0"
5690+ sources."pify-4.0.1"
5691+ sources."semver-5.7.1"
58025692 ];
58035693 })
58045694 sources."matrix-appservice-0.8.0"
58055695 (sources."matrix-appservice-bridge-2.6.1" // {
58065696 dependencies = [
58075697 sources."argparse-2.0.1"
5698+ sources."chalk-4.1.1"
58085699 sources."extend-3.0.2"
5700+ sources."has-flag-4.0.0"
58095701 sources."js-yaml-4.1.0"
58105702 sources."nopt-5.0.0"
5703+ sources."supports-color-7.2.0"
58115704 ];
58125705 })
58135706 (sources."matrix-bot-sdk-0.4.0" // {
58145707 dependencies = [
58155708 sources."chalk-3.0.0"
5709+ sources."escape-string-regexp-1.0.5"
5710+ sources."has-flag-4.0.0"
5711+ (sources."postcss-7.0.35" // {
5712+ dependencies = [
5713+ sources."ansi-styles-3.2.1"
5714+ (sources."chalk-2.4.2" // {
5715+ dependencies = [
5716+ sources."supports-color-5.5.0"
5717+ ];
5718+ })
5719+ sources."has-flag-3.0.0"
5720+ sources."supports-color-6.1.0"
5721+ ];
5722+ })
58165723 sources."sanitize-html-1.27.5"
5724+ sources."supports-color-7.2.0"
58175725 ];
58185726 })
58195727 (sources."matrix-js-sdk-9.11.0" // {
@@ -5822,20 +5730,20 @@ in
58225730 ];
58235731 })
58245732 sources."matrix-lastactive-0.1.5"
5825− (sources."matrix-org-irc-1.0.0-alpha4" // {
5826− dependencies = [
5827− sources."iconv-lite-0.6.3"
5828− ];
5829− })
5733+ sources."matrix-org-irc-1.2.0"
58305734 sources."media-typer-0.3.0"
58315735 sources."merge-descriptors-1.0.1"
58325736 sources."merge-source-map-1.1.0"
58335737 sources."merge2-1.4.1"
58345738 sources."methods-1.1.2"
5835− sources."micromatch-4.0.4"
5739+ (sources."micromatch-4.0.4" // {
5740+ dependencies = [
5741+ sources."picomatch-2.2.3"
5742+ ];
5743+ })
58365744 sources."mime-1.6.0"
5837− sources."mime-db-1.48.0"
5838− sources."mime-types-2.1.31"
5745+ sources."mime-db-1.47.0"
5746+ sources."mime-types-2.1.30"
58395747 sources."mimic-response-1.0.1"
58405748 sources."minimalistic-assert-1.0.1"
58415749 sources."minimatch-3.0.4"
@@ -5851,7 +5759,6 @@ in
58515759 ];
58525760 })
58535761 sources."ms-2.1.2"
5854− sources."nan-2.14.2"
58555762 sources."nanoid-3.1.23"
58565763 sources."natural-compare-1.4.0"
58575764 sources."nedb-1.8.0"
@@ -5861,18 +5768,20 @@ in
58615768 (sources."nodemon-2.0.7" // {
58625769 dependencies = [
58635770 sources."debug-3.2.7"
5864− sources."has-flag-3.0.0"
5771+ sources."semver-5.7.1"
58655772 sources."supports-color-5.5.0"
58665773 ];
58675774 })
58685775 sources."nopt-3.0.6"
5869− sources."normalize-package-data-2.5.0"
5776+ (sources."normalize-package-data-2.5.0" // {
5777+ dependencies = [
5778+ sources."semver-5.7.1"
5779+ ];
5780+ })
58705781 sources."normalize-path-3.0.0"
58715782 sources."normalize-url-4.5.1"
58725783 (sources."nyc-14.1.1" // {
58735784 dependencies = [
5874− sources."make-dir-2.1.0"
5875− sources."pify-4.0.1"
58765785 sources."rimraf-2.7.1"
58775786 ];
58785787 })
@@ -5883,7 +5792,6 @@ in
58835792 sources."on-headers-1.0.2"
58845793 sources."once-1.4.0"
58855794 sources."one-time-1.0.0"
5886− sources."optimist-0.3.7"
58875795 sources."optionator-0.9.1"
58885796 sources."os-homedir-1.0.2"
58895797 sources."p-cancelable-1.1.0"
@@ -5894,11 +5802,7 @@ in
58945802 sources."p-timeout-3.2.0"
58955803 sources."p-try-2.2.0"
58965804 sources."package-hash-3.0.0"
5897− (sources."package-json-6.5.0" // {
5898− dependencies = [
5899− sources."semver-6.3.0"
5900− ];
5901− })
5805+ sources."package-json-6.5.0"
59025806 sources."packet-reader-1.0.0"
59035807 sources."parent-module-1.0.1"
59045808 sources."parse-json-4.0.0"
@@ -5907,7 +5811,7 @@ in
59075811 sources."path-exists-3.0.0"
59085812 sources."path-is-absolute-1.0.1"
59095813 sources."path-key-3.1.1"
5910− sources."path-parse-1.0.7"
5814+ sources."path-parse-1.0.6"
59115815 sources."path-to-regexp-0.1.7"
59125816 sources."path-type-4.0.0"
59135817 sources."performance-now-2.1.0"
@@ -5918,24 +5822,10 @@ in
59185822 sources."pg-protocol-1.5.0"
59195823 sources."pg-types-2.2.0"
59205824 sources."pgpass-1.0.4"
5921− sources."picomatch-2.3.0"
5825+ sources."picomatch-2.2.2"
59225826 sources."pify-3.0.0"
59235827 sources."pkg-dir-3.0.0"
5924− (sources."postcss-7.0.35" // {
5925− dependencies = [
5926− sources."ansi-styles-3.2.1"
5927− (sources."chalk-2.4.2" // {
5928− dependencies = [
5929− sources."supports-color-5.5.0"
5930− ];
5931− })
5932− sources."color-convert-1.9.3"
5933− sources."color-name-1.1.3"
5934− sources."escape-string-regexp-1.0.5"
5935− sources."has-flag-3.0.0"
5936− sources."supports-color-6.1.0"
5937− ];
5938− })
5828+ sources."postcss-8.3.0"
59395829 sources."postgres-array-2.0.0"
59405830 sources."postgres-bytea-1.0.0"
59415831 sources."postgres-date-1.0.7"
@@ -5945,7 +5835,7 @@ in
59455835 sources."process-nextick-args-2.0.1"
59465836 sources."progress-2.0.3"
59475837 sources."prom-client-13.1.0"
5948− sources."proxy-addr-2.0.7"
5838+ sources."proxy-addr-2.0.6"
59495839 (sources."proxyquire-1.8.0" // {
59505840 dependencies = [
59515841 sources."resolve-1.1.7"
@@ -5961,8 +5851,16 @@ in
59615851 sources."queue-microtask-1.2.3"
59625852 sources."quick-lru-4.0.1"
59635853 sources."range-parser-1.2.1"
5964− sources."raw-body-2.4.0"
5965− sources."rc-1.2.8"
5854+ (sources."raw-body-2.4.0" // {
5855+ dependencies = [
5856+ sources."iconv-lite-0.4.24"
5857+ ];
5858+ })
5859+ (sources."rc-1.2.8" // {
5860+ dependencies = [
5861+ sources."strip-json-comments-2.0.1"
5862+ ];
5863+ })
59665864 (sources."read-pkg-3.0.0" // {
59675865 dependencies = [
59685866 sources."path-type-3.0.0"
@@ -5971,8 +5869,7 @@ in
59715869 sources."read-pkg-up-4.0.0"
59725870 sources."readable-stream-3.6.0"
59735871 sources."readdirp-3.5.0"
5974− sources."rebuild-0.1.2"
5975− sources."regenerator-runtime-0.13.8"
5872+ sources."regenerator-runtime-0.13.7"
59765873 sources."regexpp-3.1.0"
59775874 sources."registry-auth-token-4.2.1"
59785875 sources."registry-url-5.1.0"
@@ -6002,15 +5899,10 @@ in
60025899 sources."domhandler-4.2.0"
60035900 sources."escape-string-regexp-4.0.0"
60045901 sources."htmlparser2-6.1.0"
6005− sources."postcss-8.3.0"
6006− ];
6007− })
6008− sources."semver-5.7.1"
6009− (sources."semver-diff-3.1.1" // {
6010− dependencies = [
6011− sources."semver-6.3.0"
60125902 ];
60135903 })
5904+ sources."semver-6.3.0"
5905+ sources."semver-diff-3.1.1"
60145906 (sources."send-0.17.1" // {
60155907 dependencies = [
60165908 (sources."debug-2.6.9" // {
@@ -6027,14 +5919,10 @@ in
60275919 sources."shebang-command-2.0.0"
60285920 sources."shebang-regex-3.0.0"
60295921 sources."side-channel-1.0.4"
6030− sources."signal-exit-3.0.3"
5922+ sources."signal-exit-3.0.2"
60315923 sources."simple-swizzle-0.2.2"
60325924 sources."slash-3.0.0"
6033− (sources."slice-ansi-4.0.0" // {
6034− dependencies = [
6035− sources."is-fullwidth-code-point-3.0.0"
6036− ];
6037− })
5925+ sources."slice-ansi-4.0.0"
60385926 sources."source-map-0.6.1"
60395927 sources."source-map-js-0.6.2"
60405928 (sources."spawn-wrap-1.4.3" // {
@@ -6046,7 +5934,7 @@ in
60465934 sources."spdx-correct-3.1.1"
60475935 sources."spdx-exceptions-2.3.0"
60485936 sources."spdx-expression-parse-3.0.1"
6049− sources."spdx-license-ids-3.0.9"
5937+ sources."spdx-license-ids-3.0.8"
60505938 sources."split2-3.2.2"
60515939 sources."sprintf-js-1.0.3"
60525940 sources."sshpk-1.16.1"
@@ -6054,12 +5942,10 @@ in
60545942 sources."statuses-1.5.0"
60555943 sources."stealthy-require-1.1.1"
60565944 sources."steno-0.4.4"
6057− (sources."string-width-4.2.2" // {
5945+ (sources."string-width-3.1.0" // {
60585946 dependencies = [
6059− sources."ansi-regex-5.0.0"
6060− sources."emoji-regex-8.0.0"
6061− sources."is-fullwidth-code-point-3.0.0"
6062− sources."strip-ansi-6.0.0"
5947+ sources."emoji-regex-7.0.3"
5948+ sources."is-fullwidth-code-point-2.0.0"
60635949 ];
60645950 })
60655951 (sources."string_decoder-1.3.0" // {
@@ -6069,13 +5955,14 @@ in
60695955 })
60705956 sources."strip-ansi-5.2.0"
60715957 sources."strip-bom-3.0.0"
6072− sources."strip-json-comments-2.0.1"
6073− sources."supports-color-7.2.0"
5958+ sources."strip-json-comments-3.1.1"
5959+ sources."supports-color-6.1.0"
60745960 (sources."table-6.7.1" // {
60755961 dependencies = [
6076− sources."ajv-8.6.0"
5962+ sources."ajv-8.4.0"
60775963 sources."ansi-regex-5.0.0"
60785964 sources."json-schema-traverse-1.0.0"
5965+ sources."string-width-4.2.2"
60795966 sources."strip-ansi-6.0.0"
60805967 ];
60815968 })
@@ -6095,7 +5982,7 @@ in
60955982 })
60965983 sources."tough-cookie-2.5.0"
60975984 sources."triple-beam-1.3.0"
6098− sources."tslib-1.14.1"
5985+ sources."tslib-1.11.1"
60995986 sources."tsutils-3.21.0"
61005987 sources."tunnel-agent-0.6.0"
61015988 sources."tweetnacl-0.14.5"
@@ -6103,7 +5990,7 @@ in
61035990 sources."type-fest-0.8.1"
61045991 sources."type-is-1.6.18"
61055992 sources."typedarray-to-buffer-3.1.5"
6106− sources."typescript-4.3.2"
5993+ sources."typescript-4.2.3"
61075994 (sources."undefsafe-2.0.3" // {
61085995 dependencies = [
61095996 sources."debug-2.6.9"
@@ -6117,9 +6004,11 @@ in
61176004 (sources."update-notifier-4.1.3" // {
61186005 dependencies = [
61196006 sources."chalk-3.0.0"
6007+ sources."has-flag-4.0.0"
6008+ sources."supports-color-7.2.0"
61206009 ];
61216010 })
6122− sources."uri-js-4.4.1"
6011+ sources."uri-js-4.2.2"
61236012 sources."url-parse-lax-3.0.0"
61246013 sources."utf-8-validate-5.0.5"
61256014 sources."util-deprecate-1.0.2"
@@ -6131,7 +6020,13 @@ in
61316020 sources."verror-1.10.0"
61326021 sources."which-2.0.2"
61336022 sources."which-module-2.0.0"
6134− sources."widest-line-3.1.0"
6023+ (sources."widest-line-3.1.0" // {
6024+ dependencies = [
6025+ sources."ansi-regex-5.0.0"
6026+ sources."string-width-4.2.2"
6027+ sources."strip-ansi-6.0.0"
6028+ ];
6029+ })
61356030 (sources."winston-3.3.3" // {
61366031 dependencies = [
61376032 sources."async-3.2.0"
@@ -6145,26 +6040,18 @@ in
61456040 ];
61466041 })
61476042 sources."word-wrap-1.2.3"
6148− sources."wordwrap-0.0.3"
61496043 (sources."wrap-ansi-5.1.0" // {
61506044 dependencies = [
61516045 sources."ansi-styles-3.2.1"
6152− sources."color-convert-1.9.3"
6153− sources."color-name-1.1.3"
6154− sources."string-width-3.1.0"
61556046 ];
61566047 })
61576048 sources."wrappy-1.0.2"
6158− sources."write-file-atomic-3.0.3"
6049+ sources."write-file-atomic-2.4.3"
61596050 sources."xdg-basedir-4.0.0"
61606051 sources."xtend-4.0.2"
61616052 sources."y18n-4.0.3"
61626053 sources."yallist-3.1.1"
6163− (sources."yargs-13.3.2" // {
6164− dependencies = [
6165− sources."string-width-3.1.0"
6166− ];
6167− })
6054+ sources."yargs-13.3.2"
61686055 sources."yargs-parser-13.1.2"
61696056 ];
61706057 buildInputs = globalBuildInputs;
@@ -6174,6 +6061,25 @@ in
61746061 };
61756062 production = false;
61766063 bypassCache = true;
6177− reconstructLock = true;
6064+ reconstructLock = false;
61786065 };
6066+in
6067+{
6068+ args = args;
6069+ sources = sources;
6070+ tarball = nodeEnv.buildNodeSourceDist args;
6071+ package = nodeEnv.buildNodePackage args;
6072+ shell = nodeEnv.buildNodeShell args;
6073+ nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
6074+ src = stdenv.mkDerivation {
6075+ name = args.name + "-package-json";
6076+ src = nix-gitignore.gitignoreSourcePure [
6077+ "*"
6078+ "!package.json"
6079+ "!package-lock.json"
6080+ ] args.src;
6081+ dontBuild = true;
6082+ installPhase = "mkdir -p $out; cp -r ./* $out;";
6083+ };
6084+ });
61796085}
pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json+69−3
@@ -1,3 +1,69 @@
1−[
2− {"matrix-appservice-irc": "git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.1" }
3−]
1+{
2+ "name": "matrix-appservice-irc",
3+ "version": "0.30.0",
4+ "description": "An IRC Bridge for Matrix",
5+ "main": "app.js",
6+ "bin": "./bin/matrix-appservice-irc",
7+ "engines": {
8+ "node": ">=12"
9+ },
10+ "scripts": {
11+ "prepare": "npm run build",
12+ "build": "tsc --project ./tsconfig.json",
13+ "test": "BLUEBIRD_DEBUG=1 jasmine --stop-on-failure=true",
14+ "lint": "eslint -c .eslintrc --max-warnings 0 'spec/**/*.js' 'src/**/*.ts'",
15+ "check": "npm test && npm run lint",
16+ "ci-test": "nyc --report text jasmine",
17+ "ci": "npm run lint && npm run ci-test"
18+ },
19+ "repository": {
20+ "type": "git",
21+ "url": "https://github.com/matrix-org/matrix-appservice-irc.git"
22+ },
23+ "author": "",
24+ "license": "Apache-2.0",
25+ "bugs": {
26+ "url": "https://github.com/matrix-org/matrix-appservice-irc/issues"
27+ },
28+ "dependencies": {
29+ "@sentry/node": "^5.27.1",
30+ "bluebird": "^3.7.2",
31+ "escape-string-regexp": "^4.0.0",
32+ "extend": "^3.0.2",
33+ "he": "^1.2.0",
34+ "logform": "^2.2.0",
35+ "matrix-appservice": "^0.8.0",
36+ "matrix-appservice-bridge": "^2.6.1",
37+ "matrix-lastactive": "^0.1.5",
38+ "matrix-org-irc": "^1.2.0",
39+ "nedb": "^1.1.2",
40+ "nodemon": "^2.0.7",
41+ "nopt": "^3.0.1",
42+ "p-queue": "^6.6.2",
43+ "pg": "^8.6.0",
44+ "quick-lru": "^4.0.1",
45+ "request": "^2.54.0",
46+ "request-promise-native": "^1.0.9",
47+ "sanitize-html": "^2.4.0",
48+ "winston": "^3.3.3",
49+ "winston-daily-rotate-file": "^4.5.5"
50+ },
51+ "devDependencies": {
52+ "@types/bluebird": "^3.5.32",
53+ "@types/express": "^4.17.7",
54+ "@types/extend": "^3.0.1",
55+ "@types/he": "^1.1.1",
56+ "@types/nedb": "^1.8.11",
57+ "@types/nopt": "^3.0.29",
58+ "@types/pg": "^8.6.0",
59+ "@types/sanitize-html": "^2.3.1",
60+ "@typescript-eslint/eslint-plugin": "^4.16.1",
61+ "@typescript-eslint/parser": "^4.16.1",
62+ "eslint": "^7.21.0",
63+ "jasmine": "^3.6.2",
64+ "nyc": "^14.1.1",
65+ "prom-client": "^13.0.0",
66+ "proxyquire": "^1.4.0",
67+ "typescript": "^4.2.2"
68+ }
69+}
pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh+7−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env nix-shell
2−#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq
2+#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix
33
44set -euo pipefail
55# cd to the folder containing this script
@@ -15,10 +15,15 @@ fi
1515
1616echo "matrix-appservice-irc: $CURRENT_VERSION -> $TARGET_VERSION"
1717
18−sed -i "s/#$CURRENT_VERSION/#$TARGET_VERSION/" package.json
18+rm -f package.json package-lock.json
19+wget https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package.json
20+wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package-lock.json
21+echo "$TARGET_VERSION" > ./REVISION
1922
2023./generate-dependencies.sh
2124
25+rm ./package-lock-temp.json
26+
2227# Apparently this is done by r-ryantm, so only uncomment for manual usage
2328#git add ./package.json ./node-packages.nix
2429#git commit -m "matrix-appservice-irc: ${CURRENT_VERSION} -> ${TARGET_VERSION}"