Merge master into staging-next

authored by github-actions[bot] and committed by GitHub 0d70d179 992fef19

+912 -773
+87 -32
nixos/tests/matrix-appservice-irc.nix
··· 25 25 "bind_address" = ""; 26 26 "port" = 8448; 27 27 "resources" = [ 28 - { "compress" = true; "names" = [ "client" "webclient" ]; } 28 + { "compress" = true; "names" = [ "client" ]; } 29 29 { "compress" = false; "names" = [ "federation" ]; } 30 30 ]; 31 31 "tls" = false; ··· 85 85 client = { pkgs, ... }: { 86 86 environment.systemPackages = [ 87 87 (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 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 92 104 93 - matrix = MatrixClient("${homeserverUrl}") 94 - matrix.register_with_password(username="alice", password="foobar") 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 95 112 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") 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) 101 144 102 - m_room = matrix.join_room("#irc_#test:homeserver") 103 - irc.send(b"JOIN #test\n") 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 104 149 105 - # plenty of time for the joins to happen 106 - sleep(10) 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) 107 154 108 - m_room.send_text("hi from matrix") 109 - irc.send(b"PRIVMSG #test :hi from irc \r\n") 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") 110 164 111 - print("Waiting for irc message...") 112 - while True: 113 - buf = irc.recv(10000) 114 - if b"hi from matrix" in buf: 115 - break 165 + print("Waiting for the matrix message to appear on the IRC side...") 166 + irc.expect_msg("hi from matrix") 116 167 117 - print("Waiting for matrix message...") 168 + callback = functools.partial( 169 + matrix_room_message_text_callback, matrix, "hi from irc" 170 + ) 171 + matrix.add_event_callback(callback, RoomMessageText) 118 172 173 + print("Waiting for matrix message...") 174 + await matrix.sync_forever() 119 175 120 - def callback(room, e): 121 - if "hi from irc" in e['content']['body']: 122 - exit(0) 176 + exit(1) # Unreachable 123 177 124 178 125 - m_room.add_listener(callback, "m.room.message") 126 - matrix.listen_forever() 127 - '' 179 + if __name__ == "__main__": 180 + asyncio.run(run(sys.argv[1])) 181 + '' 128 182 ) 129 183 ]; 130 184 }; 131 185 }; 132 186 133 187 testScript = '' 188 + import pathlib 189 + 134 190 start_all() 135 191 136 192 ircd.wait_for_unit("ngircd.service") ··· 156 212 homeserver.wait_for_open_port(8448) 157 213 158 214 with subtest("ensure messages can be exchanged"): 159 - client.succeed("do_test") 215 + client.succeed("do_test ${homeserverUrl} >&2") 160 216 ''; 161 - 162 217 })
+1 -1
pkgs/applications/audio/tonelib-jam/default.nix
··· 56 56 homepage = "https://tonelib.net/"; 57 57 license = licenses.unfree; 58 58 maintainers = with maintainers; [ dan4ik605743 ]; 59 - platforms = platforms.linux; 59 + platforms = [ "x86_64-linux" ]; 60 60 }; 61 61 }
+33 -23
pkgs/applications/audio/tonelib-zoom/default.nix
··· 1 - { stdenv 2 - , dpkg 3 - , lib 4 - , autoPatchelfHook 1 + { lib 2 + , stdenv 5 3 , fetchurl 6 - , webkitgtk 7 - , libjack2 4 + , autoPatchelfHook 5 + , dpkg 8 6 , alsa-lib 7 + , freetype 8 + , libglvnd 9 9 , curl 10 + , libXcursor 11 + , libXinerama 12 + , libXrandr 13 + , libXrender 14 + , libjack2 15 + , webkitgtk 10 16 }: 11 17 12 18 stdenv.mkDerivation rec { ··· 18 24 sha256 = "sha256-4q2vM0/q7o/FracnO2xxnr27opqfVQoN7fsqTD9Tr/c="; 19 25 }; 20 26 21 - buildInputs = [ 27 + nativeBuildInputs = [ 28 + autoPatchelfHook 22 29 dpkg 23 - webkitgtk 24 - libjack2 25 - alsa-lib 26 30 ]; 27 31 28 - nativeBuildInputs = [ 29 - autoPatchelfHook 32 + buildInputs = [ 33 + stdenv.cc.cc.lib 34 + alsa-lib 35 + freetype 36 + libglvnd 37 + webkitgtk 38 + ] ++ runtimeDependencies; 39 + 40 + runtimeDependencies = map lib.getLib [ 41 + curl 42 + libXcursor 43 + libXinerama 44 + libXrandr 45 + libXrender 46 + libjack2 30 47 ]; 31 48 32 - unpackPhase = '' 33 - mkdir -p $TMP/ $out/ 34 - dpkg -x $src $TMP 35 - ''; 49 + unpackCmd = "dpkg -x $curSrc source"; 36 50 37 51 installPhase = '' 38 - cp -R $TMP/usr/* $out/ 39 - mv $out/bin/ToneLib-Zoom $out/bin/tonelib-zoom 52 + mv usr $out 53 + substituteInPlace $out/share/applications/ToneLib-Zoom.desktop --replace /usr/ $out/ 40 54 ''; 41 - 42 - runtimeDependencies = [ 43 - (lib.getLib curl) 44 - ]; 45 55 46 56 meta = with lib; { 47 57 description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; 48 58 homepage = "https://tonelib.net/"; 49 59 license = licenses.unfree; 50 60 maintainers = with maintainers; [ dan4ik605743 ]; 51 - platforms = platforms.linux; 61 + platforms = [ "x86_64-linux" ]; 52 62 }; 53 63 }
+16 -1
pkgs/applications/editors/thonny/default.nix
··· 1 - { lib, fetchFromGitHub, python3 }: 1 + { lib, fetchFromGitHub, python3, makeDesktopItem, copyDesktopItems }: 2 2 3 3 with python3.pkgs; 4 4 ··· 13 13 sha256 = "13l8blq7y6p7a235x2lfiqml1bd4ba2brm3vfvs8wasjh3fvm9g5"; 14 14 }; 15 15 16 + nativeBuildInputs = [ copyDesktopItems ]; 17 + 18 + desktopItems = [ (makeDesktopItem { 19 + name = "Thonny"; 20 + exec = "thonny"; 21 + icon = "thonny"; 22 + desktopName = "Thonny"; 23 + comment = "Python IDE for beginners"; 24 + categories = "Development;IDE"; 25 + }) ]; 26 + 16 27 propagatedBuildInputs = with python3.pkgs; [ 17 28 jedi 18 29 pyserial ··· 32 43 preFixup = '' 33 44 wrapProgram "$out/bin/thonny" \ 34 45 --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi}) 46 + ''; 47 + 48 + postInstall = '' 49 + install -Dm644 ./packaging/icons/thonny-48x48.png $out/share/icons/hicolor/48x48/apps/thonny.png 35 50 ''; 36 51 37 52 # Tests need a DISPLAY
+5 -1
pkgs/applications/virtualization/OVMF/default.nix
··· 30 30 31 31 hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; 32 32 33 + # Fails on i686 with: 34 + # 'cc1: error: LTO support has not been enabled in this configuration' 35 + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-fno-lto" ]; 36 + 33 37 buildFlags = 34 - lib.optional secureBoot "-D SECURE_BOOT_ENABLE=TRUE" 38 + lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] 35 39 ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] 36 40 ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] 37 41 ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"];
+13
pkgs/applications/virtualization/qemu/default.nix
··· 97 97 url = "https://gitlab.com/qemu-project/qemu/-/commit/13b250b12ad3c59114a6a17d59caf073ce45b33a.patch"; 98 98 sha256 = "0lkzfc7gdlvj4rz9wk07fskidaqysmx8911g914ds1jnczgk71mf"; 99 99 }) 100 + # Fixes a crash that frequently happens in some setups that share /nix/store over 9p like nixos tests 101 + # on some systems. Remove with next release. 102 + (fetchpatch { 103 + name = "fix-crash-in-v9fs_walk.patch"; 104 + url = "https://gitlab.com/qemu-project/qemu/-/commit/f83df00900816476cca41bb536e4d532b297d76e.patch"; 105 + sha256 = "sha256-LYGbBLS5YVgq8Bf7NVk7HBFxXq34NmZRPCEG79JPwk8="; 106 + }) 107 + # Fixes an io error on discard/unmap operation for aio/file backend. Remove with next release. 108 + (fetchpatch { 109 + name = "fix-aio-discard-return-value.patch"; 110 + url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch"; 111 + sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M="; 112 + }) 100 113 ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch 101 114 ++ lib.optionals stdenv.hostPlatform.isMusl [ 102 115 (fetchpatch {
+2 -2
pkgs/desktops/lxqt/libfm-qt/default.nix
··· 16 16 17 17 mkDerivation rec { 18 18 pname = "libfm-qt"; 19 - version = "0.17.1"; 19 + version = "1.0.0"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "lxqt"; 23 23 repo = "libfm-qt"; 24 24 rev = version; 25 - sha256 = "0jdsqvwp81y4ylabrqdc673x80fp41rpp5w7c1v9zmk9k8z4s5ll"; 25 + sha256 = "1kk2cv9cp2gdj2pzdgm72c009iyl3mhrvsiz05kdxd4v1kn38ci1"; 26 26 }; 27 27 28 28 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/liblxqt/default.nix
··· 15 15 16 16 mkDerivation rec { 17 17 pname = "liblxqt"; 18 - version = "0.17.0"; 18 + version = "1.0.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "lxqt"; 22 22 repo = pname; 23 23 rev = version; 24 - sha256 = "0n0pjz5wihchfcji8qal0lw8kzvv3im50v1lbwww4ymrgacz9h4l"; 24 + sha256 = "08cqvq99pvz8lz13273hlpv8160r6zyz4f7h4kl1g8xdga7m45gr"; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/libqtxdg/default.nix
··· 10 10 11 11 mkDerivation rec { 12 12 pname = "libqtxdg"; 13 - version = "3.7.1"; 13 + version = "3.8.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "lxqt"; 17 17 repo = pname; 18 18 rev = version; 19 - sha256 = "1x806hdics3d49ys0a2vkln9znidj82qscjnpcqxclxn26xqzd91"; 19 + sha256 = "14jrzwdmhgn6bcggmhxx5rdapjzm93cfkjjls3nii1glnkwzncxz"; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/libsysstat/default.nix
··· 9 9 10 10 mkDerivation rec { 11 11 pname = "libsysstat"; 12 - version = "0.4.5"; 12 + version = "0.4.6"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "lxqt"; 16 16 repo = pname; 17 17 rev = version; 18 - sha256 = "14q55iayygmjh63zgsb9qa4af766gj9b0jsrmfn85fdiqb8p8yfz"; 18 + sha256 = "0z2r8041vqssm59lkb3ka7qis9br4wvavxzd45m3pnqlp7wwhkbn"; 19 19 }; 20 20 21 21 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lximage-qt/default.nix
··· 16 16 17 17 mkDerivation rec { 18 18 pname = "lximage-qt"; 19 - version = "0.17.0"; 19 + version = "1.0.0"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "lxqt"; 23 23 repo = pname; 24 24 rev = version; 25 - sha256 = "1xajsblk2954crvligvrgwp7q1pj7124xdfnlq9k9q0ya2xc36lx"; 25 + sha256 = "1bf0smkawyibrabw7zcynwr2afpsv7pnnyxn4nqgh6mxnp7al157"; 26 26 }; 27 27 28 28 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-about/default.nix
··· 14 14 15 15 mkDerivation rec { 16 16 pname = "lxqt-about"; 17 - version = "0.17.0"; 17 + version = "1.0.0"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "lxqt"; 21 21 repo = pname; 22 22 rev = version; 23 - sha256 = "011jcab47iif741azfgvf52my118nwkny5m0pa7nsqyv8ad1fsiw"; 23 + sha256 = "1fr2mx19ks4crh7cjc080vkrzldzgmghxvrzjqq7lspkzd5a0pjb"; 24 24 }; 25 25 26 26 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-admin/default.nix
··· 15 15 16 16 mkDerivation rec { 17 17 pname = "lxqt-admin"; 18 - version = "0.17.0"; 18 + version = "1.0.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "lxqt"; 22 22 repo = pname; 23 23 rev = version; 24 - sha256 = "1xi169gz1sarv7584kg33ymckqlx9ddci7r9m0dlm4a7mw7fm0lf"; 24 + sha256 = "06l7vs8aqx37bhrxf9xa16g7rdmia8j73q78qfj6syw57f3ssjr9"; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-archiver/default.nix
··· 14 14 15 15 mkDerivation rec { 16 16 pname = "lxqt-archiver"; 17 - version = "0.4.0"; 17 + version = "0.5.0"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "lxqt"; 21 21 repo = "lxqt-archiver"; 22 22 rev = version; 23 - sha256 = "0wpayzcyqcnvzk95bqql7p07l8p7mwdgdj7zlbcsdn0wis4yhjm6"; 23 + sha256 = "033lq7n34a5qk2zv8kr1633p5x2cjimv4w4n86w33xmcwya4yiji"; 24 24 }; 25 25 26 26 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-build-tools/default.nix
··· 13 13 14 14 mkDerivation rec { 15 15 pname = "lxqt-build-tools"; 16 - version = "0.9.0"; 16 + version = "0.10.0"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "lxqt"; 20 20 repo = pname; 21 21 rev = version; 22 - sha256 = "0zhcv6cbdn9fr5lpglz26gzssbxkpi824sgc0g7w3hh1z6nqqf8l"; 22 + sha256 = "1hb04zgpalxv6da3myf1dxsbjix15dczzfq8a24g5dg2zfhwpx21"; 23 23 }; 24 24 25 25 # Nix clang on darwin identifies as 'Clang', not 'AppleClang'
+2 -2
pkgs/desktops/lxqt/lxqt-config/default.nix
··· 19 19 20 20 mkDerivation rec { 21 21 pname = "lxqt-config"; 22 - version = "0.17.1"; 22 + version = "1.0.0"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "lxqt"; 26 26 repo = pname; 27 27 rev = version; 28 - sha256 = "0b9jihmsqgdfdsisz15j3p53fgf1w30s8irj9zjh52fsj58p924p"; 28 + sha256 = "0yllqjmj4xbqi5681ffjxmlwlf9k9bpy3hgs7li6lnn90yy46qmr"; 29 29 }; 30 30 31 31 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
··· 15 15 16 16 mkDerivation rec { 17 17 pname = "lxqt-globalkeys"; 18 - version = "0.17.0"; 18 + version = "1.0.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "lxqt"; 22 22 repo = pname; 23 23 rev = version; 24 - sha256 = "135292l8w9sngg437n1zigkap15apifyqd9847ln84bxsmcj8lay"; 24 + sha256 = "015nrlzlcams4k8svrq7692xbjlai1dmwvjdldncsbrgrmfa702m"; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
··· 15 15 16 16 mkDerivation rec { 17 17 pname = "lxqt-notificationd"; 18 - version = "0.17.0"; 18 + version = "1.0.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "lxqt"; 22 22 repo = pname; 23 23 rev = version; 24 - sha256 = "1r2cmxcjkm9lvb2ilq2winyqndnamsd9x2ynmfiqidby2pcr9i3a"; 24 + sha256 = "06gb8k1p24gm5axy42npq7n4lmsxb03a9kvzqby44qmgwh8pn069"; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
··· 15 15 16 16 mkDerivation rec { 17 17 pname = "lxqt-openssh-askpass"; 18 - version = "0.17.0"; 18 + version = "1.0.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "lxqt"; 22 22 repo = pname; 23 23 rev = version; 24 - sha256 = "18pn7kw9aw7859jnwvjnjcvr50pqsi8gqcxsbx9rvsjrybw2qcgc"; 24 + sha256 = "0fp5jq3j34p81y200jbyp7wcz04r7jk07bfwrigjwcyj2xknkrgw"; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-panel/default.nix
··· 30 30 31 31 mkDerivation rec { 32 32 pname = "lxqt-panel"; 33 - version = "0.17.1"; 33 + version = "1.0.0"; 34 34 35 35 src = fetchFromGitHub { 36 36 owner = "lxqt"; 37 37 repo = pname; 38 38 rev = version; 39 - sha256 = "1wmm4sml7par5z9xcs5qx2y2pdbnnh66zs37jhx9f9ihcmh1sqlw"; 39 + sha256 = "0i63jyjg31336davjdak7z3as34gazx1lri65fk2f07kka9dx1jl"; 40 40 }; 41 41 42 42 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-policykit/default.nix
··· 19 19 20 20 mkDerivation rec { 21 21 pname = "lxqt-policykit"; 22 - version = "0.17.0"; 22 + version = "1.0.0"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "lxqt"; 26 26 repo = pname; 27 27 rev = version; 28 - sha256 = "15f0hnif8zs38qgckif63dds9zgpp3dmg9pg3ppgh664lkbxx7n7"; 28 + sha256 = "0hmxzkkggnpci305xax9663cbjqdh6n0j0dawwcpwj4ks8mp7xh7"; 29 29 }; 30 30 31 31 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
··· 18 18 19 19 mkDerivation rec { 20 20 pname = "lxqt-powermanagement"; 21 - version = "0.17.1"; 21 + version = "1.0.0"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "lxqt"; 25 25 repo = pname; 26 26 rev = version; 27 - sha256 = "04prx15l05kw97mwajc8yi2s7p3n6amzs5jnnmh9payxzp6glzmk"; 27 + sha256 = "0dwz8z3463dz49d5k5bh7splb1zdi617xc4xzlqxxrxbf3n8x4ix"; 28 28 }; 29 29 30 30 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
··· 15 15 16 16 mkDerivation rec { 17 17 pname = "lxqt-qtplugin"; 18 - version = "0.17.0"; 18 + version = "1.0.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "lxqt"; 22 22 repo = pname; 23 23 rev = version; 24 - sha256 = "168ii015j57hkccdh27h2fdh8yzs8nzy8nw20wnx6fbcg5401666"; 24 + sha256 = "1vr2hlv1q9xwkh9bapy29g9fi90d33xw7pr9zc1bfma6j152qs36"; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-runner/default.nix
··· 20 20 21 21 mkDerivation rec { 22 22 pname = "lxqt-runner"; 23 - version = "0.17.0"; 23 + version = "1.0.0"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "lxqt"; 27 27 repo = pname; 28 28 rev = version; 29 - sha256 = "167gzn6aqk7akzbmrnm7nmcpkl0nphr8axbfgwnw552dnk6v8gn0"; 29 + sha256 = "06b7l2jkh0h4ikddh82nxkz7qhg5ap7l016klg3jl2x659z59hpj"; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-session/default.nix
··· 19 19 20 20 mkDerivation rec { 21 21 pname = "lxqt-session"; 22 - version = "0.17.1"; 22 + version = "1.0.0"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "lxqt"; 26 26 repo = pname; 27 27 rev = version; 28 - sha256 = "1nhw3y3dm4crawc1905l6drn0i79fs1dzs8iak0vmmplbiv3fvgg"; 28 + sha256 = "0g355dmlyz8iljw953gp5jqlz02abd1ksssah826hxcy4j89mk7s"; 29 29 }; 30 30 31 31 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-sudo/default.nix
··· 16 16 17 17 mkDerivation rec { 18 18 pname = "lxqt-sudo"; 19 - version = "0.17.0"; 19 + version = "1.0.0"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "lxqt"; 23 23 repo = pname; 24 24 rev = version; 25 - sha256 = "10s8k83mkqiakh18mh1l7idjp95cy49rg8dh14cy159dk8mchcd0"; 25 + sha256 = "1y2vq3n5sv6cxqpnz79kl3dybfbw65z93cahdz8m6gplzpp24gn4"; 26 26 }; 27 27 28 28 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-themes/default.nix
··· 8 8 9 9 mkDerivation rec { 10 10 pname = "lxqt-themes"; 11 - version = "0.17.0"; 11 + version = "1.0.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "lxqt"; 15 15 repo = pname; 16 16 rev = version; 17 - sha256 = "13zh5yrq0f96cn5m6i7zdvgb9iw656fad5ps0s2zx6x8mj2mv64f"; 17 + sha256 = "1viaqmcq4axwsq5vrr08j95swapbqnwmv064kaijm1jj9csadsvv"; 18 18 }; 19 19 20 20 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/pavucontrol-qt/default.nix
··· 13 13 14 14 mkDerivation rec { 15 15 pname = "pavucontrol-qt"; 16 - version = "0.17.0"; 16 + version = "1.0.0"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "lxqt"; 20 20 repo = pname; 21 21 rev = version; 22 - sha256 = "0syc4bc2k7961la2c77787akhcljspq3s2nyqvb7mq7ddq1xn0wx"; 22 + sha256 = "1n8h8flcm0na7n295lkjv49brj6razwml21wwrinwllw7s948qp0"; 23 23 }; 24 24 25 25 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
··· 15 15 16 16 mkDerivation rec { 17 17 pname = "pcmanfm-qt"; 18 - version = "0.17.0"; 18 + version = "1.0.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "lxqt"; 22 22 repo = pname; 23 23 rev = version; 24 - sha256 = "1awyncpypygsrg7d2nc6xh1l4xaln3ypdliy4xmq8bf94sh9rf0y"; 24 + sha256 = "1g7pl9ygk4k72rsrcsfjnr7h2yzp3pfmlc5wq6bhyq9rqpr5yv7l"; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/qps/default.nix
··· 14 14 15 15 mkDerivation rec { 16 16 pname = "qps"; 17 - version = "2.3.0"; 17 + version = "2.4.0"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "lxqt"; 21 21 repo = pname; 22 22 rev = version; 23 - sha256 = "0fihhnb7vp6x072spg1fnxaip4sq9mbvhrfqdwnzph5dlyvs54nj"; 23 + sha256 = "11mbzn4syfghb3zvdrw2011njagcw206ng6c8l9z9h3zlhmhcd57"; 24 24 }; 25 25 26 26 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/qterminal/default.nix
··· 12 12 13 13 mkDerivation rec { 14 14 pname = "qterminal"; 15 - version = "0.17.0"; 15 + version = "1.0.0"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "lxqt"; 19 19 repo = pname; 20 20 rev = version; 21 - sha256 = "0mdcz45faj9ysw725qzg572968kf5sh6zfw7iiksi26s8kiyhbbp"; 21 + sha256 = "12p3fnbkpj6z0iplg75304l8kvnn145iq6bpw30n9bwflxrd6yhd"; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/qtermwidget/default.nix
··· 10 10 11 11 mkDerivation rec { 12 12 pname = "qtermwidget"; 13 - version = "0.17.0"; 13 + version = "1.0.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "lxqt"; 17 17 repo = pname; 18 18 rev = version; 19 - sha256 = "0pmkk2mba8z6cgfsd8sy4vhf5d9fn9hvxszzyycyy1ndygjrc1v8"; 19 + sha256 = "0i1w5wgac7r4p0jjrrswlvvwivkwrp1b88xh5ijjw6k9irjc7zf6"; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/screengrab/default.nix
··· 17 17 18 18 mkDerivation rec { 19 19 pname = "screengrab"; 20 - version = "2.2.0"; 20 + version = "2.3.0"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "lxqt"; 24 24 repo = pname; 25 25 rev = version; 26 - sha256 = "16dycq40lbvk6jvpj7zp85m23cgvh8nj38fz99gxjfzn2nz1gy4a"; 26 + sha256 = "1ca5yyvcahabyrdjcsznz9j66yrdlvnfa3650iwlz6922c3dkn2k"; 27 27 }; 28 28 29 29 nativeBuildInputs = [
+2 -2
pkgs/development/libraries/applet-window-buttons/default.nix
··· 11 11 12 12 mkDerivation rec { 13 13 pname = "applet-window-buttons"; 14 - version = "0.9.0"; 14 + version = "0.10.1"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "psifidotos"; 18 18 repo = "applet-window-buttons"; 19 19 rev = version; 20 - sha256 = "sha256-ikgUE8GaiTpNjwrz7SbNQ3+b8KiigDgMREQ7J2b+EEs="; 20 + sha256 = "18h2g3jqzr88wkmws2iz71sgrz633zwkqvhn32sdi32sxxbrksgd"; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+18 -15
pkgs/development/libraries/glog/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "glog"; 5 - version = "0.4.0"; 5 + version = "0.5.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "google"; 9 9 repo = "glog"; 10 10 rev = "v${version}"; 11 - sha256 = "1xd3maiipfbxmhc9rrblc5x52nxvkwxp14npg31y5njqvkvzax9b"; 11 + sha256 = "17014q25c99qyis6l3fwxidw6222bb269fdlr74gn7pzmzg4lvg3"; 12 12 }; 13 13 14 - patches = lib.optionals stdenv.hostPlatform.isMusl [ 15 - # TODO: Remove at next release that includes this commit. 14 + patches = [ 15 + # Fix duplicate-concatenated nix store path in cmake file, see: 16 + # https://github.com/NixOS/nixpkgs/pull/144561#issuecomment-960296043 17 + # TODO: Remove when https://github.com/google/glog/pull/733 is merged and available. 16 18 (fetchpatch { 17 - name = "glog-Fix-symbolize_unittest-for-musl-builds.patch"; 18 - url = "https://github.com/google/glog/commit/834dd780bf1fe0704b8ed0350ca355a55f711a9f.patch"; 19 - sha256 = "0k4lanxg85anyvjsj3mh93bcgds8gizpiamcy2zvs3yyfjl40awn"; 19 + name = "glog-cmake-Fix-incorrect-relative-path-concatenation.patch"; 20 + url = "https://github.com/google/glog/pull/733/commits/57c636c02784f909e4b5d3c2f0ecbdbb47097266.patch"; 21 + sha256 = "1py93gkzmcyi2ypcwyj3nri210z8fmlaif51yflzmrrv507zd7bi"; 20 22 }) 21 23 ]; 22 24 23 - postPatch = lib.optionalString stdenv.isDarwin '' 24 - # A path clash on case-insensitive file systems blocks creation of the build directory. 25 - # The file in question is specific to bazel and does not influence the build result. 26 - rm BUILD 27 - ''; 28 - 29 25 nativeBuildInputs = [ cmake ]; 30 26 31 27 propagatedBuildInputs = [ gflags ]; 32 28 33 - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; 29 + cmakeFlags = [ 30 + "-DBUILD_SHARED_LIBS=ON" 31 + # Mak CMake place RPATHs such that tests will find the built libraries. 32 + # See https://github.com/NixOS/nixpkgs/pull/144561#discussion_r742468811 and https://github.com/NixOS/nixpkgs/pull/108496 33 + "-DCMAKE_SKIP_BUILD_RPATH=OFF" 34 + ]; 34 35 36 + # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed 37 + doCheck = !stdenv.isDarwin; 35 38 checkInputs = [ perl ]; 36 - doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm" 37 39 38 40 meta = with lib; { 39 41 homepage = "https://github.com/google/glog"; 40 42 license = licenses.bsd3; 41 43 description = "Library for application-level logging"; 42 44 platforms = platforms.unix; 45 + maintainers = with lib.maintainers; [ nh2 r-burns ]; 43 46 }; 44 47 }
+2 -2
pkgs/development/python-modules/astropy/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "astropy"; 18 - version = "4.2"; 18 + version = "4.3.1"; 19 19 format = "pyproject"; 20 20 21 21 disabled = !isPy3k; # according to setup.py 22 22 23 23 src = fetchPypi { 24 24 inherit pname version; 25 - sha256 = "2c194f8a429b8399de64a413a06881ea49f0525cabaa2d78fc132b9e970adc6a"; 25 + sha256 = "sha256-LTlRIjtOt/No/K2Mg0DSc3TF2OO2NaY2J1rNs481zVE="; 26 26 }; 27 27 28 28 nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ];
+7 -16
pkgs/development/python-modules/geopandas/default.nix
··· 1 - { lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder 1 + { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder 2 2 , pandas, shapely, fiona, pyproj 3 3 , pytestCheckHook, Rtree }: 4 4 5 5 buildPythonPackage rec { 6 6 pname = "geopandas"; 7 - version = "0.9.0"; 7 + version = "0.10.2"; 8 8 disabled = pythonOlder "3.6"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "geopandas"; 12 12 repo = "geopandas"; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-58X562OkRzZ4UTNMTwXW4U5czoa5tbSMBCcE90DqbaE="; 14 + sha256 = "14azl3gppqn90k8h4hpjilsivj92k6p1jh7mdr6p4grbww1b7sdq"; 15 15 }; 16 16 17 - patches = [ 18 - (fetchpatch { 19 - name = "skip-pandas-master-fillna-test.patch"; 20 - url = "https://github.com/geopandas/geopandas/pull/1878.patch"; 21 - sha256 = "1yw3i4dbhaq7f02n329b9y2cqxbwlz9db81mhgrfc7af3whwysdb"; 22 - }) 23 - (fetchpatch { 24 - name = "fix-proj4strings-test.patch"; 25 - url = "https://github.com/geopandas/geopandas/pull/1958.patch"; 26 - sha256 = "0kzmpq5ry87yvhqr6gnh9p2606b06d3ynzjvw0hpp9fncczpc2yn"; 27 - }) 28 - ]; 29 - 30 17 propagatedBuildInputs = [ 31 18 pandas 32 19 shapely ··· 35 22 ]; 36 23 37 24 doCheck = !stdenv.isDarwin; 25 + preCheck = '' 26 + # Wants to write test files into $HOME. 27 + export HOME="$TMPDIR" 28 + ''; 38 29 checkInputs = [ pytestCheckHook Rtree ]; 39 30 disabledTests = [ 40 31 # requires network access
+2 -2
pkgs/development/python-modules/identify/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "identify"; 10 - version = "2.3.1"; 10 + version = "2.3.3"; 11 11 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "pre-commit"; 15 15 repo = pname; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-6sErta+YnaXe7lHR3kR7UAoWuaw8He7e3gCML9vWYj8="; 17 + sha256 = "sha256-mGTSl/aOPQpqFq5dqVDia/7NofO9Tz0N8nYXU2Pyi0c="; 18 18 }; 19 19 20 20 checkInputs = [
+5 -4
pkgs/development/python-modules/millheater/default.nix
··· 1 - 2 1 { lib 3 2 , aiohttp 4 3 , async-timeout ··· 10 9 11 10 buildPythonPackage rec { 12 11 pname = "millheater"; 13 - version = "0.8.0"; 12 + version = "0.8.1"; 14 13 disabled = pythonOlder "3.6"; 15 14 16 15 src = fetchFromGitHub { 17 16 owner = "Danielhiversen"; 18 17 repo = "pymill"; 19 18 rev = version; 20 - sha256 = "sha256-PL9qP6SKE8gsBUdfrPf9Fs+vU/lkpOjmkvq3cWw3Uak="; 19 + sha256 = "0269lhb6y4c13n6krsl2b66ldvzkd26jlax7bbnkvag2iv7g6hzj"; 21 20 }; 22 21 23 22 propagatedBuildInputs = [ ··· 29 28 # Project has no tests 30 29 doCheck = false; 31 30 32 - pythonImportsCheck = [ "mill" ]; 31 + pythonImportsCheck = [ 32 + "mill" 33 + ]; 33 34 34 35 meta = with lib; { 35 36 description = "Python library for Mill heater devices";
+27 -15
pkgs/development/python-modules/parfive/default.nix
··· 1 1 { lib 2 + , aiofiles 3 + , aioftp 4 + , aiohttp 2 5 , buildPythonPackage 3 6 , fetchPypi 4 - , tqdm 5 - , aiohttp 6 - , pytest 7 - , setuptools-scm 7 + , pytest-asyncio 8 8 , pytest-localserver 9 9 , pytest-socket 10 - , pytest-asyncio 11 - , aioftp 10 + , pytestCheckHook 11 + , pythonOlder 12 + , setuptools-scm 13 + , tqdm 12 14 }: 13 15 14 16 buildPythonPackage rec { 15 17 pname = "parfive"; 16 18 version = "1.5.0"; 19 + format = "setuptools"; 20 + 21 + disabled = pythonOlder "3.7"; 17 22 18 23 src = fetchPypi { 19 24 inherit pname version; ··· 25 30 ]; 26 31 27 32 propagatedBuildInputs = [ 28 - tqdm 29 - aiohttp 30 33 aioftp 34 + aiohttp 35 + tqdm 31 36 ]; 32 37 33 38 checkInputs = [ 34 - pytest 39 + aiofiles 40 + pytest-asyncio 35 41 pytest-localserver 36 42 pytest-socket 37 - pytest-asyncio 43 + pytestCheckHook 44 + ]; 45 + 46 + disabledTests = [ 47 + # Requires network access 48 + "test_ftp" 49 + "test_ftp_pasv_command" 50 + "test_ftp_http" 38 51 ]; 39 52 40 - checkPhase = '' 41 - # these two tests require network connection 42 - pytest parfive -k "not test_ftp and not test_ftp_http" 43 - ''; 53 + pythonImportsCheck = [ 54 + "parfive" 55 + ]; 44 56 45 57 meta = with lib; { 46 58 description = "A HTTP and FTP parallel file downloader"; 47 59 homepage = "https://parfive.readthedocs.io/"; 48 60 license = licenses.mit; 49 - maintainers = [ maintainers.costrouc ]; 61 + maintainers = with maintainers; [ costrouc ]; 50 62 }; 51 63 }
+13 -4
pkgs/development/python-modules/pyerfa/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchPypi 4 4 , isPy3k 5 + , setuptools-scm 5 6 , liberfa 6 7 , packaging 7 8 , numpy ··· 10 11 buildPythonPackage rec { 11 12 pname = "pyerfa"; 12 13 format = "pyproject"; 13 - version = "1.7.1.1"; 14 + version = "2.0.0"; 14 15 15 16 doCheck = false; 16 17 17 18 src = fetchPypi { 18 19 inherit pname version; 19 - sha256 = "09i2qcsvxd3q04a5yaf6fwzg79paaslpksinan9d8smj7viql15i"; 20 + sha256 = "sha256-+QQjHhpXD5REDgYUB5lZCJUQf5QoR7UqdTzoHJYJFi0="; 20 21 }; 21 22 22 - nativeBuildInputs = [ packaging ]; 23 - propagatedBuildInputs = [ liberfa numpy ]; 23 + nativeBuildInputs = [ 24 + packaging 25 + setuptools-scm 26 + ]; 27 + 28 + propagatedBuildInputs = [ 29 + liberfa 30 + numpy 31 + ]; 32 + 24 33 preBuild = '' 25 34 export PYERFA_USE_SYSTEM_LIBERFA=1 26 35 '';
+3 -6
pkgs/development/python-modules/pytest-astropy/default.nix
··· 17 17 buildPythonPackage rec { 18 18 pname = "pytest-astropy"; 19 19 version = "0.9.0"; 20 - disabled = pythonOlder "3.6"; 20 + disabled = pythonOlder "3.7"; 21 21 22 22 src = fetchPypi { 23 23 inherit pname version; ··· 43 43 pytest-remotedata 44 44 ]; 45 45 46 - # pytest-astropy is a meta package and has no tests 47 - #doCheck = false; 48 - checkPhase = '' 49 - # 'doCheck = false;' still invokes the pytestCheckPhase which makes the build fail 50 - ''; 46 + # pytest-astropy is a meta package that only propagates requirements 47 + doCheck = false; 51 48 52 49 meta = with lib; { 53 50 description = "Meta-package containing dependencies for testing";
+5
pkgs/development/python-modules/radio_beam/default.nix
··· 1 1 { lib 2 2 , fetchPypi 3 3 , buildPythonPackage 4 + , setuptools-scm 4 5 , astropy 5 6 , pytestCheckHook 6 7 , pytest-doctestplus ··· 16 17 pname = "radio-beam"; 17 18 sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; 18 19 }; 20 + 21 + nativeBuildInputs = [ 22 + setuptools-scm 23 + ]; 19 24 20 25 propagatedBuildInputs = [ astropy ]; 21 26
+5
pkgs/development/python-modules/subprocess-tee/default.nix
··· 24 24 enrich 25 25 ]; 26 26 27 + disabledTests = [ 28 + # cyclic dependency on `molecule` (see https://github.com/pycontribs/subprocess-tee/issues/50) 29 + "test_molecule" 30 + ]; 31 + 27 32 pythonImportsCheck = [ 28 33 "subprocess_tee" 29 34 ];
+16 -2
pkgs/development/python-modules/sunpy/default.nix
··· 31 31 32 32 buildPythonPackage rec { 33 33 pname = "sunpy"; 34 - version = "3.0.2"; 34 + version = "3.1.0"; 35 35 disabled = pythonOlder "3.6"; 36 36 37 37 src = fetchPypi { 38 38 inherit pname version; 39 - sha256 = "5dcd2c5cbf2f419da00abde00798d067b515c2f082ce63f4fbe1de47682c1c41"; 39 + sha256 = "sha256-0DF+/lQpsQKO5omBKJAe3gBjQ6QQb50IdRSacIRL/JA="; 40 40 }; 41 41 42 42 nativeBuildInputs = [ ··· 86 86 disabledTestPaths = [ 87 87 "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml" 88 88 "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml" 89 + # requires mpl-animators package 90 + "sunpy/map/tests/test_compositemap.py" 91 + "sunpy/map/tests/test_mapbase.py" 92 + "sunpy/map/tests/test_mapsequence.py" 93 + "sunpy/map/tests/test_plotting.py" 94 + "sunpy/map/tests/test_reproject_to.py" 95 + "sunpy/net/tests/test_helioviewer.py" 96 + "sunpy/timeseries/tests/test_timeseriesbase.py" 97 + "sunpy/visualization/animator/tests/test_basefuncanimator.py" 98 + "sunpy/visualization/animator/tests/test_mapsequenceanimator.py" 99 + "sunpy/visualization/animator/tests/test_wcs.py" 100 + "sunpy/visualization/colormaps/tests/test_cm.py" 101 + # requires cdflib package 102 + "sunpy/timeseries/tests/test_timeseries_factory.py" 89 103 ]; 90 104 91 105 pytestFlagsArray = [
+5
pkgs/development/python-modules/threadpoolctl/default.nix
··· 23 23 }; 24 24 25 25 checkInputs = [ pytestCheckHook numpy scipy ]; 26 + disabledTests = [ 27 + # accepts a limited set of cpu models based on project 28 + # developers' hardware 29 + "test_architecture" 30 + ]; 26 31 27 32 meta = with lib; { 28 33 homepage = "https://github.com/joblib/threadpoolctl";
+6 -3
pkgs/development/python-modules/vcver/default.nix
··· 1 - { lib, buildPythonPackage, fetchFromGitHub 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 2 4 , packaging 3 - , fetchurl, python }: 5 + , python 6 + }: 4 7 5 8 buildPythonPackage rec { 6 9 pname = "vcver"; 7 - version = "0.2.10"; 10 + version = "0.2.12"; 8 11 9 12 src = fetchFromGitHub { 10 13 owner = "toumorokoshi";
+1
pkgs/development/r-modules/default.nix
··· 309 309 gert = [ pkgs.libgit2 ]; 310 310 haven = with pkgs; [ libiconv zlib.dev ]; 311 311 h5vc = [ pkgs.zlib.dev ]; 312 + HDF5Array = [ pkgs.zlib.dev ]; 312 313 HiCseg = [ pkgs.gsl ]; 313 314 imager = [ pkgs.x11 ]; 314 315 iBMQ = [ pkgs.gsl ];
+4
pkgs/development/tools/rust/cargo-spellcheck/default.nix
··· 2 2 , rustPlatform 3 3 , fetchFromGitHub 4 4 , libclang 5 + , stdenv 6 + , Security 5 7 }: 6 8 7 9 rustPlatform.buildRustPackage rec { ··· 16 18 }; 17 19 18 20 cargoSha256 = "1p4iirblk6idvfhn8954v8lbxlzj0gbd8fv4wq03hfrdqisjqcsn"; 21 + 22 + buildInputs = lib.optional stdenv.isDarwin Security; 19 23 20 24 LIBCLANG_PATH = "${libclang.lib}/lib"; 21 25
-11
pkgs/servers/code-server/darwin-fsevents.patch
··· 1 - --- ./lib/vscode/node_modules/fsevents/install.js 2 - +++ ./lib/vscode/node_modules/fsevents/install.js 3 - @@ -1,7 +1,3 @@ 4 - if (process.platform === 'darwin') { 5 - - var spawn = require('child_process').spawn; 6 - - var args = ['install', '--fallback-to-build']; 7 - - var options = {stdio: 'inherit'}; 8 - - var child = spawn(require.resolve('node-pre-gyp/bin/node-pre-gyp'), args, options); 9 - - child.on('close', process.exit); 10 - + process.stdout.write('fsevents disabled on Darwin by Nix build script\n') 11 - }
+75 -59
pkgs/servers/code-server/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand 2 - , moreutils, jq, git, zip, rsync, pkg-config, yarn, python3 3 - , nodejs-14_x, libsecret, xorg, ripgrep 2 + , moreutils, jq, git, cacert, zip, rsync, pkg-config, yarn, python3 3 + , esbuild, nodejs-14_x, libsecret, xorg, ripgrep 4 4 , AppKit, Cocoa, Security, cctools }: 5 5 6 6 let ··· 13 13 14 14 in stdenv.mkDerivation rec { 15 15 pname = "code-server"; 16 - version = "3.9.0"; 17 - commit = "fc6d123da59a4e5a675ac8e080f66e032ba01a1b"; 16 + version = "3.12.0"; 17 + commit = "798dc0baf284416dbbf951e4ef596beeab6cb6c4"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "cdr"; 21 21 repo = "code-server"; 22 22 rev = "v${version}"; 23 - sha256 = "0jgmf8d7hki1iv6yy1z0s5qjyxchxnwj8kv53jrwkllim08swbi3"; 23 + sha256 = "17v3sz0wjrmikmzyh9xswr4kf1vcj9njlibqb4wwj0pq0d72wdvl"; 24 24 }; 25 25 26 26 cloudAgent = buildGoModule rec { 27 27 pname = "cloud-agent"; 28 - version = "0.2.1"; 28 + version = "0.2.3"; 29 29 30 30 src = fetchFromGitHub { 31 31 owner = "cdr"; 32 32 repo = "cloud-agent"; 33 33 rev = "v${version}"; 34 - sha256 = "06fpiwxjz2cgzw4ks9sk3376rprkd02khfnb10hg7dhn3y9gp7x8"; 34 + sha256 = "14i1qq273f0yn5v52ryiqwj7izkd1yd212di4gh4bqypmmzhw3jj"; 35 35 }; 36 36 37 37 vendorSha256 = "0k9v10wkzx53r5syf6bmm81gr4s5dalyaa07y9zvx6vv5r2h0661"; ··· 46 46 yarnCache = stdenv.mkDerivation { 47 47 name = "${pname}-${version}-${system}-yarn-cache"; 48 48 inherit src; 49 - nativeBuildInputs = [ yarn' git ]; 49 + nativeBuildInputs = [ yarn' git cacert ]; 50 50 buildPhase = '' 51 51 export HOME=$PWD 52 + export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" 53 + 54 + yarn --cwd "./vendor" install --modules-folder modules --ignore-scripts --frozen-lockfile 52 55 53 56 yarn config set yarn-offline-mirror $out 54 57 find "$PWD" -name "yarn.lock" -printf "%h\n" | \ ··· 61 64 62 65 # to get hash values use nix-build -A code-server.prefetchYarnCache 63 66 outputHash = { 64 - x86_64-linux = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; 65 - aarch64-linux = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; 66 - x86_64-darwin = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; 67 + x86_64-linux = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; 68 + aarch64-linux = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; 69 + x86_64-darwin = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; 67 70 }.${system} or (throw "Unsupported system ${system}"); 68 71 }; 69 72 ··· 93 96 94 97 patchShebangs ./ci 95 98 96 - # remove unnecessary git config command 97 - substituteInPlace lib/vscode/build/npm/postinstall.js \ 98 - --replace "cp.execSync('git config pull.rebase true');" "" 99 - 100 - # allow offline install for postinstall scripts in extensions 101 - grep -rl "yarn install" --include package.json lib/vscode/extensions \ 102 - | xargs sed -i 's/yarn install/yarn install --offline/g' 103 - 104 - substituteInPlace ci/dev/postinstall.sh \ 105 - --replace 'yarn' 'yarn --ignore-scripts' 106 - 107 - # use offline cache when installing release packages 108 - substituteInPlace ci/build/npm-postinstall.sh \ 109 - --replace 'yarn --production' 'yarn --production --offline' 110 - 111 - # disable automatic updates 112 - sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \ 113 - lib/vscode/src/vs/platform/update/common/update.config.contribution.ts 114 - 115 99 # inject git commit 116 100 substituteInPlace ci/build/build-release.sh \ 117 101 --replace '$(git rev-parse HEAD)' "$commit" 118 - 119 - # remove all built-in extensions, as these are 3rd party extensions that 120 - # gets downloaded from vscode marketplace 121 - jq --slurp '.[0] * .[1]' "lib/vscode/product.json" <( 122 - cat << EOF 123 - { 124 - "builtInExtensions": [] 125 - } 126 - EOF 127 - ) | sponge lib/vscode/product.json 128 102 ''; 129 103 130 104 configurePhase = '' ··· 140 114 yarn --offline config set yarn-offline-mirror "${yarnCache}" 141 115 142 116 # link coder-cloud agent from nix store 117 + mkdir -p lib 143 118 ln -s "${cloudAgent}/bin/cloud-agent" ./lib/coder-cloud-agent 144 119 145 120 # skip unnecessary electron download ··· 151 126 152 127 buildPhase = '' 153 128 # install code-server dependencies 154 - yarn --offline 129 + yarn --offline --ignore-scripts 155 130 156 - # install vscode dependencies without running script for all vscode packages 157 - # that require patching for postinstall scripts to succeed 158 - for d in lib/vscode lib/vscode/build; do 159 - yarn --offline --cwd $d --offline --ignore-scripts 160 - done 131 + # patch shebangs of everything to allow binary packages to build 132 + patchShebangs . 133 + 134 + # Skip shellcheck download 135 + jq "del(.scripts.preinstall)" node_modules/shellcheck/package.json | sponge node_modules/shellcheck/package.json 136 + 137 + # rebuild binary packages now that scripts have been patched 138 + npm rebuild 139 + 140 + # Replicate ci/dev/postinstall.sh 141 + echo "----- Replicate ci/dev/postinstall.sh" 142 + yarn --cwd "./vendor" install --modules-folder modules --offline --ignore-scripts --frozen-lockfile 143 + 144 + # Replicate vendor/postinstall.sh 145 + echo " ----- Replicate vendor/postinstall.sh" 146 + yarn --cwd "./vendor/modules/code-oss-dev" --offline --frozen-lockfile --ignore-scripts install 147 + 148 + # remove all built-in extensions, as these are 3rd party extensions that 149 + # get downloaded from vscode marketplace 150 + jq --slurp '.[0] * .[1]' "vendor/modules/code-oss-dev/product.json" <( 151 + cat << EOF 152 + { 153 + "builtInExtensions": [] 154 + } 155 + EOF 156 + ) | sponge vendor/modules/code-oss-dev/product.json 157 + 158 + # disable automatic updates 159 + sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \ 160 + vendor/modules/code-oss-dev/src/vs/platform/update/common/update.config.contribution.ts 161 161 162 162 # put ripgrep binary into bin, so postinstall does not try to download it 163 163 find -name vscode-ripgrep -type d \ 164 164 -execdir mkdir -p {}/bin \; \ 165 165 -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; 166 166 167 - # patch shebangs of everything, also cached files, as otherwise postinstall 168 - # will not be able to find /usr/bin/env, as it does not exist in sandbox 169 - patchShebangs . 170 - 171 167 # Playwright is only needed for tests, we can disable it for builds. 172 168 # There's an environment variable to disable downloads, but the package makes a breaking call to 173 169 # sw_vers before that variable is checked. 174 170 patch -p1 -i ${./playwright.patch} 175 - '' + lib.optionalString stdenv.isDarwin '' 176 - # fsevents build fails on Darwin. It's an optional package that's only installed as part of Darwin 177 - # builds, so the patch will fail if run on non-Darwin systems. 178 - patch -p1 -i ${./darwin-fsevents.patch} 179 - '' + '' 171 + 172 + # Replicate install vscode dependencies without running script for all vscode packages 173 + # that require patching for postinstall scripts to succeed 174 + find ./vendor/modules/code-oss-dev -path "*node_modules" -prune -o \ 175 + -path "./*/*/*/*/*" -name "yarn.lock" -printf "%h\n" | \ 176 + xargs -I {} yarn --cwd {} \ 177 + --frozen-lockfile --offline --ignore-scripts --ignore-engines 178 + 179 + # patch shebangs of everything to allow binary packages to build 180 + patchShebangs . 181 + 182 + # patch build esbuild 183 + mkdir -p vendor/modules/code-oss-dev/build/node_modules/esbuild/bin 184 + jq "del(.scripts.postinstall)" vendor/modules/code-oss-dev/build/node_modules/esbuild/package.json | sponge vendor/modules/code-oss-dev/build/node_modules/esbuild/package.json 185 + sed -i 's/0.12.6/${esbuild.version}/g' vendor/modules/code-oss-dev/build/node_modules/esbuild/lib/main.js 186 + ln -s -f ${esbuild}/bin/esbuild vendor/modules/code-oss-dev/build/node_modules/esbuild/bin/esbuild 187 + 188 + # patch extensions esbuild 189 + mkdir -p vendor/modules/code-oss-dev/extensions/node_modules/esbuild/bin 190 + jq "del(.scripts.postinstall)" vendor/modules/code-oss-dev/extensions/node_modules/esbuild/package.json | sponge vendor/modules/code-oss-dev/extensions/node_modules/esbuild/package.json 191 + sed -i 's/0.11.12/${esbuild.version}/g' vendor/modules/code-oss-dev/extensions/node_modules/esbuild/lib/main.js 192 + ln -s -f ${esbuild}/bin/esbuild vendor/modules/code-oss-dev/extensions/node_modules/esbuild/bin/esbuild 193 + 180 194 # rebuild binaries, we use npm here, as yarn does not provide an alternative 181 195 # that would not attempt to try to reinstall everything and break our 182 196 # patching attempts 183 - npm rebuild --prefix lib/vscode --update-binary 197 + npm rebuild --prefix vendor/modules/code-oss-dev --update-binary 184 198 185 - # run postinstall scripts, which eventually do yarn install on all 186 - # additional requirements 187 - yarn --cwd lib/vscode postinstall --frozen-lockfile --offline 199 + # run postinstall scripts after patching 200 + find ./vendor/modules/code-oss-dev -path "*node_modules" -prune -o \ 201 + -path "./*/*/*/*/*" -name "yarn.lock" -printf "%h\n" | \ 202 + xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' 188 203 189 204 # build code-server 190 205 yarn build ··· 206 221 yarn --offline --cwd "$out/libexec/code-server" --production 207 222 208 223 # link coder-cloud agent from nix store 224 + mkdir -p $out/libexec/code-server/lib 209 225 ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent 210 226 211 227 # create wrapper
+3 -3
pkgs/servers/code-server/playwright.patch
··· 1 - --- ./lib/vscode/node_modules/playwright/install.js 2 - +++ ./lib/vscode/node_modules/playwright/install.js 1 + --- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js 2 + +++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js 3 3 @@ -14,6 +14,4 @@ 4 4 * limitations under the License. 5 5 */ 6 6 7 7 -const { installBrowsersWithProgressBar } = require('./lib/install/installer'); 8 8 - 9 - -installBrowsersWithProgressBar(__dirname); 9 + -installBrowsersWithProgressBar(); 10 10 +process.stdout.write('Browser install disabled by Nix build script\n');
+3 -3
pkgs/servers/code-server/remove-cloud-agent-download.patch
··· 1 1 --- ./ci/build/npm-postinstall.sh 2 2 +++ ./ci/build/npm-postinstall.sh 3 - @@ -24,13 +24,6 @@ main() { 3 + @@ -56,13 +56,6 @@ 4 4 ;; 5 5 esac 6 6 7 7 - OS="$(uname | tr '[:upper:]' '[:lower:]')" 8 - - if curl -fsSL "https://storage.googleapis.com/coder-cloud-releases/agent/latest/$OS/cloud-agent" -o ./lib/coder-cloud-agent; then 8 + - if curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then 9 9 - chmod +x ./lib/coder-cloud-agent 10 10 - else 11 11 - echo "Failed to download cloud agent; --link will not work" ··· 13 13 - 14 14 if ! vscode_yarn; then 15 15 echo "You may not have the required dependencies to build the native modules." 16 - echo "Please see https://github.com/cdr/code-server/blob/master/doc/npm.md" 16 + echo "Please see https://github.com/cdr/code-server/blob/master/docs/npm.md"
+1
pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION
··· 1 + 0.30.0
+11 -5
pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
··· 1 - { pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, ... }: 1 + { pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub }: 2 2 3 3 let 4 - 5 - packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json)); 6 - 7 4 ourNodePackages = import ./node-composition.nix { 8 5 inherit pkgs nodejs; 9 6 inherit (stdenv.hostPlatform) system; 10 7 }; 8 + version = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./REVISION); 11 9 in 12 - ourNodePackages."${packageName}".override { 10 + ourNodePackages.package.override { 13 11 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 + }; 14 20 15 21 nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; 16 22
+2 -2
pkgs/servers/matrix-synapse/matrix-appservice-irc/generate-dependencies.sh
··· 3 3 ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)" 4 4 5 5 $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ 6 - --nodejs-12 \ 6 + --nodejs-14 \ 7 7 --node-env ../../../development/node-packages/node-env.nix \ 8 8 --development \ 9 - --input package.json \ 9 + --lock ./package-lock-temp.json \ 10 10 --output node-packages.nix \ 11 11 --composition node-composition.nix
+1 -1
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix
··· 2 2 3 3 {pkgs ? import <nixpkgs> { 4 4 inherit system; 5 - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: 5 + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: 6 6 7 7 let 8 8 nodeEnv = import ../../../development/node-packages/node-env.nix {
+397 -491
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix
··· 76 76 sha512 = "YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg=="; 77 77 }; 78 78 }; 79 - "@babel/parser-7.14.4" = { 79 + "@babel/parser-7.14.3" = { 80 80 name = "_at_babel_slash_parser"; 81 81 packageName = "@babel/parser"; 82 - version = "7.14.4"; 82 + version = "7.14.3"; 83 83 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=="; 86 86 }; 87 87 }; 88 88 "@babel/runtime-7.14.0" = { ··· 112 112 sha512 = "TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA=="; 113 113 }; 114 114 }; 115 - "@babel/types-7.14.4" = { 115 + "@babel/types-7.14.2" = { 116 116 name = "_at_babel_slash_types"; 117 117 packageName = "@babel/types"; 118 - version = "7.14.4"; 118 + version = "7.14.2"; 119 119 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=="; 122 122 }; 123 123 }; 124 124 "@dabh/diagnostics-2.0.2" = { ··· 130 130 sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; 131 131 }; 132 132 }; 133 - "@eslint/eslintrc-0.4.2" = { 133 + "@eslint/eslintrc-0.4.1" = { 134 134 name = "_at_eslint_slash_eslintrc"; 135 135 packageName = "@eslint/eslintrc"; 136 - version = "0.4.2"; 136 + version = "0.4.1"; 137 137 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=="; 140 140 }; 141 141 }; 142 - "@nodelib/fs.scandir-2.1.5" = { 142 + "@nodelib/fs.scandir-2.1.4" = { 143 143 name = "_at_nodelib_slash_fs.scandir"; 144 144 packageName = "@nodelib/fs.scandir"; 145 - version = "2.1.5"; 145 + version = "2.1.4"; 146 146 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=="; 149 149 }; 150 150 }; 151 - "@nodelib/fs.stat-2.0.5" = { 151 + "@nodelib/fs.stat-2.0.4" = { 152 152 name = "_at_nodelib_slash_fs.stat"; 153 153 packageName = "@nodelib/fs.stat"; 154 - version = "2.0.5"; 154 + version = "2.0.4"; 155 155 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=="; 158 158 }; 159 159 }; 160 - "@nodelib/fs.walk-1.2.7" = { 160 + "@nodelib/fs.walk-1.2.6" = { 161 161 name = "_at_nodelib_slash_fs.walk"; 162 162 packageName = "@nodelib/fs.walk"; 163 - version = "1.2.7"; 163 + version = "1.2.6"; 164 164 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=="; 167 167 }; 168 168 }; 169 - "@sentry/core-5.30.0" = { 169 + "@sentry/core-5.27.1" = { 170 170 name = "_at_sentry_slash_core"; 171 171 packageName = "@sentry/core"; 172 - version = "5.30.0"; 172 + version = "5.27.1"; 173 173 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=="; 176 176 }; 177 177 }; 178 - "@sentry/hub-5.30.0" = { 178 + "@sentry/hub-5.27.1" = { 179 179 name = "_at_sentry_slash_hub"; 180 180 packageName = "@sentry/hub"; 181 - version = "5.30.0"; 181 + version = "5.27.1"; 182 182 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=="; 185 185 }; 186 186 }; 187 - "@sentry/minimal-5.30.0" = { 187 + "@sentry/minimal-5.27.1" = { 188 188 name = "_at_sentry_slash_minimal"; 189 189 packageName = "@sentry/minimal"; 190 - version = "5.30.0"; 190 + version = "5.27.1"; 191 191 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=="; 194 194 }; 195 195 }; 196 - "@sentry/node-5.30.0" = { 196 + "@sentry/node-5.27.1" = { 197 197 name = "_at_sentry_slash_node"; 198 198 packageName = "@sentry/node"; 199 - version = "5.30.0"; 199 + version = "5.27.1"; 200 200 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=="; 203 203 }; 204 204 }; 205 - "@sentry/tracing-5.30.0" = { 205 + "@sentry/tracing-5.27.1" = { 206 206 name = "_at_sentry_slash_tracing"; 207 207 packageName = "@sentry/tracing"; 208 - version = "5.30.0"; 208 + version = "5.27.1"; 209 209 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=="; 212 212 }; 213 213 }; 214 - "@sentry/types-5.30.0" = { 214 + "@sentry/types-5.27.1" = { 215 215 name = "_at_sentry_slash_types"; 216 216 packageName = "@sentry/types"; 217 - version = "5.30.0"; 217 + version = "5.27.1"; 218 218 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=="; 221 221 }; 222 222 }; 223 - "@sentry/utils-5.30.0" = { 223 + "@sentry/utils-5.27.1" = { 224 224 name = "_at_sentry_slash_utils"; 225 225 packageName = "@sentry/utils"; 226 - version = "5.30.0"; 226 + version = "5.27.1"; 227 227 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=="; 230 230 }; 231 231 }; 232 232 "@sindresorhus/is-0.14.0" = { ··· 247 247 sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; 248 248 }; 249 249 }; 250 - "@types/bluebird-3.5.35" = { 250 + "@types/bluebird-3.5.32" = { 251 251 name = "_at_types_slash_bluebird"; 252 252 packageName = "@types/bluebird"; 253 - version = "3.5.35"; 253 + version = "3.5.32"; 254 254 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=="; 257 257 }; 258 258 }; 259 259 "@types/body-parser-1.19.0" = { ··· 274 274 sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; 275 275 }; 276 276 }; 277 - "@types/express-4.17.12" = { 277 + "@types/express-4.17.8" = { 278 278 name = "_at_types_slash_express"; 279 279 packageName = "@types/express"; 280 - version = "4.17.12"; 280 + version = "4.17.8"; 281 281 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=="; 284 284 }; 285 285 }; 286 - "@types/express-serve-static-core-4.17.21" = { 286 + "@types/express-serve-static-core-4.17.19" = { 287 287 name = "_at_types_slash_express-serve-static-core"; 288 288 packageName = "@types/express-serve-static-core"; 289 - version = "4.17.21"; 289 + version = "4.17.19"; 290 290 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=="; 293 293 }; 294 294 }; 295 295 "@types/extend-3.0.1" = { ··· 337 337 sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; 338 338 }; 339 339 }; 340 - "@types/node-15.12.2" = { 340 + "@types/node-12.12.54" = { 341 341 name = "_at_types_slash_node"; 342 342 packageName = "@types/node"; 343 - version = "15.12.2"; 343 + version = "12.12.54"; 344 344 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=="; 347 347 }; 348 348 }; 349 349 "@types/nopt-3.0.29" = { ··· 400 400 sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; 401 401 }; 402 402 }; 403 - "@typescript-eslint/eslint-plugin-4.26.1" = { 403 + "@typescript-eslint/eslint-plugin-4.16.1" = { 404 404 name = "_at_typescript-eslint_slash_eslint-plugin"; 405 405 packageName = "@typescript-eslint/eslint-plugin"; 406 - version = "4.26.1"; 406 + version = "4.16.1"; 407 407 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=="; 410 410 }; 411 411 }; 412 - "@typescript-eslint/experimental-utils-4.26.1" = { 412 + "@typescript-eslint/experimental-utils-4.16.1" = { 413 413 name = "_at_typescript-eslint_slash_experimental-utils"; 414 414 packageName = "@typescript-eslint/experimental-utils"; 415 - version = "4.26.1"; 415 + version = "4.16.1"; 416 416 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=="; 419 419 }; 420 420 }; 421 - "@typescript-eslint/parser-4.26.1" = { 421 + "@typescript-eslint/parser-4.16.1" = { 422 422 name = "_at_typescript-eslint_slash_parser"; 423 423 packageName = "@typescript-eslint/parser"; 424 - version = "4.26.1"; 424 + version = "4.16.1"; 425 425 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=="; 428 428 }; 429 429 }; 430 - "@typescript-eslint/scope-manager-4.26.1" = { 430 + "@typescript-eslint/scope-manager-4.16.1" = { 431 431 name = "_at_typescript-eslint_slash_scope-manager"; 432 432 packageName = "@typescript-eslint/scope-manager"; 433 - version = "4.26.1"; 433 + version = "4.16.1"; 434 434 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=="; 437 437 }; 438 438 }; 439 - "@typescript-eslint/types-4.26.1" = { 439 + "@typescript-eslint/types-4.16.1" = { 440 440 name = "_at_typescript-eslint_slash_types"; 441 441 packageName = "@typescript-eslint/types"; 442 - version = "4.26.1"; 442 + version = "4.16.1"; 443 443 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=="; 446 446 }; 447 447 }; 448 - "@typescript-eslint/typescript-estree-4.26.1" = { 448 + "@typescript-eslint/typescript-estree-4.16.1" = { 449 449 name = "_at_typescript-eslint_slash_typescript-estree"; 450 450 packageName = "@typescript-eslint/typescript-estree"; 451 - version = "4.26.1"; 451 + version = "4.16.1"; 452 452 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=="; 455 455 }; 456 456 }; 457 - "@typescript-eslint/visitor-keys-4.26.1" = { 457 + "@typescript-eslint/visitor-keys-4.16.1" = { 458 458 name = "_at_typescript-eslint_slash_visitor-keys"; 459 459 packageName = "@typescript-eslint/visitor-keys"; 460 - version = "4.26.1"; 460 + version = "4.16.1"; 461 461 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=="; 464 464 }; 465 465 }; 466 466 "abbrev-1.1.1" = { ··· 517 517 sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; 518 518 }; 519 519 }; 520 - "ajv-8.6.0" = { 520 + "ajv-8.4.0" = { 521 521 name = "ajv"; 522 522 packageName = "ajv"; 523 - version = "8.6.0"; 523 + version = "8.4.0"; 524 524 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=="; 527 527 }; 528 528 }; 529 529 "another-json-0.2.0" = { ··· 1246 1246 sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; 1247 1247 }; 1248 1248 }; 1249 - "debug-4.3.2" = { 1249 + "debug-4.3.1" = { 1250 1250 name = "debug"; 1251 1251 packageName = "debug"; 1252 - version = "4.3.2"; 1252 + version = "4.3.1"; 1253 1253 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=="; 1256 1256 }; 1257 1257 }; 1258 1258 "decamelize-1.2.0" = { ··· 1408 1408 sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; 1409 1409 }; 1410 1410 }; 1411 - "domutils-2.7.0" = { 1411 + "domutils-2.6.0" = { 1412 1412 name = "domutils"; 1413 1413 packageName = "domutils"; 1414 - version = "2.7.0"; 1414 + version = "2.6.0"; 1415 1415 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=="; 1418 1418 }; 1419 1419 }; 1420 1420 "dot-prop-5.3.0" = { ··· 1561 1561 sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; 1562 1562 }; 1563 1563 }; 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 - }; 1573 1564 "escape-string-regexp-4.0.0" = { 1574 1565 name = "escape-string-regexp"; 1575 1566 packageName = "escape-string-regexp"; ··· 1579 1570 sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; 1580 1571 }; 1581 1572 }; 1582 - "eslint-7.28.0" = { 1573 + "eslint-7.21.0" = { 1583 1574 name = "eslint"; 1584 1575 packageName = "eslint"; 1585 - version = "7.28.0"; 1576 + version = "7.21.0"; 1586 1577 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=="; 1589 1580 }; 1590 1581 }; 1591 1582 "eslint-scope-5.1.1" = { ··· 1604 1595 src = fetchurl { 1605 1596 url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; 1606 1597 sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; 1607 - }; 1608 - }; 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 1598 }; 1617 1599 }; 1618 1600 "eslint-visitor-keys-1.3.0" = { ··· 1723 1705 sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; 1724 1706 }; 1725 1707 }; 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 - }; 1735 1708 "extend-3.0.2" = { 1736 1709 name = "extend"; 1737 1710 packageName = "extend"; ··· 1750 1723 sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; 1751 1724 }; 1752 1725 }; 1753 - "fast-deep-equal-3.1.3" = { 1726 + "fast-deep-equal-3.1.1" = { 1754 1727 name = "fast-deep-equal"; 1755 1728 packageName = "fast-deep-equal"; 1756 - version = "3.1.3"; 1729 + version = "3.1.1"; 1757 1730 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=="; 1760 1733 }; 1761 1734 }; 1762 1735 "fast-glob-3.2.5" = { ··· 1930 1903 sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; 1931 1904 }; 1932 1905 }; 1933 - "forwarded-0.2.0" = { 1906 + "forwarded-0.1.2" = { 1934 1907 name = "forwarded"; 1935 1908 packageName = "forwarded"; 1936 - version = "0.2.0"; 1909 + version = "0.1.2"; 1937 1910 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"; 1940 1913 }; 1941 1914 }; 1942 1915 "fresh-0.5.2" = { ··· 2092 2065 sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; 2093 2066 }; 2094 2067 }; 2095 - "globals-13.9.0" = { 2068 + "globals-12.4.0" = { 2096 2069 name = "globals"; 2097 2070 packageName = "globals"; 2098 - version = "13.9.0"; 2071 + version = "12.4.0"; 2099 2072 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=="; 2102 2075 }; 2103 2076 }; 2104 2077 "globby-11.0.3" = { ··· 2119 2092 sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; 2120 2093 }; 2121 2094 }; 2122 - "graceful-fs-4.2.6" = { 2095 + "graceful-fs-4.2.3" = { 2123 2096 name = "graceful-fs"; 2124 2097 packageName = "graceful-fs"; 2125 - version = "4.2.6"; 2098 + version = "4.2.3"; 2126 2099 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=="; 2129 2102 }; 2130 2103 }; 2131 2104 "har-schema-2.0.0" = { ··· 2299 2272 sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; 2300 2273 }; 2301 2274 }; 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 - }; 2311 2275 "iconv-lite-0.4.24" = { 2312 2276 name = "iconv-lite"; 2313 2277 packageName = "iconv-lite"; ··· 2407 2371 sha1 = "633c2c83e3da42a502f52466022480f4208261de"; 2408 2372 }; 2409 2373 }; 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 + }; 2410 2383 "ini-1.3.7" = { 2411 2384 name = "ini"; 2412 2385 packageName = "ini"; ··· 2434 2407 sha512 = "HtszKchBQTcqw1DC09uD7i7vvMayHGM1OCo6AHt5pkgZEyo99ClhHTMJdf+Ezc9ovuNNxcH89QfyclGthjZJOw=="; 2435 2408 }; 2436 2409 }; 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 - }; 2447 2410 "is-arrayish-0.2.1" = { 2448 2411 name = "is-arrayish"; 2449 2412 packageName = "is-arrayish"; ··· 2741 2704 sha512 = "uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg=="; 2742 2705 }; 2743 2706 }; 2744 - "jasmine-3.7.0" = { 2707 + "jasmine-3.6.2" = { 2745 2708 name = "jasmine"; 2746 2709 packageName = "jasmine"; 2747 - version = "3.7.0"; 2710 + version = "3.6.2"; 2748 2711 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=="; 2751 2714 }; 2752 2715 }; 2753 - "jasmine-core-3.7.1" = { 2716 + "jasmine-core-3.6.0" = { 2754 2717 name = "jasmine-core"; 2755 2718 packageName = "jasmine-core"; 2756 - version = "3.7.1"; 2719 + version = "3.6.0"; 2757 2720 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=="; 2760 2723 }; 2761 2724 }; 2762 2725 "js-tokens-4.0.0" = { ··· 2768 2731 sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; 2769 2732 }; 2770 2733 }; 2771 - "js-yaml-3.14.1" = { 2734 + "js-yaml-3.14.0" = { 2772 2735 name = "js-yaml"; 2773 2736 packageName = "js-yaml"; 2774 - version = "3.14.1"; 2737 + version = "3.14.0"; 2775 2738 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=="; 2778 2741 }; 2779 2742 }; 2780 2743 "js-yaml-4.1.0" = { ··· 2993 2956 sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; 2994 2957 }; 2995 2958 }; 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 - }; 3005 2959 "lodash.truncate-4.4.2" = { 3006 2960 name = "lodash.truncate"; 3007 2961 packageName = "lodash.truncate"; ··· 3155 3109 sha512 = "JFIMJPNGGqi0myzIlN94SQReUbCrWi1TW5PZih1OGXzUj2wXYz3puktV/f64HZYn6D1ZKcwxZdLuNCG8cRuCyw=="; 3156 3110 }; 3157 3111 }; 3158 - "matrix-org-irc-1.0.0-alpha4" = { 3112 + "matrix-org-irc-1.2.0" = { 3159 3113 name = "matrix-org-irc"; 3160 3114 packageName = "matrix-org-irc"; 3161 - version = "1.0.0-alpha4"; 3115 + version = "1.2.0"; 3162 3116 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=="; 3165 3119 }; 3166 3120 }; 3167 3121 "media-typer-0.3.0" = { ··· 3227 3181 sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; 3228 3182 }; 3229 3183 }; 3230 - "mime-db-1.48.0" = { 3184 + "mime-db-1.47.0" = { 3231 3185 name = "mime-db"; 3232 3186 packageName = "mime-db"; 3233 - version = "1.48.0"; 3187 + version = "1.47.0"; 3234 3188 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=="; 3237 3191 }; 3238 3192 }; 3239 - "mime-types-2.1.31" = { 3193 + "mime-types-2.1.30" = { 3240 3194 name = "mime-types"; 3241 3195 packageName = "mime-types"; 3242 - version = "2.1.31"; 3196 + version = "2.1.30"; 3243 3197 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=="; 3246 3200 }; 3247 3201 }; 3248 3202 "mimic-response-1.0.1" = { ··· 3344 3298 sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; 3345 3299 }; 3346 3300 }; 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 - }; 3356 3301 "nanoid-3.1.23" = { 3357 3302 name = "nanoid"; 3358 3303 packageName = "nanoid"; ··· 3542 3487 sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; 3543 3488 }; 3544 3489 }; 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 - }; 3554 3490 "optionator-0.9.1" = { 3555 3491 name = "optionator"; 3556 3492 packageName = "optionator"; ··· 3722 3658 sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; 3723 3659 }; 3724 3660 }; 3725 - "path-parse-1.0.7" = { 3661 + "path-parse-1.0.6" = { 3726 3662 name = "path-parse"; 3727 3663 packageName = "path-parse"; 3728 - version = "1.0.7"; 3664 + version = "1.0.6"; 3729 3665 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=="; 3732 3668 }; 3733 3669 }; 3734 3670 "path-to-regexp-0.1.7" = { ··· 3830 3766 sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; 3831 3767 }; 3832 3768 }; 3833 - "picomatch-2.3.0" = { 3769 + "picomatch-2.2.2" = { 3770 + name = "picomatch"; 3771 + packageName = "picomatch"; 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" = { 3834 3779 name = "picomatch"; 3835 3780 packageName = "picomatch"; 3836 - version = "2.3.0"; 3781 + version = "2.2.3"; 3837 3782 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=="; 3840 3785 }; 3841 3786 }; 3842 3787 "pify-3.0.0" = { ··· 3965 3910 sha512 = "jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng=="; 3966 3911 }; 3967 3912 }; 3968 - "proxy-addr-2.0.7" = { 3913 + "proxy-addr-2.0.6" = { 3969 3914 name = "proxy-addr"; 3970 3915 packageName = "proxy-addr"; 3971 - version = "2.0.7"; 3916 + version = "2.0.6"; 3972 3917 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=="; 3975 3920 }; 3976 3921 }; 3977 3922 "proxyquire-1.8.0" = { ··· 4154 4099 sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; 4155 4100 }; 4156 4101 }; 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" = { 4167 4103 name = "regenerator-runtime"; 4168 4104 packageName = "regenerator-runtime"; 4169 - version = "0.13.8"; 4105 + version = "0.13.7"; 4170 4106 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=="; 4173 4109 }; 4174 4110 }; 4175 4111 "regexpp-3.1.0" = { ··· 4487 4423 sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; 4488 4424 }; 4489 4425 }; 4490 - "signal-exit-3.0.3" = { 4426 + "signal-exit-3.0.2" = { 4491 4427 name = "signal-exit"; 4492 4428 packageName = "signal-exit"; 4493 - version = "3.0.3"; 4429 + version = "3.0.2"; 4494 4430 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"; 4497 4433 }; 4498 4434 }; 4499 4435 "simple-swizzle-0.2.2" = { ··· 4586 4522 sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; 4587 4523 }; 4588 4524 }; 4589 - "spdx-license-ids-3.0.9" = { 4525 + "spdx-license-ids-3.0.8" = { 4590 4526 name = "spdx-license-ids"; 4591 4527 packageName = "spdx-license-ids"; 4592 - version = "3.0.9"; 4528 + version = "3.0.8"; 4593 4529 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=="; 4596 4532 }; 4597 4533 }; 4598 4534 "split2-3.2.2" = { ··· 4883 4819 sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; 4884 4820 }; 4885 4821 }; 4886 - "tslib-1.14.1" = { 4822 + "tslib-1.11.1" = { 4887 4823 name = "tslib"; 4888 4824 packageName = "tslib"; 4889 - version = "1.14.1"; 4825 + version = "1.11.1"; 4890 4826 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=="; 4893 4829 }; 4894 4830 }; 4895 4831 "tsutils-3.21.0" = { ··· 4928 4864 sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; 4929 4865 }; 4930 4866 }; 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 - }; 4940 4867 "type-fest-0.8.1" = { 4941 4868 name = "type-fest"; 4942 4869 packageName = "type-fest"; ··· 4964 4891 sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; 4965 4892 }; 4966 4893 }; 4967 - "typescript-4.3.2" = { 4894 + "typescript-4.2.3" = { 4968 4895 name = "typescript"; 4969 4896 packageName = "typescript"; 4970 - version = "4.3.2"; 4897 + version = "4.2.3"; 4971 4898 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=="; 4974 4901 }; 4975 4902 }; 4976 4903 "undefsafe-2.0.3" = { ··· 5027 4954 sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A=="; 5028 4955 }; 5029 4956 }; 5030 - "uri-js-4.4.1" = { 4957 + "uri-js-4.2.2" = { 5031 4958 name = "uri-js"; 5032 4959 packageName = "uri-js"; 5033 - version = "4.4.1"; 4960 + version = "4.2.2"; 5034 4961 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=="; 5037 4964 }; 5038 4965 }; 5039 4966 "url-parse-lax-3.0.0" = { ··· 5189 5116 sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; 5190 5117 }; 5191 5118 }; 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 - }; 5201 5119 "wrap-ansi-5.1.0" = { 5202 5120 name = "wrap-ansi"; 5203 5121 packageName = "wrap-ansi"; ··· 5307 5225 }; 5308 5226 }; 5309 5227 }; 5310 - in 5311 - { 5312 - "matrix-appservice-irc-git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.1" = nodeEnv.buildNodePackage { 5228 + args = { 5313 5229 name = "matrix-appservice-irc"; 5314 5230 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 = ./.; 5321 5233 dependencies = [ 5322 5234 sources."@babel/code-frame-7.12.11" 5323 5235 (sources."@babel/generator-7.14.3" // { ··· 5329 5241 sources."@babel/helper-get-function-arity-7.12.13" 5330 5242 sources."@babel/helper-split-export-declaration-7.12.13" 5331 5243 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" 5344 5246 sources."@babel/runtime-7.14.0" 5345 5247 (sources."@babel/template-7.12.13" // { 5346 5248 dependencies = [ ··· 5353 5255 sources."globals-11.12.0" 5354 5256 ]; 5355 5257 }) 5356 - sources."@babel/types-7.14.4" 5258 + sources."@babel/types-7.14.2" 5357 5259 sources."@dabh/diagnostics-2.0.2" 5358 - (sources."@eslint/eslintrc-0.4.2" // { 5260 + (sources."@eslint/eslintrc-0.4.1" // { 5359 5261 dependencies = [ 5360 5262 sources."ignore-4.0.6" 5361 - sources."strip-json-comments-3.1.1" 5362 5263 ]; 5363 5264 }) 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" 5374 5275 sources."@sindresorhus/is-0.14.0" 5375 5276 sources."@szmarczak/http-timer-1.1.2" 5376 - sources."@types/bluebird-3.5.35" 5277 + sources."@types/bluebird-3.5.32" 5377 5278 sources."@types/body-parser-1.19.0" 5378 5279 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" 5381 5282 sources."@types/extend-3.0.1" 5382 5283 sources."@types/he-1.1.1" 5383 5284 sources."@types/json-schema-7.0.7" 5384 5285 sources."@types/mime-1.3.2" 5385 5286 sources."@types/nedb-1.8.11" 5386 - sources."@types/node-15.12.2" 5287 + sources."@types/node-12.12.54" 5387 5288 sources."@types/nopt-3.0.29" 5388 5289 sources."@types/pg-8.6.0" 5389 5290 sources."@types/qs-6.9.6" ··· 5395 5296 ]; 5396 5297 }) 5397 5298 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" // { 5399 5300 dependencies = [ 5400 5301 sources."lru-cache-6.0.0" 5401 5302 sources."semver-7.3.5" 5402 5303 sources."yallist-4.0.0" 5403 5304 ]; 5404 5305 }) 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" // { 5410 5311 dependencies = [ 5411 5312 sources."lru-cache-6.0.0" 5412 5313 sources."semver-7.3.5" 5413 5314 sources."yallist-4.0.0" 5414 5315 ]; 5415 5316 }) 5416 - sources."@typescript-eslint/visitor-keys-4.26.1" 5317 + sources."@typescript-eslint/visitor-keys-4.16.1" 5417 5318 sources."abbrev-1.1.1" 5418 5319 sources."accepts-1.3.7" 5419 5320 sources."acorn-7.4.1" ··· 5421 5322 sources."agent-base-6.0.2" 5422 5323 sources."ajv-6.12.6" 5423 5324 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" // { 5425 5329 dependencies = [ 5426 - sources."string-width-3.1.0" 5330 + sources."color-convert-2.0.1" 5427 5331 ]; 5428 5332 }) 5429 - sources."ansi-colors-4.1.1" 5430 - sources."ansi-regex-4.1.0" 5431 - sources."ansi-styles-4.3.0" 5432 5333 sources."anymatch-3.1.2" 5433 5334 sources."append-transform-1.0.0" 5434 5335 sources."archy-1.0.0" ··· 5453 5354 (sources."body-parser-1.19.0" // { 5454 5355 dependencies = [ 5455 5356 sources."debug-2.6.9" 5357 + sources."iconv-lite-0.4.24" 5456 5358 sources."ms-2.0.0" 5457 5359 ]; 5458 5360 }) 5459 5361 (sources."boxen-4.2.0" // { 5460 5362 dependencies = [ 5363 + sources."ansi-regex-5.0.0" 5461 5364 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" 5462 5369 ]; 5463 5370 }) 5464 5371 sources."brace-expansion-1.1.11" ··· 5473 5380 sources."lowercase-keys-2.0.0" 5474 5381 ]; 5475 5382 }) 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" 5483 5384 sources."call-bind-1.0.2" 5484 5385 sources."callsites-3.1.0" 5485 5386 sources."camelcase-5.3.1" 5486 5387 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 + }) 5488 5395 sources."chardet-1.3.0" 5489 5396 sources."chokidar-3.5.1" 5490 5397 sources."ci-info-2.0.0" 5491 5398 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" 5497 5400 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" // { 5499 5403 dependencies = [ 5500 - sources."color-convert-1.9.3" 5501 5404 sources."color-name-1.1.3" 5502 5405 ]; 5503 5406 }) 5504 - sources."color-convert-2.0.1" 5505 5407 sources."color-name-1.1.4" 5506 5408 sources."color-string-1.5.5" 5507 5409 sources."colorette-1.2.2" ··· 5510 5412 sources."combined-stream-1.0.8" 5511 5413 sources."commondir-1.0.1" 5512 5414 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 + }) 5514 5421 sources."content-disposition-0.5.3" 5515 5422 sources."content-type-1.0.4" 5516 5423 sources."convert-source-map-1.7.0" ··· 5519 5426 sources."core-util-is-1.0.2" 5520 5427 (sources."cp-file-6.2.0" // { 5521 5428 dependencies = [ 5522 - sources."make-dir-2.1.0" 5523 5429 sources."pify-4.0.1" 5524 5430 ]; 5525 5431 }) 5526 5432 sources."cross-spawn-7.0.3" 5527 5433 sources."crypto-random-string-2.0.0" 5528 5434 sources."dashdash-1.14.1" 5529 - sources."debug-4.3.2" 5435 + sources."debug-4.3.1" 5530 5436 sources."decamelize-1.2.0" 5531 5437 sources."decompress-response-3.3.0" 5532 5438 sources."deep-extend-0.6.0" ··· 5546 5452 }) 5547 5453 sources."domelementtype-2.2.0" 5548 5454 sources."domhandler-3.3.0" 5549 - (sources."domutils-2.7.0" // { 5455 + (sources."domutils-2.6.0" // { 5550 5456 dependencies = [ 5551 5457 sources."domhandler-4.2.0" 5552 5458 ]; ··· 5555 5461 sources."duplexer3-0.1.4" 5556 5462 sources."ecc-jsbn-0.1.2" 5557 5463 sources."ee-first-1.1.1" 5558 - sources."emoji-regex-7.0.3" 5464 + sources."emoji-regex-8.0.0" 5559 5465 sources."enabled-2.0.0" 5560 5466 sources."encodeurl-1.0.2" 5561 5467 sources."end-of-stream-1.4.4" ··· 5569 5475 sources."es6-error-4.1.1" 5570 5476 sources."escape-goat-2.1.1" 5571 5477 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" // { 5574 5480 dependencies = [ 5575 5481 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" 5582 5484 sources."ignore-4.0.6" 5583 5485 sources."lru-cache-6.0.0" 5584 5486 sources."semver-7.3.5" 5585 5487 sources."strip-ansi-6.0.0" 5586 - sources."strip-json-comments-3.1.1" 5488 + sources."supports-color-7.2.0" 5587 5489 sources."yallist-4.0.0" 5588 5490 ]; 5589 5491 }) 5590 5492 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 + }) 5592 5498 sources."eslint-visitor-keys-2.1.0" 5593 5499 (sources."espree-7.3.1" // { 5594 5500 dependencies = [ ··· 5617 5523 sources."ms-2.0.0" 5618 5524 ]; 5619 5525 }) 5620 - sources."extend-2.0.2" 5526 + sources."extend-3.0.2" 5621 5527 sources."extsprintf-1.3.0" 5622 - sources."fast-deep-equal-3.1.3" 5528 + sources."fast-deep-equal-3.1.1" 5623 5529 sources."fast-glob-3.2.5" 5624 5530 sources."fast-json-stable-stringify-2.1.0" 5625 5531 sources."fast-levenshtein-2.0.6" ··· 5636 5542 sources."ms-2.0.0" 5637 5543 ]; 5638 5544 }) 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" 5645 5546 sources."find-up-3.0.0" 5646 5547 sources."flat-cache-3.0.4" 5647 5548 sources."flatted-3.1.1" ··· 5656 5557 }) 5657 5558 sources."forever-agent-0.6.1" 5658 5559 sources."form-data-2.3.3" 5659 - sources."forwarded-0.2.0" 5560 + sources."forwarded-0.1.2" 5660 5561 sources."fresh-0.5.2" 5661 5562 sources."fs.realpath-1.0.0" 5662 5563 sources."fsevents-2.3.2" ··· 5672 5573 sources."glob-parent-5.1.2" 5673 5574 sources."glob-to-regexp-0.4.1" 5674 5575 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" 5680 5577 sources."globby-11.0.3" 5681 5578 sources."got-9.6.0" 5682 - sources."graceful-fs-4.2.6" 5579 + sources."graceful-fs-4.2.3" 5683 5580 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 + }) 5685 5586 sources."has-1.0.3" 5686 - sources."has-flag-4.0.0" 5587 + sources."has-flag-3.0.0" 5687 5588 sources."has-symbols-1.0.2" 5688 5589 sources."has-yarn-2.1.0" 5689 5590 sources."hash.js-1.1.7" ··· 5698 5599 sources."htmlencode-0.0.4" 5699 5600 sources."htmlparser2-4.1.0" 5700 5601 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 + }) 5702 5607 sources."http-signature-1.2.0" 5703 5608 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" 5706 5610 sources."ignore-5.1.8" 5707 5611 sources."ignore-by-default-1.0.1" 5708 5612 sources."immediate-3.0.6" ··· 5710 5614 sources."import-lazy-2.1.0" 5711 5615 sources."imurmurhash-0.1.4" 5712 5616 sources."inflight-1.0.6" 5713 - sources."inherits-2.0.3" 5617 + sources."inherits-2.0.4" 5714 5618 sources."ini-1.3.7" 5715 5619 sources."ipaddr.js-1.9.1" 5716 - sources."irc-git+https://matrix-org@github.com/matrix-org/node-irc.git#9028c2197c216dd8e6fc2cb3cc07ce2d6bf741a7" 5717 5620 sources."irc-colors-1.5.0" 5718 5621 sources."is-arrayish-0.3.2" 5719 5622 sources."is-binary-path-2.1.0" 5720 5623 sources."is-ci-2.0.0" 5721 5624 sources."is-core-module-2.4.0" 5722 5625 sources."is-extglob-2.1.1" 5723 - sources."is-fullwidth-code-point-2.0.0" 5626 + sources."is-fullwidth-code-point-3.0.0" 5724 5627 sources."is-glob-4.0.1" 5725 5628 sources."is-installed-globally-0.3.2" 5726 5629 sources."is-my-ip-valid-1.0.0" ··· 5741 5644 sources."isstream-0.1.2" 5742 5645 sources."istanbul-lib-coverage-2.0.5" 5743 5646 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" 5757 5649 (sources."istanbul-lib-source-maps-3.0.6" // { 5758 5650 dependencies = [ 5759 - sources."make-dir-2.1.0" 5760 - sources."pify-4.0.1" 5761 5651 sources."rimraf-2.7.1" 5762 5652 ]; 5763 5653 }) 5764 5654 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" 5767 5657 sources."js-tokens-4.0.0" 5768 - sources."js-yaml-3.14.1" 5658 + sources."js-yaml-3.14.0" 5769 5659 sources."jsbn-0.1.1" 5770 5660 sources."jsesc-2.5.2" 5771 5661 sources."json-buffer-3.0.0" ··· 5788 5678 sources."lodash-4.17.21" 5789 5679 sources."lodash.clonedeep-4.5.0" 5790 5680 sources."lodash.flattendeep-4.4.0" 5791 - sources."lodash.merge-4.6.2" 5792 5681 sources."lodash.truncate-4.4.2" 5793 5682 sources."logform-2.2.0" 5794 5683 sources."loglevel-1.7.1" ··· 5796 5685 sources."lowercase-keys-1.0.1" 5797 5686 sources."lru-cache-5.1.1" 5798 5687 sources."lru_map-0.3.3" 5799 - (sources."make-dir-3.1.0" // { 5688 + (sources."make-dir-2.1.0" // { 5800 5689 dependencies = [ 5801 - sources."semver-6.3.0" 5690 + sources."pify-4.0.1" 5691 + sources."semver-5.7.1" 5802 5692 ]; 5803 5693 }) 5804 5694 sources."matrix-appservice-0.8.0" 5805 5695 (sources."matrix-appservice-bridge-2.6.1" // { 5806 5696 dependencies = [ 5807 5697 sources."argparse-2.0.1" 5698 + sources."chalk-4.1.1" 5808 5699 sources."extend-3.0.2" 5700 + sources."has-flag-4.0.0" 5809 5701 sources."js-yaml-4.1.0" 5810 5702 sources."nopt-5.0.0" 5703 + sources."supports-color-7.2.0" 5811 5704 ]; 5812 5705 }) 5813 5706 (sources."matrix-bot-sdk-0.4.0" // { 5814 5707 dependencies = [ 5815 5708 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 + }) 5816 5723 sources."sanitize-html-1.27.5" 5724 + sources."supports-color-7.2.0" 5817 5725 ]; 5818 5726 }) 5819 5727 (sources."matrix-js-sdk-9.11.0" // { ··· 5822 5730 ]; 5823 5731 }) 5824 5732 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" 5830 5734 sources."media-typer-0.3.0" 5831 5735 sources."merge-descriptors-1.0.1" 5832 5736 sources."merge-source-map-1.1.0" 5833 5737 sources."merge2-1.4.1" 5834 5738 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 + }) 5836 5744 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" 5839 5747 sources."mimic-response-1.0.1" 5840 5748 sources."minimalistic-assert-1.0.1" 5841 5749 sources."minimatch-3.0.4" ··· 5851 5759 ]; 5852 5760 }) 5853 5761 sources."ms-2.1.2" 5854 - sources."nan-2.14.2" 5855 5762 sources."nanoid-3.1.23" 5856 5763 sources."natural-compare-1.4.0" 5857 5764 sources."nedb-1.8.0" ··· 5861 5768 (sources."nodemon-2.0.7" // { 5862 5769 dependencies = [ 5863 5770 sources."debug-3.2.7" 5864 - sources."has-flag-3.0.0" 5771 + sources."semver-5.7.1" 5865 5772 sources."supports-color-5.5.0" 5866 5773 ]; 5867 5774 }) 5868 5775 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 + }) 5870 5781 sources."normalize-path-3.0.0" 5871 5782 sources."normalize-url-4.5.1" 5872 5783 (sources."nyc-14.1.1" // { 5873 5784 dependencies = [ 5874 - sources."make-dir-2.1.0" 5875 - sources."pify-4.0.1" 5876 5785 sources."rimraf-2.7.1" 5877 5786 ]; 5878 5787 }) ··· 5883 5792 sources."on-headers-1.0.2" 5884 5793 sources."once-1.4.0" 5885 5794 sources."one-time-1.0.0" 5886 - sources."optimist-0.3.7" 5887 5795 sources."optionator-0.9.1" 5888 5796 sources."os-homedir-1.0.2" 5889 5797 sources."p-cancelable-1.1.0" ··· 5894 5802 sources."p-timeout-3.2.0" 5895 5803 sources."p-try-2.2.0" 5896 5804 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" 5902 5806 sources."packet-reader-1.0.0" 5903 5807 sources."parent-module-1.0.1" 5904 5808 sources."parse-json-4.0.0" ··· 5907 5811 sources."path-exists-3.0.0" 5908 5812 sources."path-is-absolute-1.0.1" 5909 5813 sources."path-key-3.1.1" 5910 - sources."path-parse-1.0.7" 5814 + sources."path-parse-1.0.6" 5911 5815 sources."path-to-regexp-0.1.7" 5912 5816 sources."path-type-4.0.0" 5913 5817 sources."performance-now-2.1.0" ··· 5918 5822 sources."pg-protocol-1.5.0" 5919 5823 sources."pg-types-2.2.0" 5920 5824 sources."pgpass-1.0.4" 5921 - sources."picomatch-2.3.0" 5825 + sources."picomatch-2.2.2" 5922 5826 sources."pify-3.0.0" 5923 5827 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" 5939 5829 sources."postgres-array-2.0.0" 5940 5830 sources."postgres-bytea-1.0.0" 5941 5831 sources."postgres-date-1.0.7" ··· 5945 5835 sources."process-nextick-args-2.0.1" 5946 5836 sources."progress-2.0.3" 5947 5837 sources."prom-client-13.1.0" 5948 - sources."proxy-addr-2.0.7" 5838 + sources."proxy-addr-2.0.6" 5949 5839 (sources."proxyquire-1.8.0" // { 5950 5840 dependencies = [ 5951 5841 sources."resolve-1.1.7" ··· 5961 5851 sources."queue-microtask-1.2.3" 5962 5852 sources."quick-lru-4.0.1" 5963 5853 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 + }) 5966 5864 (sources."read-pkg-3.0.0" // { 5967 5865 dependencies = [ 5968 5866 sources."path-type-3.0.0" ··· 5971 5869 sources."read-pkg-up-4.0.0" 5972 5870 sources."readable-stream-3.6.0" 5973 5871 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" 5976 5873 sources."regexpp-3.1.0" 5977 5874 sources."registry-auth-token-4.2.1" 5978 5875 sources."registry-url-5.1.0" ··· 6002 5899 sources."domhandler-4.2.0" 6003 5900 sources."escape-string-regexp-4.0.0" 6004 5901 sources."htmlparser2-6.1.0" 6005 - sources."postcss-8.3.0" 6006 5902 ]; 6007 5903 }) 6008 - sources."semver-5.7.1" 6009 - (sources."semver-diff-3.1.1" // { 6010 - dependencies = [ 6011 - sources."semver-6.3.0" 6012 - ]; 6013 - }) 5904 + sources."semver-6.3.0" 5905 + sources."semver-diff-3.1.1" 6014 5906 (sources."send-0.17.1" // { 6015 5907 dependencies = [ 6016 5908 (sources."debug-2.6.9" // { ··· 6027 5919 sources."shebang-command-2.0.0" 6028 5920 sources."shebang-regex-3.0.0" 6029 5921 sources."side-channel-1.0.4" 6030 - sources."signal-exit-3.0.3" 5922 + sources."signal-exit-3.0.2" 6031 5923 sources."simple-swizzle-0.2.2" 6032 5924 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" 6038 5926 sources."source-map-0.6.1" 6039 5927 sources."source-map-js-0.6.2" 6040 5928 (sources."spawn-wrap-1.4.3" // { ··· 6046 5934 sources."spdx-correct-3.1.1" 6047 5935 sources."spdx-exceptions-2.3.0" 6048 5936 sources."spdx-expression-parse-3.0.1" 6049 - sources."spdx-license-ids-3.0.9" 5937 + sources."spdx-license-ids-3.0.8" 6050 5938 sources."split2-3.2.2" 6051 5939 sources."sprintf-js-1.0.3" 6052 5940 sources."sshpk-1.16.1" ··· 6054 5942 sources."statuses-1.5.0" 6055 5943 sources."stealthy-require-1.1.1" 6056 5944 sources."steno-0.4.4" 6057 - (sources."string-width-4.2.2" // { 5945 + (sources."string-width-3.1.0" // { 6058 5946 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" 6063 5949 ]; 6064 5950 }) 6065 5951 (sources."string_decoder-1.3.0" // { ··· 6069 5955 }) 6070 5956 sources."strip-ansi-5.2.0" 6071 5957 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" 6074 5960 (sources."table-6.7.1" // { 6075 5961 dependencies = [ 6076 - sources."ajv-8.6.0" 5962 + sources."ajv-8.4.0" 6077 5963 sources."ansi-regex-5.0.0" 6078 5964 sources."json-schema-traverse-1.0.0" 5965 + sources."string-width-4.2.2" 6079 5966 sources."strip-ansi-6.0.0" 6080 5967 ]; 6081 5968 }) ··· 6095 5982 }) 6096 5983 sources."tough-cookie-2.5.0" 6097 5984 sources."triple-beam-1.3.0" 6098 - sources."tslib-1.14.1" 5985 + sources."tslib-1.11.1" 6099 5986 sources."tsutils-3.21.0" 6100 5987 sources."tunnel-agent-0.6.0" 6101 5988 sources."tweetnacl-0.14.5" ··· 6103 5990 sources."type-fest-0.8.1" 6104 5991 sources."type-is-1.6.18" 6105 5992 sources."typedarray-to-buffer-3.1.5" 6106 - sources."typescript-4.3.2" 5993 + sources."typescript-4.2.3" 6107 5994 (sources."undefsafe-2.0.3" // { 6108 5995 dependencies = [ 6109 5996 sources."debug-2.6.9" ··· 6117 6004 (sources."update-notifier-4.1.3" // { 6118 6005 dependencies = [ 6119 6006 sources."chalk-3.0.0" 6007 + sources."has-flag-4.0.0" 6008 + sources."supports-color-7.2.0" 6120 6009 ]; 6121 6010 }) 6122 - sources."uri-js-4.4.1" 6011 + sources."uri-js-4.2.2" 6123 6012 sources."url-parse-lax-3.0.0" 6124 6013 sources."utf-8-validate-5.0.5" 6125 6014 sources."util-deprecate-1.0.2" ··· 6131 6020 sources."verror-1.10.0" 6132 6021 sources."which-2.0.2" 6133 6022 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 + }) 6135 6030 (sources."winston-3.3.3" // { 6136 6031 dependencies = [ 6137 6032 sources."async-3.2.0" ··· 6145 6040 ]; 6146 6041 }) 6147 6042 sources."word-wrap-1.2.3" 6148 - sources."wordwrap-0.0.3" 6149 6043 (sources."wrap-ansi-5.1.0" // { 6150 6044 dependencies = [ 6151 6045 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" 6155 6046 ]; 6156 6047 }) 6157 6048 sources."wrappy-1.0.2" 6158 - sources."write-file-atomic-3.0.3" 6049 + sources."write-file-atomic-2.4.3" 6159 6050 sources."xdg-basedir-4.0.0" 6160 6051 sources."xtend-4.0.2" 6161 6052 sources."y18n-4.0.3" 6162 6053 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" 6168 6055 sources."yargs-parser-13.1.2" 6169 6056 ]; 6170 6057 buildInputs = globalBuildInputs; ··· 6174 6061 }; 6175 6062 production = false; 6176 6063 bypassCache = true; 6177 - reconstructLock = true; 6064 + reconstructLock = false; 6178 6065 }; 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 + }); 6179 6085 }
+69 -3
pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json
··· 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 + }
+7 -2
pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh
··· 1 1 #!/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 3 3 4 4 set -euo pipefail 5 5 # cd to the folder containing this script ··· 15 15 16 16 echo "matrix-appservice-irc: $CURRENT_VERSION -> $TARGET_VERSION" 17 17 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 19 22 20 23 ./generate-dependencies.sh 24 + 25 + rm ./package-lock-temp.json 21 26 22 27 # Apparently this is done by r-ryantm, so only uncomment for manual usage 23 28 #git add ./package.json ./node-packages.nix
+1 -1
pkgs/servers/monitoring/zabbix/agent2.nix
··· 12 12 13 13 modRoot = "src/go"; 14 14 15 - vendorSha256 = "1iyi7lnknr42gbv25illqnnjc7mshv73ih9anc6rxbf87n9s46ac"; 15 + vendorSha256 = "1417qi061xc4m55z0vz420fr7qpi24kw5yj9wq7iic92smakgkjn"; 16 16 17 17 nativeBuildInputs = [ autoreconfHook pkg-config ]; 18 18 buildInputs = [ libiconv openssl pcre zlib ];
+4 -4
pkgs/servers/unpfs/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "unpfs"; 5 - version = "0.0.2019-05-17"; 5 + version = "unstable-2021-04-23"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "pfpacket"; 9 9 repo = "rust-9p"; 10 - rev = "01cf9c60bff0f35567d876db7be7fb86032b44eb"; 11 - sha256 = "0mhmr1912z5nyfpcvhnlgb3v67a5n7i2n9l5abi05sfqffqssi79"; 10 + rev = "6d9b62aa182c5764e00b96f93109feb605d9eac9"; 11 + sha256 = "sha256-zyDkUb+bFsVnxAE4UODbnRtDim7gqUNuY22vuxMsLZM="; 12 12 }; 13 13 14 14 sourceRoot = "source/example/unpfs"; 15 15 16 - cargoSha256 = "1vdk99qz23lkh5z03qjjs3d6p2vdmxrmd2km9im94gzgcyb2fvjs"; 16 + cargoSha256 = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0="; 17 17 18 18 RUSTC_BOOTSTRAP = 1; 19 19
+2 -2
pkgs/tools/filesystems/dduper/default.nix
··· 5 5 patches = [ 6 6 (fetchpatch { 7 7 name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; 8 - url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/8fab08e0f1901bf54411d25f1767b48c978074cb/patch/btrfs-progs-v5.9/0001-Print-csum-for-a-given-file-on-stdout.patch"; 9 - sha256 = "1li9lslrap70ibad8sij3bgpxn5lqs0j10l60bmy3c36y866q3g1"; 8 + url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/f45d04854a40cb52ae0e6736916d5955cb68b8ee/patch/btrfs-progs-v5.12.1/0001-Print-csum-for-a-given-file-on-stdout.patch"; 9 + sha256 = "0c7dd44q2ww6k9nk5dh6m0f0wbd8x84vb2m61fk6a44nsv2fwz1x"; 10 10 }) 11 11 ]; 12 12 });
+1
pkgs/tools/filesystems/sshfs-fuse/common.nix
··· 56 56 longDescription = macfuse-stubs.warning; 57 57 homepage = "https://github.com/libfuse/sshfs"; 58 58 license = licenses.gpl2Plus; 59 + mainProgram = "sshfs"; 59 60 maintainers = with maintainers; [ primeos ]; 60 61 }; 61 62 }
+2 -2
pkgs/tools/security/pwncat/default.nix
··· 5 5 6 6 buildPythonApplication rec { 7 7 pname = "pwncat"; 8 - version = "0.1.1"; 8 + version = "0.1.2"; 9 9 10 10 src = fetchPypi { 11 11 inherit pname version; 12 - sha256 = "62e625e9061f037cfca7b7455a4f7db4213c1d1302e73d4c475c63f924f1805f"; 12 + sha256 = "1230fdn5mx3wwr3a3nn6z2vwh973n248m11hnx9y3fjq7bgpky67"; 13 13 }; 14 14 15 15 # Tests requires to start containers
+3 -1
pkgs/top-level/all-packages.nix
··· 12799 12799 }; 12800 12800 cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; 12801 12801 cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; 12802 - cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { }; 12802 + cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { 12803 + inherit (darwin.apple_sdk.frameworks) Security; 12804 + }; 12803 12805 cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { 12804 12806 inherit (darwin.apple_sdk.frameworks) Security; 12805 12807 };