diff options
Diffstat (limited to 'pkgs/applications')
460 files changed, 15890 insertions, 24112 deletions
diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 9cb084a6182b9..eca4567984ede 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -16,6 +16,7 @@ , feedbackd , wrapGAppsHook , fetchpatch +, nixosTests }: stdenv.mkDerivation rec { @@ -68,6 +69,8 @@ stdenv.mkDerivation rec { feedbackd ]; + passthru.tests.phosh = nixosTests.phosh; + meta = with lib; { description = "A virtual keyboard supporting Wayland"; homepage = "https://source.puri.sm/Librem5/squeekboard"; diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index 8b03a97d12808..b388674fa4492 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sed -i 's@/usr/bin/install@install@g' Makefile sed -i 's@/bin/rm@rm@g' Makefile sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile + sed -i 's@g++@$(CXX)@g' Makefile ''; preInstall="mkdir -p $out/lib/ladspa"; diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 517a53a5feccc..62a72fea62a0a 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,68 +1,45 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, autoconf +, automake +, libtool +, faad2 +, mp4v2 +}: stdenv.mkDerivation rec { pname = "aacgain"; - version = "1.9.0"; + version = "2.0.0"; - src = fetchFromGitLab { - owner = "mulx"; - repo = "aacgain"; - rev = "7c29dccd878ade1301710959aeebe87a8f0828f5"; - sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0"; + src = fetchFromGitHub { + owner = "dgilman"; + repo = pname; + rev = version; + sha256 = "sha256-9Y23Zh7q3oB4ha17Fpm1Hu2+wtQOA1llj6WDUAO2ARU="; }; - hardeningDisable = [ "format" ]; - - # -Wnarrowing is enabled by default in recent GCC versions, - # causing compilation to fail. - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - postPatch = '' - ( - cd mp4v2 - patch -p0 < ${fetchpatch { - name = "fix_missing_ptr_deref.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7"; - sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9"; - }} - ) - ''; - - configurePhase = '' - runHook preConfigure - cd mp4v2 - ./configure - - cd ../faad2 - ./configure - - cd .. - ./configure - runHook postConfigure + cp -R ${faad2.src}/* 3rdparty/faad2 + cp -R ${mp4v2.src}/* 3rdparty/mp4v2 + chmod -R +w 3rdparty ''; - buildPhase = '' - runHook preBuild - cd mp4v2 - make libmp4v2.la - - cd ../faad2 - make LDFLAGS=-static + nativeBuildInputs = [ + cmake + autoconf + automake + libtool + ]; - cd .. - make - runHook postBuild - ''; - - installPhase = '' - install -D aacgain/aacgain "$out/bin/aacgain" - ''; + NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; meta = with lib; { description = "ReplayGain for AAC files"; - homepage = "https://aacgain.altosdesign.com"; - license = licenses.gpl2; - platforms = platforms.linux; + homepage = "https://github.com/dgilman/aacgain"; + license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = [ maintainers.robbinch ]; }; } diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/applications/audio/aaxtomp3/default.nix new file mode 100644 index 0000000000000..358dfce0d4f05 --- /dev/null +++ b/pkgs/applications/audio/aaxtomp3/default.nix @@ -0,0 +1,56 @@ +{ coreutils +, fetchFromGitHub +, ffmpeg +, findutils +, gnugrep +, gnused +, jq +, lame +, lib +, makeWrapper +, mediainfo +, mp4v2 +, stdenv +}: +let + runtimeInputs = [ + coreutils + ffmpeg + findutils + gnugrep + gnused + jq + lame + mediainfo + mp4v2 + ]; +in +stdenv.mkDerivation rec { + pname = "aaxtomp3"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "krumpetpirate"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg="; + }; + + dontBuild = false; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm755 AAXtoMP3 $out/bin/aaxtomp3 + wrapProgram $out/bin/aaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} + install -Dm755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3 + wrapProgram $out/bin/interactiveaaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} + ''; + + meta = with lib; { + description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS"; + homepage = "https://krumpetpirate.github.io/AAXtoMP3"; + license = licenses.wtfpl; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index 623aa1584521e..e6aaeb1291588 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.10.10"; + version = "1.12.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-LNPG/ETRmgPv8LsYVHol4p5oRCvg+dSYVEe61i8Dvz8="; + sha256 = "sha256-P6sbxhgnlek1IJ4i9yTe/3g/2C8oLPKXI3zbLdswvl8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index fa64cd74e71ad..15b2ad85ea7e3 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { description = "An MPD client built on top of rofi"; homepage = "https://github.com/carnager/clerk"; license = licenses.mit; + broken = true; # not compatible with current version of rofi maintainers = with maintainers; [ anderspapitto ]; }; } diff --git a/pkgs/applications/audio/cplay-ng/default.nix b/pkgs/applications/audio/cplay-ng/default.nix new file mode 100644 index 0000000000000..965cb31fde54d --- /dev/null +++ b/pkgs/applications/audio/cplay-ng/default.nix @@ -0,0 +1,48 @@ +{ lib +, python3 +, fetchFromGitHub +, makeWrapper +, mpv +, pulseaudio +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cplay-ng"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "xi"; + repo = "cplay-ng"; + rev = version; + hash = "sha256-pmuZ1NgrQKEJLoJEVC9wp5deFWc6DiX5DpnISeOOw4k="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/cplay-ng \ + --prefix PATH : ${lib.makeBinPath [ mpv pulseaudio ]} + ''; + + meta = with lib; { + homepage = "https://github.com/xi/cplay-ng"; + description = "Simple curses audio player"; + longDescription = '' + cplay is a minimalist music player with a textual user interface written + in Python. It aims to provide a power-user-friendly interface with simple + filelist and playlist control. + + Instead of building an elaborate database of your music library, cplay + allows you to quickly browse the filesystem and enqueue files, + directories, and playlists. + + The original cplay was started by Ulf Betlehem in 1998 and is no longer + maintained. This is a rewrite that aims to stay true to the original + design while evolving with a shifting environment. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 4da3efbffe471..dc8ea92ae2421 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "csound"; - version = "6.17.0"; + version = "6.18.1"; hardeningDisable = [ "format" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "sha256-O19jm3JxHg4TcQzWQZu1uFjfYN2FR41fCRq5YGnTGD0="; + sha256 = "sha256-O7s92N54+zIl07eIdK/puoSve/qJ3O01fTh0TP+VdZA="; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5b1fbbb2d7df1..d4584e191d50c 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.61"; + version = "1.62"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-dm+l+CECsr3TzL1ZGAqW+NLQXNh5JRtdYVROKOjKMXY="; + sha256 = "sha256-PHDkCE30sVAFXHjG8d/4ETSDS2KO/j43iMMW0PhCFgI="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix new file mode 100644 index 0000000000000..99005937a142e --- /dev/null +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -0,0 +1,49 @@ +{ buildGoModule +, cairo +, fetchFromGitHub +, gdk-pixbuf +, glib +, gobject-introspection +, graphene +, gtk4 +, lib +, pango +, pkg-config +, wrapGAppsHook4 +}: + +buildGoModule rec { + pname = "gtkcord4"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "diamondburned"; + repo = pname; + rev = "v${version}"; + hash = "sha256-uEG1pAHMQT+C/E5rKByflvL0NNkC8SeSPMAXanzvhE4="; + }; + + nativeBuildInputs = [ + gobject-introspection + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + graphene + gtk4 + pango + ]; + + vendorHash = "sha256-QZSjSk1xu5ZcrNEra5TxnUVvlQWb5/h31fm5Nc7WMoI="; + + meta = with lib; { + description = "GTK4 Discord client in Go, attempt #4."; + homepage = "https://github.com/diamondburned/gtkcord4"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hmenke urandom ]; + }; +} diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 17c8f936efd11..bacb67806ebc5 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -89,5 +89,7 @@ mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; + # src link returns 403 + broken = true; }; } diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index e9d2abee91cd8..ed2d2a499303b 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,6 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib +, fetchpatch +}: mkDerivation rec { pname = "jackmix"; @@ -11,9 +13,16 @@ mkDerivation rec { sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h"; }; - patches = [ ./no_error.patch ]; + patches = [ + ./no_error.patch + (fetchpatch { + name = "sconstruct-python3.patch"; + url = "https://github.com/kampfschlaefer/jackmix/commit/3a0c868b267728fdbc69cc3dc1941edac27d97f6.patch"; + hash = "sha256-MLgxIiZ0+C1IVEci9Q347DR+SJUlPG2N3iPvuhRptJU="; + }) + ]; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkg-config ]; + nativeBuildInputs = [ sconsPackages.scons_latest pkg-config ]; buildInputs = [ qtbase lash diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 281a7148dfeae..cbe12a486efa1 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -1,19 +1,34 @@ -{ lib, stdenv, fetchurl, sconsPackages, pkg-config -, libsamplerate, libsndfile, liblo, libjack2, boost }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, sconsPackages +, rubberband +, boost +, libjack2 +, liblo +, libsamplerate +, libsndfile +}: stdenv.mkDerivation rec { pname = "klick"; - version = "0.12.2"; + version = "0.14.2"; - src = fetchurl { - url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; - sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; + src = fetchFromGitHub { + owner = "Allfifthstuning"; + repo = "klick"; + rev = version; + hash = "sha256-jHyeVCmyy9ipbVaF7GSW19DOVpU9EQJoLcGq9uos+eY="; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; + nativeBuildInputs = [ + pkg-config + rubberband + sconsPackages.scons_latest + ]; buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ]; prefixKey = "PREFIX="; - NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { homepage = "http://das.nasophon.de/klick/"; diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/applications/audio/miniplayer/default.nix index 4eea3dbcb7f99..bc9c88b292a0a 100644 --- a/pkgs/applications/audio/miniplayer/default.nix +++ b/pkgs/applications/audio/miniplayer/default.nix @@ -6,12 +6,12 @@ with python3Packages; buildPythonApplication rec { pname = "miniplayer"; - version = "1.7.1"; + version = "1.8.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NrIDv61mRDe9JWpSP8cvlU4CGoN6Ou6XuNOIn1p47Pw="; + hash = "sha256-iUUsVIDLQAiaMomfA2LvvJZ2ePhgADtC6GCwIpRC1MA="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index 4e9b18d7eb651..f32d9e3a3456b 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -2,6 +2,7 @@ , lib , mopidy , python3Packages +, fetchpatch }: python3Packages.buildPythonApplication rec { @@ -13,6 +14,15 @@ python3Packages.buildPythonApplication rec { sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9"; }; + patches = [ + # Fix tests with newer Mopidy versions >=3.4.0 -- mopidy/mopidy-local#69 + (fetchpatch { + name = "update-tests-for-mopidy-3.4.0.patch"; + url = "https://github.com/mopidy/mopidy-local/commit/f2c198f8eb253f62100afc58f652e73a76d5a090.patch"; + hash = "sha256-jrlZc/pd00S5q9nOfV1OXu+uP/SvH+Xbi7U52aZajj4="; + }) + ]; + propagatedBuildInputs = [ mopidy python3Packages.uritools diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 6d3db5d50970a..d3ee3ea9a0305 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-F0fIl9DrludZZdzsrl/xsp7TLMgTPbVGtGvMHyD52Yw="; + sha256 = "sha256-cr4v1ScrXLRjqlsCXTm0KvLc+jJbFX1HVKJLrDAtIw8="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix index a66620294dde3..70c7942f3d768 100644 --- a/pkgs/applications/audio/mopidy/ytmusic.nix +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -3,33 +3,20 @@ , mopidy }: -let - python = python3.override { - packageOverrides = self: super: { - ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec { - version = "0.22.0"; - format = "setuptools"; - src = old.src.override { - inherit version; - hash = "sha256-CZ4uoW4UHn5C+MckQXysTdydaApn99b0UCnF5RPb7DI="; - }; - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "mopidy-ytmusic"; - version = "0.3.7"; + version = "0.3.8"; - src = python.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit version; - pname = "Mopidy-YTMusic"; - sha256 = "0gqjvi3nfzkqvbdhihzai241p1h5p037bj2475cc93xwzyyqxcrq"; + pname = "mopidy_ytmusic"; + sha256 = "6b4d8ff9c477dbdd30d0259a009494ebe104cad3f8b37241ae503e5bce4ec2e8"; }; propagatedBuildInputs = [ - (mopidy.override { pythonPackages = python.pkgs; }) - python.pkgs.ytmusicapi - python.pkgs.pytube + (mopidy.override { pythonPackages = python3.pkgs; }) + python3.pkgs.ytmusicapi + python3.pkgs.pytube ]; pythonImportsCheck = [ "mopidy_ytmusic" ]; @@ -38,6 +25,7 @@ in python.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic/blob/v${version}/CHANGELOG.rst"; description = "Mopidy extension for playing music from YouTube Music"; homepage = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic"; license = licenses.asl20; diff --git a/pkgs/applications/audio/museeks/default.nix b/pkgs/applications/audio/museeks/default.nix new file mode 100644 index 0000000000000..2db7b9e46df4c --- /dev/null +++ b/pkgs/applications/audio/museeks/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "museeks"; + version = "0.13.1"; + + src = fetchurl { + url = "https://github.com/martpie/museeks/releases/download/${version}/museeks-x86_64.AppImage"; + hash = "sha256-LvunhCFmpv00TnXzWjp3kQUAhoKpmp6pqKgcaUqZV+o="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/usr/share/icons $out/share/ + install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A simple, clean and cross-platform music player"; + homepage = "https://github.com/martpie/museeks"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch index f47c233d6aee0..45754a1f9e5d8 100644 --- a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch +++ b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch @@ -1,16 +1,18 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..f191345 +index 0000000..471b1a5 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2649 @@ +@@ -0,0 +1,2778 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. ++version = 3 ++ +[[package]] +name = "addr2line" -+version = "0.14.1" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" ++checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] @@ -23,18 +25,18 @@ index 0000000..f191345 + +[[package]] +name = "aho-corasick" -+version = "0.7.15" ++version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "alsa" -+version = "0.5.0" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18" ++checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +dependencies = [ + "alsa-sys", + "bitflags", @@ -53,43 +55,41 @@ index 0000000..f191345 +] + +[[package]] -+name = "arrayref" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.2" ++name = "android_system_properties" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" ++dependencies = [ ++ "libc", ++] + +[[package]] +name = "async-compression" -+version = "0.3.7" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537" ++checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "bytes 0.5.6", + "flate2", + "futures-core", + "memchr", -+ "pin-project-lite 0.2.6", ++ "pin-project-lite 0.2.9", +] + +[[package]] +name = "autocfg" -+version = "1.0.1" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" -+version = "0.3.56" ++version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" ++checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line", ++ "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", @@ -99,9 +99,9 @@ index 0000000..f191345 + +[[package]] +name = "base-x" -+version = "0.2.8" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" ++checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base64" @@ -111,15 +111,15 @@ index 0000000..f191345 + +[[package]] +name = "base64" -+version = "0.13.0" ++version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bindgen" -+version = "0.56.0" ++version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" ++checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" +dependencies = [ + "bitflags", + "cexpr", @@ -132,30 +132,20 @@ index 0000000..f191345 + "regex", + "rustc-hash", + "shlex", ++ "syn", +] + +[[package]] +name = "bitflags" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "blake2b_simd" -+version = "0.5.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -+dependencies = [ -+ "arrayref", -+ "arrayvec", -+ "constant_time_eq", -+] ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" -+version = "3.6.1" ++version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" ++checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "byteorder" @@ -181,9 +171,9 @@ index 0000000..f191345 + +[[package]] +name = "bytes" -+version = "1.0.1" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" ++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "cassowary" @@ -193,9 +183,9 @@ index 0000000..f191345 + +[[package]] +name = "cc" -+version = "1.0.67" ++version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" ++checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +dependencies = [ + "jobserver", +] @@ -208,11 +198,11 @@ index 0000000..f191345 + +[[package]] +name = "cexpr" -+version = "0.4.0" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" ++checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ -+ "nom 5.1.2", ++ "nom 7.1.1", +] + +[[package]] @@ -229,22 +219,24 @@ index 0000000..f191345 + +[[package]] +name = "chrono" -+version = "0.4.19" ++version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ -+ "libc", ++ "iana-time-zone", ++ "js-sys", + "num-integer", -+ "num-traits 0.2.14", -+ "time 0.1.43", ++ "num-traits 0.2.15", ++ "time 0.1.44", ++ "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "clang-sys" -+version = "1.1.1" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1" ++checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +dependencies = [ + "glob", + "libc", @@ -258,12 +250,22 @@ index 0000000..f191345 +checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" + +[[package]] ++name = "codespan-reporting" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" ++dependencies = [ ++ "termcolor", ++ "unicode-width", ++] ++ ++[[package]] +name = "combine" -+version = "4.5.2" ++version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e" ++checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ -+ "bytes 1.0.1", ++ "bytes 1.2.1", + "memchr", +] + @@ -276,7 +278,7 @@ index 0000000..f191345 + "lazy_static 1.4.0", + "nom 4.2.3", + "rust-ini", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde-hjson", + "serde_json", + "toml 0.4.10", @@ -285,15 +287,9 @@ index 0000000..f191345 + +[[package]] +name = "const_fn" -+version = "0.4.6" ++version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28" -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "cookie" @@ -302,8 +298,8 @@ index 0000000..f191345 +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +dependencies = [ + "percent-encoding", -+ "time 0.2.26", -+ "version_check 0.9.3", ++ "time 0.2.27", ++ "version_check 0.9.4", +] + +[[package]] @@ -313,36 +309,30 @@ index 0000000..f191345 +checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" +dependencies = [ + "cookie", -+ "idna", ++ "idna 0.2.3", + "log", + "publicsuffix", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_json", -+ "time 0.2.26", ++ "time 0.2.27", + "url", +] + +[[package]] +name = "core-foundation" -+version = "0.9.1" ++version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" ++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ -+ "core-foundation-sys 0.8.2", ++ "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.2" ++version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" ++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "coreaudio-rs" @@ -356,21 +346,21 @@ index 0000000..f191345 + +[[package]] +name = "coreaudio-sys" -+version = "0.2.8" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa" ++checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" -+version = "0.13.3" ++version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25" ++checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +dependencies = [ + "alsa", -+ "core-foundation-sys 0.6.2", ++ "core-foundation-sys", + "coreaudio-rs", + "jni", + "js-sys", @@ -390,29 +380,62 @@ index 0000000..f191345 + +[[package]] +name = "crc32fast" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] -+name = "crossbeam-utils" -+version = "0.8.3" ++name = "cxx" ++version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" ++checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +dependencies = [ -+ "autocfg", -+ "cfg-if 1.0.0", -+ "lazy_static 1.4.0", ++ "cc", ++ "cxxbridge-flags", ++ "cxxbridge-macro", ++ "link-cplusplus", ++] ++ ++[[package]] ++name = "cxx-build" ++version = "1.0.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" ++dependencies = [ ++ "cc", ++ "codespan-reporting", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "scratch", ++ "syn", ++] ++ ++[[package]] ++name = "cxxbridge-flags" ++version = "1.0.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" ++ ++[[package]] ++name = "cxxbridge-macro" ++version = "1.0.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] +name = "darling" -+version = "0.10.2" ++version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" ++checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", @@ -420,9 +443,9 @@ index 0000000..f191345 + +[[package]] +name = "darling_core" -+version = "0.10.2" ++version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" ++checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", @@ -434,9 +457,9 @@ index 0000000..f191345 + +[[package]] +name = "darling_macro" -+version = "0.10.2" ++version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" ++checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", @@ -454,17 +477,6 @@ index 0000000..f191345 +] + +[[package]] -+name = "derivative" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -476,9 +488,9 @@ index 0000000..f191345 + +[[package]] +name = "dirs-sys" -+version = "0.3.5" ++version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" ++checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", @@ -499,15 +511,15 @@ index 0000000..f191345 + +[[package]] +name = "either" -+version = "1.6.1" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" -+version = "0.8.28" ++version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" ++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] @@ -535,14 +547,21 @@ index 0000000..f191345 +] + +[[package]] ++name = "fastrand" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] +name = "flate2" -+version = "1.0.20" ++version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" ++checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ -+ "cfg-if 1.0.0", + "crc32fast", -+ "libc", + "miniz_oxide", +] + @@ -569,11 +588,10 @@ index 0000000..f191345 + +[[package]] +name = "form_urlencoded" -+version = "1.0.1" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" ++checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ -+ "matches", + "percent-encoding", +] + @@ -595,9 +613,9 @@ index 0000000..f191345 + +[[package]] +name = "futures" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" ++checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", @@ -610,9 +628,9 @@ index 0000000..f191345 + +[[package]] +name = "futures-channel" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" ++checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", @@ -620,15 +638,15 @@ index 0000000..f191345 + +[[package]] +name = "futures-core" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" ++checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" ++checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", @@ -637,17 +655,16 @@ index 0000000..f191345 + +[[package]] +name = "futures-io" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" ++checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-macro" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" ++checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ -+ "proc-macro-hack", + "proc-macro2", + "quote", + "syn", @@ -655,21 +672,21 @@ index 0000000..f191345 + +[[package]] +name = "futures-sink" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" ++checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" ++checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" ++checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-channel", + "futures-core", @@ -678,10 +695,8 @@ index 0000000..f191345 + "futures-sink", + "futures-task", + "memchr", -+ "pin-project-lite 0.2.6", ++ "pin-project-lite 0.2.9", + "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", + "slab", +] + @@ -698,20 +713,20 @@ index 0000000..f191345 + +[[package]] +name = "getrandom" -+version = "0.2.2" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if 1.0.0", + "libc", -+ "wasi 0.10.2+wasi-snapshot-preview1", ++ "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" -+version = "0.23.0" ++version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" ++checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" + +[[package]] +name = "glob" @@ -741,15 +756,15 @@ index 0000000..f191345 + +[[package]] +name = "hashbrown" -+version = "0.9.1" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] @@ -762,19 +777,19 @@ index 0000000..f191345 + +[[package]] +name = "hound" -+version = "3.4.0" ++version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" ++checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" + +[[package]] +name = "http" -+version = "0.2.3" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" ++checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ -+ "bytes 1.0.1", ++ "bytes 1.2.1", + "fnv", -+ "itoa", ++ "itoa 1.0.4", +] + +[[package]] @@ -789,9 +804,9 @@ index 0000000..f191345 + +[[package]] +name = "httparse" -+version = "1.3.5" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" ++checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" @@ -814,7 +829,7 @@ index 0000000..f191345 + "http-body", + "httparse", + "httpdate", -+ "itoa", ++ "itoa 0.4.8", + "pin-project", + "socket2", + "tokio", @@ -837,6 +852,30 @@ index 0000000..f191345 +] + +[[package]] ++name = "iana-time-zone" ++version = "0.1.53" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" ++dependencies = [ ++ "android_system_properties", ++ "core-foundation-sys", ++ "iana-time-zone-haiku", ++ "js-sys", ++ "wasm-bindgen", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "iana-time-zone-haiku" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" ++dependencies = [ ++ "cxx", ++ "cxx-build", ++] ++ ++[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -844,9 +883,9 @@ index 0000000..f191345 + +[[package]] +name = "idna" -+version = "0.2.2" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" ++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", @@ -854,10 +893,20 @@ index 0000000..f191345 +] + +[[package]] ++name = "idna" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" ++dependencies = [ ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] +name = "indexmap" -+version = "1.6.2" ++version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" ++checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", @@ -865,9 +914,9 @@ index 0000000..f191345 + +[[package]] +name = "instant" -+version = "0.1.9" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] @@ -883,9 +932,9 @@ index 0000000..f191345 + +[[package]] +name = "ipnet" -+version = "2.3.0" ++version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" ++checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" + +[[package]] +name = "itertools" @@ -898,15 +947,21 @@ index 0000000..f191345 + +[[package]] +name = "itoa" -+version = "0.4.7" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "itoa" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "jni" -+version = "0.18.0" ++version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf" ++checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", @@ -924,18 +979,18 @@ index 0000000..f191345 + +[[package]] +name = "jobserver" -+version = "0.1.21" ++version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" ++checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" -+version = "0.3.50" ++version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" ++checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] @@ -981,30 +1036,39 @@ index 0000000..f191345 + +[[package]] +name = "libc" -+version = "0.2.92" ++version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714" ++checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libdbus-sys" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0" ++checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libloading" -+version = "0.7.0" ++version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" ++checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] ++name = "link-cplusplus" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] +name = "linked-hash-map" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1016,33 +1080,34 @@ index 0000000..f191345 + +[[package]] +name = "linked-hash-map" -+version = "0.5.4" ++version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" ++checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "lock_api" -+version = "0.4.2" ++version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" ++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ ++ "autocfg", + "scopeguard", +] + +[[package]] +name = "log" -+version = "0.4.14" ++version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "log-panics" -+version = "2.0.0" ++version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae0136257df209261daa18d6c16394757c63e032e27aafd8b07788b051082bef" ++checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "log", +] @@ -1058,15 +1123,24 @@ index 0000000..f191345 + +[[package]] +name = "matches" -+version = "0.1.8" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" -+version = "2.3.4" ++version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] + +[[package]] +name = "mime" @@ -1076,15 +1150,21 @@ index 0000000..f191345 + +[[package]] +name = "mime_guess" -+version = "2.0.3" ++version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" ++checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] ++name = "minimal-lexical" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" ++ ++[[package]] +name = "minimp3" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1106,12 +1186,11 @@ index 0000000..f191345 + +[[package]] +name = "miniz_oxide" -+version = "0.4.4" ++version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" ++checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", -+ "autocfg", +] + +[[package]] @@ -1156,9 +1235,9 @@ index 0000000..f191345 + +[[package]] +name = "native-tls" -+version = "0.2.7" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" ++checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static 1.4.0", + "libc", @@ -1174,10 +1253,11 @@ index 0000000..f191345 + +[[package]] +name = "ndk" -+version = "0.3.0" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" ++checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ ++ "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", @@ -1185,24 +1265,31 @@ index 0000000..f191345 +] + +[[package]] ++name = "ndk-context" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" ++ ++[[package]] +name = "ndk-glue" -+version = "0.3.0" ++version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" ++checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" +dependencies = [ + "lazy_static 1.4.0", + "libc", + "log", + "ndk", ++ "ndk-context", + "ndk-macro", + "ndk-sys", +] + +[[package]] +name = "ndk-macro" -+version = "0.2.0" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" ++checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling", + "proc-macro-crate", @@ -1213,15 +1300,18 @@ index 0000000..f191345 + +[[package]] +name = "ndk-sys" -+version = "0.2.1" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" ++checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" ++dependencies = [ ++ "jni-sys", ++] + +[[package]] +name = "net2" -+version = "0.2.37" ++version = "0.2.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" ++checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +dependencies = [ + "cfg-if 0.1.10", + "libc", @@ -1237,6 +1327,7 @@ index 0000000..f191345 + "bytes 0.4.12", + "chrono", + "config", ++ "cpal", + "dbus", + "dirs", + "failure", @@ -1248,11 +1339,11 @@ index 0000000..f191345 + "mp3-duration", + "num-bigint", + "openssl", -+ "rand 0.7.3", ++ "rand", + "regex", + "reqwest", + "rodio", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_derive", + "serde_json", + "serde_urlencoded 0.6.1", @@ -1266,14 +1357,15 @@ index 0000000..f191345 + +[[package]] +name = "nix" -+version = "0.20.0" ++version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" ++checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", ++ "memoffset", +] + +[[package]] @@ -1288,12 +1380,12 @@ index 0000000..f191345 + +[[package]] +name = "nom" -+version = "5.1.2" ++version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" ++checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", -+ "version_check 0.9.3", ++ "minimal-lexical", +] + +[[package]] @@ -1304,7 +1396,7 @@ index 0000000..f191345 +dependencies = [ + "autocfg", + "num-integer", -+ "num-traits 0.2.14", ++ "num-traits 0.2.15", +] + +[[package]] @@ -1320,12 +1412,12 @@ index 0000000..f191345 + +[[package]] +name = "num-integer" -+version = "0.1.44" ++version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", -+ "num-traits 0.2.14", ++ "num-traits 0.2.15", +] + +[[package]] @@ -1334,23 +1426,23 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ -+ "num-traits 0.2.14", ++ "num-traits 0.2.15", +] + +[[package]] +name = "num-traits" -+version = "0.2.14" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" -+version = "1.13.0" ++version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", @@ -1358,19 +1450,18 @@ index 0000000..f191345 + +[[package]] +name = "num_enum" -+version = "0.5.1" ++version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" ++checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ -+ "derivative", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" -+version = "0.5.1" ++version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e" ++checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", @@ -1386,29 +1477,32 @@ index 0000000..f191345 + +[[package]] +name = "object" -+version = "0.23.0" ++version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" ++checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" ++dependencies = [ ++ "memchr", ++] + +[[package]] +name = "oboe" -+version = "0.4.1" ++version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4" ++checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +dependencies = [ + "jni", + "ndk", -+ "ndk-glue", ++ "ndk-context", + "num-derive", -+ "num-traits 0.2.14", ++ "num-traits 0.2.15", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" -+version = "0.4.0" ++version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103" ++checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +dependencies = [ + "cc", +] @@ -1424,35 +1518,47 @@ index 0000000..f191345 + +[[package]] +name = "once_cell" -+version = "1.7.2" ++version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" ++checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "openssl" -+version = "0.10.33" ++version = "0.10.42" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" ++checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", ++ "openssl-macros", + "openssl-sys", +] + +[[package]] ++name = "openssl-macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] +name = "openssl-probe" -+version = "0.1.2" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" -+version = "0.9.61" ++version = "0.9.77" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" ++checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +dependencies = [ + "autocfg", + "cc", @@ -1463,9 +1569,9 @@ index 0000000..f191345 + +[[package]] +name = "parking_lot" -+version = "0.11.1" ++version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" ++checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", @@ -1474,14 +1580,14 @@ index 0000000..f191345 + +[[package]] +name = "parking_lot_core" -+version = "0.8.3" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" ++checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", -+ "redox_syscall 0.2.5", ++ "redox_syscall 0.2.16", + "smallvec", + "winapi 0.3.9", +] @@ -1494,24 +1600,24 @@ index 0000000..f191345 + +[[package]] +name = "percent-encoding" -+version = "2.1.0" ++version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" -+version = "1.0.6" ++version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" ++checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" -+version = "1.0.6" ++version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" ++checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", @@ -1526,9 +1632,9 @@ index 0000000..f191345 + +[[package]] +name = "pin-project-lite" -+version = "0.2.6" ++version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" ++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" @@ -1538,23 +1644,25 @@ index 0000000..f191345 + +[[package]] +name = "pkg-config" -+version = "0.3.19" ++version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "ppv-lite86" -+version = "0.2.10" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" -+version = "0.1.5" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ -+ "toml 0.5.8", ++ "once_cell", ++ "thiserror", ++ "toml 0.5.9", +] + +[[package]] @@ -1564,18 +1672,12 @@ index 0000000..f191345 +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] -+name = "proc-macro-nested" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -+ -+[[package]] +name = "proc-macro2" -+version = "1.0.26" ++version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" ++checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ -+ "unicode-xid", ++ "unicode-ident", +] + +[[package]] @@ -1584,15 +1686,15 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" +dependencies = [ -+ "idna", ++ "idna 0.2.3", + "url", +] + +[[package]] +name = "quote" -+version = "1.0.9" ++version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] @@ -1605,21 +1707,9 @@ index 0000000..f191345 +dependencies = [ + "getrandom 0.1.16", + "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc 0.2.0", -+] -+ -+[[package]] -+name = "rand" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -+dependencies = [ -+ "libc", -+ "rand_chacha 0.3.0", -+ "rand_core 0.6.2", -+ "rand_hc 0.3.0", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", +] + +[[package]] @@ -1629,17 +1719,7 @@ index 0000000..f191345 +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core 0.6.2", ++ "rand_core", +] + +[[package]] @@ -1652,30 +1732,12 @@ index 0000000..f191345 +] + +[[package]] -+name = "rand_core" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -+dependencies = [ -+ "getrandom 0.2.2", -+] -+ -+[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -+dependencies = [ -+ "rand_core 0.6.2", ++ "rand_core", +] + +[[package]] @@ -1686,9 +1748,9 @@ index 0000000..f191345 + +[[package]] +name = "redox_syscall" -+version = "0.2.5" ++version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] @@ -1699,25 +1761,25 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +dependencies = [ -+ "redox_syscall 0.2.5", ++ "redox_syscall 0.2.16", +] + +[[package]] +name = "redox_users" -+version = "0.3.5" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" ++checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ -+ "getrandom 0.1.16", -+ "redox_syscall 0.1.57", -+ "rust-argon2", ++ "getrandom 0.2.8", ++ "redox_syscall 0.2.16", ++ "thiserror", +] + +[[package]] +name = "regex" -+version = "1.4.5" ++version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" ++checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", @@ -1726,9 +1788,9 @@ index 0000000..f191345 + +[[package]] +name = "regex-syntax" -+version = "0.6.23" ++version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" ++checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" @@ -1746,7 +1808,7 @@ index 0000000..f191345 +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "async-compression", -+ "base64 0.13.0", ++ "base64 0.13.1", + "bytes 0.5.6", + "cookie", + "cookie_store", @@ -1765,10 +1827,10 @@ index 0000000..f191345 + "mime_guess", + "native-tls", + "percent-encoding", -+ "pin-project-lite 0.2.6", -+ "serde 1.0.125", -+ "serde_urlencoded 0.7.0", -+ "time 0.2.26", ++ "pin-project-lite 0.2.9", ++ "serde 1.0.147", ++ "serde_urlencoded 0.7.1", ++ "time 0.2.27", + "tokio", + "tokio-socks", + "tokio-tls", @@ -1781,9 +1843,9 @@ index 0000000..f191345 + +[[package]] +name = "rodio" -+version = "0.13.1" ++version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f" ++checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" +dependencies = [ + "claxon", + "cpal", @@ -1793,18 +1855,6 @@ index 0000000..f191345 +] + +[[package]] -+name = "rust-argon2" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -+dependencies = [ -+ "base64 0.13.0", -+ "blake2b_simd", -+ "constant_time_eq", -+ "crossbeam-utils", -+] -+ -+[[package]] +name = "rust-ini" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1812,9 +1862,9 @@ index 0000000..f191345 + +[[package]] +name = "rustc-demangle" -+version = "0.1.18" ++version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" ++checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustc-hash" @@ -1833,9 +1883,9 @@ index 0000000..f191345 + +[[package]] +name = "ryu" -+version = "1.0.5" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "same-file" @@ -1848,12 +1898,12 @@ index 0000000..f191345 + +[[package]] +name = "schannel" -+version = "0.1.19" ++version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static 1.4.0", -+ "winapi 0.3.9", ++ "windows-sys", +] + +[[package]] @@ -1863,25 +1913,31 @@ index 0000000..f191345 +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] ++name = "scratch" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" ++ ++[[package]] +name = "security-framework" -+version = "2.2.0" ++version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" ++checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", -+ "core-foundation-sys 0.8.2", ++ "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" -+version = "2.2.0" ++version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" ++checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ -+ "core-foundation-sys 0.8.2", ++ "core-foundation-sys", + "libc", +] + @@ -1908,9 +1964,9 @@ index 0000000..f191345 + +[[package]] +name = "serde" -+version = "1.0.125" ++version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" ++checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +dependencies = [ + "serde_derive", +] @@ -1930,9 +1986,9 @@ index 0000000..f191345 + +[[package]] +name = "serde_derive" -+version = "1.0.125" ++version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" ++checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", @@ -1941,13 +1997,13 @@ index 0000000..f191345 + +[[package]] +name = "serde_json" -+version = "1.0.64" ++version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +dependencies = [ -+ "itoa", ++ "itoa 1.0.4", + "ryu", -+ "serde 1.0.125", ++ "serde 1.0.147", +] + +[[package]] @@ -1966,34 +2022,43 @@ index 0000000..f191345 +checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +dependencies = [ + "dtoa", -+ "itoa", -+ "serde 1.0.125", ++ "itoa 0.4.8", ++ "serde 1.0.147", + "url", +] + +[[package]] +name = "serde_urlencoded" -+version = "0.7.0" ++version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" ++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", -+ "itoa", ++ "itoa 1.0.4", + "ryu", -+ "serde 1.0.125", ++ "serde 1.0.147", +] + +[[package]] +name = "sha1" -+version = "0.6.0" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" ++dependencies = [ ++ "sha1_smol", ++] ++ ++[[package]] ++name = "sha1_smol" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" ++checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "shlex" -+version = "0.1.1" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "simple-logging" @@ -2008,9 +2073,12 @@ index 0000000..f191345 + +[[package]] +name = "slab" -+version = "0.4.2" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++dependencies = [ ++ "autocfg", ++] + +[[package]] +name = "slice-deque" @@ -2025,9 +2093,9 @@ index 0000000..f191345 + +[[package]] +name = "smallvec" -+version = "1.6.1" ++version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" ++checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" @@ -2046,7 +2114,7 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ -+ "version_check 0.9.3", ++ "version_check 0.9.4", +] + +[[package]] @@ -2077,7 +2145,7 @@ index 0000000..f191345 +dependencies = [ + "proc-macro2", + "quote", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_derive", + "syn", +] @@ -2091,7 +2159,7 @@ index 0000000..f191345 + "base-x", + "proc-macro2", + "quote", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_derive", + "serde_json", + "sha1", @@ -2106,26 +2174,26 @@ index 0000000..f191345 + +[[package]] +name = "strsim" -+version = "0.9.3" ++version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" ++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" -+version = "1.0.68" ++version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e8fd87" ++checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", -+ "unicode-xid", ++ "unicode-ident", +] + +[[package]] +name = "synstructure" -+version = "0.12.4" ++version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", @@ -2135,19 +2203,28 @@ index 0000000..f191345 + +[[package]] +name = "tempfile" -+version = "3.2.0" ++version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if 1.0.0", ++ "fastrand", + "libc", -+ "rand 0.8.3", -+ "redox_syscall 0.2.5", ++ "redox_syscall 0.2.16", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] ++name = "termcolor" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] +name = "termion" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2155,24 +2232,24 @@ index 0000000..f191345 +dependencies = [ + "libc", + "numtoa", -+ "redox_syscall 0.2.5", ++ "redox_syscall 0.2.16", + "redox_termios", +] + +[[package]] +name = "thiserror" -+version = "1.0.24" ++version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" ++checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.24" ++version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" ++checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", @@ -2192,26 +2269,27 @@ index 0000000..f191345 + +[[package]] +name = "time" -+version = "0.1.43" ++version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" -+version = "0.2.26" ++version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" ++checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb 0.4.20", + "time-macros", -+ "version_check 0.9.3", ++ "version_check 0.9.4", + "winapi 0.3.9", +] + @@ -2227,9 +2305,9 @@ index 0000000..f191345 + +[[package]] +name = "time-macros-impl" -+version = "0.1.1" ++version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" ++checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", @@ -2240,9 +2318,9 @@ index 0000000..f191345 + +[[package]] +name = "tinyvec" -+version = "1.1.1" ++version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" ++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] @@ -2326,43 +2404,43 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +dependencies = [ -+ "serde 1.0.125", ++ "serde 1.0.147", +] + +[[package]] +name = "toml" -+version = "0.5.8" ++version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ -+ "serde 1.0.125", ++ "serde 1.0.147", +] + +[[package]] +name = "tower-service" -+version = "0.3.1" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" ++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" -+version = "0.1.25" ++version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" ++checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "log", -+ "pin-project-lite 0.2.6", ++ "pin-project-lite 0.2.9", + "tracing-core", +] + +[[package]] +name = "tracing-core" -+version = "0.1.17" ++version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" ++checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ -+ "lazy_static 1.4.0", ++ "once_cell", +] + +[[package]] @@ -2403,62 +2481,64 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ -+ "version_check 0.9.3", ++ "version_check 0.9.4", +] + +[[package]] +name = "unicode-bidi" -+version = "0.3.4" ++version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+dependencies = [ -+ "matches", -+] ++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" -+version = "0.1.17" ++version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" ++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" -+version = "1.7.1" ++version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" ++checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "unicode-width" -+version = "0.1.8" ++version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" -+version = "0.2.1" ++version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" -+version = "2.2.1" ++version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" ++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", -+ "idna", -+ "matches", ++ "idna 0.3.0", + "percent-encoding", +] + +[[package]] +name = "vcpkg" -+version = "0.2.11" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" @@ -2468,9 +2548,9 @@ index 0000000..f191345 + +[[package]] +name = "version_check" -+version = "0.9.3" ++version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" @@ -2501,31 +2581,37 @@ index 0000000..f191345 + +[[package]] +name = "wasi" -+version = "0.10.2+wasi-snapshot-preview1" ++version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" ++checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if 1.0.0", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_json", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" ++checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", -+ "lazy_static 1.4.0", + "log", ++ "once_cell", + "proc-macro2", + "quote", + "syn", @@ -2534,9 +2620,9 @@ index 0000000..f191345 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.23" ++version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" ++checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", @@ -2546,9 +2632,9 @@ index 0000000..f191345 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" ++checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", @@ -2556,9 +2642,9 @@ index 0000000..f191345 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" ++checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", @@ -2569,15 +2655,15 @@ index 0000000..f191345 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" ++checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" -+version = "0.3.50" ++version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" ++checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2627,6 +2713,49 @@ index 0000000..f191345 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] ++name = "windows-sys" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" ++dependencies = [ ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" ++ ++[[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2651,5 +2780,5 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ -+ "linked-hash-map 0.5.4", ++ "linked-hash-map 0.5.6", +] diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index f6ccee3e535ea..90d645804b77b 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "netease-music-tui"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "betta-cyber"; repo = "netease-music-tui"; rev = "v${version}"; - sha256 = "sha256-ILJkejRKG2DRXgR6O2tAFbrbd8HtnLZJmITq7hF41DQ="; + sha256 = "sha256-+zRXihWg65DtyX3yD04CsW8aXIvNph36PW2veeg36lg="; }; cargoPatches = [ ./cargo-lock.patch ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib openssl ]; - cargoSha256 = "sha256-/JQDUtSSkuO9nrYVSkQOaZjps1BUuH8Bc1SMyDSSJS4="; + cargoSha256 = "sha256-i+W/KwnqdaHcrdaWYUuCUeFlRKekVuEvFh/pxDolPNU="; meta = with lib; { homepage = "https://github.com/betta-cyber/netease-music-tui"; diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 0152657745070..3c57041e45589 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,21 +2,21 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-XgwlRdwUSl4gIRKqk6BnMAKarVvp291zk8vmNkuRWKo="; + hash = "sha256-6tRd8boVwWc8qGlklYqA/Kp76VOMvtUJlu/G/InvHkA="; }; - patches = [ - # Use generated package-lock.json since upstream does not provide one in releases - ./package-lock.json.patch - ]; + # Remove some Electron stuff from package.json + postPatch = '' + sed -i -e '/"electron"\|"electron-installer-debian"/d' package.json + ''; - npmDepsHash = "sha256-SGLcFjPnmhFoeXtP4gfGr4Qa1dTaXwSnzkweEvYW/1k="; + npmDepsHash = "sha256-M+6+zrxy8VpJQS0dG/xORMbflKEq8wO2DEOjGrA6OUw="; nativeBuildInputs = [ copyDesktopItems @@ -38,7 +38,7 @@ buildNpmPackage rec { runHook preInstall # prune unused deps - npm prune --omit dev $npmFlags + npm prune --omit dev --no-save $npmFlags # copy built app and node_modules directories mkdir -p $out/lib/node_modules/open-stage-control diff --git a/pkgs/applications/audio/open-stage-control/package-lock.json.patch b/pkgs/applications/audio/open-stage-control/package-lock.json.patch deleted file mode 100644 index 44a82d595aad1..0000000000000 --- a/pkgs/applications/audio/open-stage-control/package-lock.json.patch +++ /dev/null @@ -1,18247 +0,0 @@ ---- /dev/null 2022-11-10 08:46:51.851132440 -0500 -+++ ./package-lock.json 2022-11-10 10:15:51.122373816 -0500 -@@ -0,0 +1,18244 @@ -+{ -+ "name": "open-stage-control", -+ "version": "1.20.0", -+ "lockfileVersion": 2, -+ "requires": true, -+ "packages": { -+ "": { -+ "name": "open-stage-control", -+ "version": "1.20.0", -+ "hasInstallScript": true, -+ "license": "GPL-3.0", -+ "dependencies": { -+ "@babel/core": "7.18.0", -+ "@babel/eslint-parser": "7.17.0", -+ "@babel/plugin-proposal-object-rest-spread": "7.18.0", -+ "@babel/polyfill": "7.12.1", -+ "@babel/preset-env": "7.18.0", -+ "@electron/remote": "2.0.8", -+ "ansi-html": "0.0.9", -+ "babelify": "10.0.0", -+ "balanced-match": "2.0.0", -+ "bonjour": "github:jean-emmanuel/bonjour", -+ "brace": "0.11.1", -+ "browserify": "17.0.0", -+ "chokidar": "3.5.3", -+ "chroma-js": "2.4.2", -+ "core-js": "3.22.5", -+ "cpr": "3.0.1", -+ "deep-extend": "0.6.0", -+ "electron-localshortcut": "3.2.1", -+ "electron-packager": "15.2.0", -+ "electron-packager-plugin-non-proprietary-codecs-ffmpeg": "1.0.2", -+ "env-paths": "2.2.1", -+ "eslint": "8.16.0", -+ "exorcist": "2.0.0", -+ "fastdom": "1.0.10", -+ "file-saver": "2.0.5", -+ "gyronorm": "2.0.6", -+ "http-auth": "4.1.9", -+ "json5": "2.2.1", -+ "jsondiffpatch": "0.4.1", -+ "keyboardjs": "2.6.4", -+ "licensify": "3.1.3", -+ "loop-protect": "github:jean-emmanuel/loop-protect#v1.0.1", -+ "minimatch": "5.1.0", -+ "nanohtml": "1.10.0", -+ "nanoid": "3.3.4", -+ "nanomorph": "5.4.3", -+ "node-forge": "1.3.1", -+ "node-mouse": "0.0.2", -+ "node-sass": "7.0.1", -+ "nodemon": "2.0.16", -+ "nosleep.js": "0.12.0", -+ "open": "8.4.0", -+ "osc": "github:jean-emmanuel/osc.js", -+ "python-shell": "3.0.1", -+ "replacestream": "4.0.3", -+ "sanitize-html": "1.27.5", -+ "scope-css": "1.2.1", -+ "screenfull": "5.2.0", -+ "semver": "7.3.7", -+ "send": "0.18.0", -+ "sortablejs": "1.15.0", -+ "source-map-support": "0.5.21", -+ "stacktrace-js": "2.0.2", -+ "through": "2.3.8", -+ "uglifyify": "5.0.2", -+ "webworkify": "1.5.0", -+ "ws": "8.6.0", -+ "yargs": "17.5.1" -+ }, -+ "devDependencies": { -+ "watchify": "4.0.0" -+ }, -+ "engines": { -+ "node": "16" -+ } -+ }, -+ "node_modules/@ampproject/remapping": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", -+ "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", -+ "dependencies": { -+ "@jridgewell/gen-mapping": "^0.1.0", -+ "@jridgewell/trace-mapping": "^0.3.9" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@babel/code-frame": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", -+ "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", -+ "dependencies": { -+ "@babel/highlight": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/compat-data": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", -+ "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/core": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.0.tgz", -+ "integrity": "sha512-Xyw74OlJwDijToNi0+6BBI5mLLR5+5R3bcSH80LXzjzEGEUlvNzujEE71BaD/ApEZHAvFI/Mlmp4M5lIkdeeWw==", -+ "dependencies": { -+ "@ampproject/remapping": "^2.1.0", -+ "@babel/code-frame": "^7.16.7", -+ "@babel/generator": "^7.18.0", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-module-transforms": "^7.18.0", -+ "@babel/helpers": "^7.18.0", -+ "@babel/parser": "^7.18.0", -+ "@babel/template": "^7.16.7", -+ "@babel/traverse": "^7.18.0", -+ "@babel/types": "^7.18.0", -+ "convert-source-map": "^1.7.0", -+ "debug": "^4.1.0", -+ "gensync": "^1.0.0-beta.2", -+ "json5": "^2.2.1", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/babel" -+ } -+ }, -+ "node_modules/@babel/core/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/eslint-parser": { -+ "version": "7.17.0", -+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", -+ "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", -+ "dependencies": { -+ "eslint-scope": "^5.1.1", -+ "eslint-visitor-keys": "^2.1.0", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": "^10.13.0 || ^12.13.0 || >=14.0.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": ">=7.11.0", -+ "eslint": "^7.5.0 || ^8.0.0" -+ } -+ }, -+ "node_modules/@babel/eslint-parser/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/generator": { -+ "version": "7.20.4", -+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz", -+ "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==", -+ "dependencies": { -+ "@babel/types": "^7.20.2", -+ "@jridgewell/gen-mapping": "^0.3.2", -+ "jsesc": "^2.5.1" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { -+ "version": "0.3.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", -+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", -+ "dependencies": { -+ "@jridgewell/set-array": "^1.0.1", -+ "@jridgewell/sourcemap-codec": "^1.4.10", -+ "@jridgewell/trace-mapping": "^0.3.9" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-annotate-as-pure": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", -+ "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", -+ "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", -+ "dependencies": { -+ "@babel/helper-explode-assignable-expression": "^7.18.6", -+ "@babel/types": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-compilation-targets": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz", -+ "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==", -+ "dependencies": { -+ "@babel/compat-data": "^7.20.0", -+ "@babel/helper-validator-option": "^7.18.6", -+ "browserslist": "^4.21.3", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-compilation-targets/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/helper-create-class-features-plugin": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz", -+ "integrity": "sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-member-expression-to-functions": "^7.18.9", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/helper-replace-supers": "^7.19.1", -+ "@babel/helper-split-export-declaration": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-create-regexp-features-plugin": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz", -+ "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "regexpu-core": "^5.1.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-define-polyfill-provider": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", -+ "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", -+ "dependencies": { -+ "@babel/helper-compilation-targets": "^7.17.7", -+ "@babel/helper-plugin-utils": "^7.16.7", -+ "debug": "^4.1.1", -+ "lodash.debounce": "^4.0.8", -+ "resolve": "^1.14.2", -+ "semver": "^6.1.2" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.4.0-0" -+ } -+ }, -+ "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/helper-environment-visitor": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", -+ "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-explode-assignable-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", -+ "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-function-name": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", -+ "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", -+ "dependencies": { -+ "@babel/template": "^7.18.10", -+ "@babel/types": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-hoist-variables": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", -+ "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-member-expression-to-functions": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz", -+ "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==", -+ "dependencies": { -+ "@babel/types": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-module-imports": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", -+ "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-module-transforms": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", -+ "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", -+ "dependencies": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-module-imports": "^7.18.6", -+ "@babel/helper-simple-access": "^7.20.2", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "@babel/helper-validator-identifier": "^7.19.1", -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.20.1", -+ "@babel/types": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-optimise-call-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", -+ "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-plugin-utils": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", -+ "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-remap-async-to-generator": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", -+ "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-wrap-function": "^7.18.9", -+ "@babel/types": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-replace-supers": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz", -+ "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==", -+ "dependencies": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-member-expression-to-functions": "^7.18.9", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/traverse": "^7.19.1", -+ "@babel/types": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-simple-access": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", -+ "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", -+ "dependencies": { -+ "@babel/types": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-skip-transparent-expression-wrappers": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", -+ "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", -+ "dependencies": { -+ "@babel/types": "^7.20.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-split-export-declaration": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", -+ "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-string-parser": { -+ "version": "7.19.4", -+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", -+ "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-validator-identifier": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", -+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-validator-option": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", -+ "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-wrap-function": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz", -+ "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==", -+ "dependencies": { -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.19.0", -+ "@babel/types": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helpers": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz", -+ "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==", -+ "dependencies": { -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.20.1", -+ "@babel/types": "^7.20.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/highlight": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", -+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", -+ "dependencies": { -+ "@babel/helper-validator-identifier": "^7.18.6", -+ "chalk": "^2.0.0", -+ "js-tokens": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/parser": { -+ "version": "7.20.3", -+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", -+ "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==", -+ "bin": { -+ "parser": "bin/babel-parser.js" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", -+ "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz", -+ "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9", -+ "@babel/plugin-proposal-optional-chaining": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.13.0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-async-generator-functions": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz", -+ "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==", -+ "dependencies": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-remap-async-to-generator": "^7.18.9", -+ "@babel/plugin-syntax-async-generators": "^7.8.4" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-class-properties": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", -+ "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", -+ "dependencies": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-class-static-block": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz", -+ "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==", -+ "dependencies": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-class-static-block": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.12.0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-dynamic-import": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", -+ "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-dynamic-import": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-export-namespace-from": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", -+ "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/plugin-syntax-export-namespace-from": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-json-strings": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", -+ "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-json-strings": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-logical-assignment-operators": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz", -+ "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", -+ "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-numeric-separator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", -+ "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-numeric-separator": "^7.10.4" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-object-rest-spread": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz", -+ "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==", -+ "dependencies": { -+ "@babel/compat-data": "^7.17.10", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-plugin-utils": "^7.17.12", -+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", -+ "@babel/plugin-transform-parameters": "^7.17.12" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-optional-catch-binding": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", -+ "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-optional-chaining": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz", -+ "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9", -+ "@babel/plugin-syntax-optional-chaining": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-private-methods": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", -+ "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", -+ "dependencies": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-private-property-in-object": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz", -+ "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-unicode-property-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", -+ "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", -+ "dependencies": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=4" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-async-generators": { -+ "version": "7.8.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", -+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-class-properties": { -+ "version": "7.12.13", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", -+ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.12.13" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-class-static-block": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", -+ "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-dynamic-import": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", -+ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-export-namespace-from": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", -+ "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.3" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-import-assertions": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", -+ "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-json-strings": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", -+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-logical-assignment-operators": { -+ "version": "7.10.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", -+ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.10.4" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", -+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-numeric-separator": { -+ "version": "7.10.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", -+ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.10.4" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-object-rest-spread": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", -+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-optional-catch-binding": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", -+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-optional-chaining": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", -+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-private-property-in-object": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", -+ "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-top-level-await": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", -+ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-arrow-functions": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz", -+ "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-async-to-generator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz", -+ "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==", -+ "dependencies": { -+ "@babel/helper-module-imports": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/helper-remap-async-to-generator": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-block-scoped-functions": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", -+ "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-block-scoping": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz", -+ "integrity": "sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-classes": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz", -+ "integrity": "sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-compilation-targets": "^7.20.0", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.20.2", -+ "@babel/helper-replace-supers": "^7.19.1", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "globals": "^11.1.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-computed-properties": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz", -+ "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-destructuring": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz", -+ "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-dotall-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", -+ "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", -+ "dependencies": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-duplicate-keys": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", -+ "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-exponentiation-operator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", -+ "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", -+ "dependencies": { -+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-for-of": { -+ "version": "7.18.8", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", -+ "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-function-name": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz", -+ "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==", -+ "dependencies": { -+ "@babel/helper-compilation-targets": "^7.18.9", -+ "@babel/helper-function-name": "^7.18.9", -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-literals": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", -+ "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-member-expression-literals": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", -+ "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-modules-amd": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz", -+ "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==", -+ "dependencies": { -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-modules-commonjs": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz", -+ "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==", -+ "dependencies": { -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-simple-access": "^7.19.4" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-modules-systemjs": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz", -+ "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==", -+ "dependencies": { -+ "@babel/helper-hoist-variables": "^7.18.6", -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-validator-identifier": "^7.19.1" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-modules-umd": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", -+ "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", -+ "dependencies": { -+ "@babel/helper-module-transforms": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz", -+ "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==", -+ "dependencies": { -+ "@babel/helper-create-regexp-features-plugin": "^7.19.0", -+ "@babel/helper-plugin-utils": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-new-target": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", -+ "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-object-super": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", -+ "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/helper-replace-supers": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-parameters": { -+ "version": "7.20.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz", -+ "integrity": "sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-property-literals": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", -+ "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-regenerator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz", -+ "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "regenerator-transform": "^0.15.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-reserved-words": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", -+ "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-shorthand-properties": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", -+ "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-spread": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz", -+ "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-sticky-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", -+ "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-template-literals": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", -+ "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-typeof-symbol": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", -+ "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-unicode-escapes": { -+ "version": "7.18.10", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", -+ "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-unicode-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", -+ "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", -+ "dependencies": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/polyfill": { -+ "version": "7.12.1", -+ "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz", -+ "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==", -+ "deprecated": "🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.", -+ "dependencies": { -+ "core-js": "^2.6.5", -+ "regenerator-runtime": "^0.13.4" -+ } -+ }, -+ "node_modules/@babel/polyfill/node_modules/core-js": { -+ "version": "2.6.12", -+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", -+ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", -+ "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", -+ "hasInstallScript": true -+ }, -+ "node_modules/@babel/preset-env": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.0.tgz", -+ "integrity": "sha512-cP74OMs7ECLPeG1reiCQ/D/ypyOxgfm8uR6HRYV23vTJ7Lu1nbgj9DQDo/vH59gnn7GOAwtTDPPYV4aXzsMKHA==", -+ "dependencies": { -+ "@babel/compat-data": "^7.17.10", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-plugin-utils": "^7.17.12", -+ "@babel/helper-validator-option": "^7.16.7", -+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12", -+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12", -+ "@babel/plugin-proposal-async-generator-functions": "^7.17.12", -+ "@babel/plugin-proposal-class-properties": "^7.17.12", -+ "@babel/plugin-proposal-class-static-block": "^7.18.0", -+ "@babel/plugin-proposal-dynamic-import": "^7.16.7", -+ "@babel/plugin-proposal-export-namespace-from": "^7.17.12", -+ "@babel/plugin-proposal-json-strings": "^7.17.12", -+ "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12", -+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12", -+ "@babel/plugin-proposal-numeric-separator": "^7.16.7", -+ "@babel/plugin-proposal-object-rest-spread": "^7.18.0", -+ "@babel/plugin-proposal-optional-catch-binding": "^7.16.7", -+ "@babel/plugin-proposal-optional-chaining": "^7.17.12", -+ "@babel/plugin-proposal-private-methods": "^7.17.12", -+ "@babel/plugin-proposal-private-property-in-object": "^7.17.12", -+ "@babel/plugin-proposal-unicode-property-regex": "^7.17.12", -+ "@babel/plugin-syntax-async-generators": "^7.8.4", -+ "@babel/plugin-syntax-class-properties": "^7.12.13", -+ "@babel/plugin-syntax-class-static-block": "^7.14.5", -+ "@babel/plugin-syntax-dynamic-import": "^7.8.3", -+ "@babel/plugin-syntax-export-namespace-from": "^7.8.3", -+ "@babel/plugin-syntax-import-assertions": "^7.17.12", -+ "@babel/plugin-syntax-json-strings": "^7.8.3", -+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", -+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", -+ "@babel/plugin-syntax-numeric-separator": "^7.10.4", -+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", -+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", -+ "@babel/plugin-syntax-optional-chaining": "^7.8.3", -+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", -+ "@babel/plugin-syntax-top-level-await": "^7.14.5", -+ "@babel/plugin-transform-arrow-functions": "^7.17.12", -+ "@babel/plugin-transform-async-to-generator": "^7.17.12", -+ "@babel/plugin-transform-block-scoped-functions": "^7.16.7", -+ "@babel/plugin-transform-block-scoping": "^7.17.12", -+ "@babel/plugin-transform-classes": "^7.17.12", -+ "@babel/plugin-transform-computed-properties": "^7.17.12", -+ "@babel/plugin-transform-destructuring": "^7.18.0", -+ "@babel/plugin-transform-dotall-regex": "^7.16.7", -+ "@babel/plugin-transform-duplicate-keys": "^7.17.12", -+ "@babel/plugin-transform-exponentiation-operator": "^7.16.7", -+ "@babel/plugin-transform-for-of": "^7.17.12", -+ "@babel/plugin-transform-function-name": "^7.16.7", -+ "@babel/plugin-transform-literals": "^7.17.12", -+ "@babel/plugin-transform-member-expression-literals": "^7.16.7", -+ "@babel/plugin-transform-modules-amd": "^7.18.0", -+ "@babel/plugin-transform-modules-commonjs": "^7.18.0", -+ "@babel/plugin-transform-modules-systemjs": "^7.18.0", -+ "@babel/plugin-transform-modules-umd": "^7.18.0", -+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12", -+ "@babel/plugin-transform-new-target": "^7.17.12", -+ "@babel/plugin-transform-object-super": "^7.16.7", -+ "@babel/plugin-transform-parameters": "^7.17.12", -+ "@babel/plugin-transform-property-literals": "^7.16.7", -+ "@babel/plugin-transform-regenerator": "^7.18.0", -+ "@babel/plugin-transform-reserved-words": "^7.17.12", -+ "@babel/plugin-transform-shorthand-properties": "^7.16.7", -+ "@babel/plugin-transform-spread": "^7.17.12", -+ "@babel/plugin-transform-sticky-regex": "^7.16.7", -+ "@babel/plugin-transform-template-literals": "^7.17.12", -+ "@babel/plugin-transform-typeof-symbol": "^7.17.12", -+ "@babel/plugin-transform-unicode-escapes": "^7.16.7", -+ "@babel/plugin-transform-unicode-regex": "^7.16.7", -+ "@babel/preset-modules": "^0.1.5", -+ "@babel/types": "^7.18.0", -+ "babel-plugin-polyfill-corejs2": "^0.3.0", -+ "babel-plugin-polyfill-corejs3": "^0.5.0", -+ "babel-plugin-polyfill-regenerator": "^0.3.0", -+ "core-js-compat": "^3.22.1", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/preset-env/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/preset-modules": { -+ "version": "0.1.5", -+ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", -+ "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.0.0", -+ "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", -+ "@babel/plugin-transform-dotall-regex": "^7.4.4", -+ "@babel/types": "^7.4.4", -+ "esutils": "^2.0.2" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/runtime": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz", -+ "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", -+ "dependencies": { -+ "regenerator-runtime": "^0.13.10" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/template": { -+ "version": "7.18.10", -+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", -+ "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", -+ "dependencies": { -+ "@babel/code-frame": "^7.18.6", -+ "@babel/parser": "^7.18.10", -+ "@babel/types": "^7.18.10" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/traverse": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", -+ "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", -+ "dependencies": { -+ "@babel/code-frame": "^7.18.6", -+ "@babel/generator": "^7.20.1", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-hoist-variables": "^7.18.6", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "@babel/parser": "^7.20.1", -+ "@babel/types": "^7.20.0", -+ "debug": "^4.1.0", -+ "globals": "^11.1.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/types": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz", -+ "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==", -+ "dependencies": { -+ "@babel/helper-string-parser": "^7.19.4", -+ "@babel/helper-validator-identifier": "^7.19.1", -+ "to-fast-properties": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@electron/get": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz", -+ "integrity": "sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==", -+ "dependencies": { -+ "debug": "^4.1.1", -+ "env-paths": "^2.2.0", -+ "fs-extra": "^8.1.0", -+ "got": "^9.6.0", -+ "progress": "^2.0.3", -+ "semver": "^6.2.0", -+ "sumchecker": "^3.0.1" -+ }, -+ "engines": { -+ "node": ">=8.6" -+ }, -+ "optionalDependencies": { -+ "global-agent": "^3.0.0", -+ "global-tunnel-ng": "^2.7.1" -+ } -+ }, -+ "node_modules/@electron/get/node_modules/fs-extra": { -+ "version": "8.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", -+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", -+ "dependencies": { -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ }, -+ "engines": { -+ "node": ">=6 <7 || >=8" -+ } -+ }, -+ "node_modules/@electron/get/node_modules/jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/@electron/get/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@electron/get/node_modules/universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/@electron/remote": { -+ "version": "2.0.8", -+ "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.8.tgz", -+ "integrity": "sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==", -+ "peerDependencies": { -+ "electron": ">= 13.0.0" -+ } -+ }, -+ "node_modules/@eslint/eslintrc": { -+ "version": "1.3.3", -+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", -+ "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", -+ "dependencies": { -+ "ajv": "^6.12.4", -+ "debug": "^4.3.2", -+ "espree": "^9.4.0", -+ "globals": "^13.15.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.2.1", -+ "js-yaml": "^4.1.0", -+ "minimatch": "^3.1.2", -+ "strip-json-comments": "^3.1.1" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/globals": { -+ "version": "13.17.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", -+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", -+ "dependencies": { -+ "type-fest": "^0.20.2" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/@gar/promisify": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", -+ "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" -+ }, -+ "node_modules/@humanwhocodes/config-array": { -+ "version": "0.9.5", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", -+ "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", -+ "dependencies": { -+ "@humanwhocodes/object-schema": "^1.2.1", -+ "debug": "^4.1.1", -+ "minimatch": "^3.0.4" -+ }, -+ "engines": { -+ "node": ">=10.10.0" -+ } -+ }, -+ "node_modules/@humanwhocodes/config-array/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/@humanwhocodes/object-schema": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", -+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==" -+ }, -+ "node_modules/@jridgewell/gen-mapping": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", -+ "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", -+ "dependencies": { -+ "@jridgewell/set-array": "^1.0.0", -+ "@jridgewell/sourcemap-codec": "^1.4.10" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/resolve-uri": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", -+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/set-array": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", -+ "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/sourcemap-codec": { -+ "version": "1.4.14", -+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", -+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" -+ }, -+ "node_modules/@jridgewell/trace-mapping": { -+ "version": "0.3.17", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", -+ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", -+ "dependencies": { -+ "@jridgewell/resolve-uri": "3.1.0", -+ "@jridgewell/sourcemap-codec": "1.4.14" -+ } -+ }, -+ "node_modules/@npmcli/fs": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", -+ "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", -+ "dependencies": { -+ "@gar/promisify": "^1.0.1", -+ "semver": "^7.3.5" -+ } -+ }, -+ "node_modules/@npmcli/move-file": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", -+ "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", -+ "deprecated": "This functionality has been moved to @npmcli/fs", -+ "dependencies": { -+ "mkdirp": "^1.0.4", -+ "rimraf": "^3.0.2" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/@npmcli/move-file/node_modules/mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/@npmcli/move-file/node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/@serialport/binding-abstract": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.2.4.tgz", -+ "integrity": "sha512-UESvncat2oQKnAp29eDVJ2jB9sADatCgoojPPB4RVvp3+3Wqu5QVEh/UCjHRUeDJ20fkSFnKAw9D0vNoBQ+5Kw==", -+ "deprecated": "This package has been renamed to @serialport/bindings-interface", -+ "optional": true, -+ "dependencies": { -+ "debug": "^4.3.2" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/binding-mock": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.7.tgz", -+ "integrity": "sha512-aR8H+htZwwZZkVb1MdbnNvGWw8eXVRqQ2qPhkbKyx0N/LY5aVIgCgT98Kt1YylLsG7SzNG+Jbhd4wzwEuPVT5Q==", -+ "optional": true, -+ "dependencies": { -+ "@serialport/binding-abstract": "^9.0.7", -+ "debug": "^4.3.1" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/bindings": { -+ "version": "9.2.9", -+ "resolved": "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.2.9.tgz", -+ "integrity": "sha512-An7PiVlyNMx/0RDnSBxFHIsd4kt0/zPlDALlTjhVQKXbG6e0xRqLKbkoZVzHMS8rg7HzCu8G1nplifoAwNm5Lg==", -+ "deprecated": "This package has been renamed to @serialport/bindings-cpp.", -+ "hasInstallScript": true, -+ "optional": true, -+ "dependencies": { -+ "@serialport/binding-abstract": "9.2.3", -+ "@serialport/parser-readline": "9.2.4", -+ "bindings": "^1.5.0", -+ "debug": "^4.3.2", -+ "nan": "^2.15.0", -+ "prebuild-install": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/bindings/node_modules/@serialport/binding-abstract": { -+ "version": "9.2.3", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.2.3.tgz", -+ "integrity": "sha512-cQs9tbIlG3P0IrOWyVirqlhWuJ7Ms2Zh9m2108z6Y5UW/iVj6wEOiW8EmK9QX9jmJXYllE7wgGgvVozP5oCj3w==", -+ "optional": true, -+ "dependencies": { -+ "debug": "^4.3.2" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/bindings/node_modules/@serialport/parser-delimiter": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.2.4.tgz", -+ "integrity": "sha512-4nvTAoYAgkxFiXrkI+3CA49Yd43CODjeszh89EK+I9c8wOZ+etZduRCzINYPiy26g7zO+GRAb9FoPCsY+sYcbQ==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/bindings/node_modules/@serialport/parser-readline": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.2.4.tgz", -+ "integrity": "sha512-Z1/qrZTQUVhNSJP1hd9YfDvq0o7d87rNwAjjRKbVpa7Qi51tG5BnKt43IV3NFMyBlVcRe0rnIb3tJu57E0SOwg==", -+ "optional": true, -+ "dependencies": { -+ "@serialport/parser-delimiter": "9.2.4" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-byte-length": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.7.tgz", -+ "integrity": "sha512-evf7oOOSBMBn2AZZbgBFMRIyEzlsyQkhqaPm7IBCPTxMDXRf4tKkFYJHYZB0/6d1W4eI0meH079UqmSsh/uoDA==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-cctalk": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.7.tgz", -+ "integrity": "sha512-ert5jhMkeiTfr44TkbdySC09J8UwAsf/RxBucVN5Mz5enG509RggnkfFi4mfj3UCG2vZ7qsmM6gtZ62DshY02Q==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-delimiter": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.7.tgz", -+ "integrity": "sha512-Vb2NPeXPZ/28M4m5x4OAHFd8jRAeddNCgvL+Q+H/hqFPY1w47JcMLchC7pigRW8Cnt1fklmzfwdNQ8Fb+kMkxQ==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-inter-byte-timeout": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-9.0.7.tgz", -+ "integrity": "sha512-lUZ3cwgUluBvJ1jf+0LQsqoiPYAokDO6+fRCw9HCfnrF/OS60Gm4rxuyo2uQIueqZkJ7NIFP+ibKsULrA47AEA==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-readline": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.7.tgz", -+ "integrity": "sha512-ydoLbgVQQPxWrwbe3Fhh4XnZexbkEQAC6M/qgRTzjnKvTjrD61CJNxLc3vyDaAPI9bJIhTiI7eTX3JB5jJv8Hg==", -+ "optional": true, -+ "dependencies": { -+ "@serialport/parser-delimiter": "^9.0.7" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-ready": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.7.tgz", -+ "integrity": "sha512-3qYhI4cNUPAYqVYvdwV57Y+PVRl4dJf1fPBtMoWtwDgwopsAXTR93WCs49WuUq9JCyNW+8Hrfqv8x8eNAD5Dqg==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-regex": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.7.tgz", -+ "integrity": "sha512-5XF+FXbhqQ/5bVKM4NaGs1m+E9KjfmeCx/obwsKaUZognQF67jwoTfjJJWNP/21jKfxdl8XoCYjZjASl3XKRAw==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/stream": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.7.tgz", -+ "integrity": "sha512-c/h7HPAeFiryD9iTGlaSvPqHFHSZ0NMQHxC4rcmKS2Vu3qJuEtkBdTLABwsMp7iWEiSnI4KC3s7bHapaXP06FQ==", -+ "optional": true, -+ "dependencies": { -+ "debug": "^4.3.1" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@sindresorhus/is": { -+ "version": "0.14.0", -+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", -+ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/@szmarczak/http-timer": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", -+ "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", -+ "dependencies": { -+ "defer-to-connect": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/@tootallnate/once": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", -+ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/@types/glob": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", -+ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", -+ "optional": true, -+ "dependencies": { -+ "@types/minimatch": "*", -+ "@types/node": "*" -+ } -+ }, -+ "node_modules/@types/minimatch": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", -+ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", -+ "optional": true -+ }, -+ "node_modules/@types/minimist": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", -+ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" -+ }, -+ "node_modules/@types/node": { -+ "version": "18.11.9", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", -+ "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", -+ "optional": true -+ }, -+ "node_modules/@types/normalize-package-data": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", -+ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" -+ }, -+ "node_modules/@types/yauzl": { -+ "version": "2.10.0", -+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", -+ "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", -+ "optional": true, -+ "dependencies": { -+ "@types/node": "*" -+ } -+ }, -+ "node_modules/7zip": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz", -+ "integrity": "sha512-ns8vKbKhIQm338AeWo/YdDSWil3pldwCMoyR2npoM2qDAzF8Vuko8BtDxpNt/wE15SXOh5K5WbjSLR4kTOAHLA==", -+ "bin": { -+ "7z": "7zip-lite/7z.exe" -+ } -+ }, -+ "node_modules/abbrev": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", -+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" -+ }, -+ "node_modules/acorn": { -+ "version": "8.8.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", -+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", -+ "bin": { -+ "acorn": "bin/acorn" -+ }, -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/acorn-jsx": { -+ "version": "5.3.2", -+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", -+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", -+ "peerDependencies": { -+ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" -+ } -+ }, -+ "node_modules/acorn-node": { -+ "version": "1.8.2", -+ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", -+ "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", -+ "dependencies": { -+ "acorn": "^7.0.0", -+ "acorn-walk": "^7.0.0", -+ "xtend": "^4.0.2" -+ } -+ }, -+ "node_modules/acorn-node/node_modules/acorn": { -+ "version": "7.4.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", -+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", -+ "bin": { -+ "acorn": "bin/acorn" -+ }, -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/acorn-walk": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", -+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/agent-base": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", -+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", -+ "dependencies": { -+ "debug": "4" -+ }, -+ "engines": { -+ "node": ">= 6.0.0" -+ } -+ }, -+ "node_modules/agentkeepalive": { -+ "version": "4.2.1", -+ "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", -+ "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", -+ "dependencies": { -+ "debug": "^4.1.0", -+ "depd": "^1.1.2", -+ "humanize-ms": "^1.2.1" -+ }, -+ "engines": { -+ "node": ">= 8.0.0" -+ } -+ }, -+ "node_modules/aggregate-error": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", -+ "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", -+ "dependencies": { -+ "clean-stack": "^2.0.0", -+ "indent-string": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/ajv": { -+ "version": "6.12.6", -+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", -+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", -+ "dependencies": { -+ "fast-deep-equal": "^3.1.1", -+ "fast-json-stable-stringify": "^2.0.0", -+ "json-schema-traverse": "^0.4.1", -+ "uri-js": "^4.2.2" -+ }, -+ "funding": { -+ "type": "github", -+ "url": "https://github.com/sponsors/epoberezkin" -+ } -+ }, -+ "node_modules/ansi-align": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", -+ "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", -+ "dependencies": { -+ "string-width": "^4.1.0" -+ } -+ }, -+ "node_modules/ansi-html": { -+ "version": "0.0.9", -+ "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz", -+ "integrity": "sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==", -+ "engines": [ -+ "node >= 0.8.0" -+ ], -+ "bin": { -+ "ansi-html": "bin/ansi-html" -+ } -+ }, -+ "node_modules/ansi-regex": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/ansi-styles": { -+ "version": "3.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", -+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", -+ "dependencies": { -+ "color-convert": "^1.9.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/anymatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", -+ "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", -+ "dependencies": { -+ "normalize-path": "^3.0.0", -+ "picomatch": "^2.0.4" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/apache-crypt": { -+ "version": "1.2.6", -+ "resolved": "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.6.tgz", -+ "integrity": "sha512-072WetlM4blL8PREJVeY+WHiUh1R5VNt2HfceGS8aKqttPHcmqE5pkKuXPz/ULmJOFkc8Hw3kfKl6vy7Qka6DA==", -+ "dependencies": { -+ "unix-crypt-td-js": "^1.1.4" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/apache-md5": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.8.tgz", -+ "integrity": "sha512-FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/aproba": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", -+ "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" -+ }, -+ "node_modules/are-we-there-yet": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", -+ "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", -+ "dependencies": { -+ "delegates": "^1.0.0", -+ "readable-stream": "^3.6.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/are-we-there-yet/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/argparse": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", -+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" -+ }, -+ "node_modules/array-flatten": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", -+ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" -+ }, -+ "node_modules/arrify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", -+ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/asar": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz", -+ "integrity": "sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==", -+ "deprecated": "Please use @electron/asar moving forward. There is no API change, just a package name change", -+ "dependencies": { -+ "chromium-pickle-js": "^0.2.0", -+ "commander": "^5.0.0", -+ "glob": "^7.1.6", -+ "minimatch": "^3.0.4" -+ }, -+ "bin": { -+ "asar": "bin/asar.js" -+ }, -+ "engines": { -+ "node": ">=10.12.0" -+ }, -+ "optionalDependencies": { -+ "@types/glob": "^7.1.1" -+ } -+ }, -+ "node_modules/asar/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/asar/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/asar/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/asn1": { -+ "version": "0.2.6", -+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", -+ "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", -+ "dependencies": { -+ "safer-buffer": "~2.1.0" -+ } -+ }, -+ "node_modules/asn1.js": { -+ "version": "5.4.1", -+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", -+ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", -+ "dependencies": { -+ "bn.js": "^4.0.0", -+ "inherits": "^2.0.1", -+ "minimalistic-assert": "^1.0.0", -+ "safer-buffer": "^2.1.0" -+ } -+ }, -+ "node_modules/asn1.js/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/assert": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", -+ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", -+ "dependencies": { -+ "object-assign": "^4.1.1", -+ "util": "0.10.3" -+ } -+ }, -+ "node_modules/assert-plus": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", -+ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", -+ "engines": { -+ "node": ">=0.8" -+ } -+ }, -+ "node_modules/assert/node_modules/inherits": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", -+ "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==" -+ }, -+ "node_modules/assert/node_modules/util": { -+ "version": "0.10.3", -+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", -+ "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", -+ "dependencies": { -+ "inherits": "2.0.1" -+ } -+ }, -+ "node_modules/async-foreach": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", -+ "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/asynckit": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", -+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" -+ }, -+ "node_modules/at-least-node": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", -+ "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/author-regex": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", -+ "integrity": "sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==", -+ "engines": { -+ "node": ">=0.8" -+ } -+ }, -+ "node_modules/available-typed-arrays": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", -+ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/aws-sign2": { -+ "version": "0.7.0", -+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", -+ "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/aws4": { -+ "version": "1.11.0", -+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", -+ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" -+ }, -+ "node_modules/babel-plugin-polyfill-corejs2": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", -+ "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", -+ "dependencies": { -+ "@babel/compat-data": "^7.17.7", -+ "@babel/helper-define-polyfill-provider": "^0.3.3", -+ "semver": "^6.1.1" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/babel-plugin-polyfill-corejs3": { -+ "version": "0.5.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz", -+ "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==", -+ "dependencies": { -+ "@babel/helper-define-polyfill-provider": "^0.3.2", -+ "core-js-compat": "^3.21.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/babel-plugin-polyfill-regenerator": { -+ "version": "0.3.1", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", -+ "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", -+ "dependencies": { -+ "@babel/helper-define-polyfill-provider": "^0.3.1" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/babelify": { -+ "version": "10.0.0", -+ "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", -+ "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==", -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/balanced-match": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", -+ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==" -+ }, -+ "node_modules/base64-js": { -+ "version": "1.5.1", -+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", -+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/bcrypt-pbkdf": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", -+ "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", -+ "dependencies": { -+ "tweetnacl": "^0.14.3" -+ } -+ }, -+ "node_modules/bcryptjs": { -+ "version": "2.4.3", -+ "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", -+ "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==" -+ }, -+ "node_modules/binary-extensions": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", -+ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/bindings": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", -+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", -+ "optional": true, -+ "dependencies": { -+ "file-uri-to-path": "1.0.0" -+ } -+ }, -+ "node_modules/bl": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", -+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", -+ "optional": true, -+ "dependencies": { -+ "buffer": "^5.5.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.4.0" -+ } -+ }, -+ "node_modules/bl/node_modules/buffer": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", -+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ], -+ "optional": true, -+ "dependencies": { -+ "base64-js": "^1.3.1", -+ "ieee754": "^1.1.13" -+ } -+ }, -+ "node_modules/bl/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "optional": true, -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/bluebird": { -+ "version": "3.7.2", -+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", -+ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" -+ }, -+ "node_modules/bn.js": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", -+ "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" -+ }, -+ "node_modules/bonjour": { -+ "version": "4.0.0", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/bonjour.git#33d7fa28c568d05cb7ffda1fd2b20f4cc364e273", -+ "license": "MIT", -+ "dependencies": { -+ "array-flatten": "^2.1.0", -+ "deep-equal": "^1.0.1", -+ "dns-equal": "^1.0.0", -+ "dns-txt": "github:jean-emmanuel/dns-txt#v2.0.3", -+ "multicast-dns": "github:jean-emmanuel/multicast-dns", -+ "multicast-dns-service-types": "^1.1.0" -+ } -+ }, -+ "node_modules/boolean": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", -+ "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", -+ "optional": true -+ }, -+ "node_modules/boxen": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", -+ "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", -+ "dependencies": { -+ "ansi-align": "^3.0.0", -+ "camelcase": "^6.2.0", -+ "chalk": "^4.1.0", -+ "cli-boxes": "^2.2.1", -+ "string-width": "^4.2.2", -+ "type-fest": "^0.20.2", -+ "widest-line": "^3.1.0", -+ "wrap-ansi": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/boxen/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/boxen/node_modules/camelcase": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", -+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/boxen/node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/boxen/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/boxen/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/boxen/node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/boxen/node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/boxen/node_modules/type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/brace": { -+ "version": "0.11.1", -+ "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz", -+ "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==" -+ }, -+ "node_modules/brace-expansion": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", -+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0" -+ } -+ }, -+ "node_modules/brace-expansion/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/braces": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", -+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", -+ "dependencies": { -+ "fill-range": "^7.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/brorand": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", -+ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" -+ }, -+ "node_modules/browser-pack": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", -+ "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", -+ "dependencies": { -+ "combine-source-map": "~0.8.0", -+ "defined": "^1.0.0", -+ "JSONStream": "^1.0.3", -+ "safe-buffer": "^5.1.1", -+ "through2": "^2.0.0", -+ "umd": "^3.0.0" -+ }, -+ "bin": { -+ "browser-pack": "bin/cmd.js" -+ } -+ }, -+ "node_modules/browser-process-hrtime": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", -+ "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==" -+ }, -+ "node_modules/browser-resolve": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", -+ "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", -+ "dependencies": { -+ "resolve": "^1.17.0" -+ } -+ }, -+ "node_modules/browserify": { -+ "version": "17.0.0", -+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz", -+ "integrity": "sha512-SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w==", -+ "dependencies": { -+ "assert": "^1.4.0", -+ "browser-pack": "^6.0.1", -+ "browser-resolve": "^2.0.0", -+ "browserify-zlib": "~0.2.0", -+ "buffer": "~5.2.1", -+ "cached-path-relative": "^1.0.0", -+ "concat-stream": "^1.6.0", -+ "console-browserify": "^1.1.0", -+ "constants-browserify": "~1.0.0", -+ "crypto-browserify": "^3.0.0", -+ "defined": "^1.0.0", -+ "deps-sort": "^2.0.1", -+ "domain-browser": "^1.2.0", -+ "duplexer2": "~0.1.2", -+ "events": "^3.0.0", -+ "glob": "^7.1.0", -+ "has": "^1.0.0", -+ "htmlescape": "^1.1.0", -+ "https-browserify": "^1.0.0", -+ "inherits": "~2.0.1", -+ "insert-module-globals": "^7.2.1", -+ "JSONStream": "^1.0.3", -+ "labeled-stream-splicer": "^2.0.0", -+ "mkdirp-classic": "^0.5.2", -+ "module-deps": "^6.2.3", -+ "os-browserify": "~0.3.0", -+ "parents": "^1.0.1", -+ "path-browserify": "^1.0.0", -+ "process": "~0.11.0", -+ "punycode": "^1.3.2", -+ "querystring-es3": "~0.2.0", -+ "read-only-stream": "^2.0.0", -+ "readable-stream": "^2.0.2", -+ "resolve": "^1.1.4", -+ "shasum-object": "^1.0.0", -+ "shell-quote": "^1.6.1", -+ "stream-browserify": "^3.0.0", -+ "stream-http": "^3.0.0", -+ "string_decoder": "^1.1.1", -+ "subarg": "^1.0.0", -+ "syntax-error": "^1.1.1", -+ "through2": "^2.0.0", -+ "timers-browserify": "^1.0.1", -+ "tty-browserify": "0.0.1", -+ "url": "~0.11.0", -+ "util": "~0.12.0", -+ "vm-browserify": "^1.0.0", -+ "xtend": "^4.0.0" -+ }, -+ "bin": { -+ "browserify": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/browserify-aes": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", -+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", -+ "dependencies": { -+ "buffer-xor": "^1.0.3", -+ "cipher-base": "^1.0.0", -+ "create-hash": "^1.1.0", -+ "evp_bytestokey": "^1.0.3", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "node_modules/browserify-cipher": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", -+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", -+ "dependencies": { -+ "browserify-aes": "^1.0.4", -+ "browserify-des": "^1.0.0", -+ "evp_bytestokey": "^1.0.0" -+ } -+ }, -+ "node_modules/browserify-des": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", -+ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", -+ "dependencies": { -+ "cipher-base": "^1.0.1", -+ "des.js": "^1.0.0", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "node_modules/browserify-rsa": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", -+ "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", -+ "dependencies": { -+ "bn.js": "^5.0.0", -+ "randombytes": "^2.0.1" -+ } -+ }, -+ "node_modules/browserify-sign": { -+ "version": "4.2.1", -+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", -+ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", -+ "dependencies": { -+ "bn.js": "^5.1.1", -+ "browserify-rsa": "^4.0.1", -+ "create-hash": "^1.2.0", -+ "create-hmac": "^1.1.7", -+ "elliptic": "^6.5.3", -+ "inherits": "^2.0.4", -+ "parse-asn1": "^5.1.5", -+ "readable-stream": "^3.6.0", -+ "safe-buffer": "^5.2.0" -+ } -+ }, -+ "node_modules/browserify-sign/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/browserify-zlib": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", -+ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", -+ "dependencies": { -+ "pako": "~1.0.5" -+ } -+ }, -+ "node_modules/browserslist": { -+ "version": "4.21.4", -+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", -+ "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", -+ "funding": [ -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/browserslist" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/funding/github/npm/browserslist" -+ } -+ ], -+ "dependencies": { -+ "caniuse-lite": "^1.0.30001400", -+ "electron-to-chromium": "^1.4.251", -+ "node-releases": "^2.0.6", -+ "update-browserslist-db": "^1.0.9" -+ }, -+ "bin": { -+ "browserslist": "cli.js" -+ }, -+ "engines": { -+ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" -+ } -+ }, -+ "node_modules/buffer": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", -+ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", -+ "dependencies": { -+ "base64-js": "^1.0.2", -+ "ieee754": "^1.1.4" -+ } -+ }, -+ "node_modules/buffer-alloc": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", -+ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", -+ "dependencies": { -+ "buffer-alloc-unsafe": "^1.1.0", -+ "buffer-fill": "^1.0.0" -+ } -+ }, -+ "node_modules/buffer-alloc-unsafe": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", -+ "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" -+ }, -+ "node_modules/buffer-crc32": { -+ "version": "0.2.13", -+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", -+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/buffer-fill": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", -+ "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==" -+ }, -+ "node_modules/buffer-from": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", -+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" -+ }, -+ "node_modules/buffer-indexof": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", -+ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" -+ }, -+ "node_modules/buffer-xor": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", -+ "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==" -+ }, -+ "node_modules/builtin-status-codes": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", -+ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==" -+ }, -+ "node_modules/cacache": { -+ "version": "15.3.0", -+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", -+ "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", -+ "dependencies": { -+ "@npmcli/fs": "^1.0.0", -+ "@npmcli/move-file": "^1.0.1", -+ "chownr": "^2.0.0", -+ "fs-minipass": "^2.0.0", -+ "glob": "^7.1.4", -+ "infer-owner": "^1.0.4", -+ "lru-cache": "^6.0.0", -+ "minipass": "^3.1.1", -+ "minipass-collect": "^1.0.2", -+ "minipass-flush": "^1.0.5", -+ "minipass-pipeline": "^1.2.2", -+ "mkdirp": "^1.0.3", -+ "p-map": "^4.0.0", -+ "promise-inflight": "^1.0.1", -+ "rimraf": "^3.0.2", -+ "ssri": "^8.0.1", -+ "tar": "^6.0.2", -+ "unique-filename": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/cacache/node_modules/mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/cacache/node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/cacheable-request": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", -+ "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", -+ "dependencies": { -+ "clone-response": "^1.0.2", -+ "get-stream": "^5.1.0", -+ "http-cache-semantics": "^4.0.0", -+ "keyv": "^3.0.0", -+ "lowercase-keys": "^2.0.0", -+ "normalize-url": "^4.1.0", -+ "responselike": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/cacheable-request/node_modules/lowercase-keys": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", -+ "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/cached-path-relative": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz", -+ "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==" -+ }, -+ "node_modules/call-bind": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", -+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", -+ "dependencies": { -+ "function-bind": "^1.1.1", -+ "get-intrinsic": "^1.0.2" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/callsites": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", -+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/camel-case": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", -+ "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==", -+ "dependencies": { -+ "no-case": "^2.2.0", -+ "upper-case": "^1.1.1" -+ } -+ }, -+ "node_modules/camelcase": { -+ "version": "5.3.1", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", -+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/camelcase-keys": { -+ "version": "6.2.2", -+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", -+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", -+ "dependencies": { -+ "camelcase": "^5.3.1", -+ "map-obj": "^4.0.0", -+ "quick-lru": "^4.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/caniuse-lite": { -+ "version": "1.0.30001431", -+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", -+ "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", -+ "funding": [ -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/browserslist" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/funding/github/npm/caniuse-lite" -+ } -+ ] -+ }, -+ "node_modules/caseless": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", -+ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" -+ }, -+ "node_modules/chalk": { -+ "version": "2.4.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", -+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", -+ "dependencies": { -+ "ansi-styles": "^3.2.1", -+ "escape-string-regexp": "^1.0.5", -+ "supports-color": "^5.3.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/chokidar": { -+ "version": "3.5.3", -+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", -+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", -+ "funding": [ -+ { -+ "type": "individual", -+ "url": "https://paulmillr.com/funding/" -+ } -+ ], -+ "dependencies": { -+ "anymatch": "~3.1.2", -+ "braces": "~3.0.2", -+ "glob-parent": "~5.1.2", -+ "is-binary-path": "~2.1.0", -+ "is-glob": "~4.0.1", -+ "normalize-path": "~3.0.0", -+ "readdirp": "~3.6.0" -+ }, -+ "engines": { -+ "node": ">= 8.10.0" -+ }, -+ "optionalDependencies": { -+ "fsevents": "~2.3.2" -+ } -+ }, -+ "node_modules/chownr": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", -+ "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/chroma-js": { -+ "version": "2.4.2", -+ "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz", -+ "integrity": "sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==" -+ }, -+ "node_modules/chromium-pickle-js": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", -+ "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==" -+ }, -+ "node_modules/ci-info": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", -+ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" -+ }, -+ "node_modules/cipher-base": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", -+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "node_modules/clean-stack": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", -+ "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/cli-boxes": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", -+ "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/cliui": { -+ "version": "7.0.4", -+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", -+ "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", -+ "dependencies": { -+ "string-width": "^4.2.0", -+ "strip-ansi": "^6.0.0", -+ "wrap-ansi": "^7.0.0" -+ } -+ }, -+ "node_modules/clone-response": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", -+ "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", -+ "dependencies": { -+ "mimic-response": "^1.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/color-convert": { -+ "version": "1.9.3", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", -+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", -+ "dependencies": { -+ "color-name": "1.1.3" -+ } -+ }, -+ "node_modules/color-name": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", -+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" -+ }, -+ "node_modules/color-support": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", -+ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", -+ "bin": { -+ "color-support": "bin.js" -+ } -+ }, -+ "node_modules/combine-source-map": { -+ "version": "0.8.0", -+ "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", -+ "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==", -+ "dependencies": { -+ "convert-source-map": "~1.1.0", -+ "inline-source-map": "~0.6.0", -+ "lodash.memoize": "~3.0.3", -+ "source-map": "~0.5.3" -+ } -+ }, -+ "node_modules/combine-source-map/node_modules/convert-source-map": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", -+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==" -+ }, -+ "node_modules/combined-stream": { -+ "version": "1.0.8", -+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", -+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", -+ "dependencies": { -+ "delayed-stream": "~1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/commander": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", -+ "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/compare-version": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", -+ "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/concat-map": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", -+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" -+ }, -+ "node_modules/concat-stream": { -+ "version": "1.6.2", -+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", -+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", -+ "engines": [ -+ "node >= 0.8" -+ ], -+ "dependencies": { -+ "buffer-from": "^1.0.0", -+ "inherits": "^2.0.3", -+ "readable-stream": "^2.2.2", -+ "typedarray": "^0.0.6" -+ } -+ }, -+ "node_modules/config-chain": { -+ "version": "1.1.13", -+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", -+ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", -+ "optional": true, -+ "dependencies": { -+ "ini": "^1.3.4", -+ "proto-list": "~1.2.1" -+ } -+ }, -+ "node_modules/configstore": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", -+ "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", -+ "dependencies": { -+ "dot-prop": "^5.2.0", -+ "graceful-fs": "^4.1.2", -+ "make-dir": "^3.0.0", -+ "unique-string": "^2.0.0", -+ "write-file-atomic": "^3.0.0", -+ "xdg-basedir": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/console-browserify": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", -+ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" -+ }, -+ "node_modules/console-control-strings": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", -+ "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" -+ }, -+ "node_modules/constants-browserify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", -+ "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==" -+ }, -+ "node_modules/convert-source-map": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", -+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" -+ }, -+ "node_modules/core-js": { -+ "version": "3.22.5", -+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz", -+ "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==", -+ "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", -+ "hasInstallScript": true, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/core-js" -+ } -+ }, -+ "node_modules/core-js-compat": { -+ "version": "3.26.0", -+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz", -+ "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==", -+ "dependencies": { -+ "browserslist": "^4.21.4" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/core-js" -+ } -+ }, -+ "node_modules/core-util-is": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", -+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" -+ }, -+ "node_modules/cpr": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz", -+ "integrity": "sha512-Xch4PXQ/KC8lJ+KfJ9JI6eG/nmppLrPPWg5Q+vh65Qr9EjuJEubxh/H/Le1TmCZ7+Xv7iJuNRqapyOFZB+wsxA==", -+ "dependencies": { -+ "graceful-fs": "^4.1.5", -+ "minimist": "^1.2.0", -+ "mkdirp": "~0.5.1", -+ "rimraf": "^2.5.4" -+ }, -+ "bin": { -+ "cpr": "bin/cpr" -+ } -+ }, -+ "node_modules/create-ecdh": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", -+ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", -+ "dependencies": { -+ "bn.js": "^4.1.0", -+ "elliptic": "^6.5.3" -+ } -+ }, -+ "node_modules/create-ecdh/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/create-hash": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", -+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", -+ "dependencies": { -+ "cipher-base": "^1.0.1", -+ "inherits": "^2.0.1", -+ "md5.js": "^1.3.4", -+ "ripemd160": "^2.0.1", -+ "sha.js": "^2.4.0" -+ } -+ }, -+ "node_modules/create-hmac": { -+ "version": "1.1.7", -+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", -+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", -+ "dependencies": { -+ "cipher-base": "^1.0.3", -+ "create-hash": "^1.1.0", -+ "inherits": "^2.0.1", -+ "ripemd160": "^2.0.0", -+ "safe-buffer": "^5.0.1", -+ "sha.js": "^2.4.8" -+ } -+ }, -+ "node_modules/cross-spawn": { -+ "version": "7.0.3", -+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", -+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", -+ "dependencies": { -+ "path-key": "^3.1.0", -+ "shebang-command": "^2.0.0", -+ "which": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/cross-unzip": { -+ "version": "0.0.2", -+ "resolved": "https://registry.npmjs.org/cross-unzip/-/cross-unzip-0.0.2.tgz", -+ "integrity": "sha512-nRJ5c+aqHz0OJVU4V1bqoaDggydfauK/Gha/H/ScBvuIjhZvl8YIpdWVzSR3vUhzCloqB1tvBdQ4V7J8qK7HzQ==" -+ }, -+ "node_modules/crypto-browserify": { -+ "version": "3.12.0", -+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", -+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", -+ "dependencies": { -+ "browserify-cipher": "^1.0.0", -+ "browserify-sign": "^4.0.0", -+ "create-ecdh": "^4.0.0", -+ "create-hash": "^1.1.0", -+ "create-hmac": "^1.1.0", -+ "diffie-hellman": "^5.0.0", -+ "inherits": "^2.0.1", -+ "pbkdf2": "^3.0.3", -+ "public-encrypt": "^4.0.0", -+ "randombytes": "^2.0.0", -+ "randomfill": "^1.0.3" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/crypto-random-string": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", -+ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/dash-ast": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", -+ "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==" -+ }, -+ "node_modules/dashdash": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", -+ "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", -+ "dependencies": { -+ "assert-plus": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/debug": { -+ "version": "4.3.4", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", -+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", -+ "dependencies": { -+ "ms": "2.1.2" -+ }, -+ "engines": { -+ "node": ">=6.0" -+ }, -+ "peerDependenciesMeta": { -+ "supports-color": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/decamelize": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", -+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/decamelize-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", -+ "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", -+ "dependencies": { -+ "decamelize": "^1.1.0", -+ "map-obj": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/decamelize-keys/node_modules/map-obj": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", -+ "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/decompress-response": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", -+ "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", -+ "dependencies": { -+ "mimic-response": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/deep-equal": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", -+ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", -+ "dependencies": { -+ "is-arguments": "^1.0.4", -+ "is-date-object": "^1.0.1", -+ "is-regex": "^1.0.4", -+ "object-is": "^1.0.1", -+ "object-keys": "^1.1.1", -+ "regexp.prototype.flags": "^1.2.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/deep-extend": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", -+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", -+ "engines": { -+ "node": ">=4.0.0" -+ } -+ }, -+ "node_modules/deep-is": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", -+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" -+ }, -+ "node_modules/defer-to-connect": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", -+ "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" -+ }, -+ "node_modules/define-lazy-prop": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", -+ "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/define-properties": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", -+ "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", -+ "dependencies": { -+ "has-property-descriptors": "^1.0.0", -+ "object-keys": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/defined": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", -+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/delayed-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", -+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/delegates": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", -+ "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" -+ }, -+ "node_modules/depd": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", -+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/deps-sort": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz", -+ "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==", -+ "dependencies": { -+ "JSONStream": "^1.0.3", -+ "shasum-object": "^1.0.0", -+ "subarg": "^1.0.0", -+ "through2": "^2.0.0" -+ }, -+ "bin": { -+ "deps-sort": "bin/cmd.js" -+ } -+ }, -+ "node_modules/des.js": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", -+ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "minimalistic-assert": "^1.0.0" -+ } -+ }, -+ "node_modules/destroy": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", -+ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", -+ "engines": { -+ "node": ">= 0.8", -+ "npm": "1.2.8000 || >= 1.4.16" -+ } -+ }, -+ "node_modules/detect-libc": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", -+ "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", -+ "optional": true, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/detect-node": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", -+ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", -+ "optional": true -+ }, -+ "node_modules/detective": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", -+ "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", -+ "dependencies": { -+ "acorn-node": "^1.8.2", -+ "defined": "^1.0.0", -+ "minimist": "^1.2.6" -+ }, -+ "bin": { -+ "detective": "bin/detective.js" -+ }, -+ "engines": { -+ "node": ">=0.8.0" -+ } -+ }, -+ "node_modules/diff-match-patch": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz", -+ "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==" -+ }, -+ "node_modules/diffie-hellman": { -+ "version": "5.0.3", -+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", -+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", -+ "dependencies": { -+ "bn.js": "^4.1.0", -+ "miller-rabin": "^4.0.0", -+ "randombytes": "^2.0.0" -+ } -+ }, -+ "node_modules/diffie-hellman/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/dns-equal": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", -+ "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==" -+ }, -+ "node_modules/dns-packet": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", -+ "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", -+ "dependencies": { -+ "ip": "^1.1.0", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "node_modules/dns-txt": { -+ "version": "2.0.3", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/dns-txt.git#3bee7785c32d8bc71230d5e01383c61fb72a4b4f", -+ "license": "MIT", -+ "dependencies": { -+ "buffer-indexof": "^1.0.0" -+ } -+ }, -+ "node_modules/doctrine": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", -+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", -+ "dependencies": { -+ "esutils": "^2.0.2" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/dom-serializer": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", -+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", -+ "dependencies": { -+ "domelementtype": "^2.0.1", -+ "domhandler": "^4.2.0", -+ "entities": "^2.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" -+ } -+ }, -+ "node_modules/dom-serializer/node_modules/domhandler": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", -+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -+ "dependencies": { -+ "domelementtype": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">= 4" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/domhandler?sponsor=1" -+ } -+ }, -+ "node_modules/domain-browser": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", -+ "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", -+ "engines": { -+ "node": ">=0.4", -+ "npm": ">=1.2" -+ } -+ }, -+ "node_modules/domelementtype": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", -+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/fb55" -+ } -+ ] -+ }, -+ "node_modules/domhandler": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", -+ "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", -+ "dependencies": { -+ "domelementtype": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">= 4" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/domhandler?sponsor=1" -+ } -+ }, -+ "node_modules/domutils": { -+ "version": "2.8.0", -+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", -+ "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", -+ "dependencies": { -+ "dom-serializer": "^1.0.1", -+ "domelementtype": "^2.2.0", -+ "domhandler": "^4.2.0" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/domutils?sponsor=1" -+ } -+ }, -+ "node_modules/domutils/node_modules/domhandler": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", -+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -+ "dependencies": { -+ "domelementtype": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">= 4" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/domhandler?sponsor=1" -+ } -+ }, -+ "node_modules/dot-prop": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", -+ "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", -+ "dependencies": { -+ "is-obj": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/duplexer2": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", -+ "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", -+ "dependencies": { -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/duplexer3": { -+ "version": "0.1.5", -+ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz", -+ "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==" -+ }, -+ "node_modules/ecc-jsbn": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", -+ "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", -+ "dependencies": { -+ "jsbn": "~0.1.0", -+ "safer-buffer": "^2.1.0" -+ } -+ }, -+ "node_modules/ee-first": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", -+ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" -+ }, -+ "node_modules/electron-is-accelerator": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz", -+ "integrity": "sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA==" -+ }, -+ "node_modules/electron-localshortcut": { -+ "version": "3.2.1", -+ "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz", -+ "integrity": "sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q==", -+ "dependencies": { -+ "debug": "^4.0.1", -+ "electron-is-accelerator": "^0.1.0", -+ "keyboardevent-from-electron-accelerator": "^2.0.0", -+ "keyboardevents-areequal": "^0.2.1" -+ } -+ }, -+ "node_modules/electron-notarize": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.2.tgz", -+ "integrity": "sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw==", -+ "deprecated": "Please use @electron/notarize moving forward. There is no API change, just a package name change", -+ "dependencies": { -+ "debug": "^4.1.1", -+ "fs-extra": "^9.0.1" -+ }, -+ "engines": { -+ "node": ">= 10.0.0" -+ } -+ }, -+ "node_modules/electron-osx-sign": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", -+ "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==", -+ "deprecated": "Please use @electron/osx-sign moving forward. Be aware the API is slightly different", -+ "dependencies": { -+ "bluebird": "^3.5.0", -+ "compare-version": "^0.1.2", -+ "debug": "^2.6.8", -+ "isbinaryfile": "^3.0.2", -+ "minimist": "^1.2.0", -+ "plist": "^3.0.1" -+ }, -+ "bin": { -+ "electron-osx-flat": "bin/electron-osx-flat.js", -+ "electron-osx-sign": "bin/electron-osx-sign.js" -+ }, -+ "engines": { -+ "node": ">=4.0.0" -+ } -+ }, -+ "node_modules/electron-osx-sign/node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/electron-osx-sign/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ }, -+ "node_modules/electron-packager": { -+ "version": "15.2.0", -+ "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-15.2.0.tgz", -+ "integrity": "sha512-BaklTBRQy1JTijR3hi8XxHf/uo76rHbDCNM/eQHSblzE9C0NoNfOe86nPxB7y1u2jwlqoEJ4zFiHpTFioKGGRA==", -+ "dependencies": { -+ "@electron/get": "^1.6.0", -+ "asar": "^3.0.0", -+ "debug": "^4.0.1", -+ "electron-notarize": "^1.0.0", -+ "electron-osx-sign": "^0.5.0", -+ "extract-zip": "^2.0.0", -+ "filenamify": "^4.1.0", -+ "fs-extra": "^9.0.0", -+ "galactus": "^0.2.1", -+ "get-package-info": "^1.0.0", -+ "junk": "^3.1.0", -+ "parse-author": "^2.0.0", -+ "plist": "^3.0.0", -+ "rcedit": "^2.0.0", -+ "resolve": "^1.1.6", -+ "semver": "^7.1.3", -+ "yargs-parser": "^20.0.0" -+ }, -+ "bin": { -+ "electron-packager": "bin/electron-packager.js" -+ }, -+ "engines": { -+ "node": ">= 10.12.0" -+ }, -+ "funding": { -+ "url": "https://github.com/electron/electron-packager?sponsor=1" -+ } -+ }, -+ "node_modules/electron-packager-plugin-non-proprietary-codecs-ffmpeg": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/electron-packager-plugin-non-proprietary-codecs-ffmpeg/-/electron-packager-plugin-non-proprietary-codecs-ffmpeg-1.0.2.tgz", -+ "integrity": "sha512-xPkbzndg2KODqmNe9yIx0dhNOfaOqrdNZ1ZSSZN4h1wT0T5SV/YES0tNyN932jQd+c5cFPv6AWYYjuPWKvcITg==", -+ "dependencies": { -+ "7zip": "0.0.6", -+ "cross-unzip": "0.0.2", -+ "mkdirp": "^0.5.1", -+ "request": "^2.73.0", -+ "semver": "^5.2.0" -+ } -+ }, -+ "node_modules/electron-packager-plugin-non-proprietary-codecs-ffmpeg/node_modules/semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/electron-to-chromium": { -+ "version": "1.4.284", -+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", -+ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" -+ }, -+ "node_modules/elliptic": { -+ "version": "6.5.4", -+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", -+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", -+ "dependencies": { -+ "bn.js": "^4.11.9", -+ "brorand": "^1.1.0", -+ "hash.js": "^1.0.0", -+ "hmac-drbg": "^1.0.1", -+ "inherits": "^2.0.4", -+ "minimalistic-assert": "^1.0.1", -+ "minimalistic-crypto-utils": "^1.0.1" -+ } -+ }, -+ "node_modules/elliptic/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/emoji-regex": { -+ "version": "8.0.0", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" -+ }, -+ "node_modules/encodeurl": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", -+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/encoding": { -+ "version": "0.1.13", -+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", -+ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", -+ "optional": true, -+ "dependencies": { -+ "iconv-lite": "^0.6.2" -+ } -+ }, -+ "node_modules/end-of-stream": { -+ "version": "1.4.4", -+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", -+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", -+ "dependencies": { -+ "once": "^1.4.0" -+ } -+ }, -+ "node_modules/entities": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", -+ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", -+ "funding": { -+ "url": "https://github.com/fb55/entities?sponsor=1" -+ } -+ }, -+ "node_modules/env-paths": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", -+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/err-code": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", -+ "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" -+ }, -+ "node_modules/error-ex": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", -+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", -+ "dependencies": { -+ "is-arrayish": "^0.2.1" -+ } -+ }, -+ "node_modules/error-stack-parser": { -+ "version": "2.1.4", -+ "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", -+ "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", -+ "dependencies": { -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "node_modules/es6-error": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", -+ "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", -+ "optional": true -+ }, -+ "node_modules/escalade": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", -+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/escape-goat": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", -+ "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/escape-html": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", -+ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" -+ }, -+ "node_modules/escape-string-regexp": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", -+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", -+ "engines": { -+ "node": ">=0.8.0" -+ } -+ }, -+ "node_modules/escaper": { -+ "version": "2.5.3", -+ "resolved": "https://registry.npmjs.org/escaper/-/escaper-2.5.3.tgz", -+ "integrity": "sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ==" -+ }, -+ "node_modules/eslint": { -+ "version": "8.16.0", -+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz", -+ "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==", -+ "dependencies": { -+ "@eslint/eslintrc": "^1.3.0", -+ "@humanwhocodes/config-array": "^0.9.2", -+ "ajv": "^6.10.0", -+ "chalk": "^4.0.0", -+ "cross-spawn": "^7.0.2", -+ "debug": "^4.3.2", -+ "doctrine": "^3.0.0", -+ "escape-string-regexp": "^4.0.0", -+ "eslint-scope": "^7.1.1", -+ "eslint-utils": "^3.0.0", -+ "eslint-visitor-keys": "^3.3.0", -+ "espree": "^9.3.2", -+ "esquery": "^1.4.0", -+ "esutils": "^2.0.2", -+ "fast-deep-equal": "^3.1.3", -+ "file-entry-cache": "^6.0.1", -+ "functional-red-black-tree": "^1.0.1", -+ "glob-parent": "^6.0.1", -+ "globals": "^13.15.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.0.0", -+ "imurmurhash": "^0.1.4", -+ "is-glob": "^4.0.0", -+ "js-yaml": "^4.1.0", -+ "json-stable-stringify-without-jsonify": "^1.0.1", -+ "levn": "^0.4.1", -+ "lodash.merge": "^4.6.2", -+ "minimatch": "^3.1.2", -+ "natural-compare": "^1.4.0", -+ "optionator": "^0.9.1", -+ "regexpp": "^3.2.0", -+ "strip-ansi": "^6.0.1", -+ "strip-json-comments": "^3.1.0", -+ "text-table": "^0.2.0", -+ "v8-compile-cache": "^2.0.3" -+ }, -+ "bin": { -+ "eslint": "bin/eslint.js" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/eslint-scope": { -+ "version": "5.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", -+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", -+ "dependencies": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^4.1.1" -+ }, -+ "engines": { -+ "node": ">=8.0.0" -+ } -+ }, -+ "node_modules/eslint-utils": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", -+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", -+ "dependencies": { -+ "eslint-visitor-keys": "^2.0.0" -+ }, -+ "engines": { -+ "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/mysticatea" -+ }, -+ "peerDependencies": { -+ "eslint": ">=5" -+ } -+ }, -+ "node_modules/eslint-visitor-keys": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", -+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/eslint/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/eslint/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/eslint/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/eslint/node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/eslint/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/eslint/node_modules/escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/eslint/node_modules/eslint-scope": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", -+ "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", -+ "dependencies": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^5.2.0" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/glob-parent": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", -+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", -+ "dependencies": { -+ "is-glob": "^4.0.3" -+ }, -+ "engines": { -+ "node": ">=10.13.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/globals": { -+ "version": "13.17.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", -+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", -+ "dependencies": { -+ "type-fest": "^0.20.2" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/eslint/node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/eslint/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/eslint/node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/eslint/node_modules/type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/espree": { -+ "version": "9.4.1", -+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", -+ "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", -+ "dependencies": { -+ "acorn": "^8.8.0", -+ "acorn-jsx": "^5.3.2", -+ "eslint-visitor-keys": "^3.3.0" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/espree/node_modules/eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/esquery": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", -+ "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", -+ "dependencies": { -+ "estraverse": "^5.1.0" -+ }, -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/esquery/node_modules/estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/esrecurse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", -+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", -+ "dependencies": { -+ "estraverse": "^5.2.0" -+ }, -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/esrecurse/node_modules/estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/estraverse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", -+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/estree-is-member-expression": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/estree-is-member-expression/-/estree-is-member-expression-1.0.0.tgz", -+ "integrity": "sha512-Ec+X44CapIGExvSZN+pGkmr5p7HwUVQoPQSd458Lqwvaf4/61k/invHSh4BYK8OXnCkfEhWuIoG5hayKLQStIg==" -+ }, -+ "node_modules/esutils": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", -+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/etag": { -+ "version": "1.8.1", -+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", -+ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/events": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", -+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", -+ "engines": { -+ "node": ">=0.8.x" -+ } -+ }, -+ "node_modules/evp_bytestokey": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", -+ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", -+ "dependencies": { -+ "md5.js": "^1.3.4", -+ "safe-buffer": "^5.1.1" -+ } -+ }, -+ "node_modules/exorcist": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/exorcist/-/exorcist-2.0.0.tgz", -+ "integrity": "sha512-+c63SvhBq/HjmbV9cu9vkDkjXFiuI4lpqOZU5Y3t5GSV2l4TQCqVli9c7nIASHxkUL4THaOZDUcb6XNBI/eYjw==", -+ "dependencies": { -+ "is-stream": "^2.0.0", -+ "minimist": "^1.2.5", -+ "mkdirp": "^1.0.4", -+ "mold-source-map": "^0.4.0" -+ }, -+ "bin": { -+ "exorcist": "bin/exorcist.js" -+ } -+ }, -+ "node_modules/exorcist/node_modules/mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/expand-template": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", -+ "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", -+ "optional": true, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/extend": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", -+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" -+ }, -+ "node_modules/extract-zip": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", -+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", -+ "dependencies": { -+ "debug": "^4.1.1", -+ "get-stream": "^5.1.0", -+ "yauzl": "^2.10.0" -+ }, -+ "bin": { -+ "extract-zip": "cli.js" -+ }, -+ "engines": { -+ "node": ">= 10.17.0" -+ }, -+ "optionalDependencies": { -+ "@types/yauzl": "^2.9.1" -+ } -+ }, -+ "node_modules/extsprintf": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", -+ "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", -+ "engines": [ -+ "node >=0.6.0" -+ ] -+ }, -+ "node_modules/fast-deep-equal": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", -+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" -+ }, -+ "node_modules/fast-json-stable-stringify": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", -+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" -+ }, -+ "node_modules/fast-levenshtein": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", -+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" -+ }, -+ "node_modules/fast-safe-stringify": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", -+ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" -+ }, -+ "node_modules/fastdom": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/fastdom/-/fastdom-1.0.10.tgz", -+ "integrity": "sha512-sbL4h358IlZn8VsTvA5TYnKVLYif46XhPEll+HTSxVtDSpqZEO/17D/QqlxE9V2K7AQ82GXeYeQLU2HWwKgk1A==", -+ "dependencies": { -+ "strictdom": "^1.0.1" -+ } -+ }, -+ "node_modules/fd-slicer": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", -+ "dependencies": { -+ "pend": "~1.2.0" -+ } -+ }, -+ "node_modules/file-entry-cache": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", -+ "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", -+ "dependencies": { -+ "flat-cache": "^3.0.4" -+ }, -+ "engines": { -+ "node": "^10.12.0 || >=12.0.0" -+ } -+ }, -+ "node_modules/file-saver": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", -+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" -+ }, -+ "node_modules/file-uri-to-path": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", -+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", -+ "optional": true -+ }, -+ "node_modules/filename-reserved-regex": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", -+ "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/filenamify": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", -+ "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", -+ "dependencies": { -+ "filename-reserved-regex": "^2.0.0", -+ "strip-outer": "^1.0.1", -+ "trim-repeated": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/fill-range": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", -+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", -+ "dependencies": { -+ "to-regex-range": "^5.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/find-up": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", -+ "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", -+ "dependencies": { -+ "locate-path": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/flat-cache": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", -+ "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", -+ "dependencies": { -+ "flatted": "^3.1.0", -+ "rimraf": "^3.0.2" -+ }, -+ "engines": { -+ "node": "^10.12.0 || >=12.0.0" -+ } -+ }, -+ "node_modules/flat-cache/node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/flatted": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", -+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" -+ }, -+ "node_modules/flora-colossus": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/flora-colossus/-/flora-colossus-1.0.1.tgz", -+ "integrity": "sha512-d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==", -+ "dependencies": { -+ "debug": "^4.1.1", -+ "fs-extra": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">= 6.0.0" -+ } -+ }, -+ "node_modules/flora-colossus/node_modules/fs-extra": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", -+ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", -+ "dependencies": { -+ "graceful-fs": "^4.1.2", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ }, -+ "engines": { -+ "node": ">=6 <7 || >=8" -+ } -+ }, -+ "node_modules/flora-colossus/node_modules/jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/flora-colossus/node_modules/universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/for-each": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", -+ "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", -+ "dependencies": { -+ "is-callable": "^1.1.3" -+ } -+ }, -+ "node_modules/forever-agent": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", -+ "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/form-data": { -+ "version": "2.3.3", -+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", -+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", -+ "dependencies": { -+ "asynckit": "^0.4.0", -+ "combined-stream": "^1.0.6", -+ "mime-types": "^2.1.12" -+ }, -+ "engines": { -+ "node": ">= 0.12" -+ } -+ }, -+ "node_modules/fresh": { -+ "version": "0.5.2", -+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", -+ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/fs-constants": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", -+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", -+ "optional": true -+ }, -+ "node_modules/fs-extra": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", -+ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", -+ "dependencies": { -+ "at-least-node": "^1.0.0", -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^6.0.1", -+ "universalify": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/fs-minipass": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", -+ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/fs.realpath": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" -+ }, -+ "node_modules/fsevents": { -+ "version": "2.3.2", -+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", -+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", -+ "hasInstallScript": true, -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" -+ } -+ }, -+ "node_modules/function-bind": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", -+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" -+ }, -+ "node_modules/functional-red-black-tree": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", -+ "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==" -+ }, -+ "node_modules/functions-have-names": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", -+ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/galactus": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/galactus/-/galactus-0.2.1.tgz", -+ "integrity": "sha512-mDc8EQJKtxjp9PMYS3PbpjjbX3oXhBTxoGaPahw620XZBIHJ4+nvw5KN/tRtmmSDR9dypstGNvqQ3C29QGoGHQ==", -+ "dependencies": { -+ "debug": "^3.1.0", -+ "flora-colossus": "^1.0.0", -+ "fs-extra": "^4.0.0" -+ } -+ }, -+ "node_modules/galactus/node_modules/debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "dependencies": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "node_modules/galactus/node_modules/fs-extra": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", -+ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", -+ "dependencies": { -+ "graceful-fs": "^4.1.2", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ } -+ }, -+ "node_modules/galactus/node_modules/jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/galactus/node_modules/universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/gauge": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", -+ "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", -+ "dependencies": { -+ "aproba": "^1.0.3 || ^2.0.0", -+ "color-support": "^1.1.2", -+ "console-control-strings": "^1.0.0", -+ "has-unicode": "^2.0.1", -+ "object-assign": "^4.1.1", -+ "signal-exit": "^3.0.0", -+ "string-width": "^4.2.3", -+ "strip-ansi": "^6.0.1", -+ "wide-align": "^1.1.2" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/gaze": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", -+ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", -+ "dependencies": { -+ "globule": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/gensync": { -+ "version": "1.0.0-beta.2", -+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", -+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/get-assigned-identifiers": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz", -+ "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==" -+ }, -+ "node_modules/get-caller-file": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", -+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", -+ "engines": { -+ "node": "6.* || 8.* || >= 10.*" -+ } -+ }, -+ "node_modules/get-intrinsic": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", -+ "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", -+ "dependencies": { -+ "function-bind": "^1.1.1", -+ "has": "^1.0.3", -+ "has-symbols": "^1.0.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/get-package-info": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", -+ "integrity": "sha512-SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw==", -+ "dependencies": { -+ "bluebird": "^3.1.1", -+ "debug": "^2.2.0", -+ "lodash.get": "^4.0.0", -+ "read-pkg-up": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">= 4.0" -+ } -+ }, -+ "node_modules/get-package-info/node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/get-package-info/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ }, -+ "node_modules/get-stdin": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", -+ "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/get-stream": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", -+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", -+ "dependencies": { -+ "pump": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/getpass": { -+ "version": "0.1.7", -+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", -+ "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", -+ "dependencies": { -+ "assert-plus": "^1.0.0" -+ } -+ }, -+ "node_modules/github-from-package": { -+ "version": "0.0.0", -+ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", -+ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", -+ "optional": true -+ }, -+ "node_modules/glob": { -+ "version": "7.2.3", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", -+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", -+ "dependencies": { -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.1.1", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" -+ }, -+ "engines": { -+ "node": "*" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/glob-parent": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", -+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", -+ "dependencies": { -+ "is-glob": "^4.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/glob/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/glob/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/glob/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/global-agent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", -+ "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", -+ "optional": true, -+ "dependencies": { -+ "boolean": "^3.0.1", -+ "es6-error": "^4.1.1", -+ "matcher": "^3.0.0", -+ "roarr": "^2.15.3", -+ "semver": "^7.3.2", -+ "serialize-error": "^7.0.1" -+ }, -+ "engines": { -+ "node": ">=10.0" -+ } -+ }, -+ "node_modules/global-dirs": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", -+ "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", -+ "dependencies": { -+ "ini": "2.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/global-dirs/node_modules/ini": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", -+ "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/global-tunnel-ng": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", -+ "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", -+ "optional": true, -+ "dependencies": { -+ "encodeurl": "^1.0.2", -+ "lodash": "^4.17.10", -+ "npm-conf": "^1.1.3", -+ "tunnel": "^0.0.6" -+ }, -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/globals": { -+ "version": "11.12.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", -+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/globalthis": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", -+ "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", -+ "optional": true, -+ "dependencies": { -+ "define-properties": "^1.1.3" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/globule": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz", -+ "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==", -+ "dependencies": { -+ "glob": "~7.1.1", -+ "lodash": "^4.17.21", -+ "minimatch": "~3.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.10" -+ } -+ }, -+ "node_modules/globule/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/globule/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/globule/node_modules/glob": { -+ "version": "7.1.7", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", -+ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", -+ "dependencies": { -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.0.4", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" -+ }, -+ "engines": { -+ "node": "*" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/globule/node_modules/minimatch": { -+ "version": "3.0.8", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", -+ "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/gopd": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", -+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", -+ "dependencies": { -+ "get-intrinsic": "^1.1.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/got": { -+ "version": "9.6.0", -+ "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", -+ "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", -+ "dependencies": { -+ "@sindresorhus/is": "^0.14.0", -+ "@szmarczak/http-timer": "^1.1.2", -+ "cacheable-request": "^6.0.0", -+ "decompress-response": "^3.3.0", -+ "duplexer3": "^0.1.4", -+ "get-stream": "^4.1.0", -+ "lowercase-keys": "^1.0.1", -+ "mimic-response": "^1.0.1", -+ "p-cancelable": "^1.0.0", -+ "to-readable-stream": "^1.0.0", -+ "url-parse-lax": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8.6" -+ } -+ }, -+ "node_modules/got/node_modules/get-stream": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", -+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", -+ "dependencies": { -+ "pump": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/graceful-fs": { -+ "version": "4.2.10", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", -+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" -+ }, -+ "node_modules/gyronorm": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/gyronorm/-/gyronorm-2.0.6.tgz", -+ "integrity": "sha512-pE66zEK/3G9t1dpikTKIjNuY1JauXgtNiulgPKc28IKwMJ5NuJ03mOQ5ArqnkOyQxhlJSY71i3YdFcHhzx4TOg==" -+ }, -+ "node_modules/har-schema": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", -+ "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/har-validator": { -+ "version": "5.1.5", -+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", -+ "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", -+ "deprecated": "this library is no longer supported", -+ "dependencies": { -+ "ajv": "^6.12.3", -+ "har-schema": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/hard-rejection": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", -+ "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/has": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", -+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", -+ "dependencies": { -+ "function-bind": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.4.0" -+ } -+ }, -+ "node_modules/has-ansi": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", -+ "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", -+ "dependencies": { -+ "ansi-regex": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/has-ansi/node_modules/ansi-regex": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", -+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/has-flag": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", -+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/has-property-descriptors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", -+ "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", -+ "dependencies": { -+ "get-intrinsic": "^1.1.1" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-symbols": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", -+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-tostringtag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", -+ "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", -+ "dependencies": { -+ "has-symbols": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-unicode": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", -+ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" -+ }, -+ "node_modules/has-yarn": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", -+ "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/hash-base": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", -+ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", -+ "dependencies": { -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.6.0", -+ "safe-buffer": "^5.2.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/hash-base/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/hash.js": { -+ "version": "1.1.7", -+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", -+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "minimalistic-assert": "^1.0.1" -+ } -+ }, -+ "node_modules/hmac-drbg": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", -+ "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", -+ "dependencies": { -+ "hash.js": "^1.0.3", -+ "minimalistic-assert": "^1.0.0", -+ "minimalistic-crypto-utils": "^1.0.1" -+ } -+ }, -+ "node_modules/hosted-git-info": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", -+ "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", -+ "dependencies": { -+ "lru-cache": "^6.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/htmlescape": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", -+ "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==", -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/htmlparser2": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", -+ "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", -+ "dependencies": { -+ "domelementtype": "^2.0.1", -+ "domhandler": "^3.0.0", -+ "domutils": "^2.0.0", -+ "entities": "^2.0.0" -+ } -+ }, -+ "node_modules/http-auth": { -+ "version": "4.1.9", -+ "resolved": "https://registry.npmjs.org/http-auth/-/http-auth-4.1.9.tgz", -+ "integrity": "sha512-kvPYxNGc9EKGTXvOMnTBQw2RZfuiSihK/mLw/a4pbtRueTE45S55Lw/3k5CktIf7Ak0veMKEIteDj4YkNmCzmQ==", -+ "dependencies": { -+ "apache-crypt": "^1.1.2", -+ "apache-md5": "^1.0.6", -+ "bcryptjs": "^2.4.3", -+ "uuid": "^8.3.2" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/http-cache-semantics": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", -+ "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" -+ }, -+ "node_modules/http-errors": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", -+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", -+ "dependencies": { -+ "depd": "2.0.0", -+ "inherits": "2.0.4", -+ "setprototypeof": "1.2.0", -+ "statuses": "2.0.1", -+ "toidentifier": "1.0.1" -+ }, -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/http-errors/node_modules/depd": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/http-proxy-agent": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", -+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", -+ "dependencies": { -+ "@tootallnate/once": "1", -+ "agent-base": "6", -+ "debug": "4" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/http-signature": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", -+ "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", -+ "dependencies": { -+ "assert-plus": "^1.0.0", -+ "jsprim": "^1.2.2", -+ "sshpk": "^1.7.0" -+ }, -+ "engines": { -+ "node": ">=0.8", -+ "npm": ">=1.3.7" -+ } -+ }, -+ "node_modules/https-browserify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", -+ "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" -+ }, -+ "node_modules/https-proxy-agent": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", -+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", -+ "dependencies": { -+ "agent-base": "6", -+ "debug": "4" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/humanize-ms": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", -+ "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", -+ "dependencies": { -+ "ms": "^2.0.0" -+ } -+ }, -+ "node_modules/hyperscript-attribute-to-property": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/hyperscript-attribute-to-property/-/hyperscript-attribute-to-property-1.0.2.tgz", -+ "integrity": "sha512-oerMul16jZCmrbNsUw8QgrtDzF8lKgFri1bKQjReLw1IhiiNkI59CWuzZjJDGT79UQ1YiWqXhJMv/tRMVqgtkA==" -+ }, -+ "node_modules/hyperx": { -+ "version": "2.5.4", -+ "resolved": "https://registry.npmjs.org/hyperx/-/hyperx-2.5.4.tgz", -+ "integrity": "sha512-iOkSh7Yse7lsN/B9y7OsevLWjeXPqGuHQ5SbwaiJM5xAhWFqhoN6erpK1dQsS12OFU36lyai1pnx1mmzWLQqcA==", -+ "dependencies": { -+ "hyperscript-attribute-to-property": "^1.0.0" -+ } -+ }, -+ "node_modules/iconv-lite": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", -+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", -+ "optional": true, -+ "dependencies": { -+ "safer-buffer": ">= 2.1.2 < 3.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/ieee754": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", -+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/ignore": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", -+ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", -+ "engines": { -+ "node": ">= 4" -+ } -+ }, -+ "node_modules/ignore-by-default": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", -+ "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" -+ }, -+ "node_modules/import-fresh": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", -+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", -+ "dependencies": { -+ "parent-module": "^1.0.0", -+ "resolve-from": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/import-lazy": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", -+ "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/imurmurhash": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", -+ "engines": { -+ "node": ">=0.8.19" -+ } -+ }, -+ "node_modules/indent-string": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", -+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/infer-owner": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", -+ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" -+ }, -+ "node_modules/inflight": { -+ "version": "1.0.6", -+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", -+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", -+ "dependencies": { -+ "once": "^1.3.0", -+ "wrappy": "1" -+ } -+ }, -+ "node_modules/inherits": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" -+ }, -+ "node_modules/ini": { -+ "version": "1.3.8", -+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", -+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" -+ }, -+ "node_modules/inline-source-map": { -+ "version": "0.6.2", -+ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz", -+ "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==", -+ "dependencies": { -+ "source-map": "~0.5.3" -+ } -+ }, -+ "node_modules/insert-module-globals": { -+ "version": "7.2.1", -+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz", -+ "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==", -+ "dependencies": { -+ "acorn-node": "^1.5.2", -+ "combine-source-map": "^0.8.0", -+ "concat-stream": "^1.6.1", -+ "is-buffer": "^1.1.0", -+ "JSONStream": "^1.0.3", -+ "path-is-absolute": "^1.0.1", -+ "process": "~0.11.0", -+ "through2": "^2.0.0", -+ "undeclared-identifiers": "^1.1.2", -+ "xtend": "^4.0.0" -+ }, -+ "bin": { -+ "insert-module-globals": "bin/cmd.js" -+ } -+ }, -+ "node_modules/ip": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", -+ "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" -+ }, -+ "node_modules/is-arguments": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", -+ "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-arrayish": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", -+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" -+ }, -+ "node_modules/is-binary-path": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", -+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", -+ "dependencies": { -+ "binary-extensions": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-boolean-attribute": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/is-boolean-attribute/-/is-boolean-attribute-0.0.1.tgz", -+ "integrity": "sha512-0kXT52Scokg2Miscvsn5UVqg6y1691vcLJcagie1YHJB4zOEuAhMERLX992jtvaStGy2xQTqOtJhvmG/MK1T5w==" -+ }, -+ "node_modules/is-buffer": { -+ "version": "1.1.6", -+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", -+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" -+ }, -+ "node_modules/is-callable": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", -+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-ci": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", -+ "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", -+ "dependencies": { -+ "ci-info": "^2.0.0" -+ }, -+ "bin": { -+ "is-ci": "bin.js" -+ } -+ }, -+ "node_modules/is-core-module": { -+ "version": "2.11.0", -+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", -+ "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", -+ "dependencies": { -+ "has": "^1.0.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-date-object": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", -+ "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", -+ "dependencies": { -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-docker": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", -+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", -+ "bin": { -+ "is-docker": "cli.js" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-extglob": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", -+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-fullwidth-code-point": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-generator-function": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", -+ "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", -+ "dependencies": { -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-glob": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", -+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", -+ "dependencies": { -+ "is-extglob": "^2.1.1" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-installed-globally": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", -+ "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", -+ "dependencies": { -+ "global-dirs": "^3.0.0", -+ "is-path-inside": "^3.0.2" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-lambda": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", -+ "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" -+ }, -+ "node_modules/is-npm": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", -+ "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-number": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", -+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", -+ "engines": { -+ "node": ">=0.12.0" -+ } -+ }, -+ "node_modules/is-obj": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", -+ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-path-inside": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", -+ "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-plain-obj": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", -+ "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-regex": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", -+ "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-regexp": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", -+ "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-stream": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", -+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-typed-array": { -+ "version": "1.1.10", -+ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", -+ "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", -+ "dependencies": { -+ "available-typed-arrays": "^1.0.5", -+ "call-bind": "^1.0.2", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-typedarray": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", -+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" -+ }, -+ "node_modules/is-wsl": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", -+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", -+ "dependencies": { -+ "is-docker": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-yarn-global": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", -+ "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" -+ }, -+ "node_modules/isarray": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", -+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" -+ }, -+ "node_modules/isbinaryfile": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", -+ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", -+ "dependencies": { -+ "buffer-alloc": "^1.2.0" -+ }, -+ "engines": { -+ "node": ">=0.6.0" -+ } -+ }, -+ "node_modules/isexe": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" -+ }, -+ "node_modules/isstream": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", -+ "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" -+ }, -+ "node_modules/js-base64": { -+ "version": "2.6.4", -+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", -+ "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" -+ }, -+ "node_modules/js-tokens": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", -+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" -+ }, -+ "node_modules/js-yaml": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", -+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", -+ "dependencies": { -+ "argparse": "^2.0.1" -+ }, -+ "bin": { -+ "js-yaml": "bin/js-yaml.js" -+ } -+ }, -+ "node_modules/jsbn": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", -+ "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" -+ }, -+ "node_modules/jsesc": { -+ "version": "2.5.2", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", -+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", -+ "bin": { -+ "jsesc": "bin/jsesc" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/json-buffer": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", -+ "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==" -+ }, -+ "node_modules/json-parse-even-better-errors": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", -+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" -+ }, -+ "node_modules/json-schema": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", -+ "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" -+ }, -+ "node_modules/json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" -+ }, -+ "node_modules/json-stable-stringify-without-jsonify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", -+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" -+ }, -+ "node_modules/json-stringify-safe": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", -+ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" -+ }, -+ "node_modules/json5": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", -+ "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", -+ "bin": { -+ "json5": "lib/cli.js" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/jsondiffpatch": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz", -+ "integrity": "sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==", -+ "dependencies": { -+ "chalk": "^2.3.0", -+ "diff-match-patch": "^1.0.0" -+ }, -+ "bin": { -+ "jsondiffpatch": "bin/jsondiffpatch" -+ }, -+ "engines": { -+ "node": ">=8.17.0" -+ } -+ }, -+ "node_modules/jsonfile": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", -+ "dependencies": { -+ "universalify": "^2.0.0" -+ }, -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/jsonparse": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", -+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", -+ "engines": [ -+ "node >= 0.2.0" -+ ] -+ }, -+ "node_modules/JSONStream": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", -+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", -+ "dependencies": { -+ "jsonparse": "^1.2.0", -+ "through": ">=2.2.7 <3" -+ }, -+ "bin": { -+ "JSONStream": "bin.js" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/jsprim": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", -+ "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", -+ "dependencies": { -+ "assert-plus": "1.0.0", -+ "extsprintf": "1.3.0", -+ "json-schema": "0.4.0", -+ "verror": "1.10.0" -+ }, -+ "engines": { -+ "node": ">=0.6.0" -+ } -+ }, -+ "node_modules/junk": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", -+ "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/keyboardevent-from-electron-accelerator": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz", -+ "integrity": "sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA==" -+ }, -+ "node_modules/keyboardevents-areequal": { -+ "version": "0.2.2", -+ "resolved": "https://registry.npmjs.org/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz", -+ "integrity": "sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==" -+ }, -+ "node_modules/keyboardjs": { -+ "version": "2.6.4", -+ "resolved": "https://registry.npmjs.org/keyboardjs/-/keyboardjs-2.6.4.tgz", -+ "integrity": "sha512-xDiNwiwH3KUqap++RFJiLAXzbvRB5Yw08xliuceOgLhM1o7g1puKKR9vWy6wp9H/Bi4VP0+SQMpiWXMWWmR6rA==" -+ }, -+ "node_modules/keyv": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", -+ "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", -+ "dependencies": { -+ "json-buffer": "3.0.0" -+ } -+ }, -+ "node_modules/kind-of": { -+ "version": "6.0.3", -+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", -+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/labeled-stream-splicer": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz", -+ "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "stream-splicer": "^2.0.0" -+ } -+ }, -+ "node_modules/latest-version": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", -+ "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", -+ "dependencies": { -+ "package-json": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/levn": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", -+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", -+ "dependencies": { -+ "prelude-ls": "^1.2.1", -+ "type-check": "~0.4.0" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/licensify": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/licensify/-/licensify-3.1.3.tgz", -+ "integrity": "sha512-3sEEBR0Cxq8yeSrV1KGZwpjm4KJKp8Cx/WHZxBnG/YX319ZTvxGtL+NCF+A9pcXwh8KwKB4BmVrc6eRrfk/Raw==", -+ "dependencies": { -+ "convert-source-map": "^1.1.3", -+ "offset-sourcemap-lines": "^1.0.0", -+ "oss-license-name-to-url": "^1.2.1", -+ "through2": "^2.0.0", -+ "type-name": "^2.0.0" -+ } -+ }, -+ "node_modules/lines-and-columns": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", -+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" -+ }, -+ "node_modules/load-json-file": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", -+ "integrity": "sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==", -+ "dependencies": { -+ "graceful-fs": "^4.1.2", -+ "parse-json": "^2.2.0", -+ "pify": "^2.0.0", -+ "strip-bom": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/load-json-file/node_modules/pify": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", -+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/locate-path": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", -+ "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", -+ "dependencies": { -+ "p-locate": "^2.0.0", -+ "path-exists": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/lodash": { -+ "version": "4.17.21", -+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", -+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" -+ }, -+ "node_modules/lodash.debounce": { -+ "version": "4.0.8", -+ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", -+ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" -+ }, -+ "node_modules/lodash.get": { -+ "version": "4.4.2", -+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", -+ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" -+ }, -+ "node_modules/lodash.memoize": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", -+ "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==" -+ }, -+ "node_modules/lodash.merge": { -+ "version": "4.6.2", -+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", -+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" -+ }, -+ "node_modules/long": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", -+ "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" -+ }, -+ "node_modules/loop-protect": { -+ "version": "1.0.1", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/loop-protect.git#335856f37ee4a805704bfcd1d7429ab94620bf6d" -+ }, -+ "node_modules/lower-case": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", -+ "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==" -+ }, -+ "node_modules/lowercase-keys": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", -+ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/lru-cache": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", -+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", -+ "dependencies": { -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/magic-string": { -+ "version": "0.23.2", -+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.23.2.tgz", -+ "integrity": "sha512-oIUZaAxbcxYIp4AyLafV6OVKoB3YouZs0UTCJ8mOKBHNyJgGDaMJ4TgA+VylJh6fx7EQCC52XkbURxxG9IoJXA==", -+ "dependencies": { -+ "sourcemap-codec": "^1.4.1" -+ } -+ }, -+ "node_modules/make-dir": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", -+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", -+ "dependencies": { -+ "semver": "^6.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/make-dir/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/make-fetch-happen": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", -+ "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", -+ "dependencies": { -+ "agentkeepalive": "^4.1.3", -+ "cacache": "^15.2.0", -+ "http-cache-semantics": "^4.1.0", -+ "http-proxy-agent": "^4.0.1", -+ "https-proxy-agent": "^5.0.0", -+ "is-lambda": "^1.0.1", -+ "lru-cache": "^6.0.0", -+ "minipass": "^3.1.3", -+ "minipass-collect": "^1.0.2", -+ "minipass-fetch": "^1.3.2", -+ "minipass-flush": "^1.0.5", -+ "minipass-pipeline": "^1.2.4", -+ "negotiator": "^0.6.2", -+ "promise-retry": "^2.0.1", -+ "socks-proxy-agent": "^6.0.0", -+ "ssri": "^8.0.0" -+ }, -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/map-obj": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", -+ "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/matcher": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", -+ "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", -+ "optional": true, -+ "dependencies": { -+ "escape-string-regexp": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/matcher/node_modules/escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", -+ "optional": true, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/md5.js": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", -+ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", -+ "dependencies": { -+ "hash-base": "^3.0.0", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "node_modules/meow": { -+ "version": "9.0.0", -+ "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", -+ "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", -+ "dependencies": { -+ "@types/minimist": "^1.2.0", -+ "camelcase-keys": "^6.2.2", -+ "decamelize": "^1.2.0", -+ "decamelize-keys": "^1.1.0", -+ "hard-rejection": "^2.1.0", -+ "minimist-options": "4.1.0", -+ "normalize-package-data": "^3.0.0", -+ "read-pkg-up": "^7.0.1", -+ "redent": "^3.0.0", -+ "trim-newlines": "^3.0.0", -+ "type-fest": "^0.18.0", -+ "yargs-parser": "^20.2.3" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/meow/node_modules/find-up": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", -+ "dependencies": { -+ "locate-path": "^5.0.0", -+ "path-exists": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" -+ }, -+ "node_modules/meow/node_modules/locate-path": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", -+ "dependencies": { -+ "p-locate": "^4.1.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/p-limit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", -+ "dependencies": { -+ "p-try": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/meow/node_modules/p-locate": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", -+ "dependencies": { -+ "p-limit": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/p-try": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", -+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/meow/node_modules/parse-json": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", -+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", -+ "dependencies": { -+ "@babel/code-frame": "^7.0.0", -+ "error-ex": "^1.3.1", -+ "json-parse-even-better-errors": "^2.3.0", -+ "lines-and-columns": "^1.1.6" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/meow/node_modules/path-exists": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", -+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", -+ "dependencies": { -+ "@types/normalize-package-data": "^2.4.0", -+ "normalize-package-data": "^2.5.0", -+ "parse-json": "^5.0.0", -+ "type-fest": "^0.6.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg-up": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", -+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", -+ "dependencies": { -+ "find-up": "^4.1.0", -+ "read-pkg": "^5.2.0", -+ "type-fest": "^0.8.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", -+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", -+ "dependencies": { -+ "hosted-git-info": "^2.1.4", -+ "resolve": "^1.10.0", -+ "semver": "2 || 3 || 4 || 5", -+ "validate-npm-package-license": "^3.0.1" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", -+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/merge-source-map": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", -+ "integrity": "sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==", -+ "dependencies": { -+ "source-map": "^0.5.6" -+ } -+ }, -+ "node_modules/miller-rabin": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", -+ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", -+ "dependencies": { -+ "bn.js": "^4.0.0", -+ "brorand": "^1.0.1" -+ }, -+ "bin": { -+ "miller-rabin": "bin/miller-rabin" -+ } -+ }, -+ "node_modules/miller-rabin/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/mime": { -+ "version": "1.6.0", -+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", -+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", -+ "bin": { -+ "mime": "cli.js" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/mime-db": { -+ "version": "1.52.0", -+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", -+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/mime-types": { -+ "version": "2.1.35", -+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", -+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", -+ "dependencies": { -+ "mime-db": "1.52.0" -+ }, -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/mimic-response": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", -+ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/min-indent": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", -+ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/minimalistic-assert": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", -+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" -+ }, -+ "node_modules/minimalistic-crypto-utils": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", -+ "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" -+ }, -+ "node_modules/minimatch": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", -+ "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", -+ "dependencies": { -+ "brace-expansion": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/minimist": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", -+ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/minimist-options": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", -+ "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", -+ "dependencies": { -+ "arrify": "^1.0.1", -+ "is-plain-obj": "^1.1.0", -+ "kind-of": "^6.0.3" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/minipass": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", -+ "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", -+ "dependencies": { -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/minipass-collect": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", -+ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/minipass-fetch": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", -+ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", -+ "dependencies": { -+ "minipass": "^3.1.0", -+ "minipass-sized": "^1.0.3", -+ "minizlib": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "optionalDependencies": { -+ "encoding": "^0.1.12" -+ } -+ }, -+ "node_modules/minipass-flush": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", -+ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/minipass-pipeline": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", -+ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/minipass-sized": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", -+ "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/minizlib": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", -+ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", -+ "dependencies": { -+ "minipass": "^3.0.0", -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/mkdirp": { -+ "version": "0.5.6", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", -+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", -+ "dependencies": { -+ "minimist": "^1.2.6" -+ }, -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ } -+ }, -+ "node_modules/mkdirp-classic": { -+ "version": "0.5.3", -+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", -+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" -+ }, -+ "node_modules/module-deps": { -+ "version": "6.2.3", -+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz", -+ "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==", -+ "dependencies": { -+ "browser-resolve": "^2.0.0", -+ "cached-path-relative": "^1.0.2", -+ "concat-stream": "~1.6.0", -+ "defined": "^1.0.0", -+ "detective": "^5.2.0", -+ "duplexer2": "^0.1.2", -+ "inherits": "^2.0.1", -+ "JSONStream": "^1.0.3", -+ "parents": "^1.0.0", -+ "readable-stream": "^2.0.2", -+ "resolve": "^1.4.0", -+ "stream-combiner2": "^1.1.1", -+ "subarg": "^1.0.0", -+ "through2": "^2.0.0", -+ "xtend": "^4.0.0" -+ }, -+ "bin": { -+ "module-deps": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/mold-source-map": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz", -+ "integrity": "sha512-Y0uA/sDKVuPgLd7BmaJOai+fqzjrOlR6vZgx5cJIvturI/xOPQPgbf3X7ZbzJd6MvqQ6ucIfK8dSteFyc2Mw2w==", -+ "dependencies": { -+ "convert-source-map": "^1.1.0", -+ "through": "~2.2.7" -+ } -+ }, -+ "node_modules/mold-source-map/node_modules/through": { -+ "version": "2.2.7", -+ "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz", -+ "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==" -+ }, -+ "node_modules/ms": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", -+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" -+ }, -+ "node_modules/multicast-dns": { -+ "version": "7.2.1", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/multicast-dns.git#1bb9f6ba892eba88f2cb12ca96a1c1b3088413c0", -+ "license": "MIT", -+ "dependencies": { -+ "dns-packet": "^1.3.1", -+ "thunky": "^1.0.2" -+ }, -+ "bin": { -+ "multicast-dns": "cli.js" -+ } -+ }, -+ "node_modules/multicast-dns-service-types": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", -+ "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==" -+ }, -+ "node_modules/mutexify": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/mutexify/-/mutexify-1.4.0.tgz", -+ "integrity": "sha512-pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg==", -+ "dependencies": { -+ "queue-tick": "^1.0.0" -+ } -+ }, -+ "node_modules/nan": { -+ "version": "2.17.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", -+ "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==" -+ }, -+ "node_modules/nanoassert": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz", -+ "integrity": "sha512-C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ==" -+ }, -+ "node_modules/nanobench": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/nanobench/-/nanobench-2.1.1.tgz", -+ "integrity": "sha512-z+Vv7zElcjN+OpzAxAquUayFLGK3JI/ubCl0Oh64YQqsTGG09CGqieJVQw4ui8huDnnAgrvTv93qi5UaOoNj8A==", -+ "dependencies": { -+ "browser-process-hrtime": "^0.1.2", -+ "chalk": "^1.1.3", -+ "mutexify": "^1.1.0", -+ "pretty-hrtime": "^1.0.2" -+ }, -+ "bin": { -+ "nanobench": "run.js", -+ "nanobench-compare": "compare.js" -+ } -+ }, -+ "node_modules/nanobench/node_modules/ansi-regex": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", -+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/nanobench/node_modules/ansi-styles": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", -+ "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/nanobench/node_modules/chalk": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", -+ "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", -+ "dependencies": { -+ "ansi-styles": "^2.2.1", -+ "escape-string-regexp": "^1.0.2", -+ "has-ansi": "^2.0.0", -+ "strip-ansi": "^3.0.0", -+ "supports-color": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/nanobench/node_modules/strip-ansi": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", -+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", -+ "dependencies": { -+ "ansi-regex": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/nanobench/node_modules/supports-color": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", -+ "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", -+ "engines": { -+ "node": ">=0.8.0" -+ } -+ }, -+ "node_modules/nanohtml": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/nanohtml/-/nanohtml-1.10.0.tgz", -+ "integrity": "sha512-r/3AQl+jxAxUIJRiKExUjBtFcE1cm4yTOsTIdVqqlxPNtBxJh522ANrcQYzdNHhPzbPgb7j6qujq6eGehBX0kg==", -+ "dependencies": { -+ "acorn-node": "^1.8.2", -+ "camel-case": "^3.0.0", -+ "convert-source-map": "^1.5.1", -+ "estree-is-member-expression": "^1.0.0", -+ "hyperx": "^2.5.0", -+ "is-boolean-attribute": "0.0.1", -+ "nanoassert": "^1.1.0", -+ "nanobench": "^2.1.0", -+ "normalize-html-whitespace": "^0.2.0", -+ "through2": "^2.0.3", -+ "transform-ast": "^2.4.0" -+ } -+ }, -+ "node_modules/nanoid": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", -+ "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", -+ "bin": { -+ "nanoid": "bin/nanoid.cjs" -+ }, -+ "engines": { -+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" -+ } -+ }, -+ "node_modules/nanomorph": { -+ "version": "5.4.3", -+ "resolved": "https://registry.npmjs.org/nanomorph/-/nanomorph-5.4.3.tgz", -+ "integrity": "sha512-uPP5y0x21KISffZCKHh1A0QW0RHZFQS0BR7LetlHBlay6UWAbjwhjiJTxOO6JeMHko5Cigl617zFoGrYFJ8ZLg==", -+ "dependencies": { -+ "nanoassert": "^1.1.0" -+ } -+ }, -+ "node_modules/napi-build-utils": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", -+ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", -+ "optional": true -+ }, -+ "node_modules/natural-compare": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", -+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" -+ }, -+ "node_modules/negotiator": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", -+ "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/no-case": { -+ "version": "2.3.2", -+ "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", -+ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", -+ "dependencies": { -+ "lower-case": "^1.1.1" -+ } -+ }, -+ "node_modules/node-abi": { -+ "version": "3.28.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz", -+ "integrity": "sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==", -+ "optional": true, -+ "dependencies": { -+ "semver": "^7.3.5" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/node-forge": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", -+ "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", -+ "engines": { -+ "node": ">= 6.13.0" -+ } -+ }, -+ "node_modules/node-gyp": { -+ "version": "8.4.1", -+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", -+ "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", -+ "dependencies": { -+ "env-paths": "^2.2.0", -+ "glob": "^7.1.4", -+ "graceful-fs": "^4.2.6", -+ "make-fetch-happen": "^9.1.0", -+ "nopt": "^5.0.0", -+ "npmlog": "^6.0.0", -+ "rimraf": "^3.0.2", -+ "semver": "^7.3.5", -+ "tar": "^6.1.2", -+ "which": "^2.0.2" -+ }, -+ "bin": { -+ "node-gyp": "bin/node-gyp.js" -+ }, -+ "engines": { -+ "node": ">= 10.12.0" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/are-we-there-yet": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", -+ "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", -+ "dependencies": { -+ "delegates": "^1.0.0", -+ "readable-stream": "^3.6.0" -+ }, -+ "engines": { -+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/gauge": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", -+ "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", -+ "dependencies": { -+ "aproba": "^1.0.3 || ^2.0.0", -+ "color-support": "^1.1.3", -+ "console-control-strings": "^1.1.0", -+ "has-unicode": "^2.0.1", -+ "signal-exit": "^3.0.7", -+ "string-width": "^4.2.3", -+ "strip-ansi": "^6.0.1", -+ "wide-align": "^1.1.5" -+ }, -+ "engines": { -+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/npmlog": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", -+ "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", -+ "dependencies": { -+ "are-we-there-yet": "^3.0.0", -+ "console-control-strings": "^1.1.0", -+ "gauge": "^4.0.3", -+ "set-blocking": "^2.0.0" -+ }, -+ "engines": { -+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/node-mouse": { -+ "version": "0.0.2", -+ "resolved": "https://registry.npmjs.org/node-mouse/-/node-mouse-0.0.2.tgz", -+ "integrity": "sha512-qqm+c/uKB1ceGMrKW+mxAxPKFTu0HD1DWoCElJHA0VQDloudzZD4bI++Z18mSDA3n5lix+RTXiOiu3XAOSYVHA==" -+ }, -+ "node_modules/node-releases": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", -+ "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" -+ }, -+ "node_modules/node-sass": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz", -+ "integrity": "sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==", -+ "hasInstallScript": true, -+ "dependencies": { -+ "async-foreach": "^0.1.3", -+ "chalk": "^4.1.2", -+ "cross-spawn": "^7.0.3", -+ "gaze": "^1.0.0", -+ "get-stdin": "^4.0.1", -+ "glob": "^7.0.3", -+ "lodash": "^4.17.15", -+ "meow": "^9.0.0", -+ "nan": "^2.13.2", -+ "node-gyp": "^8.4.1", -+ "npmlog": "^5.0.0", -+ "request": "^2.88.0", -+ "sass-graph": "4.0.0", -+ "stdout-stream": "^1.4.0", -+ "true-case-path": "^1.0.2" -+ }, -+ "bin": { -+ "node-sass": "bin/node-sass" -+ }, -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/node-sass/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/node-sass/node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/node-sass/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/node-sass/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/node-sass/node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/node-sass/node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/nodemon": { -+ "version": "2.0.16", -+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.16.tgz", -+ "integrity": "sha512-zsrcaOfTWRuUzBn3P44RDliLlp263Z/76FPoHFr3cFFkOz0lTPAcIw8dCzfdVIx/t3AtDYCZRCDkoCojJqaG3w==", -+ "hasInstallScript": true, -+ "dependencies": { -+ "chokidar": "^3.5.2", -+ "debug": "^3.2.7", -+ "ignore-by-default": "^1.0.1", -+ "minimatch": "^3.0.4", -+ "pstree.remy": "^1.1.8", -+ "semver": "^5.7.1", -+ "supports-color": "^5.5.0", -+ "touch": "^3.1.0", -+ "undefsafe": "^2.0.5", -+ "update-notifier": "^5.1.0" -+ }, -+ "bin": { -+ "nodemon": "bin/nodemon.js" -+ }, -+ "engines": { -+ "node": ">=8.10.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/nodemon" -+ } -+ }, -+ "node_modules/nodemon/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/nodemon/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/nodemon/node_modules/debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "dependencies": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "node_modules/nodemon/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/nodemon/node_modules/semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/nopt": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", -+ "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", -+ "dependencies": { -+ "abbrev": "1" -+ }, -+ "bin": { -+ "nopt": "bin/nopt.js" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/normalize-html-whitespace": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-0.2.0.tgz", -+ "integrity": "sha512-5CZAEQ4bQi8Msqw0GAT6rrkrjNN4ZKqAG3+jJMwms4O6XoMvh6ekwOueG4mRS1LbPUR1r9EdnhxxfpzMTOdzKw==", -+ "engines": { -+ "node": ">= 0.10" -+ } -+ }, -+ "node_modules/normalize-package-data": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", -+ "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", -+ "dependencies": { -+ "hosted-git-info": "^4.0.1", -+ "is-core-module": "^2.5.0", -+ "semver": "^7.3.4", -+ "validate-npm-package-license": "^3.0.1" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/normalize-path": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", -+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/normalize-url": { -+ "version": "4.5.1", -+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", -+ "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/nosleep.js": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz", -+ "integrity": "sha512-9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA==" -+ }, -+ "node_modules/npm-conf": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", -+ "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", -+ "optional": true, -+ "dependencies": { -+ "config-chain": "^1.1.11", -+ "pify": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/npmlog": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", -+ "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", -+ "dependencies": { -+ "are-we-there-yet": "^2.0.0", -+ "console-control-strings": "^1.1.0", -+ "gauge": "^3.0.0", -+ "set-blocking": "^2.0.0" -+ } -+ }, -+ "node_modules/oauth-sign": { -+ "version": "0.9.0", -+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", -+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/object-assign": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", -+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/object-is": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", -+ "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/object-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", -+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", -+ "engines": { -+ "node": ">= 0.4" -+ } -+ }, -+ "node_modules/offset-sourcemap-lines": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/offset-sourcemap-lines/-/offset-sourcemap-lines-1.0.1.tgz", -+ "integrity": "sha512-8giJa0GProV9hPLOp9qAobkvi6OiZnzeM6fdubVjhqcrISX8FYMk1jMVzG6R9d7HQWLysG22jyXEIF6sWu4fJw==", -+ "dependencies": { -+ "source-map": "^0.5.0" -+ } -+ }, -+ "node_modules/on-finished": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", -+ "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", -+ "dependencies": { -+ "ee-first": "1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/once": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", -+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", -+ "dependencies": { -+ "wrappy": "1" -+ } -+ }, -+ "node_modules/open": { -+ "version": "8.4.0", -+ "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", -+ "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", -+ "dependencies": { -+ "define-lazy-prop": "^2.0.0", -+ "is-docker": "^2.1.1", -+ "is-wsl": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/optionator": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", -+ "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", -+ "dependencies": { -+ "deep-is": "^0.1.3", -+ "fast-levenshtein": "^2.0.6", -+ "levn": "^0.4.1", -+ "prelude-ls": "^1.2.1", -+ "type-check": "^0.4.0", -+ "word-wrap": "^1.2.3" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/os-browserify": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", -+ "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" -+ }, -+ "node_modules/osc": { -+ "version": "2.4.2", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/osc.js.git#9197739162f26086e6a72670103c3fa036e9dcd5", -+ "license": "(MIT OR GPL-2.0)", -+ "dependencies": { -+ "long": "4.0.0", -+ "slip": "1.0.2", -+ "wolfy87-eventemitter": "5.2.9", -+ "ws": "7.5.3" -+ }, -+ "optionalDependencies": { -+ "serialport": "9.2.0" -+ } -+ }, -+ "node_modules/osc/node_modules/ws": { -+ "version": "7.5.3", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", -+ "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", -+ "engines": { -+ "node": ">=8.3.0" -+ }, -+ "peerDependencies": { -+ "bufferutil": "^4.0.1", -+ "utf-8-validate": "^5.0.2" -+ }, -+ "peerDependenciesMeta": { -+ "bufferutil": { -+ "optional": true -+ }, -+ "utf-8-validate": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/osi-licenses": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/osi-licenses/-/osi-licenses-0.1.1.tgz", -+ "integrity": "sha512-ZGAGO6dIxTS/mXxEJCpIdYetAoxIOOr7uYpMOoDWo4+b/6rf+2GagOjTbegL+eoMI8aYAiyNgKWUT7vWJRPl9A==", -+ "engines": { -+ "node": ">=0.10", -+ "npm": ">=1.2" -+ } -+ }, -+ "node_modules/oss-license-name-to-url": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/oss-license-name-to-url/-/oss-license-name-to-url-1.2.1.tgz", -+ "integrity": "sha512-apFbKq0EAYi70q0pOpS0tDfSviZYdG3KM6U1GpofZPsRMwgDga0DQiPQ/GHyQx7PDDrLCGvFBNPLMLV/K4Jr4Q==", -+ "dependencies": { -+ "osi-licenses": "^0.1.0" -+ } -+ }, -+ "node_modules/outpipe": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/outpipe/-/outpipe-1.1.1.tgz", -+ "integrity": "sha512-BnNY/RwnDrkmQdUa9U+OfN/Y7AWmKuUPCCd+hbRclZnnANvYpO72zp/a6Q4n829hPbdqEac31XCcsvlEvb+rtA==", -+ "dev": true, -+ "dependencies": { -+ "shell-quote": "^1.4.2" -+ } -+ }, -+ "node_modules/p-cancelable": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", -+ "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/p-limit": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", -+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", -+ "dependencies": { -+ "p-try": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/p-locate": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", -+ "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", -+ "dependencies": { -+ "p-limit": "^1.1.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/p-map": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", -+ "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", -+ "dependencies": { -+ "aggregate-error": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/p-try": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", -+ "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/package-json": { -+ "version": "6.5.0", -+ "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", -+ "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", -+ "dependencies": { -+ "got": "^9.6.0", -+ "registry-auth-token": "^4.0.0", -+ "registry-url": "^5.0.0", -+ "semver": "^6.2.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/package-json/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/pako": { -+ "version": "1.0.11", -+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", -+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" -+ }, -+ "node_modules/parent-module": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", -+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", -+ "dependencies": { -+ "callsites": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/parents": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz", -+ "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==", -+ "dependencies": { -+ "path-platform": "~0.11.15" -+ } -+ }, -+ "node_modules/parse-asn1": { -+ "version": "5.1.6", -+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", -+ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", -+ "dependencies": { -+ "asn1.js": "^5.2.0", -+ "browserify-aes": "^1.0.0", -+ "evp_bytestokey": "^1.0.0", -+ "pbkdf2": "^3.0.3", -+ "safe-buffer": "^5.1.1" -+ } -+ }, -+ "node_modules/parse-author": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", -+ "integrity": "sha512-yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw==", -+ "dependencies": { -+ "author-regex": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/parse-json": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", -+ "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", -+ "dependencies": { -+ "error-ex": "^1.2.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/parse-srcset": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", -+ "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==" -+ }, -+ "node_modules/path-browserify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", -+ "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" -+ }, -+ "node_modules/path-exists": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", -+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/path-is-absolute": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", -+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/path-key": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/path-parse": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" -+ }, -+ "node_modules/path-platform": { -+ "version": "0.11.15", -+ "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz", -+ "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==", -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/path-type": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", -+ "integrity": "sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==", -+ "dependencies": { -+ "pify": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/path-type/node_modules/pify": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", -+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/pbkdf2": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", -+ "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", -+ "dependencies": { -+ "create-hash": "^1.1.2", -+ "create-hmac": "^1.1.4", -+ "ripemd160": "^2.0.1", -+ "safe-buffer": "^5.0.1", -+ "sha.js": "^2.4.8" -+ }, -+ "engines": { -+ "node": ">=0.12" -+ } -+ }, -+ "node_modules/pend": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", -+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" -+ }, -+ "node_modules/performance-now": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", -+ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" -+ }, -+ "node_modules/picocolors": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", -+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" -+ }, -+ "node_modules/picomatch": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", -+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", -+ "engines": { -+ "node": ">=8.6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/jonschlinkert" -+ } -+ }, -+ "node_modules/pify": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", -+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", -+ "optional": true, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/plist": { -+ "version": "3.0.6", -+ "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz", -+ "integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==", -+ "dependencies": { -+ "base64-js": "^1.5.1", -+ "xmlbuilder": "^15.1.1" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/postcss": { -+ "version": "7.0.39", -+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", -+ "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", -+ "dependencies": { -+ "picocolors": "^0.2.1", -+ "source-map": "^0.6.1" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/postcss/" -+ } -+ }, -+ "node_modules/postcss/node_modules/source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/prebuild-install": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", -+ "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", -+ "optional": true, -+ "dependencies": { -+ "detect-libc": "^2.0.0", -+ "expand-template": "^2.0.3", -+ "github-from-package": "0.0.0", -+ "minimist": "^1.2.3", -+ "mkdirp-classic": "^0.5.3", -+ "napi-build-utils": "^1.0.1", -+ "node-abi": "^3.3.0", -+ "pump": "^3.0.0", -+ "rc": "^1.2.7", -+ "simple-get": "^4.0.0", -+ "tar-fs": "^2.0.0", -+ "tunnel-agent": "^0.6.0" -+ }, -+ "bin": { -+ "prebuild-install": "bin.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/prelude-ls": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", -+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/prepend-http": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", -+ "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/pretty-hrtime": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", -+ "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/process": { -+ "version": "0.11.10", -+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", -+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", -+ "engines": { -+ "node": ">= 0.6.0" -+ } -+ }, -+ "node_modules/process-nextick-args": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", -+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" -+ }, -+ "node_modules/progress": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", -+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/promise-inflight": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", -+ "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==" -+ }, -+ "node_modules/promise-retry": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", -+ "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", -+ "dependencies": { -+ "err-code": "^2.0.2", -+ "retry": "^0.12.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/proto-list": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", -+ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", -+ "optional": true -+ }, -+ "node_modules/psl": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", -+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" -+ }, -+ "node_modules/pstree.remy": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", -+ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" -+ }, -+ "node_modules/public-encrypt": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", -+ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", -+ "dependencies": { -+ "bn.js": "^4.1.0", -+ "browserify-rsa": "^4.0.0", -+ "create-hash": "^1.1.0", -+ "parse-asn1": "^5.0.0", -+ "randombytes": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "node_modules/public-encrypt/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/pump": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", -+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", -+ "dependencies": { -+ "end-of-stream": "^1.1.0", -+ "once": "^1.3.1" -+ } -+ }, -+ "node_modules/punycode": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", -+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" -+ }, -+ "node_modules/pupa": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", -+ "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", -+ "dependencies": { -+ "escape-goat": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/python-shell": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/python-shell/-/python-shell-3.0.1.tgz", -+ "integrity": "sha512-TWeotuxe1auhXa5bGRScxnc2J+0r41NBntSa6RYZtMBLtAEsvCboKrEbW6DvASosWQepVkhZZlT3B5Ei766G+Q==", -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/qs": { -+ "version": "6.5.3", -+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", -+ "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", -+ "engines": { -+ "node": ">=0.6" -+ } -+ }, -+ "node_modules/querystring": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", -+ "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", -+ "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", -+ "engines": { -+ "node": ">=0.4.x" -+ } -+ }, -+ "node_modules/querystring-es3": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", -+ "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", -+ "engines": { -+ "node": ">=0.4.x" -+ } -+ }, -+ "node_modules/queue-tick": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", -+ "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==" -+ }, -+ "node_modules/quick-lru": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", -+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/randombytes": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", -+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", -+ "dependencies": { -+ "safe-buffer": "^5.1.0" -+ } -+ }, -+ "node_modules/randomfill": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", -+ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", -+ "dependencies": { -+ "randombytes": "^2.0.5", -+ "safe-buffer": "^5.1.0" -+ } -+ }, -+ "node_modules/range-parser": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", -+ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/rc": { -+ "version": "1.2.8", -+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", -+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", -+ "dependencies": { -+ "deep-extend": "^0.6.0", -+ "ini": "~1.3.0", -+ "minimist": "^1.2.0", -+ "strip-json-comments": "~2.0.1" -+ }, -+ "bin": { -+ "rc": "cli.js" -+ } -+ }, -+ "node_modules/rc/node_modules/strip-json-comments": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", -+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/rcedit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz", -+ "integrity": "sha512-h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ==", -+ "engines": { -+ "node": ">= 8.0.0" -+ } -+ }, -+ "node_modules/read-only-stream": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz", -+ "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==", -+ "dependencies": { -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/read-pkg": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", -+ "integrity": "sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==", -+ "dependencies": { -+ "load-json-file": "^2.0.0", -+ "normalize-package-data": "^2.3.2", -+ "path-type": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/read-pkg-up": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", -+ "integrity": "sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==", -+ "dependencies": { -+ "find-up": "^2.0.0", -+ "read-pkg": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/read-pkg/node_modules/hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" -+ }, -+ "node_modules/read-pkg/node_modules/normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", -+ "dependencies": { -+ "hosted-git-info": "^2.1.4", -+ "resolve": "^1.10.0", -+ "semver": "2 || 3 || 4 || 5", -+ "validate-npm-package-license": "^3.0.1" -+ } -+ }, -+ "node_modules/read-pkg/node_modules/semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/readable-stream": { -+ "version": "2.3.7", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", -+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", -+ "dependencies": { -+ "core-util-is": "~1.0.0", -+ "inherits": "~2.0.3", -+ "isarray": "~1.0.0", -+ "process-nextick-args": "~2.0.0", -+ "safe-buffer": "~5.1.1", -+ "string_decoder": "~1.1.1", -+ "util-deprecate": "~1.0.1" -+ } -+ }, -+ "node_modules/readable-stream/node_modules/safe-buffer": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" -+ }, -+ "node_modules/readable-stream/node_modules/string_decoder": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -+ "dependencies": { -+ "safe-buffer": "~5.1.0" -+ } -+ }, -+ "node_modules/readdirp": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", -+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", -+ "dependencies": { -+ "picomatch": "^2.2.1" -+ }, -+ "engines": { -+ "node": ">=8.10.0" -+ } -+ }, -+ "node_modules/redent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", -+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", -+ "dependencies": { -+ "indent-string": "^4.0.0", -+ "strip-indent": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/regenerate": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", -+ "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" -+ }, -+ "node_modules/regenerate-unicode-properties": { -+ "version": "10.1.0", -+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", -+ "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", -+ "dependencies": { -+ "regenerate": "^1.4.2" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/regenerator-runtime": { -+ "version": "0.13.10", -+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", -+ "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==" -+ }, -+ "node_modules/regenerator-transform": { -+ "version": "0.15.0", -+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz", -+ "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==", -+ "dependencies": { -+ "@babel/runtime": "^7.8.4" -+ } -+ }, -+ "node_modules/regexp.prototype.flags": { -+ "version": "1.4.3", -+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", -+ "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3", -+ "functions-have-names": "^1.2.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/regexpp": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", -+ "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/mysticatea" -+ } -+ }, -+ "node_modules/regexpu-core": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz", -+ "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==", -+ "dependencies": { -+ "regenerate": "^1.4.2", -+ "regenerate-unicode-properties": "^10.1.0", -+ "regjsgen": "^0.7.1", -+ "regjsparser": "^0.9.1", -+ "unicode-match-property-ecmascript": "^2.0.0", -+ "unicode-match-property-value-ecmascript": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/registry-auth-token": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz", -+ "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==", -+ "dependencies": { -+ "rc": "1.2.8" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/registry-url": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", -+ "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", -+ "dependencies": { -+ "rc": "^1.2.8" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/regjsgen": { -+ "version": "0.7.1", -+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", -+ "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==" -+ }, -+ "node_modules/regjsparser": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", -+ "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", -+ "dependencies": { -+ "jsesc": "~0.5.0" -+ }, -+ "bin": { -+ "regjsparser": "bin/parser" -+ } -+ }, -+ "node_modules/regjsparser/node_modules/jsesc": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", -+ "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", -+ "bin": { -+ "jsesc": "bin/jsesc" -+ } -+ }, -+ "node_modules/replacestream": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", -+ "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", -+ "dependencies": { -+ "escape-string-regexp": "^1.0.3", -+ "object-assign": "^4.0.1", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/request": { -+ "version": "2.88.2", -+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", -+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", -+ "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", -+ "dependencies": { -+ "aws-sign2": "~0.7.0", -+ "aws4": "^1.8.0", -+ "caseless": "~0.12.0", -+ "combined-stream": "~1.0.6", -+ "extend": "~3.0.2", -+ "forever-agent": "~0.6.1", -+ "form-data": "~2.3.2", -+ "har-validator": "~5.1.3", -+ "http-signature": "~1.2.0", -+ "is-typedarray": "~1.0.0", -+ "isstream": "~0.1.2", -+ "json-stringify-safe": "~5.0.1", -+ "mime-types": "~2.1.19", -+ "oauth-sign": "~0.9.0", -+ "performance-now": "^2.1.0", -+ "qs": "~6.5.2", -+ "safe-buffer": "^5.1.2", -+ "tough-cookie": "~2.5.0", -+ "tunnel-agent": "^0.6.0", -+ "uuid": "^3.3.2" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/request/node_modules/uuid": { -+ "version": "3.4.0", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", -+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", -+ "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", -+ "bin": { -+ "uuid": "bin/uuid" -+ } -+ }, -+ "node_modules/require-directory": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", -+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/resolve": { -+ "version": "1.22.1", -+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", -+ "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", -+ "dependencies": { -+ "is-core-module": "^2.9.0", -+ "path-parse": "^1.0.7", -+ "supports-preserve-symlinks-flag": "^1.0.0" -+ }, -+ "bin": { -+ "resolve": "bin/resolve" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/resolve-from": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", -+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/responselike": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", -+ "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==", -+ "dependencies": { -+ "lowercase-keys": "^1.0.0" -+ } -+ }, -+ "node_modules/retry": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", -+ "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", -+ "engines": { -+ "node": ">= 4" -+ } -+ }, -+ "node_modules/rimraf": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", -+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ } -+ }, -+ "node_modules/ripemd160": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", -+ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", -+ "dependencies": { -+ "hash-base": "^3.0.0", -+ "inherits": "^2.0.1" -+ } -+ }, -+ "node_modules/roarr": { -+ "version": "2.15.4", -+ "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", -+ "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", -+ "optional": true, -+ "dependencies": { -+ "boolean": "^3.0.1", -+ "detect-node": "^2.0.4", -+ "globalthis": "^1.0.1", -+ "json-stringify-safe": "^5.0.1", -+ "semver-compare": "^1.0.0", -+ "sprintf-js": "^1.1.2" -+ }, -+ "engines": { -+ "node": ">=8.0" -+ } -+ }, -+ "node_modules/safe-buffer": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", -+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/safer-buffer": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", -+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" -+ }, -+ "node_modules/sanitize-html": { -+ "version": "1.27.5", -+ "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz", -+ "integrity": "sha512-M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A==", -+ "dependencies": { -+ "htmlparser2": "^4.1.0", -+ "lodash": "^4.17.15", -+ "parse-srcset": "^1.0.2", -+ "postcss": "^7.0.27" -+ } -+ }, -+ "node_modules/sass-graph": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz", -+ "integrity": "sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==", -+ "dependencies": { -+ "glob": "^7.0.0", -+ "lodash": "^4.17.11", -+ "scss-tokenizer": "^0.3.0", -+ "yargs": "^17.2.1" -+ }, -+ "bin": { -+ "sassgraph": "bin/sassgraph" -+ }, -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/scope-css": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/scope-css/-/scope-css-1.2.1.tgz", -+ "integrity": "sha512-UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q==", -+ "dependencies": { -+ "escaper": "^2.5.3", -+ "slugify": "^1.3.1", -+ "strip-css-comments": "^3.0.0" -+ } -+ }, -+ "node_modules/screenfull": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz", -+ "integrity": "sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==", -+ "engines": { -+ "node": ">=0.10.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/scss-tokenizer": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz", -+ "integrity": "sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==", -+ "dependencies": { -+ "js-base64": "^2.4.3", -+ "source-map": "^0.7.1" -+ } -+ }, -+ "node_modules/scss-tokenizer/node_modules/source-map": { -+ "version": "0.7.4", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", -+ "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/semver": { -+ "version": "7.3.7", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", -+ "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", -+ "dependencies": { -+ "lru-cache": "^6.0.0" -+ }, -+ "bin": { -+ "semver": "bin/semver.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/semver-compare": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", -+ "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", -+ "optional": true -+ }, -+ "node_modules/semver-diff": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", -+ "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", -+ "dependencies": { -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/semver-diff/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/send": { -+ "version": "0.18.0", -+ "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", -+ "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", -+ "dependencies": { -+ "debug": "2.6.9", -+ "depd": "2.0.0", -+ "destroy": "1.2.0", -+ "encodeurl": "~1.0.2", -+ "escape-html": "~1.0.3", -+ "etag": "~1.8.1", -+ "fresh": "0.5.2", -+ "http-errors": "2.0.0", -+ "mime": "1.6.0", -+ "ms": "2.1.3", -+ "on-finished": "2.4.1", -+ "range-parser": "~1.2.1", -+ "statuses": "2.0.1" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/send/node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/send/node_modules/debug/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ }, -+ "node_modules/send/node_modules/depd": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/send/node_modules/ms": { -+ "version": "2.1.3", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" -+ }, -+ "node_modules/serialize-error": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", -+ "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", -+ "optional": true, -+ "dependencies": { -+ "type-fest": "^0.13.1" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/serialize-error/node_modules/type-fest": { -+ "version": "0.13.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", -+ "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", -+ "optional": true, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/serialport": { -+ "version": "9.2.0", -+ "resolved": "https://registry.npmjs.org/serialport/-/serialport-9.2.0.tgz", -+ "integrity": "sha512-C6AQ4jD4mre3tn3QA+atn++mEZDh4r40CIeh1sKhskKE+Q4eiIr/nzVMOiPxHb8gskrSNxujH+Br49tl3i9s9g==", -+ "optional": true, -+ "dependencies": { -+ "@serialport/binding-mock": "9.0.7", -+ "@serialport/bindings": "^9.2.0", -+ "@serialport/parser-byte-length": "9.0.7", -+ "@serialport/parser-cctalk": "9.0.7", -+ "@serialport/parser-delimiter": "9.0.7", -+ "@serialport/parser-inter-byte-timeout": "9.0.7", -+ "@serialport/parser-readline": "9.0.7", -+ "@serialport/parser-ready": "9.0.7", -+ "@serialport/parser-regex": "9.0.7", -+ "@serialport/stream": "9.0.7", -+ "debug": "^4.3.1" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/set-blocking": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", -+ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" -+ }, -+ "node_modules/setprototypeof": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", -+ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" -+ }, -+ "node_modules/sha.js": { -+ "version": "2.4.11", -+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", -+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ }, -+ "bin": { -+ "sha.js": "bin.js" -+ } -+ }, -+ "node_modules/shasum-object": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz", -+ "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==", -+ "dependencies": { -+ "fast-safe-stringify": "^2.0.7" -+ } -+ }, -+ "node_modules/shebang-command": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", -+ "dependencies": { -+ "shebang-regex": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/shebang-regex": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/shell-quote": { -+ "version": "1.7.4", -+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz", -+ "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/signal-exit": { -+ "version": "3.0.7", -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", -+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" -+ }, -+ "node_modules/simple-concat": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", -+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/simple-get": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", -+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ], -+ "optional": true, -+ "dependencies": { -+ "decompress-response": "^6.0.0", -+ "once": "^1.3.1", -+ "simple-concat": "^1.0.0" -+ } -+ }, -+ "node_modules/simple-get/node_modules/decompress-response": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", -+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", -+ "optional": true, -+ "dependencies": { -+ "mimic-response": "^3.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/simple-get/node_modules/mimic-response": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", -+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", -+ "optional": true, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/slip": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/slip/-/slip-1.0.2.tgz", -+ "integrity": "sha512-XrcHe3NAcyD3wO+O4I13RcS4/3AF+S9RvGNj9JhJeS02HyImwD2E3QWLrmn9hBfL+fB6yapagwxRkeyYzhk98g==" -+ }, -+ "node_modules/slugify": { -+ "version": "1.6.5", -+ "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz", -+ "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==", -+ "engines": { -+ "node": ">=8.0.0" -+ } -+ }, -+ "node_modules/smart-buffer": { -+ "version": "4.2.0", -+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", -+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", -+ "engines": { -+ "node": ">= 6.0.0", -+ "npm": ">= 3.0.0" -+ } -+ }, -+ "node_modules/socks": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", -+ "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", -+ "dependencies": { -+ "ip": "^2.0.0", -+ "smart-buffer": "^4.2.0" -+ }, -+ "engines": { -+ "node": ">= 10.13.0", -+ "npm": ">= 3.0.0" -+ } -+ }, -+ "node_modules/socks-proxy-agent": { -+ "version": "6.2.1", -+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", -+ "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", -+ "dependencies": { -+ "agent-base": "^6.0.2", -+ "debug": "^4.3.3", -+ "socks": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/socks/node_modules/ip": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", -+ "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" -+ }, -+ "node_modules/sortablejs": { -+ "version": "1.15.0", -+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", -+ "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" -+ }, -+ "node_modules/source-map": { -+ "version": "0.5.7", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", -+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/source-map-support": { -+ "version": "0.5.21", -+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", -+ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", -+ "dependencies": { -+ "buffer-from": "^1.0.0", -+ "source-map": "^0.6.0" -+ } -+ }, -+ "node_modules/source-map-support/node_modules/source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/sourcemap-codec": { -+ "version": "1.4.8", -+ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", -+ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" -+ }, -+ "node_modules/spdx-correct": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", -+ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", -+ "dependencies": { -+ "spdx-expression-parse": "^3.0.0", -+ "spdx-license-ids": "^3.0.0" -+ } -+ }, -+ "node_modules/spdx-exceptions": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", -+ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" -+ }, -+ "node_modules/spdx-expression-parse": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", -+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", -+ "dependencies": { -+ "spdx-exceptions": "^2.1.0", -+ "spdx-license-ids": "^3.0.0" -+ } -+ }, -+ "node_modules/spdx-license-ids": { -+ "version": "3.0.12", -+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", -+ "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==" -+ }, -+ "node_modules/sprintf-js": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", -+ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", -+ "optional": true -+ }, -+ "node_modules/sshpk": { -+ "version": "1.17.0", -+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", -+ "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", -+ "dependencies": { -+ "asn1": "~0.2.3", -+ "assert-plus": "^1.0.0", -+ "bcrypt-pbkdf": "^1.0.0", -+ "dashdash": "^1.12.0", -+ "ecc-jsbn": "~0.1.1", -+ "getpass": "^0.1.1", -+ "jsbn": "~0.1.0", -+ "safer-buffer": "^2.0.2", -+ "tweetnacl": "~0.14.0" -+ }, -+ "bin": { -+ "sshpk-conv": "bin/sshpk-conv", -+ "sshpk-sign": "bin/sshpk-sign", -+ "sshpk-verify": "bin/sshpk-verify" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/ssri": { -+ "version": "8.0.1", -+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", -+ "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", -+ "dependencies": { -+ "minipass": "^3.1.1" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/stack-generator": { -+ "version": "2.0.10", -+ "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz", -+ "integrity": "sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==", -+ "dependencies": { -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "node_modules/stackframe": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", -+ "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==" -+ }, -+ "node_modules/stacktrace-gps": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz", -+ "integrity": "sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==", -+ "dependencies": { -+ "source-map": "0.5.6", -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "node_modules/stacktrace-gps/node_modules/source-map": { -+ "version": "0.5.6", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", -+ "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/stacktrace-js": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz", -+ "integrity": "sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==", -+ "dependencies": { -+ "error-stack-parser": "^2.0.6", -+ "stack-generator": "^2.0.5", -+ "stacktrace-gps": "^3.0.4" -+ } -+ }, -+ "node_modules/statuses": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", -+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/stdout-stream": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", -+ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", -+ "dependencies": { -+ "readable-stream": "^2.0.1" -+ } -+ }, -+ "node_modules/stream-browserify": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", -+ "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", -+ "dependencies": { -+ "inherits": "~2.0.4", -+ "readable-stream": "^3.5.0" -+ } -+ }, -+ "node_modules/stream-browserify/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/stream-combiner2": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", -+ "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==", -+ "dependencies": { -+ "duplexer2": "~0.1.0", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/stream-http": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", -+ "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", -+ "dependencies": { -+ "builtin-status-codes": "^3.0.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.6.0", -+ "xtend": "^4.0.2" -+ } -+ }, -+ "node_modules/stream-http/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/stream-splicer": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz", -+ "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/strictdom": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/strictdom/-/strictdom-1.0.1.tgz", -+ "integrity": "sha512-cEmp9QeXXRmjj/rVp9oyiqcvyocWab/HaoN4+bwFeZ7QzykJD6L3yD4v12K1x0tHpqRqVpJevN3gW7kyM39Bqg==" -+ }, -+ "node_modules/string_decoder": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", -+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", -+ "dependencies": { -+ "safe-buffer": "~5.2.0" -+ } -+ }, -+ "node_modules/string-width": { -+ "version": "4.2.3", -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", -+ "dependencies": { -+ "emoji-regex": "^8.0.0", -+ "is-fullwidth-code-point": "^3.0.0", -+ "strip-ansi": "^6.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/strip-ansi": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -+ "dependencies": { -+ "ansi-regex": "^5.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/strip-bom": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", -+ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/strip-css-comments": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz", -+ "integrity": "sha512-xJwk2yMZ6j+0Clj7ETUfqQ6frsaCIqNGg3zjTVswIt3SbiOsCQgRI1E93hdt/JgGfh5De/sTwxrnrBhhWzMwcg==", -+ "dependencies": { -+ "is-regexp": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/strip-indent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", -+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", -+ "dependencies": { -+ "min-indent": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/strip-json-comments": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", -+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/strip-outer": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", -+ "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", -+ "dependencies": { -+ "escape-string-regexp": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/subarg": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", -+ "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==", -+ "dependencies": { -+ "minimist": "^1.1.0" -+ } -+ }, -+ "node_modules/sumchecker": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", -+ "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", -+ "dependencies": { -+ "debug": "^4.1.0" -+ }, -+ "engines": { -+ "node": ">= 8.0" -+ } -+ }, -+ "node_modules/supports-color": { -+ "version": "5.5.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", -+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", -+ "dependencies": { -+ "has-flag": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/supports-preserve-symlinks-flag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/syntax-error": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", -+ "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", -+ "dependencies": { -+ "acorn-node": "^1.2.0" -+ } -+ }, -+ "node_modules/tar": { -+ "version": "6.1.12", -+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz", -+ "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==", -+ "dependencies": { -+ "chownr": "^2.0.0", -+ "fs-minipass": "^2.0.0", -+ "minipass": "^3.0.0", -+ "minizlib": "^2.1.1", -+ "mkdirp": "^1.0.3", -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/tar-fs": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", -+ "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", -+ "optional": true, -+ "dependencies": { -+ "chownr": "^1.1.1", -+ "mkdirp-classic": "^0.5.2", -+ "pump": "^3.0.0", -+ "tar-stream": "^2.1.4" -+ } -+ }, -+ "node_modules/tar-fs/node_modules/chownr": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", -+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", -+ "optional": true -+ }, -+ "node_modules/tar-stream": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", -+ "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", -+ "optional": true, -+ "dependencies": { -+ "bl": "^4.0.3", -+ "end-of-stream": "^1.4.1", -+ "fs-constants": "^1.0.0", -+ "inherits": "^2.0.3", -+ "readable-stream": "^3.1.1" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/tar-stream/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "optional": true, -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/tar/node_modules/mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/terser": { -+ "version": "3.17.0", -+ "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", -+ "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", -+ "dependencies": { -+ "commander": "^2.19.0", -+ "source-map": "~0.6.1", -+ "source-map-support": "~0.5.10" -+ }, -+ "bin": { -+ "terser": "bin/uglifyjs" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/terser/node_modules/commander": { -+ "version": "2.20.3", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", -+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" -+ }, -+ "node_modules/terser/node_modules/source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/text-table": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", -+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" -+ }, -+ "node_modules/through": { -+ "version": "2.3.8", -+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", -+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" -+ }, -+ "node_modules/through2": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", -+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", -+ "dependencies": { -+ "readable-stream": "~2.3.6", -+ "xtend": "~4.0.1" -+ } -+ }, -+ "node_modules/thunky": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", -+ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" -+ }, -+ "node_modules/timers-browserify": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", -+ "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==", -+ "dependencies": { -+ "process": "~0.11.0" -+ }, -+ "engines": { -+ "node": ">=0.6.0" -+ } -+ }, -+ "node_modules/to-fast-properties": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", -+ "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/to-readable-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", -+ "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/to-regex-range": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", -+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", -+ "dependencies": { -+ "is-number": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">=8.0" -+ } -+ }, -+ "node_modules/toidentifier": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", -+ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", -+ "engines": { -+ "node": ">=0.6" -+ } -+ }, -+ "node_modules/touch": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", -+ "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", -+ "dependencies": { -+ "nopt": "~1.0.10" -+ }, -+ "bin": { -+ "nodetouch": "bin/nodetouch.js" -+ } -+ }, -+ "node_modules/touch/node_modules/nopt": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", -+ "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", -+ "dependencies": { -+ "abbrev": "1" -+ }, -+ "bin": { -+ "nopt": "bin/nopt.js" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/tough-cookie": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", -+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", -+ "dependencies": { -+ "psl": "^1.1.28", -+ "punycode": "^2.1.1" -+ }, -+ "engines": { -+ "node": ">=0.8" -+ } -+ }, -+ "node_modules/tough-cookie/node_modules/punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/transform-ast": { -+ "version": "2.4.4", -+ "resolved": "https://registry.npmjs.org/transform-ast/-/transform-ast-2.4.4.tgz", -+ "integrity": "sha512-AxjeZAcIOUO2lev2GDe3/xZ1Q0cVGjIMk5IsriTy8zbWlsEnjeB025AhkhBJHoy997mXpLd4R+kRbvnnQVuQHQ==", -+ "dependencies": { -+ "acorn-node": "^1.3.0", -+ "convert-source-map": "^1.5.1", -+ "dash-ast": "^1.0.0", -+ "is-buffer": "^2.0.0", -+ "magic-string": "^0.23.2", -+ "merge-source-map": "1.0.4", -+ "nanobench": "^2.1.1" -+ } -+ }, -+ "node_modules/transform-ast/node_modules/is-buffer": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", -+ "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ], -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/trim-newlines": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", -+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/trim-repeated": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", -+ "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==", -+ "dependencies": { -+ "escape-string-regexp": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/true-case-path": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", -+ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", -+ "dependencies": { -+ "glob": "^7.1.2" -+ } -+ }, -+ "node_modules/tty-browserify": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", -+ "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" -+ }, -+ "node_modules/tunnel": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", -+ "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", -+ "optional": true, -+ "engines": { -+ "node": ">=0.6.11 <=0.7.0 || >=0.7.3" -+ } -+ }, -+ "node_modules/tunnel-agent": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", -+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", -+ "dependencies": { -+ "safe-buffer": "^5.0.1" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/tweetnacl": { -+ "version": "0.14.5", -+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", -+ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" -+ }, -+ "node_modules/type-check": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", -+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", -+ "dependencies": { -+ "prelude-ls": "^1.2.1" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/type-fest": { -+ "version": "0.18.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", -+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/type-name": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/type-name/-/type-name-2.0.2.tgz", -+ "integrity": "sha512-kkgkuqR/jKdKO5oh/I2SMu2dGbLXoJq0zkdgbxaqYK+hr9S9edwVVGf+tMUFTx2gH9TN2+Zu9JZ/Njonb3cjhA==" -+ }, -+ "node_modules/typedarray": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", -+ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" -+ }, -+ "node_modules/typedarray-to-buffer": { -+ "version": "3.1.5", -+ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", -+ "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", -+ "dependencies": { -+ "is-typedarray": "^1.0.0" -+ } -+ }, -+ "node_modules/uglifyify": { -+ "version": "5.0.2", -+ "resolved": "https://registry.npmjs.org/uglifyify/-/uglifyify-5.0.2.tgz", -+ "integrity": "sha512-NcSk6pgoC+IgwZZ2tVLVHq+VNKSvLPlLkF5oUiHPVOJI0s/OlSVYEGXG9PCAH0hcyFZLyvt4KBdPAQBRlVDn1Q==", -+ "dependencies": { -+ "convert-source-map": "~1.1.0", -+ "minimatch": "^3.0.2", -+ "terser": "^3.7.5", -+ "through": "~2.3.4", -+ "xtend": "^4.0.1" -+ } -+ }, -+ "node_modules/uglifyify/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/uglifyify/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/uglifyify/node_modules/convert-source-map": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", -+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==" -+ }, -+ "node_modules/uglifyify/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/umd": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz", -+ "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==", -+ "bin": { -+ "umd": "bin/cli.js" -+ } -+ }, -+ "node_modules/undeclared-identifiers": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz", -+ "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==", -+ "dependencies": { -+ "acorn-node": "^1.3.0", -+ "dash-ast": "^1.0.0", -+ "get-assigned-identifiers": "^1.2.0", -+ "simple-concat": "^1.0.0", -+ "xtend": "^4.0.1" -+ }, -+ "bin": { -+ "undeclared-identifiers": "bin.js" -+ } -+ }, -+ "node_modules/undefsafe": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", -+ "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" -+ }, -+ "node_modules/unicode-canonical-property-names-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/unicode-match-property-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", -+ "dependencies": { -+ "unicode-canonical-property-names-ecmascript": "^2.0.0", -+ "unicode-property-aliases-ecmascript": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/unicode-match-property-value-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/unicode-property-aliases-ecmascript": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", -+ "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/unique-filename": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", -+ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", -+ "dependencies": { -+ "unique-slug": "^2.0.0" -+ } -+ }, -+ "node_modules/unique-slug": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", -+ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", -+ "dependencies": { -+ "imurmurhash": "^0.1.4" -+ } -+ }, -+ "node_modules/unique-string": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", -+ "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", -+ "dependencies": { -+ "crypto-random-string": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/universalify": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", -+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", -+ "engines": { -+ "node": ">= 10.0.0" -+ } -+ }, -+ "node_modules/unix-crypt-td-js": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.1.4.tgz", -+ "integrity": "sha512-8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==" -+ }, -+ "node_modules/update-browserslist-db": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", -+ "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", -+ "funding": [ -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/browserslist" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/funding/github/npm/browserslist" -+ } -+ ], -+ "dependencies": { -+ "escalade": "^3.1.1", -+ "picocolors": "^1.0.0" -+ }, -+ "bin": { -+ "browserslist-lint": "cli.js" -+ }, -+ "peerDependencies": { -+ "browserslist": ">= 4.21.0" -+ } -+ }, -+ "node_modules/update-browserslist-db/node_modules/picocolors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", -+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" -+ }, -+ "node_modules/update-notifier": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", -+ "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", -+ "dependencies": { -+ "boxen": "^5.0.0", -+ "chalk": "^4.1.0", -+ "configstore": "^5.0.1", -+ "has-yarn": "^2.1.0", -+ "import-lazy": "^2.1.0", -+ "is-ci": "^2.0.0", -+ "is-installed-globally": "^0.4.0", -+ "is-npm": "^5.0.0", -+ "is-yarn-global": "^0.3.0", -+ "latest-version": "^5.1.0", -+ "pupa": "^2.1.1", -+ "semver": "^7.3.4", -+ "semver-diff": "^3.1.1", -+ "xdg-basedir": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/yeoman/update-notifier?sponsor=1" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/update-notifier/node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/upper-case": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", -+ "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==" -+ }, -+ "node_modules/uri-js": { -+ "version": "4.4.1", -+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", -+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", -+ "dependencies": { -+ "punycode": "^2.1.0" -+ } -+ }, -+ "node_modules/uri-js/node_modules/punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/url": { -+ "version": "0.11.0", -+ "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", -+ "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", -+ "dependencies": { -+ "punycode": "1.3.2", -+ "querystring": "0.2.0" -+ } -+ }, -+ "node_modules/url-parse-lax": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", -+ "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", -+ "dependencies": { -+ "prepend-http": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/url/node_modules/punycode": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", -+ "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" -+ }, -+ "node_modules/util": { -+ "version": "0.12.5", -+ "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", -+ "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "is-arguments": "^1.0.4", -+ "is-generator-function": "^1.0.7", -+ "is-typed-array": "^1.1.3", -+ "which-typed-array": "^1.1.2" -+ } -+ }, -+ "node_modules/util-deprecate": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" -+ }, -+ "node_modules/uuid": { -+ "version": "8.3.2", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", -+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", -+ "bin": { -+ "uuid": "dist/bin/uuid" -+ } -+ }, -+ "node_modules/v8-compile-cache": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", -+ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" -+ }, -+ "node_modules/validate-npm-package-license": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", -+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", -+ "dependencies": { -+ "spdx-correct": "^3.0.0", -+ "spdx-expression-parse": "^3.0.0" -+ } -+ }, -+ "node_modules/verror": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", -+ "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", -+ "engines": [ -+ "node >=0.6.0" -+ ], -+ "dependencies": { -+ "assert-plus": "^1.0.0", -+ "core-util-is": "1.0.2", -+ "extsprintf": "^1.2.0" -+ } -+ }, -+ "node_modules/verror/node_modules/core-util-is": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", -+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" -+ }, -+ "node_modules/vm-browserify": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", -+ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" -+ }, -+ "node_modules/watchify": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/watchify/-/watchify-4.0.0.tgz", -+ "integrity": "sha512-2Z04dxwoOeNxa11qzWumBTgSAohTC0+ScuY7XMenPnH+W2lhTcpEOJP4g2EIG/SWeLadPk47x++Yh+8BqPM/lA==", -+ "dev": true, -+ "dependencies": { -+ "anymatch": "^3.1.0", -+ "browserify": "^17.0.0", -+ "chokidar": "^3.4.0", -+ "defined": "^1.0.0", -+ "outpipe": "^1.1.0", -+ "through2": "^4.0.2", -+ "xtend": "^4.0.2" -+ }, -+ "bin": { -+ "watchify": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">= 8.10.0" -+ } -+ }, -+ "node_modules/watchify/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dev": true, -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/watchify/node_modules/through2": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", -+ "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", -+ "dev": true, -+ "dependencies": { -+ "readable-stream": "3" -+ } -+ }, -+ "node_modules/webworkify": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz", -+ "integrity": "sha512-AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g==" -+ }, -+ "node_modules/which": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", -+ "dependencies": { -+ "isexe": "^2.0.0" -+ }, -+ "bin": { -+ "node-which": "bin/node-which" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/which-typed-array": { -+ "version": "1.1.9", -+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", -+ "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", -+ "dependencies": { -+ "available-typed-arrays": "^1.0.5", -+ "call-bind": "^1.0.2", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "has-tostringtag": "^1.0.0", -+ "is-typed-array": "^1.1.10" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/wide-align": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", -+ "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", -+ "dependencies": { -+ "string-width": "^1.0.2 || 2 || 3 || 4" -+ } -+ }, -+ "node_modules/widest-line": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", -+ "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", -+ "dependencies": { -+ "string-width": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/wolfy87-eventemitter": { -+ "version": "5.2.9", -+ "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz", -+ "integrity": "sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw==" -+ }, -+ "node_modules/word-wrap": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", -+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/wrap-ansi": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", -+ "dependencies": { -+ "ansi-styles": "^4.0.0", -+ "string-width": "^4.1.0", -+ "strip-ansi": "^6.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -+ } -+ }, -+ "node_modules/wrap-ansi/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/wrap-ansi/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/wrap-ansi/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/wrappy": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" -+ }, -+ "node_modules/write-file-atomic": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", -+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", -+ "dependencies": { -+ "imurmurhash": "^0.1.4", -+ "is-typedarray": "^1.0.0", -+ "signal-exit": "^3.0.2", -+ "typedarray-to-buffer": "^3.1.5" -+ } -+ }, -+ "node_modules/ws": { -+ "version": "8.6.0", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", -+ "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "peerDependencies": { -+ "bufferutil": "^4.0.1", -+ "utf-8-validate": "^5.0.2" -+ }, -+ "peerDependenciesMeta": { -+ "bufferutil": { -+ "optional": true -+ }, -+ "utf-8-validate": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/xdg-basedir": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", -+ "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/xmlbuilder": { -+ "version": "15.1.1", -+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", -+ "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", -+ "engines": { -+ "node": ">=8.0" -+ } -+ }, -+ "node_modules/xtend": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", -+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", -+ "engines": { -+ "node": ">=0.4" -+ } -+ }, -+ "node_modules/y18n": { -+ "version": "5.0.8", -+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", -+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/yallist": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" -+ }, -+ "node_modules/yargs": { -+ "version": "17.5.1", -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", -+ "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", -+ "dependencies": { -+ "cliui": "^7.0.2", -+ "escalade": "^3.1.1", -+ "get-caller-file": "^2.0.5", -+ "require-directory": "^2.1.1", -+ "string-width": "^4.2.3", -+ "y18n": "^5.0.5", -+ "yargs-parser": "^21.0.0" -+ }, -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/yargs-parser": { -+ "version": "20.2.9", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", -+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/yargs/node_modules/yargs-parser": { -+ "version": "21.1.1", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", -+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/yauzl": { -+ "version": "2.10.0", -+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", -+ "dependencies": { -+ "buffer-crc32": "~0.2.3", -+ "fd-slicer": "~1.1.0" -+ } -+ } -+ }, -+ "dependencies": { -+ "@ampproject/remapping": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", -+ "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", -+ "requires": { -+ "@jridgewell/gen-mapping": "^0.1.0", -+ "@jridgewell/trace-mapping": "^0.3.9" -+ } -+ }, -+ "@babel/code-frame": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", -+ "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", -+ "requires": { -+ "@babel/highlight": "^7.18.6" -+ } -+ }, -+ "@babel/compat-data": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", -+ "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==" -+ }, -+ "@babel/core": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.0.tgz", -+ "integrity": "sha512-Xyw74OlJwDijToNi0+6BBI5mLLR5+5R3bcSH80LXzjzEGEUlvNzujEE71BaD/ApEZHAvFI/Mlmp4M5lIkdeeWw==", -+ "requires": { -+ "@ampproject/remapping": "^2.1.0", -+ "@babel/code-frame": "^7.16.7", -+ "@babel/generator": "^7.18.0", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-module-transforms": "^7.18.0", -+ "@babel/helpers": "^7.18.0", -+ "@babel/parser": "^7.18.0", -+ "@babel/template": "^7.16.7", -+ "@babel/traverse": "^7.18.0", -+ "@babel/types": "^7.18.0", -+ "convert-source-map": "^1.7.0", -+ "debug": "^4.1.0", -+ "gensync": "^1.0.0-beta.2", -+ "json5": "^2.2.1", -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/eslint-parser": { -+ "version": "7.17.0", -+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", -+ "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", -+ "requires": { -+ "eslint-scope": "^5.1.1", -+ "eslint-visitor-keys": "^2.1.0", -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/generator": { -+ "version": "7.20.4", -+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz", -+ "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==", -+ "requires": { -+ "@babel/types": "^7.20.2", -+ "@jridgewell/gen-mapping": "^0.3.2", -+ "jsesc": "^2.5.1" -+ }, -+ "dependencies": { -+ "@jridgewell/gen-mapping": { -+ "version": "0.3.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", -+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", -+ "requires": { -+ "@jridgewell/set-array": "^1.0.1", -+ "@jridgewell/sourcemap-codec": "^1.4.10", -+ "@jridgewell/trace-mapping": "^0.3.9" -+ } -+ } -+ } -+ }, -+ "@babel/helper-annotate-as-pure": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", -+ "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-builder-binary-assignment-operator-visitor": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", -+ "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", -+ "requires": { -+ "@babel/helper-explode-assignable-expression": "^7.18.6", -+ "@babel/types": "^7.18.9" -+ } -+ }, -+ "@babel/helper-compilation-targets": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz", -+ "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==", -+ "requires": { -+ "@babel/compat-data": "^7.20.0", -+ "@babel/helper-validator-option": "^7.18.6", -+ "browserslist": "^4.21.3", -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/helper-create-class-features-plugin": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz", -+ "integrity": "sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-member-expression-to-functions": "^7.18.9", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/helper-replace-supers": "^7.19.1", -+ "@babel/helper-split-export-declaration": "^7.18.6" -+ } -+ }, -+ "@babel/helper-create-regexp-features-plugin": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz", -+ "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "regexpu-core": "^5.1.0" -+ } -+ }, -+ "@babel/helper-define-polyfill-provider": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", -+ "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", -+ "requires": { -+ "@babel/helper-compilation-targets": "^7.17.7", -+ "@babel/helper-plugin-utils": "^7.16.7", -+ "debug": "^4.1.1", -+ "lodash.debounce": "^4.0.8", -+ "resolve": "^1.14.2", -+ "semver": "^6.1.2" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/helper-environment-visitor": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", -+ "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==" -+ }, -+ "@babel/helper-explode-assignable-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", -+ "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-function-name": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", -+ "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", -+ "requires": { -+ "@babel/template": "^7.18.10", -+ "@babel/types": "^7.19.0" -+ } -+ }, -+ "@babel/helper-hoist-variables": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", -+ "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-member-expression-to-functions": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz", -+ "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==", -+ "requires": { -+ "@babel/types": "^7.18.9" -+ } -+ }, -+ "@babel/helper-module-imports": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", -+ "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-module-transforms": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", -+ "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", -+ "requires": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-module-imports": "^7.18.6", -+ "@babel/helper-simple-access": "^7.20.2", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "@babel/helper-validator-identifier": "^7.19.1", -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.20.1", -+ "@babel/types": "^7.20.2" -+ } -+ }, -+ "@babel/helper-optimise-call-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", -+ "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-plugin-utils": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", -+ "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==" -+ }, -+ "@babel/helper-remap-async-to-generator": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", -+ "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-wrap-function": "^7.18.9", -+ "@babel/types": "^7.18.9" -+ } -+ }, -+ "@babel/helper-replace-supers": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz", -+ "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==", -+ "requires": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-member-expression-to-functions": "^7.18.9", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/traverse": "^7.19.1", -+ "@babel/types": "^7.19.0" -+ } -+ }, -+ "@babel/helper-simple-access": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", -+ "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", -+ "requires": { -+ "@babel/types": "^7.20.2" -+ } -+ }, -+ "@babel/helper-skip-transparent-expression-wrappers": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", -+ "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", -+ "requires": { -+ "@babel/types": "^7.20.0" -+ } -+ }, -+ "@babel/helper-split-export-declaration": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", -+ "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-string-parser": { -+ "version": "7.19.4", -+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", -+ "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==" -+ }, -+ "@babel/helper-validator-identifier": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", -+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" -+ }, -+ "@babel/helper-validator-option": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", -+ "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==" -+ }, -+ "@babel/helper-wrap-function": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz", -+ "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==", -+ "requires": { -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.19.0", -+ "@babel/types": "^7.19.0" -+ } -+ }, -+ "@babel/helpers": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz", -+ "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==", -+ "requires": { -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.20.1", -+ "@babel/types": "^7.20.0" -+ } -+ }, -+ "@babel/highlight": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", -+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", -+ "requires": { -+ "@babel/helper-validator-identifier": "^7.18.6", -+ "chalk": "^2.0.0", -+ "js-tokens": "^4.0.0" -+ } -+ }, -+ "@babel/parser": { -+ "version": "7.20.3", -+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", -+ "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==" -+ }, -+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", -+ "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz", -+ "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9", -+ "@babel/plugin-proposal-optional-chaining": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-proposal-async-generator-functions": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz", -+ "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==", -+ "requires": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-remap-async-to-generator": "^7.18.9", -+ "@babel/plugin-syntax-async-generators": "^7.8.4" -+ } -+ }, -+ "@babel/plugin-proposal-class-properties": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", -+ "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", -+ "requires": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-proposal-class-static-block": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz", -+ "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==", -+ "requires": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-class-static-block": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-proposal-dynamic-import": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", -+ "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-dynamic-import": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-export-namespace-from": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", -+ "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/plugin-syntax-export-namespace-from": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-json-strings": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", -+ "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-json-strings": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-logical-assignment-operators": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz", -+ "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" -+ } -+ }, -+ "@babel/plugin-proposal-nullish-coalescing-operator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", -+ "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-numeric-separator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", -+ "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-numeric-separator": "^7.10.4" -+ } -+ }, -+ "@babel/plugin-proposal-object-rest-spread": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz", -+ "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==", -+ "requires": { -+ "@babel/compat-data": "^7.17.10", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-plugin-utils": "^7.17.12", -+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", -+ "@babel/plugin-transform-parameters": "^7.17.12" -+ } -+ }, -+ "@babel/plugin-proposal-optional-catch-binding": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", -+ "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-optional-chaining": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz", -+ "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9", -+ "@babel/plugin-syntax-optional-chaining": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-private-methods": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", -+ "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", -+ "requires": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-proposal-private-property-in-object": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz", -+ "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-proposal-unicode-property-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", -+ "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", -+ "requires": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-syntax-async-generators": { -+ "version": "7.8.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", -+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-class-properties": { -+ "version": "7.12.13", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", -+ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.12.13" -+ } -+ }, -+ "@babel/plugin-syntax-class-static-block": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", -+ "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-syntax-dynamic-import": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", -+ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-export-namespace-from": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", -+ "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-syntax-import-assertions": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", -+ "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.19.0" -+ } -+ }, -+ "@babel/plugin-syntax-json-strings": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", -+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-logical-assignment-operators": { -+ "version": "7.10.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", -+ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.10.4" -+ } -+ }, -+ "@babel/plugin-syntax-nullish-coalescing-operator": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", -+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-numeric-separator": { -+ "version": "7.10.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", -+ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.10.4" -+ } -+ }, -+ "@babel/plugin-syntax-object-rest-spread": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", -+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-optional-catch-binding": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", -+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-optional-chaining": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", -+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-private-property-in-object": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", -+ "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-syntax-top-level-await": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", -+ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-transform-arrow-functions": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz", -+ "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-async-to-generator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz", -+ "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==", -+ "requires": { -+ "@babel/helper-module-imports": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/helper-remap-async-to-generator": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-block-scoped-functions": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", -+ "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-block-scoping": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz", -+ "integrity": "sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ } -+ }, -+ "@babel/plugin-transform-classes": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz", -+ "integrity": "sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-compilation-targets": "^7.20.0", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.20.2", -+ "@babel/helper-replace-supers": "^7.19.1", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "globals": "^11.1.0" -+ } -+ }, -+ "@babel/plugin-transform-computed-properties": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz", -+ "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-destructuring": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz", -+ "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ } -+ }, -+ "@babel/plugin-transform-dotall-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", -+ "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", -+ "requires": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-duplicate-keys": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", -+ "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-exponentiation-operator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", -+ "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", -+ "requires": { -+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-for-of": { -+ "version": "7.18.8", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", -+ "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-function-name": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz", -+ "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==", -+ "requires": { -+ "@babel/helper-compilation-targets": "^7.18.9", -+ "@babel/helper-function-name": "^7.18.9", -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-literals": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", -+ "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-member-expression-literals": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", -+ "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-modules-amd": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz", -+ "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==", -+ "requires": { -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0" -+ } -+ }, -+ "@babel/plugin-transform-modules-commonjs": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz", -+ "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==", -+ "requires": { -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-simple-access": "^7.19.4" -+ } -+ }, -+ "@babel/plugin-transform-modules-systemjs": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz", -+ "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==", -+ "requires": { -+ "@babel/helper-hoist-variables": "^7.18.6", -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-validator-identifier": "^7.19.1" -+ } -+ }, -+ "@babel/plugin-transform-modules-umd": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", -+ "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", -+ "requires": { -+ "@babel/helper-module-transforms": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-named-capturing-groups-regex": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz", -+ "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==", -+ "requires": { -+ "@babel/helper-create-regexp-features-plugin": "^7.19.0", -+ "@babel/helper-plugin-utils": "^7.19.0" -+ } -+ }, -+ "@babel/plugin-transform-new-target": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", -+ "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-object-super": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", -+ "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/helper-replace-supers": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-parameters": { -+ "version": "7.20.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz", -+ "integrity": "sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ } -+ }, -+ "@babel/plugin-transform-property-literals": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", -+ "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-regenerator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz", -+ "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "regenerator-transform": "^0.15.0" -+ } -+ }, -+ "@babel/plugin-transform-reserved-words": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", -+ "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-shorthand-properties": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", -+ "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-spread": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz", -+ "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-sticky-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", -+ "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-template-literals": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", -+ "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-typeof-symbol": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", -+ "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-unicode-escapes": { -+ "version": "7.18.10", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", -+ "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-unicode-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", -+ "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", -+ "requires": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/polyfill": { -+ "version": "7.12.1", -+ "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz", -+ "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==", -+ "requires": { -+ "core-js": "^2.6.5", -+ "regenerator-runtime": "^0.13.4" -+ }, -+ "dependencies": { -+ "core-js": { -+ "version": "2.6.12", -+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", -+ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" -+ } -+ } -+ }, -+ "@babel/preset-env": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.0.tgz", -+ "integrity": "sha512-cP74OMs7ECLPeG1reiCQ/D/ypyOxgfm8uR6HRYV23vTJ7Lu1nbgj9DQDo/vH59gnn7GOAwtTDPPYV4aXzsMKHA==", -+ "requires": { -+ "@babel/compat-data": "^7.17.10", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-plugin-utils": "^7.17.12", -+ "@babel/helper-validator-option": "^7.16.7", -+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12", -+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12", -+ "@babel/plugin-proposal-async-generator-functions": "^7.17.12", -+ "@babel/plugin-proposal-class-properties": "^7.17.12", -+ "@babel/plugin-proposal-class-static-block": "^7.18.0", -+ "@babel/plugin-proposal-dynamic-import": "^7.16.7", -+ "@babel/plugin-proposal-export-namespace-from": "^7.17.12", -+ "@babel/plugin-proposal-json-strings": "^7.17.12", -+ "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12", -+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12", -+ "@babel/plugin-proposal-numeric-separator": "^7.16.7", -+ "@babel/plugin-proposal-object-rest-spread": "^7.18.0", -+ "@babel/plugin-proposal-optional-catch-binding": "^7.16.7", -+ "@babel/plugin-proposal-optional-chaining": "^7.17.12", -+ "@babel/plugin-proposal-private-methods": "^7.17.12", -+ "@babel/plugin-proposal-private-property-in-object": "^7.17.12", -+ "@babel/plugin-proposal-unicode-property-regex": "^7.17.12", -+ "@babel/plugin-syntax-async-generators": "^7.8.4", -+ "@babel/plugin-syntax-class-properties": "^7.12.13", -+ "@babel/plugin-syntax-class-static-block": "^7.14.5", -+ "@babel/plugin-syntax-dynamic-import": "^7.8.3", -+ "@babel/plugin-syntax-export-namespace-from": "^7.8.3", -+ "@babel/plugin-syntax-import-assertions": "^7.17.12", -+ "@babel/plugin-syntax-json-strings": "^7.8.3", -+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", -+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", -+ "@babel/plugin-syntax-numeric-separator": "^7.10.4", -+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", -+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", -+ "@babel/plugin-syntax-optional-chaining": "^7.8.3", -+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", -+ "@babel/plugin-syntax-top-level-await": "^7.14.5", -+ "@babel/plugin-transform-arrow-functions": "^7.17.12", -+ "@babel/plugin-transform-async-to-generator": "^7.17.12", -+ "@babel/plugin-transform-block-scoped-functions": "^7.16.7", -+ "@babel/plugin-transform-block-scoping": "^7.17.12", -+ "@babel/plugin-transform-classes": "^7.17.12", -+ "@babel/plugin-transform-computed-properties": "^7.17.12", -+ "@babel/plugin-transform-destructuring": "^7.18.0", -+ "@babel/plugin-transform-dotall-regex": "^7.16.7", -+ "@babel/plugin-transform-duplicate-keys": "^7.17.12", -+ "@babel/plugin-transform-exponentiation-operator": "^7.16.7", -+ "@babel/plugin-transform-for-of": "^7.17.12", -+ "@babel/plugin-transform-function-name": "^7.16.7", -+ "@babel/plugin-transform-literals": "^7.17.12", -+ "@babel/plugin-transform-member-expression-literals": "^7.16.7", -+ "@babel/plugin-transform-modules-amd": "^7.18.0", -+ "@babel/plugin-transform-modules-commonjs": "^7.18.0", -+ "@babel/plugin-transform-modules-systemjs": "^7.18.0", -+ "@babel/plugin-transform-modules-umd": "^7.18.0", -+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12", -+ "@babel/plugin-transform-new-target": "^7.17.12", -+ "@babel/plugin-transform-object-super": "^7.16.7", -+ "@babel/plugin-transform-parameters": "^7.17.12", -+ "@babel/plugin-transform-property-literals": "^7.16.7", -+ "@babel/plugin-transform-regenerator": "^7.18.0", -+ "@babel/plugin-transform-reserved-words": "^7.17.12", -+ "@babel/plugin-transform-shorthand-properties": "^7.16.7", -+ "@babel/plugin-transform-spread": "^7.17.12", -+ "@babel/plugin-transform-sticky-regex": "^7.16.7", -+ "@babel/plugin-transform-template-literals": "^7.17.12", -+ "@babel/plugin-transform-typeof-symbol": "^7.17.12", -+ "@babel/plugin-transform-unicode-escapes": "^7.16.7", -+ "@babel/plugin-transform-unicode-regex": "^7.16.7", -+ "@babel/preset-modules": "^0.1.5", -+ "@babel/types": "^7.18.0", -+ "babel-plugin-polyfill-corejs2": "^0.3.0", -+ "babel-plugin-polyfill-corejs3": "^0.5.0", -+ "babel-plugin-polyfill-regenerator": "^0.3.0", -+ "core-js-compat": "^3.22.1", -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/preset-modules": { -+ "version": "0.1.5", -+ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", -+ "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.0.0", -+ "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", -+ "@babel/plugin-transform-dotall-regex": "^7.4.4", -+ "@babel/types": "^7.4.4", -+ "esutils": "^2.0.2" -+ } -+ }, -+ "@babel/runtime": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz", -+ "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", -+ "requires": { -+ "regenerator-runtime": "^0.13.10" -+ } -+ }, -+ "@babel/template": { -+ "version": "7.18.10", -+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", -+ "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", -+ "requires": { -+ "@babel/code-frame": "^7.18.6", -+ "@babel/parser": "^7.18.10", -+ "@babel/types": "^7.18.10" -+ } -+ }, -+ "@babel/traverse": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", -+ "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", -+ "requires": { -+ "@babel/code-frame": "^7.18.6", -+ "@babel/generator": "^7.20.1", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-hoist-variables": "^7.18.6", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "@babel/parser": "^7.20.1", -+ "@babel/types": "^7.20.0", -+ "debug": "^4.1.0", -+ "globals": "^11.1.0" -+ } -+ }, -+ "@babel/types": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz", -+ "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==", -+ "requires": { -+ "@babel/helper-string-parser": "^7.19.4", -+ "@babel/helper-validator-identifier": "^7.19.1", -+ "to-fast-properties": "^2.0.0" -+ } -+ }, -+ "@electron/get": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz", -+ "integrity": "sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==", -+ "requires": { -+ "debug": "^4.1.1", -+ "env-paths": "^2.2.0", -+ "fs-extra": "^8.1.0", -+ "global-agent": "^3.0.0", -+ "global-tunnel-ng": "^2.7.1", -+ "got": "^9.6.0", -+ "progress": "^2.0.3", -+ "semver": "^6.2.0", -+ "sumchecker": "^3.0.1" -+ }, -+ "dependencies": { -+ "fs-extra": { -+ "version": "8.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", -+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", -+ "requires": { -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ } -+ }, -+ "jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "requires": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ }, -+ "universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" -+ } -+ } -+ }, -+ "@electron/remote": { -+ "version": "2.0.8", -+ "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.8.tgz", -+ "integrity": "sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==" -+ }, -+ "@eslint/eslintrc": { -+ "version": "1.3.3", -+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", -+ "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", -+ "requires": { -+ "ajv": "^6.12.4", -+ "debug": "^4.3.2", -+ "espree": "^9.4.0", -+ "globals": "^13.15.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.2.1", -+ "js-yaml": "^4.1.0", -+ "minimatch": "^3.1.2", -+ "strip-json-comments": "^3.1.1" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "globals": { -+ "version": "13.17.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", -+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", -+ "requires": { -+ "type-fest": "^0.20.2" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ }, -+ "type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" -+ } -+ } -+ }, -+ "@gar/promisify": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", -+ "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" -+ }, -+ "@humanwhocodes/config-array": { -+ "version": "0.9.5", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", -+ "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", -+ "requires": { -+ "@humanwhocodes/object-schema": "^1.2.1", -+ "debug": "^4.1.1", -+ "minimatch": "^3.0.4" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "@humanwhocodes/object-schema": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", -+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==" -+ }, -+ "@jridgewell/gen-mapping": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", -+ "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", -+ "requires": { -+ "@jridgewell/set-array": "^1.0.0", -+ "@jridgewell/sourcemap-codec": "^1.4.10" -+ } -+ }, -+ "@jridgewell/resolve-uri": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", -+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" -+ }, -+ "@jridgewell/set-array": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", -+ "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" -+ }, -+ "@jridgewell/sourcemap-codec": { -+ "version": "1.4.14", -+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", -+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" -+ }, -+ "@jridgewell/trace-mapping": { -+ "version": "0.3.17", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", -+ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", -+ "requires": { -+ "@jridgewell/resolve-uri": "3.1.0", -+ "@jridgewell/sourcemap-codec": "1.4.14" -+ } -+ }, -+ "@npmcli/fs": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", -+ "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", -+ "requires": { -+ "@gar/promisify": "^1.0.1", -+ "semver": "^7.3.5" -+ } -+ }, -+ "@npmcli/move-file": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", -+ "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", -+ "requires": { -+ "mkdirp": "^1.0.4", -+ "rimraf": "^3.0.2" -+ }, -+ "dependencies": { -+ "mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" -+ }, -+ "rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ } -+ } -+ }, -+ "@serialport/binding-abstract": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.2.4.tgz", -+ "integrity": "sha512-UESvncat2oQKnAp29eDVJ2jB9sADatCgoojPPB4RVvp3+3Wqu5QVEh/UCjHRUeDJ20fkSFnKAw9D0vNoBQ+5Kw==", -+ "optional": true, -+ "requires": { -+ "debug": "^4.3.2" -+ } -+ }, -+ "@serialport/binding-mock": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.7.tgz", -+ "integrity": "sha512-aR8H+htZwwZZkVb1MdbnNvGWw8eXVRqQ2qPhkbKyx0N/LY5aVIgCgT98Kt1YylLsG7SzNG+Jbhd4wzwEuPVT5Q==", -+ "optional": true, -+ "requires": { -+ "@serialport/binding-abstract": "^9.0.7", -+ "debug": "^4.3.1" -+ } -+ }, -+ "@serialport/bindings": { -+ "version": "9.2.9", -+ "resolved": "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.2.9.tgz", -+ "integrity": "sha512-An7PiVlyNMx/0RDnSBxFHIsd4kt0/zPlDALlTjhVQKXbG6e0xRqLKbkoZVzHMS8rg7HzCu8G1nplifoAwNm5Lg==", -+ "optional": true, -+ "requires": { -+ "@serialport/binding-abstract": "9.2.3", -+ "@serialport/parser-readline": "9.2.4", -+ "bindings": "^1.5.0", -+ "debug": "^4.3.2", -+ "nan": "^2.15.0", -+ "prebuild-install": "^7.0.0" -+ }, -+ "dependencies": { -+ "@serialport/binding-abstract": { -+ "version": "9.2.3", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.2.3.tgz", -+ "integrity": "sha512-cQs9tbIlG3P0IrOWyVirqlhWuJ7Ms2Zh9m2108z6Y5UW/iVj6wEOiW8EmK9QX9jmJXYllE7wgGgvVozP5oCj3w==", -+ "optional": true, -+ "requires": { -+ "debug": "^4.3.2" -+ } -+ }, -+ "@serialport/parser-delimiter": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.2.4.tgz", -+ "integrity": "sha512-4nvTAoYAgkxFiXrkI+3CA49Yd43CODjeszh89EK+I9c8wOZ+etZduRCzINYPiy26g7zO+GRAb9FoPCsY+sYcbQ==", -+ "optional": true -+ }, -+ "@serialport/parser-readline": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.2.4.tgz", -+ "integrity": "sha512-Z1/qrZTQUVhNSJP1hd9YfDvq0o7d87rNwAjjRKbVpa7Qi51tG5BnKt43IV3NFMyBlVcRe0rnIb3tJu57E0SOwg==", -+ "optional": true, -+ "requires": { -+ "@serialport/parser-delimiter": "9.2.4" -+ } -+ } -+ } -+ }, -+ "@serialport/parser-byte-length": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.7.tgz", -+ "integrity": "sha512-evf7oOOSBMBn2AZZbgBFMRIyEzlsyQkhqaPm7IBCPTxMDXRf4tKkFYJHYZB0/6d1W4eI0meH079UqmSsh/uoDA==", -+ "optional": true -+ }, -+ "@serialport/parser-cctalk": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.7.tgz", -+ "integrity": "sha512-ert5jhMkeiTfr44TkbdySC09J8UwAsf/RxBucVN5Mz5enG509RggnkfFi4mfj3UCG2vZ7qsmM6gtZ62DshY02Q==", -+ "optional": true -+ }, -+ "@serialport/parser-delimiter": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.7.tgz", -+ "integrity": "sha512-Vb2NPeXPZ/28M4m5x4OAHFd8jRAeddNCgvL+Q+H/hqFPY1w47JcMLchC7pigRW8Cnt1fklmzfwdNQ8Fb+kMkxQ==", -+ "optional": true -+ }, -+ "@serialport/parser-inter-byte-timeout": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-9.0.7.tgz", -+ "integrity": "sha512-lUZ3cwgUluBvJ1jf+0LQsqoiPYAokDO6+fRCw9HCfnrF/OS60Gm4rxuyo2uQIueqZkJ7NIFP+ibKsULrA47AEA==", -+ "optional": true -+ }, -+ "@serialport/parser-readline": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.7.tgz", -+ "integrity": "sha512-ydoLbgVQQPxWrwbe3Fhh4XnZexbkEQAC6M/qgRTzjnKvTjrD61CJNxLc3vyDaAPI9bJIhTiI7eTX3JB5jJv8Hg==", -+ "optional": true, -+ "requires": { -+ "@serialport/parser-delimiter": "^9.0.7" -+ } -+ }, -+ "@serialport/parser-ready": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.7.tgz", -+ "integrity": "sha512-3qYhI4cNUPAYqVYvdwV57Y+PVRl4dJf1fPBtMoWtwDgwopsAXTR93WCs49WuUq9JCyNW+8Hrfqv8x8eNAD5Dqg==", -+ "optional": true -+ }, -+ "@serialport/parser-regex": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.7.tgz", -+ "integrity": "sha512-5XF+FXbhqQ/5bVKM4NaGs1m+E9KjfmeCx/obwsKaUZognQF67jwoTfjJJWNP/21jKfxdl8XoCYjZjASl3XKRAw==", -+ "optional": true -+ }, -+ "@serialport/stream": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.7.tgz", -+ "integrity": "sha512-c/h7HPAeFiryD9iTGlaSvPqHFHSZ0NMQHxC4rcmKS2Vu3qJuEtkBdTLABwsMp7iWEiSnI4KC3s7bHapaXP06FQ==", -+ "optional": true, -+ "requires": { -+ "debug": "^4.3.1" -+ } -+ }, -+ "@sindresorhus/is": { -+ "version": "0.14.0", -+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", -+ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" -+ }, -+ "@szmarczak/http-timer": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", -+ "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", -+ "requires": { -+ "defer-to-connect": "^1.0.1" -+ } -+ }, -+ "@tootallnate/once": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", -+ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" -+ }, -+ "@types/glob": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", -+ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", -+ "optional": true, -+ "requires": { -+ "@types/minimatch": "*", -+ "@types/node": "*" -+ } -+ }, -+ "@types/minimatch": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", -+ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", -+ "optional": true -+ }, -+ "@types/minimist": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", -+ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" -+ }, -+ "@types/node": { -+ "version": "18.11.9", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", -+ "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", -+ "optional": true -+ }, -+ "@types/normalize-package-data": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", -+ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" -+ }, -+ "@types/yauzl": { -+ "version": "2.10.0", -+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", -+ "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", -+ "optional": true, -+ "requires": { -+ "@types/node": "*" -+ } -+ }, -+ "7zip": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz", -+ "integrity": "sha512-ns8vKbKhIQm338AeWo/YdDSWil3pldwCMoyR2npoM2qDAzF8Vuko8BtDxpNt/wE15SXOh5K5WbjSLR4kTOAHLA==" -+ }, -+ "abbrev": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", -+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" -+ }, -+ "acorn": { -+ "version": "8.8.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", -+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==" -+ }, -+ "acorn-jsx": { -+ "version": "5.3.2", -+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", -+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" -+ }, -+ "acorn-node": { -+ "version": "1.8.2", -+ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", -+ "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", -+ "requires": { -+ "acorn": "^7.0.0", -+ "acorn-walk": "^7.0.0", -+ "xtend": "^4.0.2" -+ }, -+ "dependencies": { -+ "acorn": { -+ "version": "7.4.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", -+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" -+ } -+ } -+ }, -+ "acorn-walk": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", -+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" -+ }, -+ "agent-base": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", -+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", -+ "requires": { -+ "debug": "4" -+ } -+ }, -+ "agentkeepalive": { -+ "version": "4.2.1", -+ "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", -+ "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", -+ "requires": { -+ "debug": "^4.1.0", -+ "depd": "^1.1.2", -+ "humanize-ms": "^1.2.1" -+ } -+ }, -+ "aggregate-error": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", -+ "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", -+ "requires": { -+ "clean-stack": "^2.0.0", -+ "indent-string": "^4.0.0" -+ } -+ }, -+ "ajv": { -+ "version": "6.12.6", -+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", -+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", -+ "requires": { -+ "fast-deep-equal": "^3.1.1", -+ "fast-json-stable-stringify": "^2.0.0", -+ "json-schema-traverse": "^0.4.1", -+ "uri-js": "^4.2.2" -+ } -+ }, -+ "ansi-align": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", -+ "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", -+ "requires": { -+ "string-width": "^4.1.0" -+ } -+ }, -+ "ansi-html": { -+ "version": "0.0.9", -+ "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz", -+ "integrity": "sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==" -+ }, -+ "ansi-regex": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" -+ }, -+ "ansi-styles": { -+ "version": "3.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", -+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", -+ "requires": { -+ "color-convert": "^1.9.0" -+ } -+ }, -+ "anymatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", -+ "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", -+ "requires": { -+ "normalize-path": "^3.0.0", -+ "picomatch": "^2.0.4" -+ } -+ }, -+ "apache-crypt": { -+ "version": "1.2.6", -+ "resolved": "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.6.tgz", -+ "integrity": "sha512-072WetlM4blL8PREJVeY+WHiUh1R5VNt2HfceGS8aKqttPHcmqE5pkKuXPz/ULmJOFkc8Hw3kfKl6vy7Qka6DA==", -+ "requires": { -+ "unix-crypt-td-js": "^1.1.4" -+ } -+ }, -+ "apache-md5": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.8.tgz", -+ "integrity": "sha512-FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA==" -+ }, -+ "aproba": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", -+ "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" -+ }, -+ "are-we-there-yet": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", -+ "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", -+ "requires": { -+ "delegates": "^1.0.0", -+ "readable-stream": "^3.6.0" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "argparse": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", -+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" -+ }, -+ "array-flatten": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", -+ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" -+ }, -+ "arrify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", -+ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==" -+ }, -+ "asar": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz", -+ "integrity": "sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==", -+ "requires": { -+ "@types/glob": "^7.1.1", -+ "chromium-pickle-js": "^0.2.0", -+ "commander": "^5.0.0", -+ "glob": "^7.1.6", -+ "minimatch": "^3.0.4" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "asn1": { -+ "version": "0.2.6", -+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", -+ "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", -+ "requires": { -+ "safer-buffer": "~2.1.0" -+ } -+ }, -+ "asn1.js": { -+ "version": "5.4.1", -+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", -+ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", -+ "requires": { -+ "bn.js": "^4.0.0", -+ "inherits": "^2.0.1", -+ "minimalistic-assert": "^1.0.0", -+ "safer-buffer": "^2.1.0" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "assert": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", -+ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", -+ "requires": { -+ "object-assign": "^4.1.1", -+ "util": "0.10.3" -+ }, -+ "dependencies": { -+ "inherits": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", -+ "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==" -+ }, -+ "util": { -+ "version": "0.10.3", -+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", -+ "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", -+ "requires": { -+ "inherits": "2.0.1" -+ } -+ } -+ } -+ }, -+ "assert-plus": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", -+ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==" -+ }, -+ "async-foreach": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", -+ "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==" -+ }, -+ "asynckit": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", -+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" -+ }, -+ "at-least-node": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", -+ "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" -+ }, -+ "author-regex": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", -+ "integrity": "sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==" -+ }, -+ "available-typed-arrays": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", -+ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" -+ }, -+ "aws-sign2": { -+ "version": "0.7.0", -+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", -+ "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==" -+ }, -+ "aws4": { -+ "version": "1.11.0", -+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", -+ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" -+ }, -+ "babel-plugin-polyfill-corejs2": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", -+ "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", -+ "requires": { -+ "@babel/compat-data": "^7.17.7", -+ "@babel/helper-define-polyfill-provider": "^0.3.3", -+ "semver": "^6.1.1" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "babel-plugin-polyfill-corejs3": { -+ "version": "0.5.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz", -+ "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==", -+ "requires": { -+ "@babel/helper-define-polyfill-provider": "^0.3.2", -+ "core-js-compat": "^3.21.0" -+ } -+ }, -+ "babel-plugin-polyfill-regenerator": { -+ "version": "0.3.1", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", -+ "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", -+ "requires": { -+ "@babel/helper-define-polyfill-provider": "^0.3.1" -+ } -+ }, -+ "babelify": { -+ "version": "10.0.0", -+ "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", -+ "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==" -+ }, -+ "balanced-match": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", -+ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==" -+ }, -+ "base64-js": { -+ "version": "1.5.1", -+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", -+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" -+ }, -+ "bcrypt-pbkdf": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", -+ "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", -+ "requires": { -+ "tweetnacl": "^0.14.3" -+ } -+ }, -+ "bcryptjs": { -+ "version": "2.4.3", -+ "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", -+ "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==" -+ }, -+ "binary-extensions": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", -+ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" -+ }, -+ "bindings": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", -+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", -+ "optional": true, -+ "requires": { -+ "file-uri-to-path": "1.0.0" -+ } -+ }, -+ "bl": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", -+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", -+ "optional": true, -+ "requires": { -+ "buffer": "^5.5.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.4.0" -+ }, -+ "dependencies": { -+ "buffer": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", -+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", -+ "optional": true, -+ "requires": { -+ "base64-js": "^1.3.1", -+ "ieee754": "^1.1.13" -+ } -+ }, -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "optional": true, -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "bluebird": { -+ "version": "3.7.2", -+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", -+ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" -+ }, -+ "bn.js": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", -+ "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" -+ }, -+ "bonjour": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/bonjour.git#33d7fa28c568d05cb7ffda1fd2b20f4cc364e273", -+ "from": "bonjour@github:jean-emmanuel/bonjour", -+ "requires": { -+ "array-flatten": "^2.1.0", -+ "deep-equal": "^1.0.1", -+ "dns-equal": "^1.0.0", -+ "dns-txt": "github:jean-emmanuel/dns-txt#v2.0.3", -+ "multicast-dns": "github:jean-emmanuel/multicast-dns", -+ "multicast-dns-service-types": "^1.1.0" -+ } -+ }, -+ "boolean": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", -+ "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", -+ "optional": true -+ }, -+ "boxen": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", -+ "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", -+ "requires": { -+ "ansi-align": "^3.0.0", -+ "camelcase": "^6.2.0", -+ "chalk": "^4.1.0", -+ "cli-boxes": "^2.2.1", -+ "string-width": "^4.2.2", -+ "type-fest": "^0.20.2", -+ "widest-line": "^3.1.0", -+ "wrap-ansi": "^7.0.0" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "camelcase": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", -+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==" -+ }, -+ "chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "requires": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" -+ }, -+ "supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "requires": { -+ "has-flag": "^4.0.0" -+ } -+ }, -+ "type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" -+ } -+ } -+ }, -+ "brace": { -+ "version": "0.11.1", -+ "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz", -+ "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==" -+ }, -+ "brace-expansion": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", -+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", -+ "requires": { -+ "balanced-match": "^1.0.0" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ } -+ } -+ }, -+ "braces": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", -+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", -+ "requires": { -+ "fill-range": "^7.0.1" -+ } -+ }, -+ "brorand": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", -+ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" -+ }, -+ "browser-pack": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", -+ "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", -+ "requires": { -+ "combine-source-map": "~0.8.0", -+ "defined": "^1.0.0", -+ "JSONStream": "^1.0.3", -+ "safe-buffer": "^5.1.1", -+ "through2": "^2.0.0", -+ "umd": "^3.0.0" -+ } -+ }, -+ "browser-process-hrtime": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", -+ "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==" -+ }, -+ "browser-resolve": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", -+ "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", -+ "requires": { -+ "resolve": "^1.17.0" -+ } -+ }, -+ "browserify": { -+ "version": "17.0.0", -+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz", -+ "integrity": "sha512-SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w==", -+ "requires": { -+ "assert": "^1.4.0", -+ "browser-pack": "^6.0.1", -+ "browser-resolve": "^2.0.0", -+ "browserify-zlib": "~0.2.0", -+ "buffer": "~5.2.1", -+ "cached-path-relative": "^1.0.0", -+ "concat-stream": "^1.6.0", -+ "console-browserify": "^1.1.0", -+ "constants-browserify": "~1.0.0", -+ "crypto-browserify": "^3.0.0", -+ "defined": "^1.0.0", -+ "deps-sort": "^2.0.1", -+ "domain-browser": "^1.2.0", -+ "duplexer2": "~0.1.2", -+ "events": "^3.0.0", -+ "glob": "^7.1.0", -+ "has": "^1.0.0", -+ "htmlescape": "^1.1.0", -+ "https-browserify": "^1.0.0", -+ "inherits": "~2.0.1", -+ "insert-module-globals": "^7.2.1", -+ "JSONStream": "^1.0.3", -+ "labeled-stream-splicer": "^2.0.0", -+ "mkdirp-classic": "^0.5.2", -+ "module-deps": "^6.2.3", -+ "os-browserify": "~0.3.0", -+ "parents": "^1.0.1", -+ "path-browserify": "^1.0.0", -+ "process": "~0.11.0", -+ "punycode": "^1.3.2", -+ "querystring-es3": "~0.2.0", -+ "read-only-stream": "^2.0.0", -+ "readable-stream": "^2.0.2", -+ "resolve": "^1.1.4", -+ "shasum-object": "^1.0.0", -+ "shell-quote": "^1.6.1", -+ "stream-browserify": "^3.0.0", -+ "stream-http": "^3.0.0", -+ "string_decoder": "^1.1.1", -+ "subarg": "^1.0.0", -+ "syntax-error": "^1.1.1", -+ "through2": "^2.0.0", -+ "timers-browserify": "^1.0.1", -+ "tty-browserify": "0.0.1", -+ "url": "~0.11.0", -+ "util": "~0.12.0", -+ "vm-browserify": "^1.0.0", -+ "xtend": "^4.0.0" -+ } -+ }, -+ "browserify-aes": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", -+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", -+ "requires": { -+ "buffer-xor": "^1.0.3", -+ "cipher-base": "^1.0.0", -+ "create-hash": "^1.1.0", -+ "evp_bytestokey": "^1.0.3", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "browserify-cipher": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", -+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", -+ "requires": { -+ "browserify-aes": "^1.0.4", -+ "browserify-des": "^1.0.0", -+ "evp_bytestokey": "^1.0.0" -+ } -+ }, -+ "browserify-des": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", -+ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", -+ "requires": { -+ "cipher-base": "^1.0.1", -+ "des.js": "^1.0.0", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "browserify-rsa": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", -+ "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", -+ "requires": { -+ "bn.js": "^5.0.0", -+ "randombytes": "^2.0.1" -+ } -+ }, -+ "browserify-sign": { -+ "version": "4.2.1", -+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", -+ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", -+ "requires": { -+ "bn.js": "^5.1.1", -+ "browserify-rsa": "^4.0.1", -+ "create-hash": "^1.2.0", -+ "create-hmac": "^1.1.7", -+ "elliptic": "^6.5.3", -+ "inherits": "^2.0.4", -+ "parse-asn1": "^5.1.5", -+ "readable-stream": "^3.6.0", -+ "safe-buffer": "^5.2.0" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "browserify-zlib": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", -+ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", -+ "requires": { -+ "pako": "~1.0.5" -+ } -+ }, -+ "browserslist": { -+ "version": "4.21.4", -+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", -+ "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", -+ "requires": { -+ "caniuse-lite": "^1.0.30001400", -+ "electron-to-chromium": "^1.4.251", -+ "node-releases": "^2.0.6", -+ "update-browserslist-db": "^1.0.9" -+ } -+ }, -+ "buffer": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", -+ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", -+ "requires": { -+ "base64-js": "^1.0.2", -+ "ieee754": "^1.1.4" -+ } -+ }, -+ "buffer-alloc": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", -+ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", -+ "requires": { -+ "buffer-alloc-unsafe": "^1.1.0", -+ "buffer-fill": "^1.0.0" -+ } -+ }, -+ "buffer-alloc-unsafe": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", -+ "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" -+ }, -+ "buffer-crc32": { -+ "version": "0.2.13", -+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", -+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==" -+ }, -+ "buffer-fill": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", -+ "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==" -+ }, -+ "buffer-from": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", -+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" -+ }, -+ "buffer-indexof": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", -+ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" -+ }, -+ "buffer-xor": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", -+ "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==" -+ }, -+ "builtin-status-codes": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", -+ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==" -+ }, -+ "cacache": { -+ "version": "15.3.0", -+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", -+ "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", -+ "requires": { -+ "@npmcli/fs": "^1.0.0", -+ "@npmcli/move-file": "^1.0.1", -+ "chownr": "^2.0.0", -+ "fs-minipass": "^2.0.0", -+ "glob": "^7.1.4", -+ "infer-owner": "^1.0.4", -+ "lru-cache": "^6.0.0", -+ "minipass": "^3.1.1", -+ "minipass-collect": "^1.0.2", -+ "minipass-flush": "^1.0.5", -+ "minipass-pipeline": "^1.2.2", -+ "mkdirp": "^1.0.3", -+ "p-map": "^4.0.0", -+ "promise-inflight": "^1.0.1", -+ "rimraf": "^3.0.2", -+ "ssri": "^8.0.1", -+ "tar": "^6.0.2", -+ "unique-filename": "^1.1.1" -+ }, -+ "dependencies": { -+ "mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" -+ }, -+ "rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ } -+ } -+ }, -+ "cacheable-request": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", -+ "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", -+ "requires": { -+ "clone-response": "^1.0.2", -+ "get-stream": "^5.1.0", -+ "http-cache-semantics": "^4.0.0", -+ "keyv": "^3.0.0", -+ "lowercase-keys": "^2.0.0", -+ "normalize-url": "^4.1.0", -+ "responselike": "^1.0.2" -+ }, -+ "dependencies": { -+ "lowercase-keys": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", -+ "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" -+ } -+ } -+ }, -+ "cached-path-relative": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz", -+ "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==" -+ }, -+ "call-bind": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", -+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", -+ "requires": { -+ "function-bind": "^1.1.1", -+ "get-intrinsic": "^1.0.2" -+ } -+ }, -+ "callsites": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", -+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" -+ }, -+ "camel-case": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", -+ "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==", -+ "requires": { -+ "no-case": "^2.2.0", -+ "upper-case": "^1.1.1" -+ } -+ }, -+ "camelcase": { -+ "version": "5.3.1", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", -+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" -+ }, -+ "camelcase-keys": { -+ "version": "6.2.2", -+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", -+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", -+ "requires": { -+ "camelcase": "^5.3.1", -+ "map-obj": "^4.0.0", -+ "quick-lru": "^4.0.1" -+ } -+ }, -+ "caniuse-lite": { -+ "version": "1.0.30001431", -+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", -+ "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==" -+ }, -+ "caseless": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", -+ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" -+ }, -+ "chalk": { -+ "version": "2.4.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", -+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", -+ "requires": { -+ "ansi-styles": "^3.2.1", -+ "escape-string-regexp": "^1.0.5", -+ "supports-color": "^5.3.0" -+ } -+ }, -+ "chokidar": { -+ "version": "3.5.3", -+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", -+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", -+ "requires": { -+ "anymatch": "~3.1.2", -+ "braces": "~3.0.2", -+ "fsevents": "~2.3.2", -+ "glob-parent": "~5.1.2", -+ "is-binary-path": "~2.1.0", -+ "is-glob": "~4.0.1", -+ "normalize-path": "~3.0.0", -+ "readdirp": "~3.6.0" -+ } -+ }, -+ "chownr": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", -+ "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" -+ }, -+ "chroma-js": { -+ "version": "2.4.2", -+ "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz", -+ "integrity": "sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==" -+ }, -+ "chromium-pickle-js": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", -+ "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==" -+ }, -+ "ci-info": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", -+ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" -+ }, -+ "cipher-base": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", -+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "clean-stack": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", -+ "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" -+ }, -+ "cli-boxes": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", -+ "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==" -+ }, -+ "cliui": { -+ "version": "7.0.4", -+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", -+ "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", -+ "requires": { -+ "string-width": "^4.2.0", -+ "strip-ansi": "^6.0.0", -+ "wrap-ansi": "^7.0.0" -+ } -+ }, -+ "clone-response": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", -+ "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", -+ "requires": { -+ "mimic-response": "^1.0.0" -+ } -+ }, -+ "color-convert": { -+ "version": "1.9.3", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", -+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", -+ "requires": { -+ "color-name": "1.1.3" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", -+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" -+ }, -+ "color-support": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", -+ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" -+ }, -+ "combine-source-map": { -+ "version": "0.8.0", -+ "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", -+ "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==", -+ "requires": { -+ "convert-source-map": "~1.1.0", -+ "inline-source-map": "~0.6.0", -+ "lodash.memoize": "~3.0.3", -+ "source-map": "~0.5.3" -+ }, -+ "dependencies": { -+ "convert-source-map": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", -+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==" -+ } -+ } -+ }, -+ "combined-stream": { -+ "version": "1.0.8", -+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", -+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", -+ "requires": { -+ "delayed-stream": "~1.0.0" -+ } -+ }, -+ "commander": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", -+ "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" -+ }, -+ "compare-version": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", -+ "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==" -+ }, -+ "concat-map": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", -+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" -+ }, -+ "concat-stream": { -+ "version": "1.6.2", -+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", -+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", -+ "requires": { -+ "buffer-from": "^1.0.0", -+ "inherits": "^2.0.3", -+ "readable-stream": "^2.2.2", -+ "typedarray": "^0.0.6" -+ } -+ }, -+ "config-chain": { -+ "version": "1.1.13", -+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", -+ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", -+ "optional": true, -+ "requires": { -+ "ini": "^1.3.4", -+ "proto-list": "~1.2.1" -+ } -+ }, -+ "configstore": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", -+ "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", -+ "requires": { -+ "dot-prop": "^5.2.0", -+ "graceful-fs": "^4.1.2", -+ "make-dir": "^3.0.0", -+ "unique-string": "^2.0.0", -+ "write-file-atomic": "^3.0.0", -+ "xdg-basedir": "^4.0.0" -+ } -+ }, -+ "console-browserify": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", -+ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" -+ }, -+ "console-control-strings": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", -+ "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" -+ }, -+ "constants-browserify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", -+ "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==" -+ }, -+ "convert-source-map": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", -+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" -+ }, -+ "core-js": { -+ "version": "3.22.5", -+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz", -+ "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==" -+ }, -+ "core-js-compat": { -+ "version": "3.26.0", -+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz", -+ "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==", -+ "requires": { -+ "browserslist": "^4.21.4" -+ } -+ }, -+ "core-util-is": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", -+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" -+ }, -+ "cpr": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz", -+ "integrity": "sha512-Xch4PXQ/KC8lJ+KfJ9JI6eG/nmppLrPPWg5Q+vh65Qr9EjuJEubxh/H/Le1TmCZ7+Xv7iJuNRqapyOFZB+wsxA==", -+ "requires": { -+ "graceful-fs": "^4.1.5", -+ "minimist": "^1.2.0", -+ "mkdirp": "~0.5.1", -+ "rimraf": "^2.5.4" -+ } -+ }, -+ "create-ecdh": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", -+ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", -+ "requires": { -+ "bn.js": "^4.1.0", -+ "elliptic": "^6.5.3" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "create-hash": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", -+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", -+ "requires": { -+ "cipher-base": "^1.0.1", -+ "inherits": "^2.0.1", -+ "md5.js": "^1.3.4", -+ "ripemd160": "^2.0.1", -+ "sha.js": "^2.4.0" -+ } -+ }, -+ "create-hmac": { -+ "version": "1.1.7", -+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", -+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", -+ "requires": { -+ "cipher-base": "^1.0.3", -+ "create-hash": "^1.1.0", -+ "inherits": "^2.0.1", -+ "ripemd160": "^2.0.0", -+ "safe-buffer": "^5.0.1", -+ "sha.js": "^2.4.8" -+ } -+ }, -+ "cross-spawn": { -+ "version": "7.0.3", -+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", -+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", -+ "requires": { -+ "path-key": "^3.1.0", -+ "shebang-command": "^2.0.0", -+ "which": "^2.0.1" -+ } -+ }, -+ "cross-unzip": { -+ "version": "0.0.2", -+ "resolved": "https://registry.npmjs.org/cross-unzip/-/cross-unzip-0.0.2.tgz", -+ "integrity": "sha512-nRJ5c+aqHz0OJVU4V1bqoaDggydfauK/Gha/H/ScBvuIjhZvl8YIpdWVzSR3vUhzCloqB1tvBdQ4V7J8qK7HzQ==" -+ }, -+ "crypto-browserify": { -+ "version": "3.12.0", -+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", -+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", -+ "requires": { -+ "browserify-cipher": "^1.0.0", -+ "browserify-sign": "^4.0.0", -+ "create-ecdh": "^4.0.0", -+ "create-hash": "^1.1.0", -+ "create-hmac": "^1.1.0", -+ "diffie-hellman": "^5.0.0", -+ "inherits": "^2.0.1", -+ "pbkdf2": "^3.0.3", -+ "public-encrypt": "^4.0.0", -+ "randombytes": "^2.0.0", -+ "randomfill": "^1.0.3" -+ } -+ }, -+ "crypto-random-string": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", -+ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" -+ }, -+ "dash-ast": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", -+ "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==" -+ }, -+ "dashdash": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", -+ "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", -+ "requires": { -+ "assert-plus": "^1.0.0" -+ } -+ }, -+ "debug": { -+ "version": "4.3.4", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", -+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", -+ "requires": { -+ "ms": "2.1.2" -+ } -+ }, -+ "decamelize": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", -+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" -+ }, -+ "decamelize-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", -+ "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", -+ "requires": { -+ "decamelize": "^1.1.0", -+ "map-obj": "^1.0.0" -+ }, -+ "dependencies": { -+ "map-obj": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", -+ "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==" -+ } -+ } -+ }, -+ "decompress-response": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", -+ "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", -+ "requires": { -+ "mimic-response": "^1.0.0" -+ } -+ }, -+ "deep-equal": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", -+ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", -+ "requires": { -+ "is-arguments": "^1.0.4", -+ "is-date-object": "^1.0.1", -+ "is-regex": "^1.0.4", -+ "object-is": "^1.0.1", -+ "object-keys": "^1.1.1", -+ "regexp.prototype.flags": "^1.2.0" -+ } -+ }, -+ "deep-extend": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", -+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" -+ }, -+ "deep-is": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", -+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" -+ }, -+ "defer-to-connect": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", -+ "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" -+ }, -+ "define-lazy-prop": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", -+ "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==" -+ }, -+ "define-properties": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", -+ "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", -+ "requires": { -+ "has-property-descriptors": "^1.0.0", -+ "object-keys": "^1.1.1" -+ } -+ }, -+ "defined": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", -+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==" -+ }, -+ "delayed-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", -+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" -+ }, -+ "delegates": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", -+ "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" -+ }, -+ "depd": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", -+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==" -+ }, -+ "deps-sort": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz", -+ "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==", -+ "requires": { -+ "JSONStream": "^1.0.3", -+ "shasum-object": "^1.0.0", -+ "subarg": "^1.0.0", -+ "through2": "^2.0.0" -+ } -+ }, -+ "des.js": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", -+ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "minimalistic-assert": "^1.0.0" -+ } -+ }, -+ "destroy": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", -+ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" -+ }, -+ "detect-libc": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", -+ "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", -+ "optional": true -+ }, -+ "detect-node": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", -+ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", -+ "optional": true -+ }, -+ "detective": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", -+ "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", -+ "requires": { -+ "acorn-node": "^1.8.2", -+ "defined": "^1.0.0", -+ "minimist": "^1.2.6" -+ } -+ }, -+ "diff-match-patch": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz", -+ "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==" -+ }, -+ "diffie-hellman": { -+ "version": "5.0.3", -+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", -+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", -+ "requires": { -+ "bn.js": "^4.1.0", -+ "miller-rabin": "^4.0.0", -+ "randombytes": "^2.0.0" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "dns-equal": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", -+ "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==" -+ }, -+ "dns-packet": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", -+ "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", -+ "requires": { -+ "ip": "^1.1.0", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "dns-txt": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/dns-txt.git#3bee7785c32d8bc71230d5e01383c61fb72a4b4f", -+ "from": "dns-txt@github:jean-emmanuel/dns-txt#v2.0.3", -+ "requires": { -+ "buffer-indexof": "^1.0.0" -+ } -+ }, -+ "doctrine": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", -+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", -+ "requires": { -+ "esutils": "^2.0.2" -+ } -+ }, -+ "dom-serializer": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", -+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", -+ "requires": { -+ "domelementtype": "^2.0.1", -+ "domhandler": "^4.2.0", -+ "entities": "^2.0.0" -+ }, -+ "dependencies": { -+ "domhandler": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", -+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -+ "requires": { -+ "domelementtype": "^2.2.0" -+ } -+ } -+ } -+ }, -+ "domain-browser": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", -+ "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" -+ }, -+ "domelementtype": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", -+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==" -+ }, -+ "domhandler": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", -+ "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", -+ "requires": { -+ "domelementtype": "^2.0.1" -+ } -+ }, -+ "domutils": { -+ "version": "2.8.0", -+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", -+ "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", -+ "requires": { -+ "dom-serializer": "^1.0.1", -+ "domelementtype": "^2.2.0", -+ "domhandler": "^4.2.0" -+ }, -+ "dependencies": { -+ "domhandler": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", -+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -+ "requires": { -+ "domelementtype": "^2.2.0" -+ } -+ } -+ } -+ }, -+ "dot-prop": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", -+ "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", -+ "requires": { -+ "is-obj": "^2.0.0" -+ } -+ }, -+ "duplexer2": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", -+ "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", -+ "requires": { -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "duplexer3": { -+ "version": "0.1.5", -+ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz", -+ "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==" -+ }, -+ "ecc-jsbn": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", -+ "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", -+ "requires": { -+ "jsbn": "~0.1.0", -+ "safer-buffer": "^2.1.0" -+ } -+ }, -+ "ee-first": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", -+ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" -+ }, -+ "electron-is-accelerator": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz", -+ "integrity": "sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA==" -+ }, -+ "electron-localshortcut": { -+ "version": "3.2.1", -+ "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz", -+ "integrity": "sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q==", -+ "requires": { -+ "debug": "^4.0.1", -+ "electron-is-accelerator": "^0.1.0", -+ "keyboardevent-from-electron-accelerator": "^2.0.0", -+ "keyboardevents-areequal": "^0.2.1" -+ } -+ }, -+ "electron-notarize": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.2.tgz", -+ "integrity": "sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw==", -+ "requires": { -+ "debug": "^4.1.1", -+ "fs-extra": "^9.0.1" -+ } -+ }, -+ "electron-osx-sign": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", -+ "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==", -+ "requires": { -+ "bluebird": "^3.5.0", -+ "compare-version": "^0.1.2", -+ "debug": "^2.6.8", -+ "isbinaryfile": "^3.0.2", -+ "minimist": "^1.2.0", -+ "plist": "^3.0.1" -+ }, -+ "dependencies": { -+ "debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "requires": { -+ "ms": "2.0.0" -+ } -+ }, -+ "ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ } -+ } -+ }, -+ "electron-packager": { -+ "version": "15.2.0", -+ "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-15.2.0.tgz", -+ "integrity": "sha512-BaklTBRQy1JTijR3hi8XxHf/uo76rHbDCNM/eQHSblzE9C0NoNfOe86nPxB7y1u2jwlqoEJ4zFiHpTFioKGGRA==", -+ "requires": { -+ "@electron/get": "^1.6.0", -+ "asar": "^3.0.0", -+ "debug": "^4.0.1", -+ "electron-notarize": "^1.0.0", -+ "electron-osx-sign": "^0.5.0", -+ "extract-zip": "^2.0.0", -+ "filenamify": "^4.1.0", -+ "fs-extra": "^9.0.0", -+ "galactus": "^0.2.1", -+ "get-package-info": "^1.0.0", -+ "junk": "^3.1.0", -+ "parse-author": "^2.0.0", -+ "plist": "^3.0.0", -+ "rcedit": "^2.0.0", -+ "resolve": "^1.1.6", -+ "semver": "^7.1.3", -+ "yargs-parser": "^20.0.0" -+ } -+ }, -+ "electron-packager-plugin-non-proprietary-codecs-ffmpeg": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/electron-packager-plugin-non-proprietary-codecs-ffmpeg/-/electron-packager-plugin-non-proprietary-codecs-ffmpeg-1.0.2.tgz", -+ "integrity": "sha512-xPkbzndg2KODqmNe9yIx0dhNOfaOqrdNZ1ZSSZN4h1wT0T5SV/YES0tNyN932jQd+c5cFPv6AWYYjuPWKvcITg==", -+ "requires": { -+ "7zip": "0.0.6", -+ "cross-unzip": "0.0.2", -+ "mkdirp": "^0.5.1", -+ "request": "^2.73.0", -+ "semver": "^5.2.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" -+ } -+ } -+ }, -+ "electron-to-chromium": { -+ "version": "1.4.284", -+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", -+ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" -+ }, -+ "elliptic": { -+ "version": "6.5.4", -+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", -+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", -+ "requires": { -+ "bn.js": "^4.11.9", -+ "brorand": "^1.1.0", -+ "hash.js": "^1.0.0", -+ "hmac-drbg": "^1.0.1", -+ "inherits": "^2.0.4", -+ "minimalistic-assert": "^1.0.1", -+ "minimalistic-crypto-utils": "^1.0.1" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "emoji-regex": { -+ "version": "8.0.0", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" -+ }, -+ "encodeurl": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", -+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" -+ }, -+ "encoding": { -+ "version": "0.1.13", -+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", -+ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", -+ "optional": true, -+ "requires": { -+ "iconv-lite": "^0.6.2" -+ } -+ }, -+ "end-of-stream": { -+ "version": "1.4.4", -+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", -+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", -+ "requires": { -+ "once": "^1.4.0" -+ } -+ }, -+ "entities": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", -+ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" -+ }, -+ "env-paths": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", -+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" -+ }, -+ "err-code": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", -+ "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" -+ }, -+ "error-ex": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", -+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", -+ "requires": { -+ "is-arrayish": "^0.2.1" -+ } -+ }, -+ "error-stack-parser": { -+ "version": "2.1.4", -+ "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", -+ "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", -+ "requires": { -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "es6-error": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", -+ "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", -+ "optional": true -+ }, -+ "escalade": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", -+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" -+ }, -+ "escape-goat": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", -+ "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==" -+ }, -+ "escape-html": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", -+ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" -+ }, -+ "escape-string-regexp": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", -+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" -+ }, -+ "escaper": { -+ "version": "2.5.3", -+ "resolved": "https://registry.npmjs.org/escaper/-/escaper-2.5.3.tgz", -+ "integrity": "sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ==" -+ }, -+ "eslint": { -+ "version": "8.16.0", -+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz", -+ "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==", -+ "requires": { -+ "@eslint/eslintrc": "^1.3.0", -+ "@humanwhocodes/config-array": "^0.9.2", -+ "ajv": "^6.10.0", -+ "chalk": "^4.0.0", -+ "cross-spawn": "^7.0.2", -+ "debug": "^4.3.2", -+ "doctrine": "^3.0.0", -+ "escape-string-regexp": "^4.0.0", -+ "eslint-scope": "^7.1.1", -+ "eslint-utils": "^3.0.0", -+ "eslint-visitor-keys": "^3.3.0", -+ "espree": "^9.3.2", -+ "esquery": "^1.4.0", -+ "esutils": "^2.0.2", -+ "fast-deep-equal": "^3.1.3", -+ "file-entry-cache": "^6.0.1", -+ "functional-red-black-tree": "^1.0.1", -+ "glob-parent": "^6.0.1", -+ "globals": "^13.15.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.0.0", -+ "imurmurhash": "^0.1.4", -+ "is-glob": "^4.0.0", -+ "js-yaml": "^4.1.0", -+ "json-stable-stringify-without-jsonify": "^1.0.1", -+ "levn": "^0.4.1", -+ "lodash.merge": "^4.6.2", -+ "minimatch": "^3.1.2", -+ "natural-compare": "^1.4.0", -+ "optionator": "^0.9.1", -+ "regexpp": "^3.2.0", -+ "strip-ansi": "^6.0.1", -+ "strip-json-comments": "^3.1.0", -+ "text-table": "^0.2.0", -+ "v8-compile-cache": "^2.0.3" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "requires": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" -+ }, -+ "eslint-scope": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", -+ "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", -+ "requires": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^5.2.0" -+ } -+ }, -+ "eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==" -+ }, -+ "estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" -+ }, -+ "glob-parent": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", -+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", -+ "requires": { -+ "is-glob": "^4.0.3" -+ } -+ }, -+ "globals": { -+ "version": "13.17.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", -+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", -+ "requires": { -+ "type-fest": "^0.20.2" -+ } -+ }, -+ "has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ }, -+ "supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "requires": { -+ "has-flag": "^4.0.0" -+ } -+ }, -+ "type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" -+ } -+ } -+ }, -+ "eslint-scope": { -+ "version": "5.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", -+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", -+ "requires": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^4.1.1" -+ } -+ }, -+ "eslint-utils": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", -+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", -+ "requires": { -+ "eslint-visitor-keys": "^2.0.0" -+ } -+ }, -+ "eslint-visitor-keys": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", -+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==" -+ }, -+ "espree": { -+ "version": "9.4.1", -+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", -+ "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", -+ "requires": { -+ "acorn": "^8.8.0", -+ "acorn-jsx": "^5.3.2", -+ "eslint-visitor-keys": "^3.3.0" -+ }, -+ "dependencies": { -+ "eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==" -+ } -+ } -+ }, -+ "esquery": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", -+ "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", -+ "requires": { -+ "estraverse": "^5.1.0" -+ }, -+ "dependencies": { -+ "estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" -+ } -+ } -+ }, -+ "esrecurse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", -+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", -+ "requires": { -+ "estraverse": "^5.2.0" -+ }, -+ "dependencies": { -+ "estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" -+ } -+ } -+ }, -+ "estraverse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", -+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" -+ }, -+ "estree-is-member-expression": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/estree-is-member-expression/-/estree-is-member-expression-1.0.0.tgz", -+ "integrity": "sha512-Ec+X44CapIGExvSZN+pGkmr5p7HwUVQoPQSd458Lqwvaf4/61k/invHSh4BYK8OXnCkfEhWuIoG5hayKLQStIg==" -+ }, -+ "esutils": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", -+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" -+ }, -+ "etag": { -+ "version": "1.8.1", -+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", -+ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" -+ }, -+ "events": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", -+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" -+ }, -+ "evp_bytestokey": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", -+ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", -+ "requires": { -+ "md5.js": "^1.3.4", -+ "safe-buffer": "^5.1.1" -+ } -+ }, -+ "exorcist": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/exorcist/-/exorcist-2.0.0.tgz", -+ "integrity": "sha512-+c63SvhBq/HjmbV9cu9vkDkjXFiuI4lpqOZU5Y3t5GSV2l4TQCqVli9c7nIASHxkUL4THaOZDUcb6XNBI/eYjw==", -+ "requires": { -+ "is-stream": "^2.0.0", -+ "minimist": "^1.2.5", -+ "mkdirp": "^1.0.4", -+ "mold-source-map": "^0.4.0" -+ }, -+ "dependencies": { -+ "mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" -+ } -+ } -+ }, -+ "expand-template": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", -+ "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", -+ "optional": true -+ }, -+ "extend": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", -+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" -+ }, -+ "extract-zip": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", -+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", -+ "requires": { -+ "@types/yauzl": "^2.9.1", -+ "debug": "^4.1.1", -+ "get-stream": "^5.1.0", -+ "yauzl": "^2.10.0" -+ } -+ }, -+ "extsprintf": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", -+ "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==" -+ }, -+ "fast-deep-equal": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", -+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" -+ }, -+ "fast-json-stable-stringify": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", -+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" -+ }, -+ "fast-levenshtein": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", -+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" -+ }, -+ "fast-safe-stringify": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", -+ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" -+ }, -+ "fastdom": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/fastdom/-/fastdom-1.0.10.tgz", -+ "integrity": "sha512-sbL4h358IlZn8VsTvA5TYnKVLYif46XhPEll+HTSxVtDSpqZEO/17D/QqlxE9V2K7AQ82GXeYeQLU2HWwKgk1A==", -+ "requires": { -+ "strictdom": "^1.0.1" -+ } -+ }, -+ "fd-slicer": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", -+ "requires": { -+ "pend": "~1.2.0" -+ } -+ }, -+ "file-entry-cache": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", -+ "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", -+ "requires": { -+ "flat-cache": "^3.0.4" -+ } -+ }, -+ "file-saver": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", -+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" -+ }, -+ "file-uri-to-path": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", -+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", -+ "optional": true -+ }, -+ "filename-reserved-regex": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", -+ "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==" -+ }, -+ "filenamify": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", -+ "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", -+ "requires": { -+ "filename-reserved-regex": "^2.0.0", -+ "strip-outer": "^1.0.1", -+ "trim-repeated": "^1.0.0" -+ } -+ }, -+ "fill-range": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", -+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", -+ "requires": { -+ "to-regex-range": "^5.0.1" -+ } -+ }, -+ "find-up": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", -+ "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", -+ "requires": { -+ "locate-path": "^2.0.0" -+ } -+ }, -+ "flat-cache": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", -+ "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", -+ "requires": { -+ "flatted": "^3.1.0", -+ "rimraf": "^3.0.2" -+ }, -+ "dependencies": { -+ "rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ } -+ } -+ }, -+ "flatted": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", -+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" -+ }, -+ "flora-colossus": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/flora-colossus/-/flora-colossus-1.0.1.tgz", -+ "integrity": "sha512-d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==", -+ "requires": { -+ "debug": "^4.1.1", -+ "fs-extra": "^7.0.0" -+ }, -+ "dependencies": { -+ "fs-extra": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", -+ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", -+ "requires": { -+ "graceful-fs": "^4.1.2", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ } -+ }, -+ "jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "requires": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" -+ } -+ } -+ }, -+ "for-each": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", -+ "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", -+ "requires": { -+ "is-callable": "^1.1.3" -+ } -+ }, -+ "forever-agent": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", -+ "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==" -+ }, -+ "form-data": { -+ "version": "2.3.3", -+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", -+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", -+ "requires": { -+ "asynckit": "^0.4.0", -+ "combined-stream": "^1.0.6", -+ "mime-types": "^2.1.12" -+ } -+ }, -+ "fresh": { -+ "version": "0.5.2", -+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", -+ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" -+ }, -+ "fs-constants": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", -+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", -+ "optional": true -+ }, -+ "fs-extra": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", -+ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", -+ "requires": { -+ "at-least-node": "^1.0.0", -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^6.0.1", -+ "universalify": "^2.0.0" -+ } -+ }, -+ "fs-minipass": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", -+ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "fs.realpath": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" -+ }, -+ "fsevents": { -+ "version": "2.3.2", -+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", -+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", -+ "optional": true -+ }, -+ "function-bind": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", -+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" -+ }, -+ "functional-red-black-tree": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", -+ "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==" -+ }, -+ "functions-have-names": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", -+ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" -+ }, -+ "galactus": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/galactus/-/galactus-0.2.1.tgz", -+ "integrity": "sha512-mDc8EQJKtxjp9PMYS3PbpjjbX3oXhBTxoGaPahw620XZBIHJ4+nvw5KN/tRtmmSDR9dypstGNvqQ3C29QGoGHQ==", -+ "requires": { -+ "debug": "^3.1.0", -+ "flora-colossus": "^1.0.0", -+ "fs-extra": "^4.0.0" -+ }, -+ "dependencies": { -+ "debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "requires": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "fs-extra": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", -+ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", -+ "requires": { -+ "graceful-fs": "^4.1.2", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ } -+ }, -+ "jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "requires": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" -+ } -+ } -+ }, -+ "gauge": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", -+ "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", -+ "requires": { -+ "aproba": "^1.0.3 || ^2.0.0", -+ "color-support": "^1.1.2", -+ "console-control-strings": "^1.0.0", -+ "has-unicode": "^2.0.1", -+ "object-assign": "^4.1.1", -+ "signal-exit": "^3.0.0", -+ "string-width": "^4.2.3", -+ "strip-ansi": "^6.0.1", -+ "wide-align": "^1.1.2" -+ } -+ }, -+ "gaze": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", -+ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", -+ "requires": { -+ "globule": "^1.0.0" -+ } -+ }, -+ "gensync": { -+ "version": "1.0.0-beta.2", -+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", -+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" -+ }, -+ "get-assigned-identifiers": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz", -+ "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==" -+ }, -+ "get-caller-file": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", -+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" -+ }, -+ "get-intrinsic": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", -+ "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", -+ "requires": { -+ "function-bind": "^1.1.1", -+ "has": "^1.0.3", -+ "has-symbols": "^1.0.3" -+ } -+ }, -+ "get-package-info": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", -+ "integrity": "sha512-SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw==", -+ "requires": { -+ "bluebird": "^3.1.1", -+ "debug": "^2.2.0", -+ "lodash.get": "^4.0.0", -+ "read-pkg-up": "^2.0.0" -+ }, -+ "dependencies": { -+ "debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "requires": { -+ "ms": "2.0.0" -+ } -+ }, -+ "ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ } -+ } -+ }, -+ "get-stdin": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", -+ "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==" -+ }, -+ "get-stream": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", -+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", -+ "requires": { -+ "pump": "^3.0.0" -+ } -+ }, -+ "getpass": { -+ "version": "0.1.7", -+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", -+ "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", -+ "requires": { -+ "assert-plus": "^1.0.0" -+ } -+ }, -+ "github-from-package": { -+ "version": "0.0.0", -+ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", -+ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", -+ "optional": true -+ }, -+ "glob": { -+ "version": "7.2.3", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", -+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", -+ "requires": { -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.1.1", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "glob-parent": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", -+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", -+ "requires": { -+ "is-glob": "^4.0.1" -+ } -+ }, -+ "global-agent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", -+ "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", -+ "optional": true, -+ "requires": { -+ "boolean": "^3.0.1", -+ "es6-error": "^4.1.1", -+ "matcher": "^3.0.0", -+ "roarr": "^2.15.3", -+ "semver": "^7.3.2", -+ "serialize-error": "^7.0.1" -+ } -+ }, -+ "global-dirs": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", -+ "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", -+ "requires": { -+ "ini": "2.0.0" -+ }, -+ "dependencies": { -+ "ini": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", -+ "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==" -+ } -+ } -+ }, -+ "global-tunnel-ng": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", -+ "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", -+ "optional": true, -+ "requires": { -+ "encodeurl": "^1.0.2", -+ "lodash": "^4.17.10", -+ "npm-conf": "^1.1.3", -+ "tunnel": "^0.0.6" -+ } -+ }, -+ "globals": { -+ "version": "11.12.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", -+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" -+ }, -+ "globalthis": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", -+ "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", -+ "optional": true, -+ "requires": { -+ "define-properties": "^1.1.3" -+ } -+ }, -+ "globule": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz", -+ "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==", -+ "requires": { -+ "glob": "~7.1.1", -+ "lodash": "^4.17.21", -+ "minimatch": "~3.0.2" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "glob": { -+ "version": "7.1.7", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", -+ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", -+ "requires": { -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.0.4", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" -+ } -+ }, -+ "minimatch": { -+ "version": "3.0.8", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", -+ "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "gopd": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", -+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", -+ "requires": { -+ "get-intrinsic": "^1.1.3" -+ } -+ }, -+ "got": { -+ "version": "9.6.0", -+ "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", -+ "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", -+ "requires": { -+ "@sindresorhus/is": "^0.14.0", -+ "@szmarczak/http-timer": "^1.1.2", -+ "cacheable-request": "^6.0.0", -+ "decompress-response": "^3.3.0", -+ "duplexer3": "^0.1.4", -+ "get-stream": "^4.1.0", -+ "lowercase-keys": "^1.0.1", -+ "mimic-response": "^1.0.1", -+ "p-cancelable": "^1.0.0", -+ "to-readable-stream": "^1.0.0", -+ "url-parse-lax": "^3.0.0" -+ }, -+ "dependencies": { -+ "get-stream": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", -+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", -+ "requires": { -+ "pump": "^3.0.0" -+ } -+ } -+ } -+ }, -+ "graceful-fs": { -+ "version": "4.2.10", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", -+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" -+ }, -+ "gyronorm": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/gyronorm/-/gyronorm-2.0.6.tgz", -+ "integrity": "sha512-pE66zEK/3G9t1dpikTKIjNuY1JauXgtNiulgPKc28IKwMJ5NuJ03mOQ5ArqnkOyQxhlJSY71i3YdFcHhzx4TOg==" -+ }, -+ "har-schema": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", -+ "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==" -+ }, -+ "har-validator": { -+ "version": "5.1.5", -+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", -+ "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", -+ "requires": { -+ "ajv": "^6.12.3", -+ "har-schema": "^2.0.0" -+ } -+ }, -+ "hard-rejection": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", -+ "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==" -+ }, -+ "has": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", -+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", -+ "requires": { -+ "function-bind": "^1.1.1" -+ } -+ }, -+ "has-ansi": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", -+ "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", -+ "requires": { -+ "ansi-regex": "^2.0.0" -+ }, -+ "dependencies": { -+ "ansi-regex": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", -+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" -+ } -+ } -+ }, -+ "has-flag": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", -+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" -+ }, -+ "has-property-descriptors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", -+ "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", -+ "requires": { -+ "get-intrinsic": "^1.1.1" -+ } -+ }, -+ "has-symbols": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", -+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" -+ }, -+ "has-tostringtag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", -+ "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", -+ "requires": { -+ "has-symbols": "^1.0.2" -+ } -+ }, -+ "has-unicode": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", -+ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" -+ }, -+ "has-yarn": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", -+ "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" -+ }, -+ "hash-base": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", -+ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", -+ "requires": { -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.6.0", -+ "safe-buffer": "^5.2.0" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "hash.js": { -+ "version": "1.1.7", -+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", -+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "minimalistic-assert": "^1.0.1" -+ } -+ }, -+ "hmac-drbg": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", -+ "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", -+ "requires": { -+ "hash.js": "^1.0.3", -+ "minimalistic-assert": "^1.0.0", -+ "minimalistic-crypto-utils": "^1.0.1" -+ } -+ }, -+ "hosted-git-info": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", -+ "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", -+ "requires": { -+ "lru-cache": "^6.0.0" -+ } -+ }, -+ "htmlescape": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", -+ "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==" -+ }, -+ "htmlparser2": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", -+ "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", -+ "requires": { -+ "domelementtype": "^2.0.1", -+ "domhandler": "^3.0.0", -+ "domutils": "^2.0.0", -+ "entities": "^2.0.0" -+ } -+ }, -+ "http-auth": { -+ "version": "4.1.9", -+ "resolved": "https://registry.npmjs.org/http-auth/-/http-auth-4.1.9.tgz", -+ "integrity": "sha512-kvPYxNGc9EKGTXvOMnTBQw2RZfuiSihK/mLw/a4pbtRueTE45S55Lw/3k5CktIf7Ak0veMKEIteDj4YkNmCzmQ==", -+ "requires": { -+ "apache-crypt": "^1.1.2", -+ "apache-md5": "^1.0.6", -+ "bcryptjs": "^2.4.3", -+ "uuid": "^8.3.2" -+ } -+ }, -+ "http-cache-semantics": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", -+ "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" -+ }, -+ "http-errors": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", -+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", -+ "requires": { -+ "depd": "2.0.0", -+ "inherits": "2.0.4", -+ "setprototypeof": "1.2.0", -+ "statuses": "2.0.1", -+ "toidentifier": "1.0.1" -+ }, -+ "dependencies": { -+ "depd": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" -+ } -+ } -+ }, -+ "http-proxy-agent": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", -+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", -+ "requires": { -+ "@tootallnate/once": "1", -+ "agent-base": "6", -+ "debug": "4" -+ } -+ }, -+ "http-signature": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", -+ "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", -+ "requires": { -+ "assert-plus": "^1.0.0", -+ "jsprim": "^1.2.2", -+ "sshpk": "^1.7.0" -+ } -+ }, -+ "https-browserify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", -+ "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" -+ }, -+ "https-proxy-agent": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", -+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", -+ "requires": { -+ "agent-base": "6", -+ "debug": "4" -+ } -+ }, -+ "humanize-ms": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", -+ "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", -+ "requires": { -+ "ms": "^2.0.0" -+ } -+ }, -+ "hyperscript-attribute-to-property": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/hyperscript-attribute-to-property/-/hyperscript-attribute-to-property-1.0.2.tgz", -+ "integrity": "sha512-oerMul16jZCmrbNsUw8QgrtDzF8lKgFri1bKQjReLw1IhiiNkI59CWuzZjJDGT79UQ1YiWqXhJMv/tRMVqgtkA==" -+ }, -+ "hyperx": { -+ "version": "2.5.4", -+ "resolved": "https://registry.npmjs.org/hyperx/-/hyperx-2.5.4.tgz", -+ "integrity": "sha512-iOkSh7Yse7lsN/B9y7OsevLWjeXPqGuHQ5SbwaiJM5xAhWFqhoN6erpK1dQsS12OFU36lyai1pnx1mmzWLQqcA==", -+ "requires": { -+ "hyperscript-attribute-to-property": "^1.0.0" -+ } -+ }, -+ "iconv-lite": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", -+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", -+ "optional": true, -+ "requires": { -+ "safer-buffer": ">= 2.1.2 < 3.0.0" -+ } -+ }, -+ "ieee754": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", -+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" -+ }, -+ "ignore": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", -+ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==" -+ }, -+ "ignore-by-default": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", -+ "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" -+ }, -+ "import-fresh": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", -+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", -+ "requires": { -+ "parent-module": "^1.0.0", -+ "resolve-from": "^4.0.0" -+ } -+ }, -+ "import-lazy": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", -+ "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==" -+ }, -+ "imurmurhash": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" -+ }, -+ "indent-string": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", -+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" -+ }, -+ "infer-owner": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", -+ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" -+ }, -+ "inflight": { -+ "version": "1.0.6", -+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", -+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", -+ "requires": { -+ "once": "^1.3.0", -+ "wrappy": "1" -+ } -+ }, -+ "inherits": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" -+ }, -+ "ini": { -+ "version": "1.3.8", -+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", -+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" -+ }, -+ "inline-source-map": { -+ "version": "0.6.2", -+ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz", -+ "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==", -+ "requires": { -+ "source-map": "~0.5.3" -+ } -+ }, -+ "insert-module-globals": { -+ "version": "7.2.1", -+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz", -+ "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==", -+ "requires": { -+ "acorn-node": "^1.5.2", -+ "combine-source-map": "^0.8.0", -+ "concat-stream": "^1.6.1", -+ "is-buffer": "^1.1.0", -+ "JSONStream": "^1.0.3", -+ "path-is-absolute": "^1.0.1", -+ "process": "~0.11.0", -+ "through2": "^2.0.0", -+ "undeclared-identifiers": "^1.1.2", -+ "xtend": "^4.0.0" -+ } -+ }, -+ "ip": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", -+ "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" -+ }, -+ "is-arguments": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", -+ "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", -+ "requires": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-arrayish": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", -+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" -+ }, -+ "is-binary-path": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", -+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", -+ "requires": { -+ "binary-extensions": "^2.0.0" -+ } -+ }, -+ "is-boolean-attribute": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/is-boolean-attribute/-/is-boolean-attribute-0.0.1.tgz", -+ "integrity": "sha512-0kXT52Scokg2Miscvsn5UVqg6y1691vcLJcagie1YHJB4zOEuAhMERLX992jtvaStGy2xQTqOtJhvmG/MK1T5w==" -+ }, -+ "is-buffer": { -+ "version": "1.1.6", -+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", -+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" -+ }, -+ "is-callable": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", -+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==" -+ }, -+ "is-ci": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", -+ "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", -+ "requires": { -+ "ci-info": "^2.0.0" -+ } -+ }, -+ "is-core-module": { -+ "version": "2.11.0", -+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", -+ "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", -+ "requires": { -+ "has": "^1.0.3" -+ } -+ }, -+ "is-date-object": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", -+ "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", -+ "requires": { -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-docker": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", -+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==" -+ }, -+ "is-extglob": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", -+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" -+ }, -+ "is-fullwidth-code-point": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" -+ }, -+ "is-generator-function": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", -+ "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", -+ "requires": { -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-glob": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", -+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", -+ "requires": { -+ "is-extglob": "^2.1.1" -+ } -+ }, -+ "is-installed-globally": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", -+ "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", -+ "requires": { -+ "global-dirs": "^3.0.0", -+ "is-path-inside": "^3.0.2" -+ } -+ }, -+ "is-lambda": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", -+ "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" -+ }, -+ "is-npm": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", -+ "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==" -+ }, -+ "is-number": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", -+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" -+ }, -+ "is-obj": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", -+ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" -+ }, -+ "is-path-inside": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", -+ "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" -+ }, -+ "is-plain-obj": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", -+ "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==" -+ }, -+ "is-regex": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", -+ "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", -+ "requires": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-regexp": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", -+ "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==" -+ }, -+ "is-stream": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", -+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" -+ }, -+ "is-typed-array": { -+ "version": "1.1.10", -+ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", -+ "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", -+ "requires": { -+ "available-typed-arrays": "^1.0.5", -+ "call-bind": "^1.0.2", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-typedarray": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", -+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" -+ }, -+ "is-wsl": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", -+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", -+ "requires": { -+ "is-docker": "^2.0.0" -+ } -+ }, -+ "is-yarn-global": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", -+ "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" -+ }, -+ "isarray": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", -+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" -+ }, -+ "isbinaryfile": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", -+ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", -+ "requires": { -+ "buffer-alloc": "^1.2.0" -+ } -+ }, -+ "isexe": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" -+ }, -+ "isstream": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", -+ "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" -+ }, -+ "js-base64": { -+ "version": "2.6.4", -+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", -+ "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" -+ }, -+ "js-tokens": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", -+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" -+ }, -+ "js-yaml": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", -+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", -+ "requires": { -+ "argparse": "^2.0.1" -+ } -+ }, -+ "jsbn": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", -+ "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" -+ }, -+ "jsesc": { -+ "version": "2.5.2", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", -+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" -+ }, -+ "json-buffer": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", -+ "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==" -+ }, -+ "json-parse-even-better-errors": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", -+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" -+ }, -+ "json-schema": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", -+ "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" -+ }, -+ "json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" -+ }, -+ "json-stable-stringify-without-jsonify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", -+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" -+ }, -+ "json-stringify-safe": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", -+ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" -+ }, -+ "json5": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", -+ "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" -+ }, -+ "jsondiffpatch": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz", -+ "integrity": "sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==", -+ "requires": { -+ "chalk": "^2.3.0", -+ "diff-match-patch": "^1.0.0" -+ } -+ }, -+ "jsonfile": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", -+ "requires": { -+ "graceful-fs": "^4.1.6", -+ "universalify": "^2.0.0" -+ } -+ }, -+ "jsonparse": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", -+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==" -+ }, -+ "JSONStream": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", -+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", -+ "requires": { -+ "jsonparse": "^1.2.0", -+ "through": ">=2.2.7 <3" -+ } -+ }, -+ "jsprim": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", -+ "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", -+ "requires": { -+ "assert-plus": "1.0.0", -+ "extsprintf": "1.3.0", -+ "json-schema": "0.4.0", -+ "verror": "1.10.0" -+ } -+ }, -+ "junk": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", -+ "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==" -+ }, -+ "keyboardevent-from-electron-accelerator": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz", -+ "integrity": "sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA==" -+ }, -+ "keyboardevents-areequal": { -+ "version": "0.2.2", -+ "resolved": "https://registry.npmjs.org/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz", -+ "integrity": "sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==" -+ }, -+ "keyboardjs": { -+ "version": "2.6.4", -+ "resolved": "https://registry.npmjs.org/keyboardjs/-/keyboardjs-2.6.4.tgz", -+ "integrity": "sha512-xDiNwiwH3KUqap++RFJiLAXzbvRB5Yw08xliuceOgLhM1o7g1puKKR9vWy6wp9H/Bi4VP0+SQMpiWXMWWmR6rA==" -+ }, -+ "keyv": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", -+ "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", -+ "requires": { -+ "json-buffer": "3.0.0" -+ } -+ }, -+ "kind-of": { -+ "version": "6.0.3", -+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", -+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" -+ }, -+ "labeled-stream-splicer": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz", -+ "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "stream-splicer": "^2.0.0" -+ } -+ }, -+ "latest-version": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", -+ "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", -+ "requires": { -+ "package-json": "^6.3.0" -+ } -+ }, -+ "levn": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", -+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", -+ "requires": { -+ "prelude-ls": "^1.2.1", -+ "type-check": "~0.4.0" -+ } -+ }, -+ "licensify": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/licensify/-/licensify-3.1.3.tgz", -+ "integrity": "sha512-3sEEBR0Cxq8yeSrV1KGZwpjm4KJKp8Cx/WHZxBnG/YX319ZTvxGtL+NCF+A9pcXwh8KwKB4BmVrc6eRrfk/Raw==", -+ "requires": { -+ "convert-source-map": "^1.1.3", -+ "offset-sourcemap-lines": "^1.0.0", -+ "oss-license-name-to-url": "^1.2.1", -+ "through2": "^2.0.0", -+ "type-name": "^2.0.0" -+ } -+ }, -+ "lines-and-columns": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", -+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" -+ }, -+ "load-json-file": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", -+ "integrity": "sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==", -+ "requires": { -+ "graceful-fs": "^4.1.2", -+ "parse-json": "^2.2.0", -+ "pify": "^2.0.0", -+ "strip-bom": "^3.0.0" -+ }, -+ "dependencies": { -+ "pify": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", -+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" -+ } -+ } -+ }, -+ "locate-path": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", -+ "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", -+ "requires": { -+ "p-locate": "^2.0.0", -+ "path-exists": "^3.0.0" -+ } -+ }, -+ "lodash": { -+ "version": "4.17.21", -+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", -+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" -+ }, -+ "lodash.debounce": { -+ "version": "4.0.8", -+ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", -+ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" -+ }, -+ "lodash.get": { -+ "version": "4.4.2", -+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", -+ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" -+ }, -+ "lodash.memoize": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", -+ "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==" -+ }, -+ "lodash.merge": { -+ "version": "4.6.2", -+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", -+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" -+ }, -+ "long": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", -+ "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" -+ }, -+ "loop-protect": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/loop-protect.git#335856f37ee4a805704bfcd1d7429ab94620bf6d", -+ "from": "loop-protect@github:jean-emmanuel/loop-protect#v1.0.1" -+ }, -+ "lower-case": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", -+ "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==" -+ }, -+ "lowercase-keys": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", -+ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" -+ }, -+ "lru-cache": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", -+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", -+ "requires": { -+ "yallist": "^4.0.0" -+ } -+ }, -+ "magic-string": { -+ "version": "0.23.2", -+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.23.2.tgz", -+ "integrity": "sha512-oIUZaAxbcxYIp4AyLafV6OVKoB3YouZs0UTCJ8mOKBHNyJgGDaMJ4TgA+VylJh6fx7EQCC52XkbURxxG9IoJXA==", -+ "requires": { -+ "sourcemap-codec": "^1.4.1" -+ } -+ }, -+ "make-dir": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", -+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", -+ "requires": { -+ "semver": "^6.0.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "make-fetch-happen": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", -+ "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", -+ "requires": { -+ "agentkeepalive": "^4.1.3", -+ "cacache": "^15.2.0", -+ "http-cache-semantics": "^4.1.0", -+ "http-proxy-agent": "^4.0.1", -+ "https-proxy-agent": "^5.0.0", -+ "is-lambda": "^1.0.1", -+ "lru-cache": "^6.0.0", -+ "minipass": "^3.1.3", -+ "minipass-collect": "^1.0.2", -+ "minipass-fetch": "^1.3.2", -+ "minipass-flush": "^1.0.5", -+ "minipass-pipeline": "^1.2.4", -+ "negotiator": "^0.6.2", -+ "promise-retry": "^2.0.1", -+ "socks-proxy-agent": "^6.0.0", -+ "ssri": "^8.0.0" -+ } -+ }, -+ "map-obj": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", -+ "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==" -+ }, -+ "matcher": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", -+ "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", -+ "optional": true, -+ "requires": { -+ "escape-string-regexp": "^4.0.0" -+ }, -+ "dependencies": { -+ "escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", -+ "optional": true -+ } -+ } -+ }, -+ "md5.js": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", -+ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", -+ "requires": { -+ "hash-base": "^3.0.0", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "meow": { -+ "version": "9.0.0", -+ "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", -+ "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", -+ "requires": { -+ "@types/minimist": "^1.2.0", -+ "camelcase-keys": "^6.2.2", -+ "decamelize": "^1.2.0", -+ "decamelize-keys": "^1.1.0", -+ "hard-rejection": "^2.1.0", -+ "minimist-options": "4.1.0", -+ "normalize-package-data": "^3.0.0", -+ "read-pkg-up": "^7.0.1", -+ "redent": "^3.0.0", -+ "trim-newlines": "^3.0.0", -+ "type-fest": "^0.18.0", -+ "yargs-parser": "^20.2.3" -+ }, -+ "dependencies": { -+ "find-up": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", -+ "requires": { -+ "locate-path": "^5.0.0", -+ "path-exists": "^4.0.0" -+ } -+ }, -+ "hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" -+ }, -+ "locate-path": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", -+ "requires": { -+ "p-locate": "^4.1.0" -+ } -+ }, -+ "p-limit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", -+ "requires": { -+ "p-try": "^2.0.0" -+ } -+ }, -+ "p-locate": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", -+ "requires": { -+ "p-limit": "^2.2.0" -+ } -+ }, -+ "p-try": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", -+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" -+ }, -+ "parse-json": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", -+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", -+ "requires": { -+ "@babel/code-frame": "^7.0.0", -+ "error-ex": "^1.3.1", -+ "json-parse-even-better-errors": "^2.3.0", -+ "lines-and-columns": "^1.1.6" -+ } -+ }, -+ "path-exists": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" -+ }, -+ "read-pkg": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", -+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", -+ "requires": { -+ "@types/normalize-package-data": "^2.4.0", -+ "normalize-package-data": "^2.5.0", -+ "parse-json": "^5.0.0", -+ "type-fest": "^0.6.0" -+ }, -+ "dependencies": { -+ "normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", -+ "requires": { -+ "hosted-git-info": "^2.1.4", -+ "resolve": "^1.10.0", -+ "semver": "2 || 3 || 4 || 5", -+ "validate-npm-package-license": "^3.0.1" -+ } -+ }, -+ "type-fest": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", -+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==" -+ } -+ } -+ }, -+ "read-pkg-up": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", -+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", -+ "requires": { -+ "find-up": "^4.1.0", -+ "read-pkg": "^5.2.0", -+ "type-fest": "^0.8.1" -+ }, -+ "dependencies": { -+ "type-fest": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", -+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" -+ } -+ } -+ }, -+ "semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" -+ } -+ } -+ }, -+ "merge-source-map": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", -+ "integrity": "sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==", -+ "requires": { -+ "source-map": "^0.5.6" -+ } -+ }, -+ "miller-rabin": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", -+ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", -+ "requires": { -+ "bn.js": "^4.0.0", -+ "brorand": "^1.0.1" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "mime": { -+ "version": "1.6.0", -+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", -+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" -+ }, -+ "mime-db": { -+ "version": "1.52.0", -+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", -+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" -+ }, -+ "mime-types": { -+ "version": "2.1.35", -+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", -+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", -+ "requires": { -+ "mime-db": "1.52.0" -+ } -+ }, -+ "mimic-response": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", -+ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" -+ }, -+ "min-indent": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", -+ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==" -+ }, -+ "minimalistic-assert": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", -+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" -+ }, -+ "minimalistic-crypto-utils": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", -+ "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" -+ }, -+ "minimatch": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", -+ "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", -+ "requires": { -+ "brace-expansion": "^2.0.1" -+ } -+ }, -+ "minimist": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", -+ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" -+ }, -+ "minimist-options": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", -+ "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", -+ "requires": { -+ "arrify": "^1.0.1", -+ "is-plain-obj": "^1.1.0", -+ "kind-of": "^6.0.3" -+ } -+ }, -+ "minipass": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", -+ "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", -+ "requires": { -+ "yallist": "^4.0.0" -+ } -+ }, -+ "minipass-collect": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", -+ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "minipass-fetch": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", -+ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", -+ "requires": { -+ "encoding": "^0.1.12", -+ "minipass": "^3.1.0", -+ "minipass-sized": "^1.0.3", -+ "minizlib": "^2.0.0" -+ } -+ }, -+ "minipass-flush": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", -+ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "minipass-pipeline": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", -+ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "minipass-sized": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", -+ "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "minizlib": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", -+ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", -+ "requires": { -+ "minipass": "^3.0.0", -+ "yallist": "^4.0.0" -+ } -+ }, -+ "mkdirp": { -+ "version": "0.5.6", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", -+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", -+ "requires": { -+ "minimist": "^1.2.6" -+ } -+ }, -+ "mkdirp-classic": { -+ "version": "0.5.3", -+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", -+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" -+ }, -+ "module-deps": { -+ "version": "6.2.3", -+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz", -+ "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==", -+ "requires": { -+ "browser-resolve": "^2.0.0", -+ "cached-path-relative": "^1.0.2", -+ "concat-stream": "~1.6.0", -+ "defined": "^1.0.0", -+ "detective": "^5.2.0", -+ "duplexer2": "^0.1.2", -+ "inherits": "^2.0.1", -+ "JSONStream": "^1.0.3", -+ "parents": "^1.0.0", -+ "readable-stream": "^2.0.2", -+ "resolve": "^1.4.0", -+ "stream-combiner2": "^1.1.1", -+ "subarg": "^1.0.0", -+ "through2": "^2.0.0", -+ "xtend": "^4.0.0" -+ } -+ }, -+ "mold-source-map": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz", -+ "integrity": "sha512-Y0uA/sDKVuPgLd7BmaJOai+fqzjrOlR6vZgx5cJIvturI/xOPQPgbf3X7ZbzJd6MvqQ6ucIfK8dSteFyc2Mw2w==", -+ "requires": { -+ "convert-source-map": "^1.1.0", -+ "through": "~2.2.7" -+ }, -+ "dependencies": { -+ "through": { -+ "version": "2.2.7", -+ "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz", -+ "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==" -+ } -+ } -+ }, -+ "ms": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", -+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" -+ }, -+ "multicast-dns": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/multicast-dns.git#1bb9f6ba892eba88f2cb12ca96a1c1b3088413c0", -+ "from": "multicast-dns@github:jean-emmanuel/multicast-dns", -+ "requires": { -+ "dns-packet": "^1.3.1", -+ "thunky": "^1.0.2" -+ } -+ }, -+ "multicast-dns-service-types": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", -+ "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==" -+ }, -+ "mutexify": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/mutexify/-/mutexify-1.4.0.tgz", -+ "integrity": "sha512-pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg==", -+ "requires": { -+ "queue-tick": "^1.0.0" -+ } -+ }, -+ "nan": { -+ "version": "2.17.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", -+ "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==" -+ }, -+ "nanoassert": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz", -+ "integrity": "sha512-C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ==" -+ }, -+ "nanobench": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/nanobench/-/nanobench-2.1.1.tgz", -+ "integrity": "sha512-z+Vv7zElcjN+OpzAxAquUayFLGK3JI/ubCl0Oh64YQqsTGG09CGqieJVQw4ui8huDnnAgrvTv93qi5UaOoNj8A==", -+ "requires": { -+ "browser-process-hrtime": "^0.1.2", -+ "chalk": "^1.1.3", -+ "mutexify": "^1.1.0", -+ "pretty-hrtime": "^1.0.2" -+ }, -+ "dependencies": { -+ "ansi-regex": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", -+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" -+ }, -+ "ansi-styles": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", -+ "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==" -+ }, -+ "chalk": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", -+ "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", -+ "requires": { -+ "ansi-styles": "^2.2.1", -+ "escape-string-regexp": "^1.0.2", -+ "has-ansi": "^2.0.0", -+ "strip-ansi": "^3.0.0", -+ "supports-color": "^2.0.0" -+ } -+ }, -+ "strip-ansi": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", -+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", -+ "requires": { -+ "ansi-regex": "^2.0.0" -+ } -+ }, -+ "supports-color": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", -+ "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" -+ } -+ } -+ }, -+ "nanohtml": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/nanohtml/-/nanohtml-1.10.0.tgz", -+ "integrity": "sha512-r/3AQl+jxAxUIJRiKExUjBtFcE1cm4yTOsTIdVqqlxPNtBxJh522ANrcQYzdNHhPzbPgb7j6qujq6eGehBX0kg==", -+ "requires": { -+ "acorn-node": "^1.8.2", -+ "camel-case": "^3.0.0", -+ "convert-source-map": "^1.5.1", -+ "estree-is-member-expression": "^1.0.0", -+ "hyperx": "^2.5.0", -+ "is-boolean-attribute": "0.0.1", -+ "nanoassert": "^1.1.0", -+ "nanobench": "^2.1.0", -+ "normalize-html-whitespace": "^0.2.0", -+ "through2": "^2.0.3", -+ "transform-ast": "^2.4.0" -+ } -+ }, -+ "nanoid": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", -+ "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" -+ }, -+ "nanomorph": { -+ "version": "5.4.3", -+ "resolved": "https://registry.npmjs.org/nanomorph/-/nanomorph-5.4.3.tgz", -+ "integrity": "sha512-uPP5y0x21KISffZCKHh1A0QW0RHZFQS0BR7LetlHBlay6UWAbjwhjiJTxOO6JeMHko5Cigl617zFoGrYFJ8ZLg==", -+ "requires": { -+ "nanoassert": "^1.1.0" -+ } -+ }, -+ "napi-build-utils": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", -+ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", -+ "optional": true -+ }, -+ "natural-compare": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", -+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" -+ }, -+ "negotiator": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", -+ "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" -+ }, -+ "no-case": { -+ "version": "2.3.2", -+ "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", -+ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", -+ "requires": { -+ "lower-case": "^1.1.1" -+ } -+ }, -+ "node-abi": { -+ "version": "3.28.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz", -+ "integrity": "sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==", -+ "optional": true, -+ "requires": { -+ "semver": "^7.3.5" -+ } -+ }, -+ "node-forge": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", -+ "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==" -+ }, -+ "node-gyp": { -+ "version": "8.4.1", -+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", -+ "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", -+ "requires": { -+ "env-paths": "^2.2.0", -+ "glob": "^7.1.4", -+ "graceful-fs": "^4.2.6", -+ "make-fetch-happen": "^9.1.0", -+ "nopt": "^5.0.0", -+ "npmlog": "^6.0.0", -+ "rimraf": "^3.0.2", -+ "semver": "^7.3.5", -+ "tar": "^6.1.2", -+ "which": "^2.0.2" -+ }, -+ "dependencies": { -+ "are-we-there-yet": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", -+ "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", -+ "requires": { -+ "delegates": "^1.0.0", -+ "readable-stream": "^3.6.0" -+ } -+ }, -+ "gauge": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", -+ "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", -+ "requires": { -+ "aproba": "^1.0.3 || ^2.0.0", -+ "color-support": "^1.1.3", -+ "console-control-strings": "^1.1.0", -+ "has-unicode": "^2.0.1", -+ "signal-exit": "^3.0.7", -+ "string-width": "^4.2.3", -+ "strip-ansi": "^6.0.1", -+ "wide-align": "^1.1.5" -+ } -+ }, -+ "npmlog": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", -+ "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", -+ "requires": { -+ "are-we-there-yet": "^3.0.0", -+ "console-control-strings": "^1.1.0", -+ "gauge": "^4.0.3", -+ "set-blocking": "^2.0.0" -+ } -+ }, -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ }, -+ "rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ } -+ } -+ }, -+ "node-mouse": { -+ "version": "0.0.2", -+ "resolved": "https://registry.npmjs.org/node-mouse/-/node-mouse-0.0.2.tgz", -+ "integrity": "sha512-qqm+c/uKB1ceGMrKW+mxAxPKFTu0HD1DWoCElJHA0VQDloudzZD4bI++Z18mSDA3n5lix+RTXiOiu3XAOSYVHA==" -+ }, -+ "node-releases": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", -+ "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" -+ }, -+ "node-sass": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz", -+ "integrity": "sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==", -+ "requires": { -+ "async-foreach": "^0.1.3", -+ "chalk": "^4.1.2", -+ "cross-spawn": "^7.0.3", -+ "gaze": "^1.0.0", -+ "get-stdin": "^4.0.1", -+ "glob": "^7.0.3", -+ "lodash": "^4.17.15", -+ "meow": "^9.0.0", -+ "nan": "^2.13.2", -+ "node-gyp": "^8.4.1", -+ "npmlog": "^5.0.0", -+ "request": "^2.88.0", -+ "sass-graph": "4.0.0", -+ "stdout-stream": "^1.4.0", -+ "true-case-path": "^1.0.2" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "requires": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" -+ }, -+ "supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "requires": { -+ "has-flag": "^4.0.0" -+ } -+ } -+ } -+ }, -+ "nodemon": { -+ "version": "2.0.16", -+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.16.tgz", -+ "integrity": "sha512-zsrcaOfTWRuUzBn3P44RDliLlp263Z/76FPoHFr3cFFkOz0lTPAcIw8dCzfdVIx/t3AtDYCZRCDkoCojJqaG3w==", -+ "requires": { -+ "chokidar": "^3.5.2", -+ "debug": "^3.2.7", -+ "ignore-by-default": "^1.0.1", -+ "minimatch": "^3.0.4", -+ "pstree.remy": "^1.1.8", -+ "semver": "^5.7.1", -+ "supports-color": "^5.5.0", -+ "touch": "^3.1.0", -+ "undefsafe": "^2.0.5", -+ "update-notifier": "^5.1.0" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "requires": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ }, -+ "semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" -+ } -+ } -+ }, -+ "nopt": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", -+ "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", -+ "requires": { -+ "abbrev": "1" -+ } -+ }, -+ "normalize-html-whitespace": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-0.2.0.tgz", -+ "integrity": "sha512-5CZAEQ4bQi8Msqw0GAT6rrkrjNN4ZKqAG3+jJMwms4O6XoMvh6ekwOueG4mRS1LbPUR1r9EdnhxxfpzMTOdzKw==" -+ }, -+ "normalize-package-data": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", -+ "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", -+ "requires": { -+ "hosted-git-info": "^4.0.1", -+ "is-core-module": "^2.5.0", -+ "semver": "^7.3.4", -+ "validate-npm-package-license": "^3.0.1" -+ } -+ }, -+ "normalize-path": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", -+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" -+ }, -+ "normalize-url": { -+ "version": "4.5.1", -+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", -+ "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==" -+ }, -+ "nosleep.js": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz", -+ "integrity": "sha512-9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA==" -+ }, -+ "npm-conf": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", -+ "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", -+ "optional": true, -+ "requires": { -+ "config-chain": "^1.1.11", -+ "pify": "^3.0.0" -+ } -+ }, -+ "npmlog": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", -+ "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", -+ "requires": { -+ "are-we-there-yet": "^2.0.0", -+ "console-control-strings": "^1.1.0", -+ "gauge": "^3.0.0", -+ "set-blocking": "^2.0.0" -+ } -+ }, -+ "oauth-sign": { -+ "version": "0.9.0", -+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", -+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" -+ }, -+ "object-assign": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", -+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" -+ }, -+ "object-is": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", -+ "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", -+ "requires": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3" -+ } -+ }, -+ "object-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", -+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" -+ }, -+ "offset-sourcemap-lines": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/offset-sourcemap-lines/-/offset-sourcemap-lines-1.0.1.tgz", -+ "integrity": "sha512-8giJa0GProV9hPLOp9qAobkvi6OiZnzeM6fdubVjhqcrISX8FYMk1jMVzG6R9d7HQWLysG22jyXEIF6sWu4fJw==", -+ "requires": { -+ "source-map": "^0.5.0" -+ } -+ }, -+ "on-finished": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", -+ "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", -+ "requires": { -+ "ee-first": "1.1.1" -+ } -+ }, -+ "once": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", -+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", -+ "requires": { -+ "wrappy": "1" -+ } -+ }, -+ "open": { -+ "version": "8.4.0", -+ "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", -+ "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", -+ "requires": { -+ "define-lazy-prop": "^2.0.0", -+ "is-docker": "^2.1.1", -+ "is-wsl": "^2.2.0" -+ } -+ }, -+ "optionator": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", -+ "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", -+ "requires": { -+ "deep-is": "^0.1.3", -+ "fast-levenshtein": "^2.0.6", -+ "levn": "^0.4.1", -+ "prelude-ls": "^1.2.1", -+ "type-check": "^0.4.0", -+ "word-wrap": "^1.2.3" -+ } -+ }, -+ "os-browserify": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", -+ "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" -+ }, -+ "osc": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/osc.js.git#9197739162f26086e6a72670103c3fa036e9dcd5", -+ "from": "osc@github:jean-emmanuel/osc.js", -+ "requires": { -+ "long": "4.0.0", -+ "serialport": "9.2.0", -+ "slip": "1.0.2", -+ "wolfy87-eventemitter": "5.2.9", -+ "ws": "7.5.3" -+ }, -+ "dependencies": { -+ "ws": { -+ "version": "7.5.3", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", -+ "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==" -+ } -+ } -+ }, -+ "osi-licenses": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/osi-licenses/-/osi-licenses-0.1.1.tgz", -+ "integrity": "sha512-ZGAGO6dIxTS/mXxEJCpIdYetAoxIOOr7uYpMOoDWo4+b/6rf+2GagOjTbegL+eoMI8aYAiyNgKWUT7vWJRPl9A==" -+ }, -+ "oss-license-name-to-url": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/oss-license-name-to-url/-/oss-license-name-to-url-1.2.1.tgz", -+ "integrity": "sha512-apFbKq0EAYi70q0pOpS0tDfSviZYdG3KM6U1GpofZPsRMwgDga0DQiPQ/GHyQx7PDDrLCGvFBNPLMLV/K4Jr4Q==", -+ "requires": { -+ "osi-licenses": "^0.1.0" -+ } -+ }, -+ "outpipe": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/outpipe/-/outpipe-1.1.1.tgz", -+ "integrity": "sha512-BnNY/RwnDrkmQdUa9U+OfN/Y7AWmKuUPCCd+hbRclZnnANvYpO72zp/a6Q4n829hPbdqEac31XCcsvlEvb+rtA==", -+ "dev": true, -+ "requires": { -+ "shell-quote": "^1.4.2" -+ } -+ }, -+ "p-cancelable": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", -+ "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" -+ }, -+ "p-limit": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", -+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", -+ "requires": { -+ "p-try": "^1.0.0" -+ } -+ }, -+ "p-locate": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", -+ "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", -+ "requires": { -+ "p-limit": "^1.1.0" -+ } -+ }, -+ "p-map": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", -+ "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", -+ "requires": { -+ "aggregate-error": "^3.0.0" -+ } -+ }, -+ "p-try": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", -+ "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==" -+ }, -+ "package-json": { -+ "version": "6.5.0", -+ "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", -+ "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", -+ "requires": { -+ "got": "^9.6.0", -+ "registry-auth-token": "^4.0.0", -+ "registry-url": "^5.0.0", -+ "semver": "^6.2.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "pako": { -+ "version": "1.0.11", -+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", -+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" -+ }, -+ "parent-module": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", -+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", -+ "requires": { -+ "callsites": "^3.0.0" -+ } -+ }, -+ "parents": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz", -+ "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==", -+ "requires": { -+ "path-platform": "~0.11.15" -+ } -+ }, -+ "parse-asn1": { -+ "version": "5.1.6", -+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", -+ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", -+ "requires": { -+ "asn1.js": "^5.2.0", -+ "browserify-aes": "^1.0.0", -+ "evp_bytestokey": "^1.0.0", -+ "pbkdf2": "^3.0.3", -+ "safe-buffer": "^5.1.1" -+ } -+ }, -+ "parse-author": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", -+ "integrity": "sha512-yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw==", -+ "requires": { -+ "author-regex": "^1.0.0" -+ } -+ }, -+ "parse-json": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", -+ "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", -+ "requires": { -+ "error-ex": "^1.2.0" -+ } -+ }, -+ "parse-srcset": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", -+ "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==" -+ }, -+ "path-browserify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", -+ "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" -+ }, -+ "path-exists": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", -+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==" -+ }, -+ "path-is-absolute": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", -+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" -+ }, -+ "path-key": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" -+ }, -+ "path-parse": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" -+ }, -+ "path-platform": { -+ "version": "0.11.15", -+ "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz", -+ "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==" -+ }, -+ "path-type": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", -+ "integrity": "sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==", -+ "requires": { -+ "pify": "^2.0.0" -+ }, -+ "dependencies": { -+ "pify": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", -+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" -+ } -+ } -+ }, -+ "pbkdf2": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", -+ "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", -+ "requires": { -+ "create-hash": "^1.1.2", -+ "create-hmac": "^1.1.4", -+ "ripemd160": "^2.0.1", -+ "safe-buffer": "^5.0.1", -+ "sha.js": "^2.4.8" -+ } -+ }, -+ "pend": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", -+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" -+ }, -+ "performance-now": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", -+ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" -+ }, -+ "picocolors": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", -+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" -+ }, -+ "picomatch": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", -+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" -+ }, -+ "pify": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", -+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", -+ "optional": true -+ }, -+ "plist": { -+ "version": "3.0.6", -+ "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz", -+ "integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==", -+ "requires": { -+ "base64-js": "^1.5.1", -+ "xmlbuilder": "^15.1.1" -+ } -+ }, -+ "postcss": { -+ "version": "7.0.39", -+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", -+ "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", -+ "requires": { -+ "picocolors": "^0.2.1", -+ "source-map": "^0.6.1" -+ }, -+ "dependencies": { -+ "source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" -+ } -+ } -+ }, -+ "prebuild-install": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", -+ "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", -+ "optional": true, -+ "requires": { -+ "detect-libc": "^2.0.0", -+ "expand-template": "^2.0.3", -+ "github-from-package": "0.0.0", -+ "minimist": "^1.2.3", -+ "mkdirp-classic": "^0.5.3", -+ "napi-build-utils": "^1.0.1", -+ "node-abi": "^3.3.0", -+ "pump": "^3.0.0", -+ "rc": "^1.2.7", -+ "simple-get": "^4.0.0", -+ "tar-fs": "^2.0.0", -+ "tunnel-agent": "^0.6.0" -+ } -+ }, -+ "prelude-ls": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", -+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" -+ }, -+ "prepend-http": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", -+ "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==" -+ }, -+ "pretty-hrtime": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", -+ "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==" -+ }, -+ "process": { -+ "version": "0.11.10", -+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", -+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" -+ }, -+ "process-nextick-args": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", -+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" -+ }, -+ "progress": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", -+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" -+ }, -+ "promise-inflight": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", -+ "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==" -+ }, -+ "promise-retry": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", -+ "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", -+ "requires": { -+ "err-code": "^2.0.2", -+ "retry": "^0.12.0" -+ } -+ }, -+ "proto-list": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", -+ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", -+ "optional": true -+ }, -+ "psl": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", -+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" -+ }, -+ "pstree.remy": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", -+ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" -+ }, -+ "public-encrypt": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", -+ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", -+ "requires": { -+ "bn.js": "^4.1.0", -+ "browserify-rsa": "^4.0.0", -+ "create-hash": "^1.1.0", -+ "parse-asn1": "^5.0.0", -+ "randombytes": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "pump": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", -+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", -+ "requires": { -+ "end-of-stream": "^1.1.0", -+ "once": "^1.3.1" -+ } -+ }, -+ "punycode": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", -+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" -+ }, -+ "pupa": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", -+ "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", -+ "requires": { -+ "escape-goat": "^2.0.0" -+ } -+ }, -+ "python-shell": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/python-shell/-/python-shell-3.0.1.tgz", -+ "integrity": "sha512-TWeotuxe1auhXa5bGRScxnc2J+0r41NBntSa6RYZtMBLtAEsvCboKrEbW6DvASosWQepVkhZZlT3B5Ei766G+Q==" -+ }, -+ "qs": { -+ "version": "6.5.3", -+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", -+ "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" -+ }, -+ "querystring": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", -+ "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==" -+ }, -+ "querystring-es3": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", -+ "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==" -+ }, -+ "queue-tick": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", -+ "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==" -+ }, -+ "quick-lru": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", -+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==" -+ }, -+ "randombytes": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", -+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", -+ "requires": { -+ "safe-buffer": "^5.1.0" -+ } -+ }, -+ "randomfill": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", -+ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", -+ "requires": { -+ "randombytes": "^2.0.5", -+ "safe-buffer": "^5.1.0" -+ } -+ }, -+ "range-parser": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", -+ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" -+ }, -+ "rc": { -+ "version": "1.2.8", -+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", -+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", -+ "requires": { -+ "deep-extend": "^0.6.0", -+ "ini": "~1.3.0", -+ "minimist": "^1.2.0", -+ "strip-json-comments": "~2.0.1" -+ }, -+ "dependencies": { -+ "strip-json-comments": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", -+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==" -+ } -+ } -+ }, -+ "rcedit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz", -+ "integrity": "sha512-h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ==" -+ }, -+ "read-only-stream": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz", -+ "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==", -+ "requires": { -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "read-pkg": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", -+ "integrity": "sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==", -+ "requires": { -+ "load-json-file": "^2.0.0", -+ "normalize-package-data": "^2.3.2", -+ "path-type": "^2.0.0" -+ }, -+ "dependencies": { -+ "hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" -+ }, -+ "normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", -+ "requires": { -+ "hosted-git-info": "^2.1.4", -+ "resolve": "^1.10.0", -+ "semver": "2 || 3 || 4 || 5", -+ "validate-npm-package-license": "^3.0.1" -+ } -+ }, -+ "semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" -+ } -+ } -+ }, -+ "read-pkg-up": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", -+ "integrity": "sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==", -+ "requires": { -+ "find-up": "^2.0.0", -+ "read-pkg": "^2.0.0" -+ } -+ }, -+ "readable-stream": { -+ "version": "2.3.7", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", -+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", -+ "requires": { -+ "core-util-is": "~1.0.0", -+ "inherits": "~2.0.3", -+ "isarray": "~1.0.0", -+ "process-nextick-args": "~2.0.0", -+ "safe-buffer": "~5.1.1", -+ "string_decoder": "~1.1.1", -+ "util-deprecate": "~1.0.1" -+ }, -+ "dependencies": { -+ "safe-buffer": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" -+ }, -+ "string_decoder": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -+ "requires": { -+ "safe-buffer": "~5.1.0" -+ } -+ } -+ } -+ }, -+ "readdirp": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", -+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", -+ "requires": { -+ "picomatch": "^2.2.1" -+ } -+ }, -+ "redent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", -+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", -+ "requires": { -+ "indent-string": "^4.0.0", -+ "strip-indent": "^3.0.0" -+ } -+ }, -+ "regenerate": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", -+ "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" -+ }, -+ "regenerate-unicode-properties": { -+ "version": "10.1.0", -+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", -+ "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", -+ "requires": { -+ "regenerate": "^1.4.2" -+ } -+ }, -+ "regenerator-runtime": { -+ "version": "0.13.10", -+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", -+ "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==" -+ }, -+ "regenerator-transform": { -+ "version": "0.15.0", -+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz", -+ "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==", -+ "requires": { -+ "@babel/runtime": "^7.8.4" -+ } -+ }, -+ "regexp.prototype.flags": { -+ "version": "1.4.3", -+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", -+ "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", -+ "requires": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3", -+ "functions-have-names": "^1.2.2" -+ } -+ }, -+ "regexpp": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", -+ "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==" -+ }, -+ "regexpu-core": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz", -+ "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==", -+ "requires": { -+ "regenerate": "^1.4.2", -+ "regenerate-unicode-properties": "^10.1.0", -+ "regjsgen": "^0.7.1", -+ "regjsparser": "^0.9.1", -+ "unicode-match-property-ecmascript": "^2.0.0", -+ "unicode-match-property-value-ecmascript": "^2.0.0" -+ } -+ }, -+ "registry-auth-token": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz", -+ "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==", -+ "requires": { -+ "rc": "1.2.8" -+ } -+ }, -+ "registry-url": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", -+ "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", -+ "requires": { -+ "rc": "^1.2.8" -+ } -+ }, -+ "regjsgen": { -+ "version": "0.7.1", -+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", -+ "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==" -+ }, -+ "regjsparser": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", -+ "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", -+ "requires": { -+ "jsesc": "~0.5.0" -+ }, -+ "dependencies": { -+ "jsesc": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", -+ "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==" -+ } -+ } -+ }, -+ "replacestream": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", -+ "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", -+ "requires": { -+ "escape-string-regexp": "^1.0.3", -+ "object-assign": "^4.0.1", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "request": { -+ "version": "2.88.2", -+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", -+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", -+ "requires": { -+ "aws-sign2": "~0.7.0", -+ "aws4": "^1.8.0", -+ "caseless": "~0.12.0", -+ "combined-stream": "~1.0.6", -+ "extend": "~3.0.2", -+ "forever-agent": "~0.6.1", -+ "form-data": "~2.3.2", -+ "har-validator": "~5.1.3", -+ "http-signature": "~1.2.0", -+ "is-typedarray": "~1.0.0", -+ "isstream": "~0.1.2", -+ "json-stringify-safe": "~5.0.1", -+ "mime-types": "~2.1.19", -+ "oauth-sign": "~0.9.0", -+ "performance-now": "^2.1.0", -+ "qs": "~6.5.2", -+ "safe-buffer": "^5.1.2", -+ "tough-cookie": "~2.5.0", -+ "tunnel-agent": "^0.6.0", -+ "uuid": "^3.3.2" -+ }, -+ "dependencies": { -+ "uuid": { -+ "version": "3.4.0", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", -+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" -+ } -+ } -+ }, -+ "require-directory": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", -+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" -+ }, -+ "resolve": { -+ "version": "1.22.1", -+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", -+ "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", -+ "requires": { -+ "is-core-module": "^2.9.0", -+ "path-parse": "^1.0.7", -+ "supports-preserve-symlinks-flag": "^1.0.0" -+ } -+ }, -+ "resolve-from": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", -+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" -+ }, -+ "responselike": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", -+ "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==", -+ "requires": { -+ "lowercase-keys": "^1.0.0" -+ } -+ }, -+ "retry": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", -+ "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==" -+ }, -+ "rimraf": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", -+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ }, -+ "ripemd160": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", -+ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", -+ "requires": { -+ "hash-base": "^3.0.0", -+ "inherits": "^2.0.1" -+ } -+ }, -+ "roarr": { -+ "version": "2.15.4", -+ "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", -+ "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", -+ "optional": true, -+ "requires": { -+ "boolean": "^3.0.1", -+ "detect-node": "^2.0.4", -+ "globalthis": "^1.0.1", -+ "json-stringify-safe": "^5.0.1", -+ "semver-compare": "^1.0.0", -+ "sprintf-js": "^1.1.2" -+ } -+ }, -+ "safe-buffer": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", -+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" -+ }, -+ "safer-buffer": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", -+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" -+ }, -+ "sanitize-html": { -+ "version": "1.27.5", -+ "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz", -+ "integrity": "sha512-M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A==", -+ "requires": { -+ "htmlparser2": "^4.1.0", -+ "lodash": "^4.17.15", -+ "parse-srcset": "^1.0.2", -+ "postcss": "^7.0.27" -+ } -+ }, -+ "sass-graph": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz", -+ "integrity": "sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==", -+ "requires": { -+ "glob": "^7.0.0", -+ "lodash": "^4.17.11", -+ "scss-tokenizer": "^0.3.0", -+ "yargs": "^17.2.1" -+ } -+ }, -+ "scope-css": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/scope-css/-/scope-css-1.2.1.tgz", -+ "integrity": "sha512-UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q==", -+ "requires": { -+ "escaper": "^2.5.3", -+ "slugify": "^1.3.1", -+ "strip-css-comments": "^3.0.0" -+ } -+ }, -+ "screenfull": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz", -+ "integrity": "sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==" -+ }, -+ "scss-tokenizer": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz", -+ "integrity": "sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==", -+ "requires": { -+ "js-base64": "^2.4.3", -+ "source-map": "^0.7.1" -+ }, -+ "dependencies": { -+ "source-map": { -+ "version": "0.7.4", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", -+ "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==" -+ } -+ } -+ }, -+ "semver": { -+ "version": "7.3.7", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", -+ "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", -+ "requires": { -+ "lru-cache": "^6.0.0" -+ } -+ }, -+ "semver-compare": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", -+ "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", -+ "optional": true -+ }, -+ "semver-diff": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", -+ "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", -+ "requires": { -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "send": { -+ "version": "0.18.0", -+ "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", -+ "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", -+ "requires": { -+ "debug": "2.6.9", -+ "depd": "2.0.0", -+ "destroy": "1.2.0", -+ "encodeurl": "~1.0.2", -+ "escape-html": "~1.0.3", -+ "etag": "~1.8.1", -+ "fresh": "0.5.2", -+ "http-errors": "2.0.0", -+ "mime": "1.6.0", -+ "ms": "2.1.3", -+ "on-finished": "2.4.1", -+ "range-parser": "~1.2.1", -+ "statuses": "2.0.1" -+ }, -+ "dependencies": { -+ "debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "requires": { -+ "ms": "2.0.0" -+ }, -+ "dependencies": { -+ "ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ } -+ } -+ }, -+ "depd": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" -+ }, -+ "ms": { -+ "version": "2.1.3", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" -+ } -+ } -+ }, -+ "serialize-error": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", -+ "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", -+ "optional": true, -+ "requires": { -+ "type-fest": "^0.13.1" -+ }, -+ "dependencies": { -+ "type-fest": { -+ "version": "0.13.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", -+ "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", -+ "optional": true -+ } -+ } -+ }, -+ "serialport": { -+ "version": "9.2.0", -+ "resolved": "https://registry.npmjs.org/serialport/-/serialport-9.2.0.tgz", -+ "integrity": "sha512-C6AQ4jD4mre3tn3QA+atn++mEZDh4r40CIeh1sKhskKE+Q4eiIr/nzVMOiPxHb8gskrSNxujH+Br49tl3i9s9g==", -+ "optional": true, -+ "requires": { -+ "@serialport/binding-mock": "9.0.7", -+ "@serialport/bindings": "^9.2.0", -+ "@serialport/parser-byte-length": "9.0.7", -+ "@serialport/parser-cctalk": "9.0.7", -+ "@serialport/parser-delimiter": "9.0.7", -+ "@serialport/parser-inter-byte-timeout": "9.0.7", -+ "@serialport/parser-readline": "9.0.7", -+ "@serialport/parser-ready": "9.0.7", -+ "@serialport/parser-regex": "9.0.7", -+ "@serialport/stream": "9.0.7", -+ "debug": "^4.3.1" -+ } -+ }, -+ "set-blocking": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", -+ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" -+ }, -+ "setprototypeof": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", -+ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" -+ }, -+ "sha.js": { -+ "version": "2.4.11", -+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", -+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "shasum-object": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz", -+ "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==", -+ "requires": { -+ "fast-safe-stringify": "^2.0.7" -+ } -+ }, -+ "shebang-command": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", -+ "requires": { -+ "shebang-regex": "^3.0.0" -+ } -+ }, -+ "shebang-regex": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" -+ }, -+ "shell-quote": { -+ "version": "1.7.4", -+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz", -+ "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==" -+ }, -+ "signal-exit": { -+ "version": "3.0.7", -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", -+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" -+ }, -+ "simple-concat": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", -+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" -+ }, -+ "simple-get": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", -+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", -+ "optional": true, -+ "requires": { -+ "decompress-response": "^6.0.0", -+ "once": "^1.3.1", -+ "simple-concat": "^1.0.0" -+ }, -+ "dependencies": { -+ "decompress-response": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", -+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", -+ "optional": true, -+ "requires": { -+ "mimic-response": "^3.1.0" -+ } -+ }, -+ "mimic-response": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", -+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", -+ "optional": true -+ } -+ } -+ }, -+ "slip": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/slip/-/slip-1.0.2.tgz", -+ "integrity": "sha512-XrcHe3NAcyD3wO+O4I13RcS4/3AF+S9RvGNj9JhJeS02HyImwD2E3QWLrmn9hBfL+fB6yapagwxRkeyYzhk98g==" -+ }, -+ "slugify": { -+ "version": "1.6.5", -+ "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz", -+ "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==" -+ }, -+ "smart-buffer": { -+ "version": "4.2.0", -+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", -+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" -+ }, -+ "socks": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", -+ "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", -+ "requires": { -+ "ip": "^2.0.0", -+ "smart-buffer": "^4.2.0" -+ }, -+ "dependencies": { -+ "ip": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", -+ "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" -+ } -+ } -+ }, -+ "socks-proxy-agent": { -+ "version": "6.2.1", -+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", -+ "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", -+ "requires": { -+ "agent-base": "^6.0.2", -+ "debug": "^4.3.3", -+ "socks": "^2.6.2" -+ } -+ }, -+ "sortablejs": { -+ "version": "1.15.0", -+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", -+ "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" -+ }, -+ "source-map": { -+ "version": "0.5.7", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", -+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==" -+ }, -+ "source-map-support": { -+ "version": "0.5.21", -+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", -+ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", -+ "requires": { -+ "buffer-from": "^1.0.0", -+ "source-map": "^0.6.0" -+ }, -+ "dependencies": { -+ "source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" -+ } -+ } -+ }, -+ "sourcemap-codec": { -+ "version": "1.4.8", -+ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", -+ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" -+ }, -+ "spdx-correct": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", -+ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", -+ "requires": { -+ "spdx-expression-parse": "^3.0.0", -+ "spdx-license-ids": "^3.0.0" -+ } -+ }, -+ "spdx-exceptions": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", -+ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" -+ }, -+ "spdx-expression-parse": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", -+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", -+ "requires": { -+ "spdx-exceptions": "^2.1.0", -+ "spdx-license-ids": "^3.0.0" -+ } -+ }, -+ "spdx-license-ids": { -+ "version": "3.0.12", -+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", -+ "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==" -+ }, -+ "sprintf-js": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", -+ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", -+ "optional": true -+ }, -+ "sshpk": { -+ "version": "1.17.0", -+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", -+ "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", -+ "requires": { -+ "asn1": "~0.2.3", -+ "assert-plus": "^1.0.0", -+ "bcrypt-pbkdf": "^1.0.0", -+ "dashdash": "^1.12.0", -+ "ecc-jsbn": "~0.1.1", -+ "getpass": "^0.1.1", -+ "jsbn": "~0.1.0", -+ "safer-buffer": "^2.0.2", -+ "tweetnacl": "~0.14.0" -+ } -+ }, -+ "ssri": { -+ "version": "8.0.1", -+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", -+ "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", -+ "requires": { -+ "minipass": "^3.1.1" -+ } -+ }, -+ "stack-generator": { -+ "version": "2.0.10", -+ "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz", -+ "integrity": "sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==", -+ "requires": { -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "stackframe": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", -+ "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==" -+ }, -+ "stacktrace-gps": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz", -+ "integrity": "sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==", -+ "requires": { -+ "source-map": "0.5.6", -+ "stackframe": "^1.3.4" -+ }, -+ "dependencies": { -+ "source-map": { -+ "version": "0.5.6", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", -+ "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==" -+ } -+ } -+ }, -+ "stacktrace-js": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz", -+ "integrity": "sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==", -+ "requires": { -+ "error-stack-parser": "^2.0.6", -+ "stack-generator": "^2.0.5", -+ "stacktrace-gps": "^3.0.4" -+ } -+ }, -+ "statuses": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", -+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" -+ }, -+ "stdout-stream": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", -+ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", -+ "requires": { -+ "readable-stream": "^2.0.1" -+ } -+ }, -+ "stream-browserify": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", -+ "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", -+ "requires": { -+ "inherits": "~2.0.4", -+ "readable-stream": "^3.5.0" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "stream-combiner2": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", -+ "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==", -+ "requires": { -+ "duplexer2": "~0.1.0", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "stream-http": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", -+ "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", -+ "requires": { -+ "builtin-status-codes": "^3.0.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.6.0", -+ "xtend": "^4.0.2" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "stream-splicer": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz", -+ "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "strictdom": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/strictdom/-/strictdom-1.0.1.tgz", -+ "integrity": "sha512-cEmp9QeXXRmjj/rVp9oyiqcvyocWab/HaoN4+bwFeZ7QzykJD6L3yD4v12K1x0tHpqRqVpJevN3gW7kyM39Bqg==" -+ }, -+ "string_decoder": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", -+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", -+ "requires": { -+ "safe-buffer": "~5.2.0" -+ } -+ }, -+ "string-width": { -+ "version": "4.2.3", -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", -+ "requires": { -+ "emoji-regex": "^8.0.0", -+ "is-fullwidth-code-point": "^3.0.0", -+ "strip-ansi": "^6.0.1" -+ } -+ }, -+ "strip-ansi": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -+ "requires": { -+ "ansi-regex": "^5.0.1" -+ } -+ }, -+ "strip-bom": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", -+ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==" -+ }, -+ "strip-css-comments": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz", -+ "integrity": "sha512-xJwk2yMZ6j+0Clj7ETUfqQ6frsaCIqNGg3zjTVswIt3SbiOsCQgRI1E93hdt/JgGfh5De/sTwxrnrBhhWzMwcg==", -+ "requires": { -+ "is-regexp": "^1.0.0" -+ } -+ }, -+ "strip-indent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", -+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", -+ "requires": { -+ "min-indent": "^1.0.0" -+ } -+ }, -+ "strip-json-comments": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", -+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" -+ }, -+ "strip-outer": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", -+ "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", -+ "requires": { -+ "escape-string-regexp": "^1.0.2" -+ } -+ }, -+ "subarg": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", -+ "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==", -+ "requires": { -+ "minimist": "^1.1.0" -+ } -+ }, -+ "sumchecker": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", -+ "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", -+ "requires": { -+ "debug": "^4.1.0" -+ } -+ }, -+ "supports-color": { -+ "version": "5.5.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", -+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", -+ "requires": { -+ "has-flag": "^3.0.0" -+ } -+ }, -+ "supports-preserve-symlinks-flag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" -+ }, -+ "syntax-error": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", -+ "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", -+ "requires": { -+ "acorn-node": "^1.2.0" -+ } -+ }, -+ "tar": { -+ "version": "6.1.12", -+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz", -+ "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==", -+ "requires": { -+ "chownr": "^2.0.0", -+ "fs-minipass": "^2.0.0", -+ "minipass": "^3.0.0", -+ "minizlib": "^2.1.1", -+ "mkdirp": "^1.0.3", -+ "yallist": "^4.0.0" -+ }, -+ "dependencies": { -+ "mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" -+ } -+ } -+ }, -+ "tar-fs": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", -+ "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", -+ "optional": true, -+ "requires": { -+ "chownr": "^1.1.1", -+ "mkdirp-classic": "^0.5.2", -+ "pump": "^3.0.0", -+ "tar-stream": "^2.1.4" -+ }, -+ "dependencies": { -+ "chownr": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", -+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", -+ "optional": true -+ } -+ } -+ }, -+ "tar-stream": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", -+ "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", -+ "optional": true, -+ "requires": { -+ "bl": "^4.0.3", -+ "end-of-stream": "^1.4.1", -+ "fs-constants": "^1.0.0", -+ "inherits": "^2.0.3", -+ "readable-stream": "^3.1.1" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "optional": true, -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "terser": { -+ "version": "3.17.0", -+ "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", -+ "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", -+ "requires": { -+ "commander": "^2.19.0", -+ "source-map": "~0.6.1", -+ "source-map-support": "~0.5.10" -+ }, -+ "dependencies": { -+ "commander": { -+ "version": "2.20.3", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", -+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" -+ }, -+ "source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" -+ } -+ } -+ }, -+ "text-table": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", -+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" -+ }, -+ "through": { -+ "version": "2.3.8", -+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", -+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" -+ }, -+ "through2": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", -+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", -+ "requires": { -+ "readable-stream": "~2.3.6", -+ "xtend": "~4.0.1" -+ } -+ }, -+ "thunky": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", -+ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" -+ }, -+ "timers-browserify": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", -+ "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==", -+ "requires": { -+ "process": "~0.11.0" -+ } -+ }, -+ "to-fast-properties": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", -+ "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" -+ }, -+ "to-readable-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", -+ "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" -+ }, -+ "to-regex-range": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", -+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", -+ "requires": { -+ "is-number": "^7.0.0" -+ } -+ }, -+ "toidentifier": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", -+ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" -+ }, -+ "touch": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", -+ "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", -+ "requires": { -+ "nopt": "~1.0.10" -+ }, -+ "dependencies": { -+ "nopt": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", -+ "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", -+ "requires": { -+ "abbrev": "1" -+ } -+ } -+ } -+ }, -+ "tough-cookie": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", -+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", -+ "requires": { -+ "psl": "^1.1.28", -+ "punycode": "^2.1.1" -+ }, -+ "dependencies": { -+ "punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" -+ } -+ } -+ }, -+ "transform-ast": { -+ "version": "2.4.4", -+ "resolved": "https://registry.npmjs.org/transform-ast/-/transform-ast-2.4.4.tgz", -+ "integrity": "sha512-AxjeZAcIOUO2lev2GDe3/xZ1Q0cVGjIMk5IsriTy8zbWlsEnjeB025AhkhBJHoy997mXpLd4R+kRbvnnQVuQHQ==", -+ "requires": { -+ "acorn-node": "^1.3.0", -+ "convert-source-map": "^1.5.1", -+ "dash-ast": "^1.0.0", -+ "is-buffer": "^2.0.0", -+ "magic-string": "^0.23.2", -+ "merge-source-map": "1.0.4", -+ "nanobench": "^2.1.1" -+ }, -+ "dependencies": { -+ "is-buffer": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", -+ "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" -+ } -+ } -+ }, -+ "trim-newlines": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", -+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==" -+ }, -+ "trim-repeated": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", -+ "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==", -+ "requires": { -+ "escape-string-regexp": "^1.0.2" -+ } -+ }, -+ "true-case-path": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", -+ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", -+ "requires": { -+ "glob": "^7.1.2" -+ } -+ }, -+ "tty-browserify": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", -+ "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" -+ }, -+ "tunnel": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", -+ "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", -+ "optional": true -+ }, -+ "tunnel-agent": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", -+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", -+ "requires": { -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "tweetnacl": { -+ "version": "0.14.5", -+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", -+ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" -+ }, -+ "type-check": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", -+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", -+ "requires": { -+ "prelude-ls": "^1.2.1" -+ } -+ }, -+ "type-fest": { -+ "version": "0.18.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", -+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==" -+ }, -+ "type-name": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/type-name/-/type-name-2.0.2.tgz", -+ "integrity": "sha512-kkgkuqR/jKdKO5oh/I2SMu2dGbLXoJq0zkdgbxaqYK+hr9S9edwVVGf+tMUFTx2gH9TN2+Zu9JZ/Njonb3cjhA==" -+ }, -+ "typedarray": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", -+ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" -+ }, -+ "typedarray-to-buffer": { -+ "version": "3.1.5", -+ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", -+ "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", -+ "requires": { -+ "is-typedarray": "^1.0.0" -+ } -+ }, -+ "uglifyify": { -+ "version": "5.0.2", -+ "resolved": "https://registry.npmjs.org/uglifyify/-/uglifyify-5.0.2.tgz", -+ "integrity": "sha512-NcSk6pgoC+IgwZZ2tVLVHq+VNKSvLPlLkF5oUiHPVOJI0s/OlSVYEGXG9PCAH0hcyFZLyvt4KBdPAQBRlVDn1Q==", -+ "requires": { -+ "convert-source-map": "~1.1.0", -+ "minimatch": "^3.0.2", -+ "terser": "^3.7.5", -+ "through": "~2.3.4", -+ "xtend": "^4.0.1" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "convert-source-map": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", -+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==" -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "umd": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz", -+ "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==" -+ }, -+ "undeclared-identifiers": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz", -+ "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==", -+ "requires": { -+ "acorn-node": "^1.3.0", -+ "dash-ast": "^1.0.0", -+ "get-assigned-identifiers": "^1.2.0", -+ "simple-concat": "^1.0.0", -+ "xtend": "^4.0.1" -+ } -+ }, -+ "undefsafe": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", -+ "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" -+ }, -+ "unicode-canonical-property-names-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==" -+ }, -+ "unicode-match-property-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", -+ "requires": { -+ "unicode-canonical-property-names-ecmascript": "^2.0.0", -+ "unicode-property-aliases-ecmascript": "^2.0.0" -+ } -+ }, -+ "unicode-match-property-value-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==" -+ }, -+ "unicode-property-aliases-ecmascript": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", -+ "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==" -+ }, -+ "unique-filename": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", -+ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", -+ "requires": { -+ "unique-slug": "^2.0.0" -+ } -+ }, -+ "unique-slug": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", -+ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", -+ "requires": { -+ "imurmurhash": "^0.1.4" -+ } -+ }, -+ "unique-string": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", -+ "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", -+ "requires": { -+ "crypto-random-string": "^2.0.0" -+ } -+ }, -+ "universalify": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", -+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" -+ }, -+ "unix-crypt-td-js": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.1.4.tgz", -+ "integrity": "sha512-8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==" -+ }, -+ "update-browserslist-db": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", -+ "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", -+ "requires": { -+ "escalade": "^3.1.1", -+ "picocolors": "^1.0.0" -+ }, -+ "dependencies": { -+ "picocolors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", -+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" -+ } -+ } -+ }, -+ "update-notifier": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", -+ "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", -+ "requires": { -+ "boxen": "^5.0.0", -+ "chalk": "^4.1.0", -+ "configstore": "^5.0.1", -+ "has-yarn": "^2.1.0", -+ "import-lazy": "^2.1.0", -+ "is-ci": "^2.0.0", -+ "is-installed-globally": "^0.4.0", -+ "is-npm": "^5.0.0", -+ "is-yarn-global": "^0.3.0", -+ "latest-version": "^5.1.0", -+ "pupa": "^2.1.1", -+ "semver": "^7.3.4", -+ "semver-diff": "^3.1.1", -+ "xdg-basedir": "^4.0.0" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "requires": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" -+ }, -+ "supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "requires": { -+ "has-flag": "^4.0.0" -+ } -+ } -+ } -+ }, -+ "upper-case": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", -+ "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==" -+ }, -+ "uri-js": { -+ "version": "4.4.1", -+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", -+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", -+ "requires": { -+ "punycode": "^2.1.0" -+ }, -+ "dependencies": { -+ "punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" -+ } -+ } -+ }, -+ "url": { -+ "version": "0.11.0", -+ "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", -+ "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", -+ "requires": { -+ "punycode": "1.3.2", -+ "querystring": "0.2.0" -+ }, -+ "dependencies": { -+ "punycode": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", -+ "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" -+ } -+ } -+ }, -+ "url-parse-lax": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", -+ "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", -+ "requires": { -+ "prepend-http": "^2.0.0" -+ } -+ }, -+ "util": { -+ "version": "0.12.5", -+ "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", -+ "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "is-arguments": "^1.0.4", -+ "is-generator-function": "^1.0.7", -+ "is-typed-array": "^1.1.3", -+ "which-typed-array": "^1.1.2" -+ } -+ }, -+ "util-deprecate": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" -+ }, -+ "uuid": { -+ "version": "8.3.2", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", -+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" -+ }, -+ "v8-compile-cache": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", -+ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" -+ }, -+ "validate-npm-package-license": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", -+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", -+ "requires": { -+ "spdx-correct": "^3.0.0", -+ "spdx-expression-parse": "^3.0.0" -+ } -+ }, -+ "verror": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", -+ "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", -+ "requires": { -+ "assert-plus": "^1.0.0", -+ "core-util-is": "1.0.2", -+ "extsprintf": "^1.2.0" -+ }, -+ "dependencies": { -+ "core-util-is": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", -+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" -+ } -+ } -+ }, -+ "vm-browserify": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", -+ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" -+ }, -+ "watchify": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/watchify/-/watchify-4.0.0.tgz", -+ "integrity": "sha512-2Z04dxwoOeNxa11qzWumBTgSAohTC0+ScuY7XMenPnH+W2lhTcpEOJP4g2EIG/SWeLadPk47x++Yh+8BqPM/lA==", -+ "dev": true, -+ "requires": { -+ "anymatch": "^3.1.0", -+ "browserify": "^17.0.0", -+ "chokidar": "^3.4.0", -+ "defined": "^1.0.0", -+ "outpipe": "^1.1.0", -+ "through2": "^4.0.2", -+ "xtend": "^4.0.2" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dev": true, -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ }, -+ "through2": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", -+ "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", -+ "dev": true, -+ "requires": { -+ "readable-stream": "3" -+ } -+ } -+ } -+ }, -+ "webworkify": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz", -+ "integrity": "sha512-AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g==" -+ }, -+ "which": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", -+ "requires": { -+ "isexe": "^2.0.0" -+ } -+ }, -+ "which-typed-array": { -+ "version": "1.1.9", -+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", -+ "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", -+ "requires": { -+ "available-typed-arrays": "^1.0.5", -+ "call-bind": "^1.0.2", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "has-tostringtag": "^1.0.0", -+ "is-typed-array": "^1.1.10" -+ } -+ }, -+ "wide-align": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", -+ "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", -+ "requires": { -+ "string-width": "^1.0.2 || 2 || 3 || 4" -+ } -+ }, -+ "widest-line": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", -+ "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", -+ "requires": { -+ "string-width": "^4.0.0" -+ } -+ }, -+ "wolfy87-eventemitter": { -+ "version": "5.2.9", -+ "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz", -+ "integrity": "sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw==" -+ }, -+ "word-wrap": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", -+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" -+ }, -+ "wrap-ansi": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", -+ "requires": { -+ "ansi-styles": "^4.0.0", -+ "string-width": "^4.1.0", -+ "strip-ansi": "^6.0.0" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ } -+ } -+ }, -+ "wrappy": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" -+ }, -+ "write-file-atomic": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", -+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", -+ "requires": { -+ "imurmurhash": "^0.1.4", -+ "is-typedarray": "^1.0.0", -+ "signal-exit": "^3.0.2", -+ "typedarray-to-buffer": "^3.1.5" -+ } -+ }, -+ "ws": { -+ "version": "8.6.0", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", -+ "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==" -+ }, -+ "xdg-basedir": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", -+ "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" -+ }, -+ "xmlbuilder": { -+ "version": "15.1.1", -+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", -+ "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==" -+ }, -+ "xtend": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", -+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" -+ }, -+ "y18n": { -+ "version": "5.0.8", -+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", -+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" -+ }, -+ "yallist": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" -+ }, -+ "yargs": { -+ "version": "17.5.1", -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", -+ "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", -+ "requires": { -+ "cliui": "^7.0.2", -+ "escalade": "^3.1.1", -+ "get-caller-file": "^2.0.5", -+ "require-directory": "^2.1.1", -+ "string-width": "^4.2.3", -+ "y18n": "^5.0.5", -+ "yargs-parser": "^21.0.0" -+ }, -+ "dependencies": { -+ "yargs-parser": { -+ "version": "21.1.1", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", -+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" -+ } -+ } -+ }, -+ "yargs-parser": { -+ "version": "20.2.9", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", -+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" -+ }, -+ "yauzl": { -+ "version": "2.10.0", -+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", -+ "requires": { -+ "buffer-crc32": "~0.2.3", -+ "fd-slicer": "~1.1.0" -+ } -+ } -+ } -+} diff --git a/pkgs/applications/audio/open-stage-control/update.sh b/pkgs/applications/audio/open-stage-control/update.sh index 58b0441438ebe..30f1b4c293f16 100755 --- a/pkgs/applications/audio/open-stage-control/update.sh +++ b/pkgs/applications/audio/open-stage-control/update.sh @@ -14,7 +14,7 @@ nixeval() { } vendorhash() { - (nix --extra-experimental-features nix-command build --impure -f "$nixpkgs" --no-link "$1" 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true + (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true } findpath() { @@ -32,7 +32,6 @@ attr="${UPDATE_NIX_ATTR_PATH:-open-stage-control}" version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)" pkgpath="$(findpath "$attr")" -pkgdir="$(dirname "$pkgpath")" updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" @@ -41,17 +40,6 @@ if [ "$updated" -eq 0 ]; then exit 0 fi -# Download package.json from the latest release -curl -sSL https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/v"$version"/package.json | grep -v '"electron"\|"electron-installer-debian"' >"$pkgdir"/package.json - -# Lock dependencies with npm -(cd "$pkgdir" && npm install --package-lock-only --ignore-scripts --legacy-peer-deps) - -# Turn lock file into patch file -(cd "$pkgdir" && (diff -u /dev/null ./package-lock.json || [ $? -eq 1 ])) >"$pkgdir"/package-lock.json.patch - -rm -f "$pkgdir"/{package.json,package-lock.json} - # Update FOD hash curhash="$(nixeval "$attr.npmDeps.outputHash")" newhash="$(vendorhash "$attr.npmDeps")" diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 9db6656dd38dc..272f475d2fc03 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -19,24 +19,15 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; - rev = "refs/tags/release-${version}"; - sha256 = "sha256-KUHciIlwaKXvyCCkAzdh1vpe9cunDizrMUl0SoCpxgY="; + rev = "release-${version}"; + sha256 = "sha256-ygZkj7hZNm7XyqDEI7l49d36ZgCTwFiAuYZjlF9d5+8="; }; - patches = [ - # fix for tests failing with newer mutagen, remove after >2.8.3 - # https://tickets.metabrainz.org/browse/PICARD-2583 - (fetchpatch { - url = "https://github.com/metabrainz/picard/commit/76c2dff6b61140bbc7675c9e9f62a086b885e539.patch"; - hash = "sha256-V1/oq1tEcb1mtqbYAA9o7mJcw16vRO0IK3GGmJkwO1Q="; - }) - ]; - nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] ++ lib.optionals (pyqt5.multimediaEnabled) [ qt5.qtmultimedia.bin @@ -71,6 +62,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { homepage = "https://picard.musicbrainz.org/"; + changelog = "https://picard.musicbrainz.org/changelog/"; description = "The official MusicBrainz tagger"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 5dd17a74f491b..b41913c4b91ee 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.3"; + version = "6.3.01"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-/XSBUM6HkANATl1Y9vs8mQFgBTyVeCv8TxcaIdP/Nm8="; + sha256 = "sha256-BgfVbD/xQ3IaTMJhac6eSnbZQdBTDdqboruxSbKvbyE="; }; configurePhase = '' diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index ef31c2a6ee99a..8b76132a847f5 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.28"; + version = "0.8.9.31"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-0j0AQZk+WEkcRTL/peAxzRw23gThlGtMnqoms2aUCrc="; + sha256 = "sha256-9Fc42f0plduihXDDLXWBdt62maxDJ0cwumIvbiMcrGc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 6eea4562de993..00931a21011c6 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,21 +1,19 @@ -{ lib, mkDerivation, fetchurl, cmake, pkg-config -, qtbase, qttools, qtmultimedia, qtx11extras +{ lib, stdenv, fetchurl, cmake, pkg-config +, qtbase, qttools, qtmultimedia, wrapQtAppsHook # transports , curl, libmms # input plugins , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile -, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi +, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi, libbs2b, game-music-emu # output plugins -, alsa-lib, libpulseaudio +, alsa-lib, libpulseaudio, pipewire # effect plugins , libsamplerate }: # Additional plugins that can be added: # wavpack (https://www.wavpack.com/) -# gme (Game music support) # Ogg Opus support -# BS2B effect plugin (http://bs2b.sourceforge.net/) # JACK audio support # ProjectM visualization plugin @@ -28,26 +26,27 @@ # Qmmp installs working .desktop file(s) all by itself, so we don't need to # handle that. -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qmmp"; - version = "1.4.4"; + version = "2.1.2"; src = fetchurl { - url = "https://qmmp.ylsoftware.com/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ="; + url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; + hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ # basic requirements - qtbase qttools qtmultimedia qtx11extras + qtbase qttools qtmultimedia # transports curl libmms # input plugins libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile - libcdio cdparanoia libcddb faad2 ffmpeg wildmidi + libcdio cdparanoia libcddb faad2 ffmpeg wildmidi libbs2b game-music-emu # output plugins - alsa-lib libpulseaudio + alsa-lib libpulseaudio pipewire # effect plugins libsamplerate ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index c5f02d7085de7..aacc584c5b84a 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -119,7 +119,7 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ - dbus.daemon + dbus gdk-pixbuf glibcLocales hicolor-icon-theme @@ -154,7 +154,7 @@ python3.pkgs.buildPythonApplication rec { runHook preCheck xvfb-run -s '-screen 0 1920x1080x24' \ - dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ pytest $pytestFlags runHook postCheck diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 6b09e086fa3de..6858d6b1bd7da 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -9,6 +9,7 @@ , ffmpeg , vlc , xdg-utils +, xdotool , which , jackSupport ? true @@ -69,7 +70,7 @@ stdenv.mkDerivation rec { # seem to have an effect for some plugins. # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc xdotool ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 1cad71ae2973c..a05a0174afc03 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -8,7 +9,7 @@ , libxml2 , libjack2 , libsndfile -, wxGTK30 +, wxGTK30-gtk3 , libsigcxx , libsamplerate , rubberband @@ -34,14 +35,19 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ autoreconfHook pkg-config which libtool ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + which + libtool + ]; buildInputs = [ liblo libxml2 libjack2 libsndfile - wxGTK30 + wxGTK30-gtk3 libsigcxx libsamplerate rubberband diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 251725ea6b29c..48acd55171792 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "soundtracker"; - version = "1.0.2.1"; + version = "1.0.3"; src = fetchurl { # Past releases get moved to the "old releases" directory. @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz"; - sha256 = "0nh0dwz8nldc040q6n06vlazhss8ms42r2dffhjcrqj3hbrvfx82"; + sha256 = "sha256-k+TB1DIauOIeQSCVV5uYu69wwRx7vCRAlSCTAtDguKo="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index f5f1feacb00cc..dad4402e2d467 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.9.1411"; + version = "1.9.9.1414"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "ca44fc6e258bb413d6281d927063b25940f42e5c"; - hash = "sha256-aZ+2nyy6tK3VwgTCWGoNaU4//kkHUzd6DZSfTEIgbvY="; + rev = "dbe69eb8aa88f644cfb46541d6cef72fa666570d"; + hash = "sha256-BN6eBHMMecucfHwzmho3xi1l2O3YnYcBUE321Rl6xrc="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index d295689716b24..4bff0179ed563 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stochas"; - version = "1.3.5"; + version = "1.3.8"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "1z8q53qfigw6wwbvpca92b9pf9d0mv3nyb0fmszz5ikj3pcybi7m"; + sha256 = "sha256-/YT2M/VbkABjFvtTjGPWaSKUZaznMIYKXV6gNSD2PeU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/applications/audio/tagger/default.nix index d7cfd5d75aaa3..bac0d7c9d8337 100644 --- a/pkgs/applications/audio/tagger/default.nix +++ b/pkgs/applications/audio/tagger/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tagger"; - version = "2022.11.1-f1"; + version = "2022.11.2"; src = fetchFromGitHub { owner = "nlogozzo"; repo = "NickvisionTagger"; rev = version; - hash = "sha256-JeQTWs3TSs3Y+WGRR0bHINQr0OuS95dDxo+MkWte2Qw="; + hash = "sha256-gFpnTuUROYwPANrkD+g7a3FHSCVY2oB97flCK+LLowY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 24c8e610a692d..89adea497c24d 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.4.3"; + version = "7.4.5"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-eB4fwW5UvylVslSEvDFdCVYcEK3M2H+8VJGHH13vvA0="; + sha256 = "sha256-fxmCLjnYO7ZblEiRoByxuFzw9xFHqbQvne1WNcFnnwI="; }; postUnpack = '' @@ -131,6 +131,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Linux desktop music player from the future"; homepage = "https://tauonmusicbox.rocks/"; + changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${version}"; license = licenses.gpl3; maintainers = with maintainers; [ jansol ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index e7d101546d3a2..b4a5c98d8b416 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -25,7 +25,7 @@ , makeWrapper , pkg-config , rtmidi -, speex +, speexdsp , stdenv , wrapGAppsHook , zstd @@ -45,8 +45,8 @@ let fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; repo = "fuzzysearchdatabase"; - rev = "fe62479811e503ef3c091f5a859d27bfcf0a44da"; - sha256 = "zgeUzuuInHPeveBIjlivRGIz+NSb7cW/9hMndxm6qOA="; + rev = "a3a1bf557b8e6ee58b55fa82ff77ff7a3d141949"; + sha256 = "13ib72acbxn1cnf66im0v4nlr1464v7j08ra2bprznjmy127xckm"; }; nanovg-source = fetchFromGitHub { owner = "VCVRack"; @@ -72,11 +72,23 @@ let rev = "2fc6405883f8451944ed080547d073c8f9f31898"; sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; }; + simde-source = fetchFromGitHub { + owner = "simd-everywhere"; + repo = "simde"; + rev = "dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4"; + sha256 = "1kxwzdlh21scak7wsbb60vwfvndppidj5fgbi26mmh73zsj02mnv"; + }; + tinyexpr-source = fetchFromGitHub { + owner = "codeplea"; + repo = "tinyexpr"; + rev = "4e8cc0067a1e2378faae23eb2dfdd21e9e9907c2"; + sha256 = "1yxkxsw3bc81cjm2knvyr1z9rlzwmjvq5zd125n34xwq568v904d"; + }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "03bd00b96ad19e0575939bb7a0b8b08eff22f076"; # tip of branch v2 - sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr"; + rev = "f80e1a0e78dc043a0ff0b777ef98a36b91063622"; # tip of branch v2 + sha256 = "0hnwrr1xhf7dpkw1v63f633x5dlrvijgbah4aj5h5xr2jchip9nx"; }; vcv-rtaudio = stdenv.mkDerivation rec { pname = "vcv-rtaudio"; @@ -103,7 +115,7 @@ let in stdenv.mkDerivation rec { pname = "VCV-Rack"; - version = "2.1.2"; + version = "2.2.0"; desktopItems = [ (makeDesktopItem { @@ -123,7 +135,7 @@ stdenv.mkDerivation rec { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "0583izk3j36mg7wm30ss2387j9dqsbbxkxrdh3993azb4q5naf02"; + sha256 = "1ag1syjxdzxx13pdcfga9ksc6a5hw9bcdfhbry8qd2pxs9lmv2q6"; }; patches = [ @@ -141,6 +153,8 @@ stdenv.mkDerivation rec { cp -r ${nanosvg-source}/* dep/nanosvg cp -r ${osdialog-source}/* dep/osdialog cp -r ${oui-blendish-source}/* dep/oui-blendish + cp -r ${simde-source}/* dep/simde + cp -r ${tinyexpr-source}/* dep/tinyexpr cp dep/pffft/*.h dep/include cp dep/fuzzysearchdatabase/src/*.hpp dep/include @@ -148,6 +162,8 @@ stdenv.mkDerivation rec { cp dep/nanovg/src/*.h dep/include cp dep/osdialog/*.h dep/include cp dep/oui-blendish/*.h dep/include + cp -r dep/simde/simde dep/include + cp dep/tinyexpr/tinyexpr.h dep/include # Build and dist the Fundamental plugins cp -r ${fundamental-source} plugins/Fundamental/ @@ -182,12 +198,19 @@ stdenv.mkDerivation rec { libpulseaudio libsamplerate rtmidi - speex + speexdsp vcv-rtaudio zstd ]; - makeFlags = [ "all" "plugins" ]; + makeFlags = [ + ( if stdenv.hostPlatform.system == "aarch64-linux" + then "MACHINE=arm64-linux" + else "MACHINE=${stdenv.hostPlatform.config}" + ) + "all" + "plugins" + ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch index 506ab6053053b..f61fd752607f7 100644 --- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch @@ -1,7 +1,8 @@ -diff -ru a/Makefile b/Makefile ---- a/Makefile 1970-01-01 01:00:01.000000000 +0100 -+++ b/Makefile 1970-01-01 01:00:01.000000000 +0100 -@@ -36,7 +36,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+- +diff --git a/Makefile b/Makefile +index e1be07d1..309b3b0b 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ ifdef ARCH_LIN LDFLAGS += -Wl,--whole-archive LDFLAGS += -static-libstdc++ -static-libgcc @@ -9,4 +10,4 @@ diff -ru a/Makefile b/Makefile + LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio LDFLAGS += -Wl,--no-whole-archive LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple - LDFLAGS += $(shell pkg-config --libs gtk+-3.0) + endif diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 5cc3c1099995f..7e834efb95249 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "A vi/vim inspired client for the Music Player Daemon (mpd)"; homepage = "https://github.com/boysetsfrog/vimpc"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index ac28733c81bc3..d96d74b89ce54 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -13,6 +13,8 @@ let in appimageTools.wrapType2 rec { inherit pname version src; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) + ++ [ pkgs.libappindicator ]; extraInstallCommands = '' mv $out/bin/{${pname}-${version},${pname}} @@ -29,7 +31,7 @@ appimageTools.wrapType2 rec { description = "Electron wrapper around YouTube Music"; homepage = "https://th-ch.github.io/youtube-music/"; license = licenses.mit; - sourceProvenance = with sourceTypes; [ fromSource ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = [ maintainers.aacebedo ]; }; diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index e7826fc6e949c..44f5c5acfb9b6 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -13,7 +13,7 @@ , libXrandr , libXi , gnome -, kdialog +, libsForQt5 }: rustPlatform.buildRustPackage rec { @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { in '' patchelf --set-rpath "${libPath}" "$out/bin/$pname" - wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity kdialog ]} + wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} ''; diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 81a0cd8b02e12..eaf3f90138172 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "22.06.5"; + version = "22.11.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "IHX/F3tnl3ckX20mnPHmuK/W4pRTFHzBUfaJg2sMpqc="; + sha256 = "JYYiqJzLszaCJSl7fDb9Oz8tdIYAnqEbJoRg4zw3wbg="; }; patches = [ diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/applications/backup/urbackup-client/default.nix index 16ae8fcf3e896..7263e72c64900 100644 --- a/pkgs/applications/backup/urbackup-client/default.nix +++ b/pkgs/applications/backup/urbackup-client/default.nix @@ -1,16 +1,29 @@ -{ stdenv, lib, fetchzip, wxGTK30, zlib, zstd }: +{ stdenv +, lib +, fetchzip +, wxGTK32 +, zlib +, zstd +}: stdenv.mkDerivation rec { pname = "urbackup-client"; - version = "2.4.11"; + version = "2.5.20"; src = fetchzip { url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz"; - sha256 = "0cciy9v1pxj9qaklpbhp2d5rdbkmfm74vhpqx6b4phww0f10wvzh"; + sha256 = "sha256-i1g3xUhspqQRfIUhy6STOWNuncK3tMFocJw652r1X9g="; }; - configureFlags = [ "--enable-embedded-cryptopp" ]; - buildInputs = [ wxGTK30 zlib zstd ]; + buildInputs = [ + wxGTK32 + zlib + zstd + ]; + + configureFlags = [ + "--enable-embedded-cryptopp" + ]; meta = with lib; { description = "An easy to setup Open Source client/server backup system"; diff --git a/pkgs/applications/blockchains/bitcoin-classic/default.nix b/pkgs/applications/blockchains/bitcoin-classic/default.nix deleted file mode 100644 index 4a0a99e288aeb..0000000000000 --- a/pkgs/applications/blockchains/bitcoin-classic/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, autoreconfHook -, openssl -, db48 -, boost -, zlib -, miniupnpc -, qtbase ? null -, qttools ? null -, util-linux -, protobuf -, qrencode -, libevent -, withGui -}: - -stdenv.mkDerivation rec { - pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-classic"; - version = "1.3.8uahf"; - - src = fetchFromGitHub { - owner = "bitcoinclassic"; - repo = "bitcoinclassic"; - rev = "v${version}"; - sha256 = "sha256-fVmFD1B4kKoejd2cmPPF5TJJQTAA6AVsGlVY8IIUNK4="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ - openssl - db48 - boost - zlib - miniupnpc - util-linux - protobuf - libevent - ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optionals withGui [ - "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; - - CXXFLAGS = [ "-std=c++14" ]; - - enableParallelBuilding = true; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Peer-to-peer electronic cash system (Classic client)"; - longDescription = '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - Bitcoin Classic stands for the original Bitcoin as Satoshi described it, - "A Peer-to-Peer Electronic Cash System". We are writing the software that - miners and users say they want. We will make sure it solves their needs, help - them deploy it, and gracefully upgrade the bitcoin network's capacity - together. The data shows that Bitcoin can grow, on-chain, to welcome many - more users onto our coin in a safe and distributed manner. In the future we - will continue to release updates that are in line with Satoshi’s whitepaper & - vision, and are agreed upon by the community. - ''; - homepage = "https://bitcoinclassic.com/"; - maintainers = with maintainers; [ jefdaj ]; - license = licenses.mit; - broken = stdenv.isDarwin; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/blockchains/bitcoin-gold/default.nix b/pkgs/applications/blockchains/bitcoin-gold/default.nix deleted file mode 100644 index 5d6775f729aad..0000000000000 --- a/pkgs/applications/blockchains/bitcoin-gold/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, openssl -, boost -, libb2 -, libevent -, autoreconfHook -, db4 -, pkg-config -, protobuf -, hexdump -, zeromq -, libsodium -, withGui -, qtbase ? null -, qttools ? null -, wrapQtAppsHook ? null -}: - -with lib; - -stdenv.mkDerivation rec { - - pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; - version = "0.17.3"; - - src = fetchFromGitHub { - owner = "BTCGPU"; - repo = "BTCGPU"; - rev = "v${version}"; - sha256 = "sha256-1tFoUNsCPJkHSmNRl5gE3n2EQD6RZSry1zIM5hiTzEI="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - hexdump - ] ++ optionals withGui [ - wrapQtAppsHook - ]; - - buildInputs = [ - openssl - boost - libevent - db4 - zeromq - libsodium - libb2 - ] ++ optionals withGui [ - qtbase - qttools - protobuf - ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ - "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; - - meta = { - description = "BTG is a cryptocurrency with Bitcoin fundamentals, mined on common GPUs instead of specialty ASICs"; - homepage = "https://bitcoingold.org/"; - license = licenses.mit; - maintainers = [ maintainers.mmahut ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index d039d4d5ec99c..4f0e8215f5e68 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -25,23 +25,21 @@ with lib; let - version = "23.0"; - majorVersion = versions.major version; desktop = fetchurl { - url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop"; + # c2e5f3e is the last commit when the debian/bitcoin-qt.desktop file was changed + url = "https://raw.githubusercontent.com/bitcoin-core/packaging/c2e5f3e20a8093ea02b73cbaf113bc0947b4140e/debian/bitcoin-qt.desktop"; sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha"; }; in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - inherit version; + version = "24.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" - "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05"; + sha256 = "9cfa4a9f4acb5093e85b8b528392f0f05067f3f8fafacd4dcfe8a396158fd9f4"; }; nativeBuildInputs = @@ -74,10 +72,6 @@ stdenv.mkDerivation rec { "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - # fix "Killed: 9 test/test_bitcoin" - # https://github.com/NixOS/nixpkgs/issues/179474 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; - checkInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index a1b0f2890e9d3..a2ce1b90d2fdd 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.6.12"; + version = "1.7.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-izjKrzHbyRsUhlUAf0PELVGBt5JmzvBzgBytB9z80cI="; + sha256 = "sha256-6E8TJ1NgWlLTegDQ4UcCQpAAQibbefg5x7qhSrSKAgc="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index a06494477a012..3cda0eac7130c 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,23 +31,23 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.All"; - version = "1.4.5"; - sha256 = "1x4500b71cmv8qba2phk1j0624w8gln5c1jzyw3x782ddvlbznna"; + version = "1.4.9"; + sha256 = "0r9ssz00d0zbbszs1ypc9jvbwg5myh9jmw46wvzk0jhp5xfz5mip"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; - version = "1.3.12"; - sha256 = "0bf9k5wx9h53fwis6887gy43683xgljwk26kr44r6gzqbzwzac1m"; + version = "1.3.14"; + sha256 = "1frhj5jmncsdcb1x5jy733l40bqifdwirmq6mjdn3596fmgjvh9b"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; - version = "1.3.14"; - sha256 = "0320bm9fz6mym3b450avwx0ng8y334w4rm2gcpicnwglp53cagx7"; + version = "1.3.16"; + sha256 = "0nh1fcjpkl6l2par60p0w7nwc45za28iagmdsq6czz68kpvfx83c"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.3.13"; - sha256 = "1yy78w4zcl17z99l0n5p86ay9cvsbhwxm42f1f2ll9k2p495bmr3"; + version = "1.3.15"; + sha256 = "1axmdn6qdzxljdvidw8s68sfgy5ykmxv0nkzcdsgdmhisahaz2pa"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; @@ -56,38 +56,23 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; - version = "1.3.12"; - sha256 = "0jqaimrcdgd7iwyy8fkqysrxfbz3gzvv4pi30fc0nz1x1b11w48j"; + version = "1.3.14"; + sha256 = "1ld5diahj75jbnqmvvsc0h65sbd4i73k7sik325yw4gvz4jmw2ih"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; - version = "1.3.14"; - sha256 = "1zsjg0zgp51vgkhq7vv05pxz5jrpahkjl042ilywb8jqlz3my9jw"; + version = "1.3.16"; + sha256 = "0nq36jg0qfj93djk5b9i42v8gm2zqkf8a2ddb69z52gsg8ixvcm6"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; - version = "1.4.4"; - sha256 = "0qm7xgd19s629swnm6b83qv5b9p57b7bq9bi5l340yim6w8yb4mb"; + version = "1.4.7"; + sha256 = "144wlnlvkmn1hrl7kwsqfvlla3lknd599rmp6zf1nv0n4jsj15l4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; - version = "1.0.7"; - sha256 = "10npvkaa6hr0a3lb4lnfakfnbzr87058irsa4jrbj238hc5m8zwg"; - }) - (fetchNuGet { - pname = "BuildBundlerMinifier"; - version = "3.2.449"; - sha256 = "1dcjlfl5w2vfppx2hq3jj6xy24id2x3hcajwylhphlz9jw2bnhsv"; - }) - (fetchNuGet { - pname = "BundlerMinifier.Core"; - version = "3.2.449"; - sha256 = "1bqc8k346b9yl7a5ywbl5g1m5982qyg7s2kihak100fzlb7g7rxs"; - }) - (fetchNuGet { - pname = "BundlerMinifier.TagHelpers"; - version = "3.2.435"; - sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; + version = "1.0.10"; + sha256 = "12c5gmd62vik0ar786jlhzf0gid4smi5ysl12mxpx1i0dndgapbh"; }) (fetchNuGet { pname = "CsvHelper"; @@ -186,8 +171,8 @@ }) (fetchNuGet { pname = "LNURL"; - version = "0.0.24"; - sha256 = "1hqa95gbcis03c0m5kwl7zzn26kwv1my94yq96766qp0rnl6c4lw"; + version = "0.0.26"; + sha256 = "0gb6n5zvf3mnmychbv3hmzbfllxamq26y1c18ql6y02wy2asrwff"; }) (fetchNuGet { pname = "MailKit"; @@ -451,11 +436,6 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "1.1.2"; - sha256 = "0z83kxfzsgqlshg4x1mhdnhlrprrwsgnnibvwk257drzy9079994"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) @@ -631,11 +611,6 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "1.1.2"; - sha256 = "0j9b4z3pf8a5xphx3ksn6jm01rf4z001vfll5kcbxw995xcidjw1"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) @@ -660,11 +635,6 @@ sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Filter"; - version = "1.1.2"; - sha256 = "1pip87q89376xxpi3r5pf9vxhqxx21qrp179fbldbkr2m1577k9m"; - }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; @@ -716,11 +686,6 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; - version = "1.1.1"; - sha256 = "0rcwxz1r89y96s8k3bmg0v6zdqanqfp09khy5l99wnl777y15g7x"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) @@ -770,11 +735,6 @@ sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; }) (fetchNuGet { - pname = "Microsoft.NetCore.Analyzers"; - version = "3.3.2"; - sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq"; - }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; @@ -836,8 +796,8 @@ }) (fetchNuGet { pname = "NBitcoin.Altcoins"; - version = "3.0.8"; - sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; + version = "3.0.17"; + sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) (fetchNuGet { pname = "NBitcoin"; @@ -846,11 +806,6 @@ }) (fetchNuGet { pname = "NBitcoin"; - version = "6.0.18"; - sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s"; - }) - (fetchNuGet { - pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) @@ -861,8 +816,8 @@ }) (fetchNuGet { pname = "NBitcoin"; - version = "7.0.11"; - sha256 = "1v5fiyi2jci162jjga9cgmh2p6ig6yxj4zr151x0fa8rwaz5f1md"; + version = "7.0.14"; + sha256 = "18nxx13fz3i7kmigijnynvrbx2i5cb3v4m89nvnxl38vcw7w5jys"; }) (fetchNuGet { pname = "NBitpayClient"; @@ -871,8 +826,8 @@ }) (fetchNuGet { pname = "NBXplorer.Client"; - version = "4.2.0"; - sha256 = "1adbn5cbr42cjfvijaf1lffhcrcn0ws1arfi7mrg3kjshbzfgims"; + version = "4.2.1"; + sha256 = "0sizhzz6ry40fphd3lqqj8r9ik103jzrq1ql57rl1zfh1490zq5y"; }) (fetchNuGet { pname = "NETStandard.Library"; @@ -896,11 +851,6 @@ }) (fetchNuGet { pname = "Newtonsoft.Json"; - version = "11.0.2"; - sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) @@ -960,11 +910,6 @@ sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { - pname = "NUglify"; - version = "1.5.14"; - sha256 = "00sy6m88z9q08ad7v55vczibxa74xwb2izrg9zinxdbihprgw92w"; - }) - (fetchNuGet { pname = "PeterO.Cbor"; version = "4.1.3"; sha256 = "0882i3bhhx2yag2m4lbdsgngjwaj9ff4v0ab9zb839i4r77aq1yn"; @@ -1556,11 +1501,6 @@ }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.3.0"; - sha256 = "149xcsa1pphlrc2zfmca9n822g4mxk7s2a44phvf34r0fajm3hk8"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) @@ -1875,11 +1815,6 @@ sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { - pname = "Text.Analyzers"; - version = "3.3.3"; - sha256 = "1fkx07xi049mlzskrw9422zpikdppsgf7vi2lq97qs5rvly3rfvp"; - }) - (fetchNuGet { pname = "TwentyTwenty.Storage.Amazon"; version = "2.12.1"; sha256 = "03nrkvhki35w1rqx94s97rwxl0qwqlczyiimhrkc72vjppn5p6ph"; diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index 83b3c0c29b392..521a44de1dd07 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; - rev = "v${version}"; - sha256 = "uiXmLdQAglgLxOX6IoF1iNZvje4EM7Tr25Okx9TPyzI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 4dfeebfe0962f..2384c3f093f8b 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.12.1"; + version = "22.11"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256-SlDDOJ6H2UVT/dof23CYSzCliAc+5CAYQc87AzOtYjg="; + sha256 = "sha256-3GE7njzuYxYXotkRWlRjwygTwF7cVzKS44IQsg9YG0Q="; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/blockchains/digibyte/default.nix b/pkgs/applications/blockchains/digibyte/default.nix index acf0b355e640e..90e84db3638e1 100644 --- a/pkgs/applications/blockchains/digibyte/default.nix +++ b/pkgs/applications/blockchains/digibyte/default.nix @@ -19,15 +19,15 @@ with lib; stdenv.mkDerivation rec { pname = "digibyte"; - version = "7.17.2"; + version = "7.17.3"; name = pname + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { - owner = pname; + owner = "digibyte-core"; repo = pname; rev = "v${version}"; - sha256 = "04czj7mx3wpbx4832npk686p9pg5zb6qwlcvnmvqf31hm5qylbxj"; + sha256 = "zPwnC2qd28fA1saG4nysPlKU1nnXhfuSG3DpCY6T+kM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/dogecoin/default.nix b/pkgs/applications/blockchains/dogecoin/default.nix index 7c92cc0831d65..6b6cfaa2398d4 100644 --- a/pkgs/applications/blockchains/dogecoin/default.nix +++ b/pkgs/applications/blockchains/dogecoin/default.nix @@ -2,7 +2,7 @@ , pkg-config, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent , protobuf, qtbase ? null -, wrapQtAppsHook ? null, qttools, qmake ? null, qrencode +, wrapQtAppsHook ? null, qttools ? null, qmake ? null, qrencode , withGui, withUpnp ? true, withUtils ? true, withWallet ? true , withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }: diff --git a/pkgs/applications/blockchains/eclair/default.nix b/pkgs/applications/blockchains/eclair/default.nix index 7c5d71f35f532..3d05546caff68 100644 --- a/pkgs/applications/blockchains/eclair/default.nix +++ b/pkgs/applications/blockchains/eclair/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "eclair"; - version = "0.7.0-patch-disconnect"; - revision = "cad88bf"; + version = "0.8.0"; + revision = "0077471"; src = fetchzip { url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip"; - hash = "sha256-agOxflCXfoeSeGliB/PAMMyCdqYYajciHMfLrSiZx1Q="; + hash = "sha256-jkXdt1aQRVgItfFPuyh45uXjUFgJtKng/17Po5i7ang="; }; propagatedBuildInputs = [ jq openjdk11 ]; diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index a5cc7431246bc..d63e68ddcb771 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.15.4-beta"; + version = "0.15.5-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "sha256-/PKW2Y6+PlWk88pC4DHFi1ZRqMfQzoO9MVLYZrB2UNc="; + sha256 = "sha256-DZElTLZHpmW/jqZc6jh/Z0+7mtFgY/X/T+srS+cDHik="; }; - vendorSha256 = "sha256-bUo0PhtOFhsZfhAXtRJMjfaLrAsOv3ksxsrPOlMNv48="; + vendorSha256 = "sha256-+jHoZymocBga5j9UI3wmI1TIBwiM9I6YEZO3IDGAllU="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index a9e77ae6fb28a..f4f0820473967 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.41"; + version = "2.3.49"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-xifL6XafK8FCtOoXt5H8ymCWETZlfzTKk51/saBGxHE="; + sha256 = "sha256-ErAdFY65EYY988+xqSd6v57NbFeOE3Yt5mvn6C0TuRE="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index b32c7d1a0cf86..a646fd1e8339a 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -200,6 +200,11 @@ sha256 = "18nxx13fz3i7kmigijnynvrbx2i5cb3v4m89nvnxl38vcw7w5jys"; }) (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.18"; + sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; + }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 058888d965da2..e484538f4168a 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.29.1"; + version = "1.29.2"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-TmmGLrDpNOfadOIwmG7XRgI89XQjaqIavxCEE2plumc="; + sha256 = "sha256-dVju9emwTqNQCYST4HuwSWdafM0yxVS3JXXJqCdFEpc="; }; - cargoSha256 = "sha256-4suoHP6AXhXlt7+sHMX5RW/LGZrbMhNNmzYvFBcnMTs="; + cargoSha256 = "sha256-k/JzKbWn5M+H6w1UEv2APzZNBZOBYZY09keyCrXaGCM="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 31c610f255fe5..443fe36143c50 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.32"; + version = "0.9.33"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-bE7PzvkHKAP/nqNkoBMTGvZZwmf8YY+cGnJ2EM/2xAs="; + sha256 = "sha256-vAFGLcsbGuoaNtxtEIHSeX00nsULJROCEhaMv5IEcp4="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-NI50KFXvQgUV+G1l5D2gnAo1EohnCpQWlFCZ0iP2CVQ="; + cargoSha256 = "sha256-SZUkgtI/4kA5iWzalmGo5KXRHXKgdeCo2SSCVF66p5E="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index 9a184bed83a53..85d5abdd178c1 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -5,7 +5,7 @@ , makeDesktopItem , copyDesktopItems , autoPatchelfHook -, openjdk18 +, openjdk , gtk3 , gsettings-desktop-schemas , writeScript @@ -20,11 +20,11 @@ let pname = "sparrow"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "1rrf5xba733c2vxgd7bf164iswc66ggp64ywh79d0vf188imzmwr"; + sha256 = "0q31b4ncvbhr9gb47wplphg43pwlg5vpd1b12qiidqlrkgm2vjy8"; }; launcher = writeScript "sparrow" '' @@ -60,7 +60,7 @@ let -m com.sparrowwallet.sparrow ) - XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ${openjdk18}/bin/java ''${params[@]} $@ + XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ${openjdk}/bin/java ''${params[@]} $@ ''; torWrapper = writeScript "tor-wrapper" '' @@ -71,14 +71,14 @@ let jdk-modules = stdenv.mkDerivation { name = "jdk-modules"; - nativeBuildInputs = [ openjdk18 ]; + nativeBuildInputs = [ openjdk ]; dontUnpack = true; buildPhase = '' # Extract the JDK's JIMAGE and generate a list of modules. mkdir modules pushd modules - jimage extract ${openjdk18}/lib/openjdk/lib/modules + jimage extract ${openjdk}/lib/openjdk/lib/modules ls | xargs -d " " -- echo > ../manifest.txt popd ''; @@ -93,7 +93,7 @@ let sparrow-modules = stdenv.mkDerivation { pname = "sparrow-modules"; inherit version src; - nativeBuildInputs = [ makeWrapper gnugrep openjdk18 autoPatchelfHook stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [ makeWrapper gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; buildPhase = '' # Extract Sparrow's JIMAGE and generate a list of them. diff --git a/pkgs/applications/blockchains/vertcoin/default.nix b/pkgs/applications/blockchains/vertcoin/default.nix index acb02298e1160..87d9a8b64b21a 100644 --- a/pkgs/applications/blockchains/vertcoin/default.nix +++ b/pkgs/applications/blockchains/vertcoin/default.nix @@ -9,6 +9,7 @@ , protobuf , hexdump , zeromq +, gmp , withGui , qtbase ? null , qttools ? null @@ -19,15 +20,15 @@ with lib; stdenv.mkDerivation rec { pname = "vertcoin"; - version = "0.15.0.1"; + version = "0.18.0"; name = pname + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = pname + "-project"; repo = pname + "-core"; - rev = version; - sha256 = "09q7qicw52gv225hq6wlpsf4zr4hjc8miyim5cygi5nxxrlw7kd3"; + rev = "2bd6dba7a822400581d5a6014afd671fb7e61f36"; + sha256 = "ua9xXA+UQHGVpCZL0srX58DDUgpfNa+AAIKsxZbhvMk="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { libevent db4 zeromq + gmp ] ++ optionals withGui [ qtbase qttools diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 70c67db31c994..30edd74d031de 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -1,8 +1,11 @@ { lib, stdenv +, autoPatchelfHook +, makeWrapper , fetchurl , makeDesktopItem , curl , dotnetCorePackages +, lttng-ust_2_12 , fontconfig , krb5 , openssl @@ -11,29 +14,31 @@ }: let - dotnet-runtime = dotnetCorePackages.runtime_5_0; - libPath = lib.makeLibraryPath [ + dotnet-runtime = dotnetCorePackages.runtime_6_0; + # These libraries are dynamically loaded by the application, + # and need to be present in LD_LIBRARY_PATH + runtimeLibs = [ curl - dotnet-runtime fontconfig.lib krb5 openssl stdenv.cc.cc.lib xorg.libX11 + xorg.libICE + xorg.libSM zlib ]; in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.1.3"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-cATqg/n4/BDQtuCVjHAx3EfMLmlX5EjeQ01gavy/L8o="; + sha256 = "sha256-0DFl+UFxQckRM2qXFqDpKaRQ5sIMUbNj7l3zKPKAOnQ="; }; dontBuild = true; - dontPatchELF = true; desktopItem = makeDesktopItem { name = "wasabi"; @@ -44,16 +49,19 @@ stdenv.mkDerivation rec { categories = [ "Network" "Utility" ]; }; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = runtimeLibs ++ [ + lttng-ust_2_12 + ]; + installPhase = '' mkdir -p $out/opt/${pname} $out/bin $out/share/applications cp -Rv . $out/opt/${pname} - cd $out/opt/${pname} - for i in $(find . -type f -name '*.so') wassabee - do - patchelf --set-rpath ${libPath} $i - done - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee - ln -s $out/opt/${pname}/wassabee $out/bin/${pname} + + makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${pname}" \ + --add-flags "$out/opt/${pname}/WalletWasabi.Fluent.Desktop.dll" \ + --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + cp -v $desktopItem/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index fe912d2cc30a6..eedfaee00c59c 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "1.5.9"; + version = "1.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-UEzidH4ZWggcOWHHuAclHbbgATDBdogL99Ze0PlwRoc="; + sha256 = "sha256-XoGha0DyrtrGXW72Zvnk1FrvULPMYc0FvQj4JFSKxXo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 3b19adfa17190..2a98995b5d599 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -60,6 +60,7 @@ self: let else super.org-transclusion; rcirc-menu = markBroken super.rcirc-menu; # Missing file header cl-lib = null; # builtin + cl-print = null; # builtin tle = null; # builtin advice = null; # builtin seq = if lib.versionAtLeast self.emacs.version "27" diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix index 04a105ed5145d..7473a8587929e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix @@ -2,11 +2,11 @@ trivialBuild rec { pname = "ebuild-mode"; - version = "1.60"; + version = "1.61"; src = fetchurl { url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; - sha256 = "sha256-XN+RLVff4yvxjaAuNjUgSOzU0KdnVGMt9B78rfW389g="; + sha256 = "sha256-/n3gs99psdiCA1Kjtljfx9T5anGPphtsMIC2nOCv0wk="; }; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 21d286ff3a2c8..d6ce650fb8ad1 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -7,7 +7,7 @@ , patches ? _: [ ] , macportVersion ? null }: -{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, substituteAll, ncurses, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, m17n_lib, libotf @@ -67,7 +67,25 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation pname = pname + lib.optionalString ( !withX && !withNS && !withMacport && !withGTK2 && !withGTK3 ) "-nox"; inherit version; - patches = patches fetchpatch; + patches = patches fetchpatch ++ lib.optionals nativeComp [ + (substituteAll { + src = if lib.versionOlder version "29" + then ./native-comp-driver-options-28.patch + else ./native-comp-driver-options.patch; + backendPath = (lib.concatStringsSep " " + (builtins.map (x: ''"-B${x}"'') [ + # Paths necessary so the JIT compiler finds its libraries: + "${lib.getLib libgccjit}/lib" + "${lib.getLib libgccjit}/lib/gcc" + "${lib.getLib stdenv.cc.libc}/lib" + + # Executable paths necessary for compilation (ld, as): + "${lib.getBin stdenv.cc.cc}/bin" + "${lib.getBin stdenv.cc.bintools}/bin" + "${lib.getBin stdenv.cc.bintools.bintools}/bin" + ])); + }) + ]; src = if macportVersion != null then fetchFromBitbucket { owner = "mituharu"; @@ -112,25 +130,6 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation done '' - # Make native compilation work both inside and outside of nix build - (lib.optionalString nativeComp (let - backendPath = (lib.concatStringsSep " " - (builtins.map (x: ''\"-B${x}\"'') [ - # Paths necessary so the JIT compiler finds its libraries: - "${lib.getLib libgccjit}/lib" - "${lib.getLib libgccjit}/lib/gcc" - "${lib.getLib stdenv.cc.libc}/lib" - - # Executable paths necessary for compilation (ld, as): - "${lib.getBin stdenv.cc.cc}/bin" - "${lib.getBin stdenv.cc.bintools}/bin" - "${lib.getBin stdenv.cc.bintools.bintools}/bin" - ])); - in '' - substituteInPlace lisp/emacs-lisp/comp.el --replace \ - "(defcustom native-comp-driver-options nil" \ - "(defcustom native-comp-driver-options '(${backendPath})" - '')) "" ]; @@ -144,9 +143,10 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation ++ lib.optionals stdenv.isLinux [ dbus libselinux alsa-lib acl gpm ] ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft - gconf cairo ] - ++ lib.optionals (withX || withNS) [ librsvg ] + [ libXaw Xaw3d gconf cairo ] + ++ lib.optionals (withX || withPgtk) + [ libXpm libpng libjpeg giflib libtiff ] + ++ lib.optionals (withX || withNS || withPgtk ) [ librsvg ] ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 @@ -178,8 +178,10 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation then [ "--disable-ns-self-contained" ] else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" "--with-cairo" ] - else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ]) + else if withPgtk + then [ "--with-pgtk" ] + else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ]) ++ lib.optionals withMacport [ "--with-mac" "--enable-mac-app=$$out/Applications" @@ -189,7 +191,6 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-native-compilation" ++ lib.optional withImageMagick "--with-imagemagick" - ++ lib.optional withPgtk "--with-pgtk" ++ lib.optional withXinput2 "--with-xinput2" ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars" ; diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch new file mode 100644 index 0000000000000..98c6da305145d --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch @@ -0,0 +1,16 @@ +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index a5ab12ae38..e33e71cb55 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -178,7 +178,7 @@ native-comp-compiler-options + :type '(repeat string) + :version "28.1") + +-(defcustom native-comp-driver-options nil ++(defcustom native-comp-driver-options '(@backendPath@) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. +-- +2.37.3 + diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options.patch b/pkgs/applications/editors/emacs/native-comp-driver-options.patch new file mode 100644 index 0000000000000..58eee35aed0af --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options.patch @@ -0,0 +1,19 @@ +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index 2c9b79334b..50c6b5ac85 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -178,8 +178,9 @@ native-comp-compiler-options + :type '(repeat string) + :version "28.1") + +-(defcustom native-comp-driver-options (when (eq system-type 'darwin) +- '("-Wl,-w")) ++(defcustom native-comp-driver-options (append (when (eq system-type 'darwin) ++ '("-Wl,-w")) ++ '(@backendPath@)) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. +-- +2.37.3 + diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 54625d75e5c53..5b6f5d0098203 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 424295b12c985..cc3b39ed4bf78 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -1,19 +1,17 @@ -{ lib, fetchFromGitHub, rustPlatform, ncurses }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "hexdino"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "Luz"; repo = pname; rev = version; - sha256 = "1n8gizawx8h58hpyyqivp7vwy7yhn6scipl5rrbvkpnav8qpmk1r"; + sha256 = "sha256-OFtOa6StpOuLgkULnY5MlqDcSTEiMxogowHIBEiGr4E="; }; - cargoSha256 = "01869b1d7gbsprcxxj7h9z16pvnzb02j2hywh97gfq5x96gnmkz3"; - - buildInputs = [ ncurses ]; + cargoSha256 = "sha256-lvLiRQNH3rpu+JTXWhQtXczmGRWGtnnLDknZaMp3d0s="; meta = with lib; { description = "A hex editor with vim like keybindings written in Rust"; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index fde3e52632e8e..a28029888bb03 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -63,7 +63,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec { mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname}} cp -a . $out/$pname - ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png + [[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png + [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg mv bin/fsnotifier* $out/libexec/${pname}/. jdk=${jdk.home} diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index a197ec3bf9ae4..3908bd1d9efd3 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -57,11 +57,11 @@ "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2021.3.1", - "sha256": "b7d41c4362e71f30adeaed9f0ec30afd5ac0e6eea9650ee4a19d70a5783db3e6", - "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1.tar.gz", - "version-major-minor": "2021.3", - "build_number": "213.7172.958" + "version": "2022.2", + "sha256": "aaee4d2bb9bc34d0b4bc62c7ef08139cc6144b433ba1675ef306e6d3d95e37a1", + "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2.tar.gz", + "version-major-minor": "2022.2", + "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", @@ -176,11 +176,11 @@ "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2021.3.1", - "sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd", - "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos.dmg", - "version-major-minor": "2021.3", - "build_number": "213.7172.958" + "version": "2022.2", + "sha256": "4e36c60d281596c220287ab2191165be37ef01c3c54ab5f5e4e535c8b81bc754", + "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos.dmg", + "version-major-minor": "2022.2", + "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", @@ -295,11 +295,11 @@ "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2021.3.1", - "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos-aarch64.dmg", - "sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70", - "version-major-minor": "2021.3", - "build_number": "213.7172.958" + "version": "2022.2", + "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos-aarch64.dmg", + "sha256": "bdc83d9c7a3430cc2b0b0361a9e4eab82e951bfe87f0e4754106d09850947077", + "version-major-minor": "2022.2", + "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index c9af2f89627fe..3f874f896a4ec 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, gitUpdater , rustPlatform , cmake , pkg-config @@ -23,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "unstable-2022-09-21"; + version = "0.2.4"; src = fetchFromGitHub { owner = "lapce"; repo = pname; - rev = "c5a924ef34250e9117e2b57c19c1f29f6b9b3ea7"; - sha256 = "sha256-0nAUbtokDgSxPcJCa9xGM8Rpbu282o7OHAQtAfdNmJU="; + rev = "v${version}"; + sha256 = "sha256-A0HeZB022GFrZFkdcSuzUmNBxxZHKCcqtTUh5MbGsEg="; }; - cargoSha256 = "sha256-uIFC5x8TzsvTGylQ0AttIRAUWU0k0P7UeF96vUc7cKw="; + cargoSha256 = "sha256-XracOWjkFZiv5bc3Xfm8sRta6CdO5rjrYAzRs3JT0rc="; nativeBuildInputs = [ cmake @@ -75,6 +76,10 @@ rustPlatform.buildRustPackage rec { categories = [ "Development" "Utility" "TextEditor" ]; }) ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "Lightning-fast and Powerful Code Editor written in Rust"; homepage = "https://github.com/lapce/lapce"; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 0502e79cb5d18..01a9cf98954b9 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -55,7 +55,7 @@ let postBuild = lib.optionalString stdenv.isLinux '' rm $out/share/applications/nvim.desktop substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ - --replace 'Name=Neovim' 'Name=WrappedNeovim' + --replace 'Name=Neovim' 'Name=Neovim wrapper' '' + optionalString withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 77b41ea610dcd..2d6f5eb8f3ca3 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-ZjDvAN/NNz1GY7/0eKlxogYPg2Ba7Ncg6TXyKQEdWrU="; + sha256 = "sha256-0ZmyEtyVpqQ05FOYdFbnFqfPJKNkrweflSl+irOzcuk="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index afb48ad65f4f6..574d83f1be974 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -1,7 +1,11 @@ { lib , python3 +, fetchzip , fetchFromGitHub , wrapQtAppsHook +, qtbase +, qttools +, qtsvg , buildEnv , aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries @@ -11,18 +15,29 @@ python3.pkgs.buildPythonApplication rec { pname = "retext"; - version = "7.2.3"; + version = "8.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "retext-project"; - repo = "retext"; + repo = pname; rev = version; - hash = "sha256-EwaJFODnkZGbqVw1oQrTrx2ME4vRttVW4CMPkWvMtHA="; + hash = "sha256-22yqNwIehgTfeElqhN5Jzye7LbcAiseTeoMgenpmsL0="; + }; + + toolbarIcons = fetchzip { + url = "https://github.com/retext-project/retext/archive/icons.zip"; + hash = "sha256-LQtSFCGWcKvXis9pFDmPqAMd1m6QieHQiz2yykeTdnI="; }; nativeBuildInputs = [ wrapQtAppsHook + qttools.dev + ]; + + buildInputs = [ + qtbase + qtsvg ]; propagatedBuildInputs = with python3.pkgs; [ @@ -32,14 +47,19 @@ python3.pkgs.buildPythonApplication rec { markups pyenchant pygments - pyqt5 + pyqt6 + pyqt6-webengine ]; - postPatch = '' - # Remove wheel check - sed -i -e '31,36d' setup.py + patches = [ ./remove-wheel-check.patch ]; + + preConfigure = '' + lrelease ReText/locale/*.ts ''; + # prevent double wrapping + dontWrapQtApps = true; + postInstall = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") makeWrapperArgs+=( @@ -49,9 +69,11 @@ python3.pkgs.buildPythonApplication rec { }}" ) + cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons + substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \ --replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \ - --replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg" + --replace "Icon=ReText/icons/retext.svg" "Icon=retext" ''; doCheck = false; @@ -63,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Editor for Markdown and reStructuredText"; homepage = "https://github.com/retext-project/retext/"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ klntsky ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/retext/remove-wheel-check.patch b/pkgs/applications/editors/retext/remove-wheel-check.patch new file mode 100644 index 0000000000000..d736a3c3ccc9c --- /dev/null +++ b/pkgs/applications/editors/retext/remove-wheel-check.patch @@ -0,0 +1,28 @@ +From f07d08d3056c46f62674f65eabae0efa2b65d681 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Sat, 15 Oct 2022 16:53:27 +0200 +Subject: [PATCH] disable wheel check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index a9cae37..e0e1e5b 100755 +--- a/setup.py ++++ b/setup.py +@@ -101,7 +101,7 @@ def run(self): + + desktop_file_path = join(self.install_data, 'share', 'applications', + 'me.mitya57.ReText.desktop') +- if self.root and self.root.endswith('/wheel'): ++ if False and self.root and self.root.endswith('/wheel'): + # Desktop files don't allow relative paths, and we don't know the + # absolute path when building a wheel. + log.info('removing the .desktop file from the wheel') +-- +2.37.3 diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 6a0f498fa5543..96fb32e80f368 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - hash = "sha256-BaTfebLilUeDNtCJZmgAx+hN+L+4MtnuL6t3wQRX/Ns="; + hash = "sha256-3w9JKX0tT5J3tJthIxJ+ZMlG8+gEeQAl9Gn+Zyjhmt4="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9486403c92364..0e7f5ecb3ed8f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-09-30"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "98c99cc950f147a877d56a590d92b357c24086b9"; - sha256 = "06q4riwy7gdmcrqjqnsgw98r382jwsk5qn1f43pg04cwdaksjy4k"; + rev = "1704623395dbd6b42d999d378f14887aa6a8e704"; + sha256 = "0bkvrhpbisrn5bvpy7aknzr0b8c4hppszv82iiqmag9y380gkxqp"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -113,12 +113,12 @@ final: prev: Ionide-vim = buildVimPluginFrom2Nix { pname = "Ionide-vim"; - version = "2022-09-02"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "a0685e9184c75beb6c608d783389d95446775c93"; - sha256 = "0y3amhzsnzanibq4i6im1p7ha8li115mjscfywc91v3zk9zim22i"; + rev = "a66845162ae4c2ad06d76e003c0aab235aac2ede"; + sha256 = "1hiq3h2ahwzfhci9lmxg3if78h7kb8cn6sab356qzyh6z2saxcvm"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-11-10"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "f92c7fce6a8ddb5b5b906d5cf7a2985b4741b9a8"; - sha256 = "07sjzaxa85zzxskq1247124x9519pz5g2s78n2h7z4hkixrd6g63"; + rev = "39260e77f7471da2a14182f83ac58e1d2b1ff5be"; + sha256 = "07jqpm7vhm10pjni0i4q0bjzf5mahi9rvz698cj66idzkmz2i89k"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-11-19"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "e40635a03538f73e67e68a18c82c63fe1832e304"; - sha256 = "0d3d02fylm4ng67yx1k67hb9gfrj9msbwxn3sd5vikx1qhgsfzvv"; + rev = "3ac0fe27ccc0bebbcdc419de7654e06a41b7c803"; + sha256 = "17s5gfscg6bvaks7d7dgsaf04y6rall4hcicvi02im9iwm49srdh"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-11-16"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4b42ddbd453caec3b12541af80e498a02d47cf20"; - sha256 = "0r3giqdvdpi3066ky4yib4lv36xy7cvsk3ry8j339ghiw00rjfv4"; + rev = "38c6fe1c199b8f35918f7efc09cae3f8af56fd68"; + sha256 = "0p5b05psbhm5aig4106vc6cd795zqwnc0blnngi3jb1snvzb22a5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -535,12 +535,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-11-07"; + version = "2022-11-25"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "4b433e5693ccec8e408504c4b139b8f7cc6a4aa3"; - sha256 = "08ik0a5g54m295pqyxfzkgav9apyqrchbfsxssb8hjgq3sl00vjv"; + rev = "5ce2bf84ca00cee8f375f108952789302980ae57"; + sha256 = "0494g5nd7289zvmk5k0x7wh1psiwdx3vnhzjz7sf3rcxi8nifc7g"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -559,12 +559,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-11-14"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "a858e4e7b0805835e61fab2b54704450427d47c3"; - sha256 = "0lcdywjbnh2rzjpyk9834invl8a8svmm2xwpmybdx1wrx9q6iip9"; + rev = "21a0f2520ad3a7c32c0822f943368dc063a569fb"; + sha256 = "1s9ywy69kap0gngpm5xnfkwlrb2apci9xv2ahs2xhhkjncqm38mq"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -643,12 +643,12 @@ final: prev: asyncomplete-lsp-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-lsp.vim"; - version = "2021-12-17"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete-lsp.vim"; - rev = "f6d6a6354ff279ba707c20292aef0dfaadc436a3"; - sha256 = "1y0wpq982nw0ibqhvcvb7md58jvadygkxc1ibg99zxw1kznfpla6"; + rev = "cc5247bc268fb2c79d8b127bd772514554efb3ee"; + sha256 = "1lyl4k10fxv8h0b84x17yfxdrm00aw38vmckmpgd3bgdz35h1qa9"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; }; @@ -667,24 +667,24 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-11-18"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "6d5e981c56a9fec9e5b617eaaad3d302bfe18dd8"; - sha256 = "11qyggn16ghpa272nv9qflf0xbqn0n36qbmv8w4mmphpcf5mq6yz"; + rev = "ea59f760c223100edcffc52ffe019f502a792039"; + sha256 = "1pkqfwkmj8yzq2nx61k35xzvx4pm8qf07337q2fdi9sna734m8dw"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-11-10"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "9053c97fc77ac3335761527d4431f936631e3a24"; - sha256 = "0jm4grwgz6wql22d3yqpmayqg0vnssdcp19csgvcjac9lrxl0m9y"; + rev = "784a4b1f75a913cc6c43dd6c4dbe69d648dbbfa5"; + sha256 = "1mwabzkdvikyy41f7q6nqym28y93v4jmjvlkak9i2rb2l4lx5ski"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -751,12 +751,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-11-18"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "04bae4b2b531f0420824acd8d411129712da96e3"; - sha256 = "044iwsa1c95354l470kakrd77bnp6xbl87bhxydmlzjfwpshs89i"; + rev = "da03666a61af32eb0f57b37f18c020a3a33a44d4"; + sha256 = "06ygwxgxzrma96waa3dc8sk258kfv4gjdjf80lg5sc41iv972x6r"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -799,24 +799,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-11-18"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "36ed977ab56d3718c41f078d01db9b218d11250c"; - sha256 = "12b2ngkcgd89ky1dnqsfyv9x0qm7lw48wrf2pr6l1ddx2izlf7pq"; + rev = "9347ed838e0bfd8993d29eac1294f82b8e04c0c3"; + sha256 = "0iyxsvp2n2achwc8pxwb554wkv5dhsnblgydrh8wwkdld6116sva"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-11-18"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "f13fad8217cabea67e4d06a82bba79fdcc56344b"; - sha256 = "103g4lzyd6amygksafhxb08ll74a33ahp66di9x7r0b7jqw53ym4"; + rev = "2a8bff5c47ae7ef3ee2d362634be2d143948dc38"; + sha256 = "0ncqyb5a5mxhzj3mpsn11342mbl0m54jfqga90ds5430d02mm6fb"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -941,6 +941,18 @@ final: prev: meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; + bufferize-vim = buildVimPluginFrom2Nix { + pname = "bufferize.vim"; + version = "2022-06-25"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "bufferize.vim"; + rev = "013857c12340bc14e285727eaf7d0bfb9807c768"; + sha256 = "1f4681p7zxchzi628n633j54y6mw13ayjcw0sf6yy2iywrrppdfy"; + }; + meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/"; + }; + bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; version = "2022-11-16"; @@ -1003,12 +1015,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-11-09"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "da5ed534bf401819eb4bc6a78c11c11b8bf3fb65"; - sha256 = "074c56gwg91jpn66rrxf05m89kx1l0is96lm2pffi35ig67c45px"; + rev = "db80a70d5fc66e0700bc7c05f19da45221851bd0"; + sha256 = "06cdbbagfabgarykcj75hs7b1v14p4ssp8p75n6gxmfjhapdsmir"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1051,24 +1063,24 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2022-11-09"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "67bc0cb720ed2f6d57073b24a7c1cf0531f2ce7e"; - sha256 = "0q88yjssn4mm7m2fbddlp2yvixrfdmf5b8hrrq9zknx6q0b7bwpb"; + rev = "91ae7e0ddf95e1984528cf3129879f4841bcbc82"; + sha256 = "0wmy9h2m4zdqaw7cmg1dz5w8l0x5269is0r8bb3ns7clilrknjhm"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2022-09-01"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "e25b6a54e5cf648eb36d5be5b82c1bbb22260fde"; - sha256 = "0ik55akiyivq70a0jds35f8jqvs78mzxq3b302vhyq07w44mk7vx"; + rev = "d866f31a6b1cfc725dd015293e0a275a6ae9beb0"; + sha256 = "1fz1mjk049b2f31ymk4ph287km8q3yan9xm5ipj41mjwaavdmzi3"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -1159,12 +1171,12 @@ final: prev: cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2022-11-13"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "8bc9c4a34b223888b7ffbe45c4fe39a7bee5b74d"; - sha256 = "0rx8ncap1dfrgwkx1wsmhybr6cs1kdh0li5hssbhws2d6igij8zq"; + rev = "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063"; + sha256 = "0vffivj94736njjhlazrs0jkc1nyvcdjpw64w38d1lhlyflf4cl7"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1231,12 +1243,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2022-11-01"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "c942c48eaafe1d9c5a5cdc7f7299336bd60e24f5"; - sha256 = "13rrqcxhif7990575vsccadzz011zjhy1qbwspyhisffz13isbcv"; + rev = "b7c0629e10c8a3a10311aa4ad952d207509d5e67"; + sha256 = "1hs3pying86zbrk3vnrpv4nfa8nl8b2ify5wks8675x5rc9z8iyh"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1279,24 +1291,24 @@ final: prev: cmp-fuzzy-buffer = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-buffer"; - version = "2022-11-15"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-buffer"; - rev = "7fdc50bedc9fd0f3bc10a2110285e5715fe2de15"; - sha256 = "0dj07y6z6p20qw2kc2js8rxwrwb48jrzgxh6jqd2410h4gw4zndf"; + rev = "471949d19b1246f069eaf50729b39231eab3221b"; + sha256 = "1l10acnb8rxis7hs1a333b23cfcjllwzr98cn9xh18mrh77my7w5"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; cmp-fuzzy-path = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-path"; - version = "2022-10-30"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-path"; - rev = "18ee8f81ab704f3f6656cfe52180dec6f7b497a7"; - sha256 = "15yivkvjsx3yfgf5i485q4kxmfmqghfqsi869wifff7v0x6y9ghk"; + rev = "28735cebc314f0b080a41350adae8612b6fc7814"; + sha256 = "0jwr9xb0axs1i3xk0z773jrp77jy1a274pwwd09lradm4rfa052q"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; @@ -1531,12 +1543,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-11-13"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "0f56fc14792602da05ac17517c755bee9645a9a7"; - sha256 = "09c3jwrraq1m9yyiwsr1rh3a7ixilmx2v85nd1haaclb6dfd5x10"; + rev = "851fbcc8ee54bdb93f9482e13b5fc31b50012422"; + sha256 = "1ll0m244zvfj5xbic7dda8s42hfk0g64p6rqani335fiznf9gijw"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1603,12 +1615,12 @@ final: prev: cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; - version = "2022-10-17"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-vsnip"; - rev = "1ae05c6c867d9ad44bce811056e861e0d5c531cb"; - sha256 = "1cqb21a180lvkprixibr1i42zxswxmzxa3zp6w8n262kfqgnl2v3"; + rev = "989a8a73c44e926199bfd05fa7a516d51f2d2752"; + sha256 = "1hs1gv7q0vfn82pwdwpy46nsi4n5z6yljnzl0rpvwfp8g79hssfs"; }; meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; @@ -1675,12 +1687,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-11-08"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "cdb82f176b13d4be5bed05c586ac1f141306a09a"; - sha256 = "1cfxzrir827wa3mnbg3gjv4n0afk220r0v55ajqqy8r5aycd68w7"; + rev = "13da36309878d1f3199877a33badeca0fdf7543e"; + sha256 = "12p7qbqvqm3pj2pbvm3vg1q84kd15n1qhw720gd1nfxm0ybfxgfc"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1723,12 +1735,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-11-19"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d227a0f0f15e1d9c7d3bb00628190ab153d13586"; - sha256 = "1zsy0i6i758g9bxjg6s0lf2zn7i42z0i7nk8fjs0vhn2wsi2nakz"; + rev = "2c4d06e9fc712b259ae2320020818fbf4c533273"; + sha256 = "0b5fq7p5ddydxk1zy1s2b93x019n5mxn7vma3ij4ry9lhc1sqxi3"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1963,12 +1975,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-10-08"; + version = "2022-11-26"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "839fe23a7746f03aa9ef1ebf087501cd6126cf0f"; - sha256 = "1009jc5zz20hfi8g7j4znnrwm6jdj6041a24i3ayklgl5dqw2519"; + rev = "0be93ef60f075a247bb5de9e29d447dc8a888ff0"; + sha256 = "07nzyswzd8bidx9by7lf60dcz51f1klfz0wnc2gfx5vq7qy3jjpq"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2011,24 +2023,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-11-19"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "3ba5d159c41915cb882781bd06f26f351338e54c"; - sha256 = "0kkkj677z3p89856hyhblx4zmzqyrllgfkv6glvj0cssyxs28h69"; + rev = "eea760e43c5800bbcb8d6053f5502ada3774b860"; + sha256 = "0n853wbpg02lw41lzs3c8yyq7ag363li0sslgrmli5h3fsd8d3j4"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-11-19"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "a6a52bc30497222e95f81b99df5bc4b999f75ba0"; - sha256 = "0swxylqp3bn7abxfqs66pnhidxqzbngl14cv2373603xmbflkfj2"; + rev = "ed621364ec22289e912f680b9e5adc17be5af817"; + sha256 = "1xwnv4agszdqj7izspgzy8qsyhdzg8ydamrpn51611aafxzz74vm"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2047,12 +2059,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-11-19"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "07d1b5582e0b327becc9bfad7979699caf1da68a"; - sha256 = "109iddmkr5jw583jqs38vdskbsfm63ph489q6pyfvpf68a6jr1nc"; + rev = "61ba300a71bf274af5c7a5069ab102729af79297"; + sha256 = "0718b7fpl10hpsaw09c4ylkxw8dflb0s2b449q8b8dcwqpgssm51"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2119,12 +2131,12 @@ final: prev: csv-vim = buildVimPluginFrom2Nix { pname = "csv.vim"; - version = "2022-08-30"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "2fcac7660734223f6cc57a3c5ec5d87e5a52d2e2"; - sha256 = "0fwxfsfnmr6jh3w3hh1lw03zapgwcsn7y5kwlvd98273qa4m290k"; + rev = "fb159987bb430bb61e07928d132e4487e54a82ef"; + sha256 = "1c6fas33baabdfsm95icbi8n84ica2hysyvkprx4zpz5zn2b8rk5"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -2191,12 +2203,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-10-29"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "1aab263f4773106abecae06e684f762d20ef587e"; - sha256 = "1w7z01r7pakz6jxajp0j3b71dcl2k7sh6g8x07kb0z1ir1lcgfh6"; + rev = "5ccce7b50c8ce81c01956864ff51b455ee6933c4"; + sha256 = "09zmv2s5fnpvjlkcy5hrjkqq58s5c10d321gx6ip7qhpaps3vgv0"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2287,12 +2299,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-07-26"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "6a5adf9a8860888076766c8a0d921236ff5deb0e"; - sha256 = "1b83s7nq4ymg3wjldfqq7in46hjylpschm1lqnfy91prg0r1djmp"; + rev = "3926c67752a14acecc293dedd1cbf9d9bfb68541"; + sha256 = "1l3xfxg9hzhvq9wi401dpfx58ajxd39f628kjca6id0rhziz8wmc"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2577,12 +2589,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-11-17"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "f32a7224096cca11c3c91b0dd412808e63f3d720"; - sha256 = "0a5dwjqnnpn05mvnz7khgy2mzqrxc0fbhm2iz8dwj5r4zjx1wg38"; + rev = "6a82dfcb59f0af1e814f34bf8344d68afe8618ec"; + sha256 = "1yggvdb0mzcimpv83jbrvyvp1m6k31i67dq05grwq879dr05igm9"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2613,12 +2625,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-11-10"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "fe57c180fd7fdea39bc0d85bac9252aa6a8645e8"; - sha256 = "1jac9pmg9sn28x62xx6n5brzycmgfsb825dfsh6mkny425705zsm"; + rev = "3023bc68d286676115b660142fe126fc5a4374ae"; + sha256 = "1c7swpgbwss6f39c28p4gh5di153k7x3ycpkpx99qn8pjg27cfiv"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2637,24 +2649,24 @@ final: prev: echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2022-06-04"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "945cdbbbd0e3c93d6514c0283425c32c35cddb17"; - sha256 = "0jqy96mc5kdgh7gxcxlgl94fvaxgazhkwkydki78vpgszvshrbry"; + rev = "8c7e99e825f9643627f169f3f45a43a3aae21901"; + sha256 = "0spgv2ml216s4zj5sgwny2l47jamh3gi86f4iy9p81gmfgvfpm1k"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-11-13"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "b0b61bc4b6c94ea487fee0e9e33725c45711e32f"; - sha256 = "1wpai52r4486fpz8ys5lv71sj2kmjhhn3knj01awrincgzkql7w1"; + rev = "2c8026cd5b1eaca890739799dc57ca8d3ca733b0"; + sha256 = "0dvfzkz8kr39w18jhms1y32lngwibicgbh9w8hgn7r203f6g027l"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2735,12 +2747,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-11-13"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "03dec15a3b2c05758d8969ed1d736fb682dc88ee"; - sha256 = "09yrzs23p9g9cg4ycppaz1rqmhy5a2i8iwinb35i53f8z6qycl2w"; + rev = "d855af543410c4047fc03798f5d58ddd07abcf2d"; + sha256 = "0sjy8gpmcfs2byj23bnscfjawabdbkj5nqk0mkhax3p1kcvcm1fx"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2843,12 +2855,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-10-25"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "2cf9997d3bde2323a1a0934826ec553423005a26"; - sha256 = "04y9lm3cm4ik0hi5b95p1wch6l460wn29dxcrn9abqbsfzwnv3d7"; + rev = "44585a0c0085765195e6961c15529ba6c5a2a13b"; + sha256 = "112mjmy2nrqwj3l9dp3gzxsygaidcdrz2l6vzn27k1a57a7jyb8l"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2964,12 +2976,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-11-16"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ef8caa5002e53977779ce8ab18a9c393ed624386"; - sha256 = "1kb3gh0qlbc75qkwy3ybhgsm9gcwbdba75ffhpcbifd6s6rdfj0n"; + rev = "b4f857a1d94d05e747951b1e8cb1a6c567396898"; + sha256 = "1z4nkk846dh3c8rj7dliw42vz6fwhj7rf1gwjwa4s7nk8f6xq545"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3072,12 +3084,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-11-10"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "0c6e614eeeb34ac9a7e1143861435609d1c65ba1"; - sha256 = "1mczan3wsdb5in33xdkz98x7s23pcw1r7403sd1mdahj72lqbslz"; + rev = "0c8b3389ec433089ebbe9d138c2ec20a6a542ce0"; + sha256 = "1x70d6k7z9q1dnif67359xm86k9fhb8lbycm5rywh1a39c5skbg8"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3228,12 +3240,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-11-09"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "9ff7dfb051e5104088ff80556203634fc8f8546d"; - sha256 = "0cfssyyhcjndwr2xlk91rxzyir4ng5hk1f4fgij5hgrhhh3wgjdv"; + rev = "d076301a634198e0ae3efee3b298fc63c055a871"; + sha256 = "12990v2zcsas8575nf6ln1byw3zg473s5jpizk4g3v9ikfdvjbfr"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3264,12 +3276,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-10-07"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "9038d7cdd76a930973b6158d800c8dbc02236a4b"; - sha256 = "0x49l7g84m1328fqad501f4iqqy3imbl8r8rh4rxsi1zam46f2ba"; + rev = "20d1cd087f8728f21a048a3b6259f6177237b39e"; + sha256 = "0zklzx2k85zyxn866xbhd6rnifc885rn68bnv1x945z34pj4m3xc"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3372,24 +3384,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-11-13"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "66f66f64788f66c8101aa35344dd005143356b6b"; - sha256 = "1issvqjvqix7c5iwlyffl52qpiz2c997pddkrwy4rmd8d2n0yclh"; + rev = "af9a1d60ca4d7e2ca34c55c46d1dbea0769d9244"; + sha256 = "11lvqr8g9rwkpb768l2pc65j1r55lrb7410hbprca5qdcpz3n720"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-11-14"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "5ac400bbd7bbe5d5911a79c45347df6d3afd388e"; - sha256 = "0r3bqlw9i1m1x5anmjcaxgx6iscd3347bc7yp47vg9bywwa4if5d"; + rev = "02a9182c66a8347d8328a32d58535dfb9785f6aa"; + sha256 = "0dwi86i6bzzbhblr8whb2bnkra4lv5zm0xvyfjn1s0qj5gs3ammw"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3443,24 +3455,24 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-10-06"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "4dfe94e633945c14ad0f03044f601b8e6a99c708"; - sha256 = "1jr4k56glyd98lk19dj9r7i8zx72hhzn5lz1w846ffvsci5ffw1g"; + rev = "21d0d1bfa3000e4384740bfaefa0ebc51c773786"; + sha256 = "16idy8a2ar2gc7kdr888wwlyw4m48kbw2yzflz16fbdg56krb43d"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-11-19"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "146a4427391df19001cc1d9f9db8f7f31fbce2a9"; - sha256 = "1306hq56lqf7cid3dhfcdbsl6chxw0dxqi70d3z2ifzakyy8anfn"; + rev = "9aa1de666b94ba31a3527f3316a202542bc528c9"; + sha256 = "1c54bk8125a5bjra58h2fkpmcv7p1kgpjdq62rkdhl7ygqvp59r5"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3586,12 +3598,12 @@ final: prev: hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2022-11-19"; + version = "2022-11-20"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "96119af8ebaf0f55567108638c662784d612eb97"; - sha256 = "0zix3lw4sm1j386vrbjfcxnmyj61g0qlz8y260gxhsc3vd2f5jdj"; + rev = "7e2aa29f88d534371c6b0263d3abbfac7c2376ce"; + sha256 = "0gc8gxnfvhmmhynvlm7dyjps3hl2lv14z70ngwdzg5pkxk5s5qmg"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -3610,12 +3622,12 @@ final: prev: iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg.vim"; - version = "2022-11-15"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "a94c2a9110986cbc92d2c059ee65b52b70a4416d"; - sha256 = "1aiarshkw8cs3kjfdj3v30294i7dj1x7pmv9j83wnssj7i4y6kp5"; + rev = "e01ac08c2202e7544531f4d806f6893539da6471"; + sha256 = "19a0wk1qjp385jmd3kp3r5mkmly90j0jipz64zkbpdsh0v8fvsnk"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -3814,12 +3826,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-04-08"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "e82d07faa17c3b3fe04b4fa6ab074e8e8601a596"; - sha256 = "1h5zdwfi584kgjh1mws240mgirf9ai0nrc0rx0zylvcdfk19l9v1"; + rev = "6b8013c480b54614d20e38966c4cd8ac4d20b86d"; + sha256 = "1nfz7av0cxsbmc9winy72xdcgrn1sjhd2qrfcw1gyi5hqzsdsavh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -3851,12 +3863,12 @@ final: prev: jq-vim = buildVimPluginFrom2Nix { pname = "jq.vim"; - version = "2019-05-21"; + version = "2022-11-26"; src = fetchFromGitHub { owner = "vito-c"; repo = "jq.vim"; - rev = "6e056fa297ce58d45500b0937b8214400e9a50fa"; - sha256 = "0dfsym34xiza9221bdsr51jykcxmz8bnkzi846bqxxjxiw0p3yk1"; + rev = "6ff60efab7a15c60ff073c5bb7aec2858a0bafba"; + sha256 = "0fzzqixnzhv2k8dhznn9yzx6h4ivc960dbj7qlbp3czs9fvs8x76"; }; meta.homepage = "https://github.com/vito-c/jq.vim/"; }; @@ -3887,12 +3899,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-11-09"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "52cfa270317121672c1416c725361fa653684de0"; - sha256 = "10wz64aks52bmhxgg0hv84zmbqfbrh9sfjcsa8ygiq38fc568g1r"; + rev = "fb733c1043a462155b52cd97efd920f1dd72d33a"; + sha256 = "1spaavmjxfnm30ks0c46i95zck967xl00cnzyclf3l8k0mzmq6kk"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3995,12 +4007,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-10-29"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "60d71f31b895cc1a1cb319f780df44de7664f0ee"; - sha256 = "1x1rdcxh2ga35x527f7csp0sfif7zrb8j4q1lsmvvzvi41y6rq70"; + rev = "9fad72569b54f067b6ad0bdafd47ce7b23578b79"; + sha256 = "1cvj59v267av6lh2wzpmqd05pa7fjvfprbs2r7gql6gr992x2s59"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4031,12 +4043,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-11-19"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "cd90202232806ec2dab9c76c7287bd2190a17459"; - sha256 = "0fk686d4hs7ld4a85gfhqmd4nk9f951bjjhkknbkkq0rijdrpysa"; + rev = "f7391b5fe9771d788816383ee3c75e0be92022af"; + sha256 = "1xxlpz6y66h8xs8bfl0bq46gkhvdi275vsmrwbac1lwk76v9b8kq"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4079,12 +4091,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-11-18"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "984ea9552fce06d24afee3d9051813a7433e1439"; - sha256 = "0nb2ik2dx0akilfdfff3sjk2pfbrscih5rrr0dy0kxk1c86fdpqx"; + rev = "36781e59099b9b46eed564283b95938f90cd852d"; + sha256 = "1p9x56iw26kkkv3dk6z8kf1bhsysr72gsc2x1ki2mhlf2i15axbn"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -4139,12 +4151,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2022-09-06"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "8b6e29e65e9711b75df289879186ff3888feed00"; - sha256 = "0lmrqv20qxiiipljkybpv3m1jsskddks6h92i6hrfldvpn1a8vx3"; + rev = "b6773302598503da8f6cb32aa47c96ff456dbdac"; + sha256 = "1g2afxk8gi09v6j6hddymis2xvn1d20ndks0mjzc0lwrr3yvwzkv"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -4223,12 +4235,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-09-14"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "c1aeb96fae55bb6cac3d01ce5123a843d7235396"; - sha256 = "03fia0m7w2q20m9jvm4wdm6w5bfh976fm0d7h4n055hbqgy73qf9"; + rev = "806651bc22cc1aa0053fba4385a18800f576cc6b"; + sha256 = "1xi2l412637vkp79338p65xb4zm0licyzrp188s2rijjqf3g2mzb"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4319,12 +4331,12 @@ final: prev: lsp-format-nvim = buildVimPluginFrom2Nix { pname = "lsp-format.nvim"; - version = "2022-09-05"; + version = "2022-11-25"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "b611bd6cea82ccc127cf8fd781a1cb784b0d6d3c"; - sha256 = "1sx09l5c8xi9n4nbnmwn7hx0wzsih3kdavgdygjckknjl1261bm1"; + rev = "ca0df5c8544e51517209ea7b86ecc522c98d4f0a"; + sha256 = "1c4hwd1v72scdwh5ydcqirx7m03ngsw3mxmjvd9cd3n3n7x8rrsi"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; @@ -4402,24 +4414,24 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-11-11"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "12c0807919ae60c7bdae8c0bd0072ee9d752fa1a"; - sha256 = "00y3hb0lzqg9xs5h5whkhdvj9r0qizm0mwfwl8lqbgqhcns5ggk9"; + rev = "2f3e5745ee7a0610ffde2b4331460151d4707724"; + sha256 = "0c0ap6xkncbsvy08897ah4sw4f6s99q9m5jp0i3a0akvw3zpn21n"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspcontainers-nvim = buildVimPluginFrom2Nix { pname = "lspcontainers.nvim"; - version = "2022-10-23"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "lspcontainers"; repo = "lspcontainers.nvim"; - rev = "648dfb56195b3d4450c3974ce86fb1f2ff8b55d5"; - sha256 = "1xrf4knmddf5mhinsfjwgcgi3h1lff19ck2ffih2868kmps771dl"; + rev = "b01e19356d4a407d5d45d8f26388d59276e84929"; + sha256 = "10pb1w8z3aiyzxlix9hlaw5fr4s2p8hbmfp41slc22hykmyky8nd"; }; meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; @@ -4462,24 +4474,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-10-23"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "3325d5d43a7a2bc9baeef2b7e58e1d915278beaf"; - sha256 = "1kz3kzgz7hl27hvxqb9kdiw6y7gyc9qyd3qppm1bp3s4kxbp2fm6"; + rev = "bfa0d99ba6f98d077dd91779841f1c88b7b5c165"; + sha256 = "1yr4p08s0yll3g39k62735g0bz21v0vg5f0vxizwhyy2cx49n90f"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-11-17"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "59bb7ea0d26524cef0fce6dcf6192963ec232fdf"; - sha256 = "0lazbc8vrx17p4jc27agqqdzn4rik7r1k824s8yk8dr07134byh5"; + rev = "3fa5c8d938e4ed9dcfd3e07d13b587cba4f87e7d"; + sha256 = "0pf4z4c4iaqzh40gsc4gs55kl6821sjhyp0x8pjahl2spqxm3nn3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4535,12 +4547,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2022-07-31"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "chentoast"; repo = "marks.nvim"; - rev = "b27cbb78e9082229590b396d3ae4fe07f1aeafe0"; - sha256 = "02bhaal3lq0bly1rx2v8n14nibjnj2lsr0r2gx9xf740dchy1mjx"; + rev = "a69253e4b471a2421f9411bc5bba127eef878dc0"; + sha256 = "1df3c2apc4gsgrysdya99294c5h5lxibr9xifnv26rgbcqqk7njh"; }; meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; @@ -4559,12 +4571,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-11-16"; + version = "2022-11-20"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "36189183cee0c91fe6d9c68f6f9868418dda6c19"; - sha256 = "04yym03wainxxjy23z6hpg5p8hz2silg1s1kp70zndvwh8lvcxds"; + rev = "2a80aea83a69d54c69fa1bb9b7c27ae396bf2390"; + sha256 = "1l3vvf09wvqhrrk3ww99mc4zbajjr4hmr4g7cm8v6z71r6s0rp00"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4595,12 +4607,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-11-15"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "dd0b7f85269d544aec6dee3bf48dc44ed284c462"; - sha256 = "1y28vqp5glvdypv8ghp9x6yg7mhf74711mas16n6abn1vaimmgsp"; + rev = "d00abe8169993b95f52ff64fbfe685f353fd1c4f"; + sha256 = "1vq968253hj82bix9gs7r48dxzfhsrjdlx0ssmbv97g96qd46ai7"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4919,24 +4931,24 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2022-10-31"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "d43fa219390094ce2a8f5c929331f0a9e2f666d1"; - sha256 = "15ri234c2hfgmbd00l3yx4a3wb8nbz2x4fnk0m0s6jaw0njsas0h"; + rev = "7fb5b63881a25c3d5a8321f8dae21737a1b01634"; + sha256 = "1843wss72yisfbp1xrrl6ajvvf3kmfcg3jwjcmyqv9vrsbivvijq"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2022-11-05"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "5c209e52681db48ca714817a4a907523ee98b377"; - sha256 = "135dkpklv1pndymkjnpnwr05cah9gm4ayhzxbchx6p11lzz70h63"; + rev = "7c6903b05b13c5d4c3882c896a59e6101cb51ea7"; + sha256 = "1ycwasdl48w2rwmwq8na63dk6wb6vdx7hnrwhbyxy6z9p207wpwj"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -4953,6 +4965,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; + neoconf-nvim = buildVimPluginFrom2Nix { + pname = "neoconf.nvim"; + version = "2022-11-30"; + src = fetchFromGitHub { + owner = "folke"; + repo = "neoconf.nvim"; + rev = "681e89d58d46a7c63ee091fee32220373dda1072"; + sha256 = "000inylrbyyfc1lg1ajmi1rb2jrcisglgc44gk3cf9iv7v1515dd"; + }; + meta.homepage = "https://github.com/folke/neoconf.nvim/"; + }; + neodark-vim = buildVimPluginFrom2Nix { pname = "neodark.vim"; version = "2022-11-13"; @@ -4967,36 +4991,36 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-11-18"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "071c8895bbff0e4d1d3d4c531adfe20e3a2a6e82"; - sha256 = "0qi0wl36m152ss2ca4hshyvf529xap19dhc0k5h98blq0h5ln0q9"; + rev = "dbed20332724909b26b5b1a083303654a6c15c20"; + sha256 = "1v5x0g49wpfm9qnqdyj27m2bnx7jr2j6hq91fhkqyy13y76qjq2w"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-11-12"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "1f79f6e6b2a1e2b3ace87d4760769feb4146ff35"; - sha256 = "02vik8gfqncxjhr065sr9bw7fd9lhbwkjjkzn2j9p7y2gw0yjcis"; + rev = "a09d6ed9eacd0b81c0f8641757e60f7bb0e27f6e"; + sha256 = "1pqz1bz5nwdrm4x0p38xhabyb089spvp5khhl154k5mi6fsws219"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-11-12"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "c1a2a1aa5b4fd774dc26c53f7f256f1320c0ff15"; - sha256 = "0m8n27yb6m5ad3jhrflw0vd7kxjd4dr5liwvk9b8gz4fw598v2n5"; + rev = "74e14e3c885f0caf64004d1c1e75dcbef96e10e5"; + sha256 = "1sdv73v5wzqvfbmrlj6vmwpvgyy9afw6nji5nc1wmhw74cwq2r3a"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5039,24 +5063,24 @@ final: prev: neon = buildVimPluginFrom2Nix { pname = "neon"; - version = "2022-08-10"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "neon"; - rev = "c7834a5a8f58ef99200cafcf705d03edda26d220"; - sha256 = "0ngbwhfnpiz3dg97n1x1aiz2liph77n2x696f4brp9qy6qgh78v8"; + rev = "7765aaa7d1cd3804176140644640766e4411c766"; + sha256 = "1rdgbx76kvlzg81cn653bqg9lj52gxnf15zla1kscw7wgh6hjvyh"; }; meta.homepage = "https://github.com/rafamadriz/neon/"; }; neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-11-19"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "0b46a9ae7e40037fced280131bef7fdc25a2041d"; - sha256 = "1klw05m8wicq1jn5qscy74nl16h50hr9pk8b3wbpy77jh7a0g753"; + rev = "5a536bc033d2ac1ef49ec4c875fd9811cceccb68"; + sha256 = "08gx5y34abpfmcmhhlmb44hi380cfyapbki32pv9xspq56ng8xpn"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5111,36 +5135,36 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-11-19"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "a11933e578e85dfd2defc4f83e0b83cf400e9e84"; - sha256 = "1b3kl97v9kvqbspk6pdv9fjzp5531a4bif14vjzp66ijsihg0az0"; + rev = "a2559f07be901638d555c0d29d8ea22c81553653"; + sha256 = "177pf0ywxqmxr7472yvrmk579k5vgh5770d1j00r1d3k8yjsnqp4"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2022-11-14"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "920a68bbb4eee1f923136c94ccb29981f6cd77e8"; - sha256 = "0np8hzqjcq2k42iiwbvql3mzgnha56war8sj79dgyr02mpf43436"; + rev = "412f498d25592d57932baa938857ef542754191b"; + sha256 = "1ml10rfwm7icvvyc0zcfjnhfdnqashh94xv7yrjg4rrqfiph2zyd"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-11-13"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "88f427fbdd9ba7fe2c60f7c6e6ba68834b39ccd1"; - sha256 = "0w44z219hns0kq98v236qbdc7021aj7k6bb2y76jn6pl83bgmbkj"; + rev = "5af91fe1176e764f7706b11b43793f31635e9520"; + sha256 = "161s84kdw7xfh1sk6yalk4a0i3hpqza71lxas8v4rnrx00s2xwwn"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5255,12 +5279,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-11-18"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "d9d2cda9ff999d3bf32164029c67444071323eb1"; - sha256 = "0mkfbafrsz6zy2zamg72figqxxy6w2iq24cj7h2qsz1crc81pi9r"; + rev = "dce9cddbccc479dad170270d18f2057a637a0297"; + sha256 = "0fkgp5hd0wgcpr0pnpk8m1k3xf08p0mfahkch41z16mlach8gjwn"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5303,12 +5327,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-11-17"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "b10bbbb91215d0324d7d7f4cd0d8de3d1332648f"; - sha256 = "1yd8w7jfxyg8y8gw4sn96jnhisfvda9vs148cnszqms6n8244n4n"; + rev = "5ca31af06078d6188de7db1369c2b40d1b606d58"; + sha256 = "1a3n5341fcvjlkp3lv5x50a81z30zaxxw427dvkpjb7bp93rb8h4"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5327,12 +5351,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-11-01"; + version = "2022-11-25"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "a6bb6a8b71fdd5329d0ae0fd637e700b12e4a5cb"; - sha256 = "0p1bdpi1h4nxrpkv90xqzhlbbgndy18xg64ws7izxqhkwjm5bv79"; + rev = "4b6d4072923cfc3a3f6aea55eafd8b4ad0ddc489"; + sha256 = "1bvwhqcpdkym94wyr7jn26jd81sz5hzsikd129x22ynwakq0ajzw"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5375,12 +5399,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-11-10"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "07d4ed4c6b561914aafd787453a685598bec510f"; - sha256 = "1avfwys8lyd6fr2f7bfjr5nlvqw5bn5n5afs8j8j33r8ssi3g3na"; + rev = "d4254b19e914e6278582d4555c57eb3d2abd9590"; + sha256 = "03f7m0v5mgpwwvy1qgijiiyvrfzk5n75a1nj5snl0vl8ivancmcs"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5423,12 +5447,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-10-27"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "6b6e35fc9aca1030a74cc022220bc22ea6c5daf4"; - sha256 = "1laskay0f6rf9283cgiv1db3ph4imzyfk10j0wn6f8zsm8n13m1v"; + rev = "99f696339266c22e7313d6a85a95bd538c3fc226"; + sha256 = "1pv3hfaxd7yifx0n9643wcb9skrqrkzx5x545x944y23xvwvv9di"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5459,12 +5483,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-11-18"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "324701806c681d43dc4d7a6a777037af4d5f5ce3"; - sha256 = "16kgzr0fzgl6mw11akzn6pg9sk1h8gvqh9rh9cvv4zh7g41nk77z"; + rev = "448fa92e7f3838e3b5adbce58b55c5f97a6d2cec"; + sha256 = "0b5byaa8l3yhxhcivp62mpcnwr8ix7k98w68ifhlh5ynfk20zf1j"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5495,12 +5519,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-11-18"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8a9e8a89eec87f86b6245d77f313a040a94081c1"; - sha256 = "1gkm3pl06xvzxl5phk2g2hg8zqdpznn3jd5hjjspjfycgwscxbsx"; + rev = "93f385c17611039f3cc35e1399f1c0a8cf82f1fb"; + sha256 = "0c9931rb4pf9vj51gqxizvbamq9ycjzy08vq2arm1jkrrr8fkmfc"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5603,12 +5627,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-11-05"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "61643680dcb771a29073cd432894e2f81a7c2ae3"; - sha256 = "0qcf6rsg610wcyz4663jjl0d6570pyxg66x6k01yyxbjsqv0jdzm"; + rev = "f0573ea26f29702ad9aa1546e102adb2f5b7ac3a"; + sha256 = "0d5ng7ffamh24bacyr4xgw393cm55x62f3m9cly8rzd38y7glpvi"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5639,12 +5663,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-11-19"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "aec0163784ac3c6d25c3735fbabdd5b294f21670"; - sha256 = "1if4ccvc1v0ljh9y8ivjxjxa22rrsfzxjiwhims8yk36r4jc3drg"; + rev = "54365d2eb4cb9cfab0371306c6a76c913c5a67e3"; + sha256 = "03i5n19q7hylnd5cb0plq7qmf21v5nq9l750988c97sfas5hwmqn"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5687,24 +5711,24 @@ final: prev: nvim-fzf-commands = buildVimPluginFrom2Nix { pname = "nvim-fzf-commands"; - version = "2022-03-31"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf-commands"; - rev = "015e77ea3185ca9175544e879e2cbb2cfb08323f"; - sha256 = "1w6s1kl83fyvwycym3i5azcx4q5ryzsjszh6wvk5pxqm2pmzs8lx"; + rev = "2379ca4275f7822d1c0e4b50414d0b06696de696"; + sha256 = "0pvjf3afa210zk1y97q5zdsc150r9fxrp7l4ivymhli5g00whmzh"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/"; }; nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-10-30"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "2ff5622755810e795b2ed33476ab7fbfab918d15"; - sha256 = "19qc0q70l7z3q3jgyk8z5y9j6jsh97x4gaxq940zqlhya5qs783g"; + rev = "9a6adc688bf9acf1628b014d2c7217443dd6fa6f"; + sha256 = "17rkx4bwr392minrp2db6s4rq3j4sz53mhcq8caz9cfmny2c3idr"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -5735,24 +5759,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-08-22"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "8895dc24c1590412bbb0ae6b06b53db99abe003d"; - sha256 = "1kd2glnihamfnqkn2qs25xxffj947l94xn302w3c7sr97cj1mm96"; + rev = "56887173181ea0915a9931960899d023ea0ae66c"; + sha256 = "132m5p9jkbj324qjjv0d7kgil3jlacz2lqrh0ygsa6hmyyq5gkay"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-11-19"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "a48ddd710c6daf9a2e90646978c99e5db500dfd3"; - sha256 = "0lk3gc8kicrz6xs57mpy1znxwi6wlc7zm44cg8q0yz7ka0f4520v"; + rev = "cad6ce2e0d4f9c26467712791a70fae9d0b0b6cf"; + sha256 = "122dkvvs7cgmba8l09vhnc6laabyv4qakm3931f4kscn6lb4kyzm"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5771,12 +5795,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-11-01"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "7bc572fc357d7dec8d3ca620b53e763776472582"; - sha256 = "10rm01cxc1xnw7m886ssnmb5ihlsfjhp6sqm9dhmrkg4ywkbhj9m"; + rev = "4ea8e66d61c9a7e40c40f4cc6051ebfbf4ce0d38"; + sha256 = "0wbfy0p7n7s8zp154p06n3nmqc5vxrmzz6abasvlisd8s2khk3g1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5831,12 +5855,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-11-19"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "666ed80fcb78cf6355f3d5b7ebdbacef6465578c"; - sha256 = "1zncna7k5k3ifr24wfjzbsby1g79cyr718lkq1vfyz798f9pkk03"; + rev = "2ef3b269546d751e4fc8c673ffddd6216421f4a1"; + sha256 = "03vdbxqa6z8471l0s65xa55n5hf1c1s59zvx1rn1kgy4h070022w"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5855,12 +5879,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-11-19"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0fd98b0d01bfc5603e56a959acb8e875e4039ac7"; - sha256 = "0xikn3mf5k7m9f79lfk8llvpp5ry7nc4bbznbxd2d1hxjd2iz604"; + rev = "5e0bd39476d4e224dfe5ea6a6624ea3bb467a8bb"; + sha256 = "11lsa35v6qb1mvnac94i3acc428r6s2zk88i6qp3xz25slmd5773"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5903,12 +5927,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-11-17"; + version = "2022-11-26"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "1071ddc47e9d9629ba754ffbf3cc11fa8be4218b"; - sha256 = "17wr3g4f4nk98jzp4g94l8nhksmwc32lc5v7bk56zn0933gr3m1v"; + rev = "92f7451aa0dd0267027ab9a5850a4b7c1af33341"; + sha256 = "16bifycciggvsq5mxp43w21jdh8r57yhsrs7bnwgzy19h0q5lm8w"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5927,12 +5951,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-11-18"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "40c0ab2640a0e17c4fad7e17f260414d18852ce6"; - sha256 = "194r8p8nljvh5jb8i860qp8kr4i16s5q84nc6phqjygwacsq69s8"; + rev = "343e07de11b15f93e44ebd47eb98dce6b7da2e6b"; + sha256 = "14rdzmh8w7qvmvqdv360nba1l2phmmbxs90ifjrxicw21b48jmyi"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -5951,24 +5975,24 @@ final: prev: nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-12-06"; + version = "2022-11-20"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "cdb104f58c46a62ff9f484f49f8660d46db6326f"; - sha256 = "0xqhcfp9qxnqn96ykycsyamwjjqrp7qfv7hshs9h4xa6c51yaqy4"; + rev = "c9b3a3818c1f02ed584a822ed1471d7f1d3e23fe"; + sha256 = "1s6625pksvpi6ri8d1l6szvjf1m9nks92zvd8ff7h2sfyvf3bm5w"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-11-10"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "43c54aec682854b39a7e0e89b4c3ba00426d74a8"; - sha256 = "0ga67fj7wf54mvrbsq423ccw3rvsgrd66dg0pq7cz7x9i7v5dz4d"; + rev = "859056ff7aec327255578c7a98ef02d0cd829f65"; + sha256 = "01sas5rv0j6rsjml9ibi9ygzpihdn6g8vz5rpwv4grkh0n844jkh"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5999,12 +6023,12 @@ final: prev: nvim-scrollbar = buildVimPluginFrom2Nix { pname = "nvim-scrollbar"; - version = "2022-11-17"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "dd0adc741c2b0a5cbd52e4888aa46e4ab3f53cb1"; - sha256 = "199833kqpyhvaa59306zv6qg2iq0jvhlxgdpx6v2mgqrzmg4iyrw"; + rev = "2cb0a0b36a45118e075699bb3a884ab819a85256"; + sha256 = "0hmx3fic2cds609a9f4ik79kb9i6hqs9ir1h6x1kamn4fgm4fqcq"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; @@ -6023,12 +6047,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-11-17"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "a6a86665ba52d299b69259d7a020e5ee11fce31e"; - sha256 = "139gfsgpj22zf4dm60my82f4z5qsbhwwdpj0aqwj63chr3i0knpq"; + rev = "7b98712fdebda8d20375359622e2cb2795f774d8"; + sha256 = "131ji85a14cd7f5gx41q76b2n1gvjbj0whlizpk3c62kz44mpgdp"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6059,12 +6083,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-11-19"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "93380716d94e451c340e653ce09d73e9cabe54c6"; - sha256 = "0xzx9iwdyz95l9bxsbb74bc35bvp5va5855c56qvimc4bcflgp5a"; + rev = "6b45fbffdabb2d8cd80d310006c92e59cec8fd74"; + sha256 = "1qdhyclzsw1inwwzw3kr1jxq3cz0qr358whj93y16x7id3ylsx52"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6083,36 +6107,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-11-19"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "e38e061710c593d9b88c8ebb2c48f2842c89dc31"; - sha256 = "1i3lb7j3nwflidkxzxwpi78ha50qvy45lsb8i4rql1hlb7ya15sd"; + rev = "829e9f68e10a998198e17bf5b348a6947f9d3c2e"; + sha256 = "1xwm3qcba6a2mxmpcdi81c29y3kxw2srm5yi9jvmzpml6zbwqmqp"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-11-19"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "24caa23402247cf03cfcdd54de8cdb8ed00690ba"; - sha256 = "0f10bcszvd3wj62mv198389gcd48glqy2vii7ddks17lccf3g8xm"; + rev = "768532453ac30cbf792b492248a6c3be19b80af1"; + sha256 = "18lamsy039c90ycxh2gz1qi2ba4npkm1j4q2ibyzljml8kznhzg6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-10-25"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "0dd5eae6dbf226107da2c2041ffbb695d9e267c1"; - sha256 = "151lk77jwwm7jnx2x3s4jb214ldjzd5jdvqq35bw29cqczdqdwhp"; + rev = "5fda0b9a2a9049ecc9900e2d86d9ddebab95b0c5"; + sha256 = "084j8bbvs0f1rah92ddbb5qpj4y4m7nq5rn0ga8bsjpyqnx04q7j"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6143,12 +6167,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-11-19"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "1435ea532a3c9e6ea48ed3438fdf48bb37277578"; - sha256 = "1m3hfidjim2cy4x3np4rqcg67cq1kqz64yaqkcj7qlwlxd29gi6p"; + rev = "98476e7364821989ab9b500e4d20d9ae2c5f6564"; + sha256 = "1gvksha3l3pripy7rsk1axr9n0wmzsh2xr1461vjz3314sdfikyj"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6191,12 +6215,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-11-14"; + version = "2022-11-26"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "3b1b794bc17b7ac3df3ae471f1c18f18d1a0f958"; - sha256 = "1yxrv5kc5prfllgfcj2h8c8b74rydwdc8hm2fwbk1d0d9jcs66w7"; + rev = "189ad3790d57c548896a78522fd8b0d0fc11be31"; + sha256 = "1k45pgz1jldkrczxyhhv6abj1klbkl07g2lxw7hhlsbyflg7h9sv"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6311,12 +6335,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-10-28"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "cad3d983e57f467ba8e8252b0567e96dde9a8f0d"; - sha256 = "1jsj9a1ggii2zcjpi6wn6clzsj0vbl2frwqp0h259zlkvwrkx2ri"; + rev = "89dde4963ad198c9b6144dee3d5e8bcbb7559ddc"; + sha256 = "0x21c2rr49yi5ad5k7d24sy75lgvjyx8irh1n069m5afcdhbb2jv"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6335,12 +6359,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-11-19"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "6de1c32d7b654e20a184ef93aa26930e1b699142"; - sha256 = "0fs3dfm10ki5q358217jcglrz730v07lnpry2gwa0ghjk0k0ar81"; + rev = "6f13896727c82c1ff56acf483d474ba7ad88f230"; + sha256 = "1vbnxc9cvk2gn5vs4mhgk7mvlzdifhkh3bl71814q9mvq46nnxav"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6395,12 +6419,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-11-18"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "b82cc5df76a766c0f585f4792db7339a73e25e77"; - sha256 = "16awk2x650aj56niwi9i87bwpqj572k1vzablchym0sbkaj3726a"; + rev = "fc9bb0f5823d01e4008e4b86663772d4148aa9ce"; + sha256 = "1vb0x89qr2kk5ma8syw4l56c6j2b7y2advyjykdli8psn6i7gsyf"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6419,12 +6443,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-09-10"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "6afb67460283f0e990d35d229fd38fdc04063e0a"; - sha256 = "1wx7wm4c6i1qnvc08b0jzjfaf95cnnxrnkscggzs90w5ncdyy80a"; + rev = "dcd2f380bb49ec2dfe208f186236dd366434a4d5"; + sha256 = "01rrangp7lwz75cqqaqfxdzd6j3jq64g816j3bk9p6fqag9pripi"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -6660,12 +6684,12 @@ final: prev: python-mode = buildVimPluginFrom2Nix { pname = "python-mode"; - version = "2022-01-28"; + version = "2022-11-25"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; - sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; + rev = "149ccf7c5be0753f5e9872c023ab2eeec3442105"; + sha256 = "1l577vb781fqsnin44r5ny0zd5mac9yxbg65fyxcr0x9x7iw97x2"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -6853,12 +6877,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2022-11-16"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "2e368cd681379f014906ad0268111eb5c95f9aa6"; - sha256 = "0hxabk1c6fn9yrvdsm00frws1m858finl9ai7rgj2s56056zx9p4"; + rev = "966b4a32f47475908b0fe88ea7b99042da7e2d86"; + sha256 = "1sv4zlmbrqxy04dm3v8x4xncz6kkgr51apcgv4lb16wj000bqvgp"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -6877,12 +6901,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-11-09"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "e9af3795f4233b3273e4b7e9d6bb7d7c8e191412"; - sha256 = "1dv9rnqpjmsfmsxzjshiqdx4kgnh341b9kypb7j0dn65gj2narsq"; + rev = "d78ca640354ea7a4671ff11df8f71fbb087e0eba"; + sha256 = "1y613xbqjv3g6drcqhx04j34fnx2l00yb17prcd4vn5sjllil9mz"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -6949,11 +6973,11 @@ final: prev: rust-vim = buildVimPluginFrom2Nix { pname = "rust.vim"; - version = "2022-09-28"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "1cdc5cb4bd061bc30b502e07321682b5a4396dca"; + rev = "889b9a7515db477f4cb6808bef1769e53493c578"; sha256 = "1xklq4g6dvqd3a5msnrir899hzqmjkscpb8bq9wd4fi3ivmjjjgg"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; @@ -6985,12 +7009,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2022-11-12"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "024920b94611684840731ea79f5a9c6a687683e8"; - sha256 = "0nmzabqmfmkx7j7fn9m20vpqmd2bkdw0zk94k44w4dx467zl757y"; + rev = "3bcd90d5cf5e61b6f4a000aaad5b6aa79b9a8bc5"; + sha256 = "1s22ciz284za50yll9avghdfvnfmf7kgv4vrfpzh28qqy11vyj1s"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -7190,12 +7214,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-11-13"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "d58ed627c7569cca7d8ea326cce79123cbb94620"; - sha256 = "0b6v3ysv0dqir7f7l5l7mzxclqrmq72jbi9c502p3kf4arpvilg2"; + rev = "f53ac94c857e2119403ce12bfba200cd6ecc2e33"; + sha256 = "08syrady97mjp9zjwjp69p0vnd3fx1s8i5cbff7dzglww1ibl3iw"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7357,6 +7381,18 @@ final: prev: meta.homepage = "https://github.com/chr4/sslsecure.vim/"; }; + ssr-nvim = buildVimPluginFrom2Nix { + pname = "ssr.nvim"; + version = "2022-11-29"; + src = fetchFromGitHub { + owner = "cshuaimin"; + repo = "ssr.nvim"; + rev = "4304933853e66060ec03048b2ce3853c39c3886a"; + sha256 = "03yz00x2wqb0b23ddawsciy52ac9q9gz6h3668l9b2srggphnxy2"; + }; + meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; + }; + stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; version = "2022-10-06"; @@ -7528,12 +7564,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2022-11-02"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "1718f42d4044ce612091fd7a7bff0dc7313ff5b8"; - sha256 = "01p7fkhflv23slsr54j7b4cvz0bl2nwn6x0zq1c373cjq3zq2x5a"; + rev = "ad80d32ba42b0c7f3a06b5754b7f669bf71eadf0"; + sha256 = "1pbbb8w164pzrlsglmc5pls8x1jp3zv97m74hxljpwkiqjzfzfjn"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -7625,12 +7661,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-11-04"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "6c3e15ea4a1ef9619c248c2b1eced56a47b61a9e"; - sha256 = "1x47bxvxhw7c4g7ij86xs1zwmb61yr5wcrn3xm606x74c11ff650"; + rev = "af3ce7c3cec81f2852bdb0a0651d2485fcd01214"; + sha256 = "1r0vn0v74g8bgyz4ycc9z8clpkn6fdy5v65y7igizcrjzxd3nlpb"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -7733,12 +7769,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-10-16"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "2429ecfd2d76e3eb6c9f8d8ba2c6ce328975a95a"; - sha256 = "1rmxz31rbb4xiisnmgsmcmrx3r1cjhdrj82l99sdjp09cqavd2bw"; + rev = "8646e46b8545b9234e87083d124c0a4e4ed47735"; + sha256 = "01q34wrk00yxy4jcr666qmkdkpfib80rjbn921dkqqv2d1nalx9b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -7757,12 +7793,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-09-06"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "65c0ee3d4bb9cb696e262bca1ea5e9af3938fc90"; - sha256 = "0nyvhlalrgg6n793lp3yrxgszv5j0ln9sjbh45pxxg0wn15jxm45"; + rev = "7447fe780fed23402a3e0c3a227b549d7506ed38"; + sha256 = "101zcy6fjrpv19cghg464wrizh82b0ny7pc1mmqsfqw48hl37hwn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -7938,12 +7974,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-11-11"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "7a4ffef931769c3fe7544214ed7ffde5852653f6"; - sha256 = "0n2cz7pgnn5wbklw0wax0k0gvhbf5gc1rs7i9d1bmwrljipgi4ak"; + rev = "3c2e5fb23e9f6ca1aa682ae16bac3319bfe03e38"; + sha256 = "08r7cjmkqw2pzagyhyv185b86pqrvwk2y6b7g6sjbv3izp4q3krk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8167,12 +8203,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-11-15"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "62b4e89ea1766baa3b5343ca77d62c817f5f48d0"; - sha256 = "1gqvynnq93dy3dchf9igvgw13ympc8zny0qjp77kq0jj77yq4jg3"; + rev = "58008d1ff7c1105ef702ac5460cb06bdccf278a6"; + sha256 = "16s593j8ikisnf8xhqqrbpadwlf8sxx3fwcnjjjh6wns6gcmkrry"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8201,6 +8237,18 @@ final: prev: meta.homepage = "https://github.com/tjdevries/train.nvim/"; }; + treesj = buildVimPluginFrom2Nix { + pname = "treesj"; + version = "2022-12-01"; + src = fetchFromGitHub { + owner = "Wansmer"; + repo = "treesj"; + rev = "da296173b61330aebfd16129a5bf1263700014f1"; + sha256 = "1wbbxdf2k1vfrnfllms0g5mnsf5bhsipacfwa546sfnc41j360v9"; + }; + meta.homepage = "https://github.com/Wansmer/treesj/"; + }; + tremor-vim = buildVimPluginFrom2Nix { pname = "tremor-vim"; version = "2021-09-07"; @@ -8395,24 +8443,24 @@ final: prev: venn-nvim = buildVimPluginFrom2Nix { pname = "venn.nvim"; - version = "2022-08-02"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "288329d9b5b8c2ffcb58cfe38fa3dd4ddf2139a0"; - sha256 = "1b7nlg0xrm0bxwl3zda9m08pj3zmnmryjnpc9zx6b1g8qa4a4vjw"; + rev = "c114563960b8fb1197695d42798d1f3e7190b798"; + sha256 = "02fcn8h0k750vw8a4pibc3cvy02pbv25c8b01davhcill98nmkia"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog.vim"; - version = "2022-09-12"; + version = "2022-11-20"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "0141e62f5609e98862002ae78c548a928386460e"; - sha256 = "011igyjvq6q0xxk11r2dvvlpad7jzaxjxy751y53943jbkdlp6c7"; + rev = "5bf36012ecd4f82a987acaee1c8504cbc8711aeb"; + sha256 = "1v2d2jyp9h2mjrmkmya879ilmsjbwdbpms1lfhiw7gx8bzb5qa62"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; @@ -8755,12 +8803,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-11-17"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "2654f838ae4eb4383ee26cf32d04a597822008cf"; - sha256 = "1sfd0ssi549y03i0rkz9qds24v19vgn2qdbnv010xpwbnxhsrbv0"; + rev = "25d53a80f4d68932de4b10fc31aa9a393e19b41e"; + sha256 = "169gxfb6lfd29ln0qwx6kch2ndik8bmj7npq9wpblpczg3g5sn4j"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9151,12 +9199,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-11-12"; + version = "2022-11-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "58e05a4e38afc3fddd513bbb0f35601e4b502cf5"; - sha256 = "148gywsna247fw0fr25y15g6x50k7gs04kmhnppjn4p8waabb8ah"; + rev = "aca487d01058c36c245cf35d30913cfb7311eebb"; + sha256 = "1q4nsjzq7cirqbg5kwc3pww4mqai5i53fq9p8cqw0pyi1vzhvc90"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9223,12 +9271,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-11-18"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "3494825e8f3e78869d2da4551fb00814f8e3f285"; - sha256 = "04mdfxwdp7c0l9c1wxfhsrldy6p3nxr0zk2wa5bxwyhqzzajq7mn"; + rev = "0fbe1b695676039b56dd09dcf66dcd23c2a92a47"; + sha256 = "1j0nfhd7nhr0xynvajf85vg27c5rf2xzsmp7gdswx6nvbwgxni8q"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -9319,12 +9367,12 @@ final: prev: vim-cool = buildVimPluginFrom2Nix { pname = "vim-cool"; - version = "2022-09-19"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-cool"; - rev = "e797f80545073f9e5b0689b91633feda7bb17cc2"; - sha256 = "0qhh3c02nraqfa5li9akar0his715cfkbfpa202yyhgsxl6ybxbc"; + rev = "471b72095378cbe14f51bc5d9f679e97c541a498"; + sha256 = "0bn323gb56kra3ciq56lidmhlnx3gbhhjajg6kjap5qqz0mp2ncq"; }; meta.homepage = "https://github.com/romainl/vim-cool/"; }; @@ -9427,12 +9475,12 @@ final: prev: vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-11-15"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "01c4f7a66786095c6f00f877c616eaf34c425a06"; - sha256 = "1kyyr6gsghs1h0654xil27acwrc3815mivdh55xvlq8cs350mbjj"; + rev = "339667d9939d434f9b4496859c077faa88880183"; + sha256 = "08slydxkahw4w383k4ln6hhz0lq9caxxilp4r9k4xk5dmsi7d2xd"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; @@ -9569,6 +9617,18 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-docbk/"; }; + vim-dotenv = buildVimPluginFrom2Nix { + pname = "vim-dotenv"; + version = "2022-05-15"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-dotenv"; + rev = "5c51cfcf8d87280d6414e03cd6b253eb70ecb800"; + sha256 = "06117ilmanj07kasshg1da3gai03fk5s3az2x8vw7rqbr9s50snp"; + }; + meta.homepage = "https://github.com/tpope/vim-dotenv/"; + }; + vim-easy-align = buildVimPluginFrom2Nix { pname = "vim-easy-align"; version = "2019-04-29"; @@ -9931,12 +9991,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-11-16"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "23b9b9b2a3b88bdefee8dfd1126efb91e34e1a57"; - sha256 = "0spghyavc5vxja7b2apck501j61s8gc43bqv1388akwmdanmbk1p"; + rev = "49cc58573e746d02024110d9af99e95994ea4b72"; + sha256 = "09lnf0r3szzqc9ykyq5w1bgx528k0jnhhlwyzcricmrlls67pnsc"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9955,12 +10015,12 @@ final: prev: vim-gh-line = buildVimPluginFrom2Nix { pname = "vim-gh-line"; - version = "2022-06-30"; + version = "2022-11-25"; src = fetchFromGitHub { owner = "ruanyl"; repo = "vim-gh-line"; - rev = "622d7812a268b3e869e8f8c7ee5871e7ee98ab43"; - sha256 = "1bz40bdfhsvh8cdnydf00qixf9yz41c1lzabb4vbrwbb9wizh4zi"; + rev = "fbf368bdfad7e5478009a6dc62559e6b2c72d603"; + sha256 = "0phxvn08z5bwdq0hkan9l1rl94ylsjc2hhv1ahzqvda0rk8lqxj9"; }; meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; @@ -10075,12 +10135,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-11-01"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "0550762a69a2ef13d9f723c9478155dbc6ad7ddb"; - sha256 = "185ysbbipqf6fivryi4pxjmdm4vfn319w1mgm3xpg2920scybwbq"; + rev = "8d7677947e0be1eecfa1bcf2c1148804963ec4f6"; + sha256 = "1f2xklijsxbc7f2y26ps6bwyhn5sxbmv8gwy66l7yhfbc0zvic0w"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10147,12 +10207,12 @@ final: prev: vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; - version = "2022-05-12"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-gutentags"; - rev = "b77b8fabcb0b052c32fe17efcc0d44f020975244"; - sha256 = "0wiqy5m7wvrmr3d2vy5j5lz6wh3z2c2v7amy9ji7prq1gxv3n095"; + rev = "1337b1891b9d98d6f4881982f27aa22b02c80084"; + sha256 = "0hzdhaingqrf57lhjdl8abhpfd5wi3zmrx12xrps31z9ik6l5041"; }; meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; @@ -10689,12 +10749,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-09-30"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "212e3aa210c9f0965e4b234653a08fd3aa525470"; - sha256 = "1vbkm5rs0n9hhcv462ldrf3acx4q170fgzzp44444dmxd7w2pgf9"; + rev = "b7fda15b5a7080c7ee9728765fa6e5b4b1c5fca4"; + sha256 = "1cb2mld2jk7zbyiwa863vmkj6a52d7dzs57vmzw1s047nl04lnb8"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -10881,12 +10941,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-11-13"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "7231fa4bbc47c5d0c64fd7f6187b07f0cae18dcd"; - sha256 = "0s75filccsp51z9sh14avjrh8vb3359b33285s9zix9i1zsm0fxb"; + rev = "df4be8626e2c5b2a42eb60e1f100fce469b81f7d"; + sha256 = "0z0lgxjxs2vjbzkmmp1286rrc57am5l7igiapq4fx4jr5bzyrbz6"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -11240,6 +11300,18 @@ final: prev: meta.homepage = "https://github.com/petRUShka/vim-opencl/"; }; + vim-openscad = buildVimPluginFrom2Nix { + pname = "vim-openscad"; + version = "2022-07-26"; + src = fetchFromGitHub { + owner = "sirtaj"; + repo = "vim-openscad"; + rev = "11ed125209e2277d439cf6d0340c6fca263cb09b"; + sha256 = "1r86pz95yva0rsgnh7mnl94r6yra6704iify95r8fbj4zsawfclp"; + }; + meta.homepage = "https://github.com/sirtaj/vim-openscad/"; + }; + vim-operator-replace = buildVimPluginFrom2Nix { pname = "vim-operator-replace"; version = "2015-02-24"; @@ -11314,12 +11386,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-08-31"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "849c67adf24a86935b8be62860ad9acb00cf4572"; - sha256 = "1f23accmz82835kxvfsksjp77w9khkbcp4064c646p90ck194lji"; + rev = "e6298736a7835bcb365dd45a8e8bfe86d935c1f8"; + sha256 = "0j08s46s8v2zgh9bf3djkdbga94mycr9if8bh3d4yq68bw8q463b"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -11398,12 +11470,12 @@ final: prev: vim-parinfer = buildVimPluginFrom2Nix { pname = "vim-parinfer"; - version = "2022-04-19"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "bhurlow"; repo = "vim-parinfer"; - rev = "e8ae788a91f41d627cec905c61a2dec9c9183341"; - sha256 = "0dkxfdakgcs6743dzja7l5vdc2pczv3ahr79g93mzjj0wbn6gd1i"; + rev = "a5490e430452a749a3ad665ebae54392d9657414"; + sha256 = "1mr2a44xjk6mr9kbh6axg8nd1fspbgi2r98g5d5cqjzvkzqfj6mm"; }; meta.homepage = "https://github.com/bhurlow/vim-parinfer/"; }; @@ -11950,12 +12022,12 @@ final: prev: vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { pname = "vim-sexp-mappings-for-regular-people"; - version = "2022-10-04"; + version = "2022-11-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sexp-mappings-for-regular-people"; - rev = "ffe645ff61e22d0b7c282d53b8745be4298104e6"; - sha256 = "1g0zi26lppgp35f9q12484c00q7yj58d7wrpfs57v4six02292dc"; + rev = "cc5923e357373ea6ef0c13eae82f44e6b9b1d374"; + sha256 = "0jr5dyqbysp0g2pahgirq1lhzr26wv50rmnyc5l4jbvdwvnhzhjn"; }; meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; @@ -12118,12 +12190,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-10-13"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "b47c2e37237875185d170f32cac67af5ab72f22d"; - sha256 = "07y85ah7hqlr9phpd4j6shhsd1q0h1fgb9863hykc3xkg04n401x"; + rev = "6173350127d56dcc5664f50320b3f522951f56e9"; + sha256 = "1a002y2pw76bh35q9z0rba3wnfcwgfmnii4gn3107wwfmfy50z55"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12539,12 +12611,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-10-30"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "b8bb357570b2d95bf893345d45fed722808571ef"; - sha256 = "145crqkr4b588k64y1rczhy5ygwada8rzsrfa3gvv6xrhkya6sgg"; + rev = "776026d7311001495095f0b49dd2f0ebf33c3604"; + sha256 = "0zj65mm4fn5acknxr1y85lmjik3i6k67w4yj4frxd61nsfk32sqv"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12563,12 +12635,12 @@ final: prev: vim-tridactyl = buildVimPluginFrom2Nix { pname = "vim-tridactyl"; - version = "2022-02-10"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "tridactyl"; repo = "vim-tridactyl"; - rev = "f2eaa5d32614f6c35dad268dd4ed7ff33cae5070"; - sha256 = "139kl89k5alh8bpa4wywsmvjnxlxzsdbhxn2w8rvclhwgrhkzvgd"; + rev = "fdd069bde3a34c786abed4601b6d59a065590ad9"; + sha256 = "07km8yp0vsipw2amkxd0rjp9qz18g0b7bvsb2vj9vgkr8wc0d780"; }; meta.homepage = "https://github.com/tridactyl/vim-tridactyl/"; }; @@ -12635,12 +12707,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2022-05-26"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "efdc6475f7ea789346716dabf9900ac04ee8604a"; - sha256 = "1lwi0dpp5jrrnzjwrl4qs88a0q4gfgiqlpjcz62j5hmmdcbj5j4s"; + rev = "6d44a6dc2ec34607c41ec78acf81657248580bf1"; + sha256 = "1ak992awy2xv01h1w3js2hrz6j5n9wj55b9r7mp2dnvyisy6chr9"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -12719,12 +12791,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-11-14"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "6f873418c4dc601d8ad019a5906eddff5088de9b"; - sha256 = "0jw8580w0x515772gnyw6y922yp0hmxk84r67iw1mv50zbkmafgz"; + rev = "e44026b5394fd79aa0f2118aaf41627ef9c354ee"; + sha256 = "1a14msxri37xs29xq80fw9mh6g9ipmc9g4ik2p0x9r5h2pz2nsbq"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -12755,12 +12827,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-06-27"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "4692ec3e77ade9e65171182296cca74352a39a12"; - sha256 = "16av4rd4ga85w3mnb40i762x6kwk9k29pgbpq5qnldyi1pfiph6f"; + rev = "8c7f33b43a56f89285de0da77ee6ec7e4af1f835"; + sha256 = "0mlhlgfr24xyzvg6qbxzbsyby3dmv973avw5qv5qablngi6kqi87"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -12779,12 +12851,12 @@ final: prev: vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2022-02-19"; + version = "2022-11-20"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "7dcfcc17094eab71fd5fb467eb73c34abdde586c"; - sha256 = "1rs2zhr500ib1drvnk63yciw4g3z1jsfksm6s2a0ywsxv1b240n2"; + rev = "1d938c6062ccd1d7fe1fcc658f36503e3283c5f6"; + sha256 = "1dgpgaq0hby85zvcl8vm3jfrpbx1dyx1xrd5i9kd3g64nngbblrv"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -13056,12 +13128,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-11-19"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b2a69e8f780709a4637f6e2fe809d6bd2a39af52"; - sha256 = "11h6bdndglq22y6w7fxzk43dia9kslgfc40l9z8r3cikd7w0pd0a"; + rev = "01333a47ebe70eac21e4b0016b04e031b9cf7b17"; + sha256 = "0vrmh4ccarz11a2904y3m1n1gp4zl00k5n8jc5231bhv8psdnlj7"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13128,12 +13200,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista.vim"; - version = "2022-10-25"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "9ddb3707b066cb288aa1ac9c33477280e0ef95d3"; - sha256 = "03qls1ggnjqv38xg8sk2ssl02pibd2r2k36g0hxanx7zqq3nvgn0"; + rev = "33774aff5d8b224f24c2e4c6015c613c1a17bf74"; + sha256 = "0c3255id5wzgb1v5zsga7ig1b8mqmrbklmz40x98av4j5dqghfw7"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -13152,12 +13224,12 @@ final: prev: webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2022-03-11"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "e9fdce27dc542f491c034a288bce5d74a79fb92d"; - sha256 = "09shpfr42h96qv4s9z3csjk39ppqmyxi183kpnli4479mc4z4df4"; + rev = "70c49ada7827d3545a65cbdab04c5c89a3a8464e"; + sha256 = "0sqhx4h2qchihf37g5fpa3arpxrnzsfpjj34ca3sdn4db89a0c8n"; }; meta.homepage = "https://github.com/mattn/webapi-vim/"; }; @@ -13284,12 +13356,12 @@ final: prev: xterm-color-table-vim = buildVimPluginFrom2Nix { pname = "xterm-color-table.vim"; - version = "2014-01-01"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "guns"; repo = "xterm-color-table.vim"; - rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; - sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; + rev = "8785bb47a38a8bce3f5e452c083907e1a9b32763"; + sha256 = "0kh805r4a2b5smphqrg51l884fsgmsd0rsagq7lj2xy6b68dbpdz"; }; meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; @@ -13429,48 +13501,48 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-11-19"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "8d4b9ed1f9cb5a575a1fa25c506409416d347241"; - sha256 = "0q26mk92h1c6n0d9l6w3r6rpb6gka4iqd5as58p6bwxxbq23w6am"; + rev = "4d2ed20bda0c07e9473c374826721ac16154698b"; + sha256 = "0xdxfpqlm68s6629h8j3pmpw4p7kfnsxlvbk5k3ii6f2yw0b8fd4"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-11-18"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "a98a00617cc8f158eee2c100eb97113cac7e3204"; - sha256 = "0ci0ww6alb6j5x7dsg58bq4nq2km49pzk53d07fs1piad3z3hsvx"; + rev = "2f0affc13228f6eac363612a3cce3677fcd0b490"; + sha256 = "0702bpvmyrr5p0r3fd09szsflrvr6qnngvgdws00x4spsq03nl1p"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-11-19"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e95c1a8d8c2a849c3da63bbf7c98772b92fad7e9"; - sha256 = "1zhyiwasy207khr8dbgnl9xvay32b6wxl4plvarrpi263099z0yk"; + rev = "4c95882b5e3d67bf31f2b7ea996e0251966e43eb"; + sha256 = "002r53w9rq13lca4sw34631b526h2wvaf5x9l87kqq0ddm2nwslh"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-11-07"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b9f4f3a169266031d3744335595eee02a6e396c6"; - sha256 = "1a9vxpdh6ry9760m69762s5annq4k52k5bk9gy3v0lr4zyvfcfgf"; + rev = "947e5298766f30bdb813749bf867913b29a06eac"; + sha256 = "0yvahswdzqphay5wak2rlaqjaf44kylsvmx697slwp8h1846xchw"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -13525,12 +13597,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-11-09"; + version = "2022-11-20"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "bfc2aa0006ad56f1a9792d6c52dc7f04fb4af94d"; - sha256 = "088wwwsqwxhii7n88k3kd6mqf7jajiva9a4a3g87nflf4g11fh57"; + rev = "77b86d932746179a50246692612e889d1cdd72da"; + sha256 = "11j9nv2n2lgqk5dap89i8irsbwb2l8arilnhv4p5bzi3zv43vy3n"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 14c265b928401..56c9bf2130031 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -49,12 +49,12 @@ }; bash = buildGrammar { language = "bash"; - version = "77cf8a7"; + version = "4488aa4"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "77cf8a7cab8904baf1a721762e012644ac1d4c7b"; - hash = "sha256-UPMJ7iL8Y0NkAHtPDrkTjG1qFwr8rXuGqvsG+LTWqEY="; + rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74"; + hash = "sha256-QkH5rI9/7x6L7e3YIwDMdSbBHOGhhC6LTHfasS7wX9U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -269,6 +269,18 @@ }; meta.homepage = "https://github.com/rydesun/tree-sitter-dot"; }; + ebnf = buildGrammar { + language = "ebnf"; + version = "ef241bc"; + source = fetchFromGitHub { + owner = "RubixDev"; + repo = "ebnf"; + rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c"; + hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI="; + }; + location = "crates/tree-sitter-ebnf"; + meta.homepage = "https://github.com/RubixDev/ebnf.git"; + }; eex = buildGrammar { language = "eex"; version = "f742f2f"; @@ -348,12 +360,12 @@ }; fish = buildGrammar { language = "fish"; - version = "84436cf"; + version = "6675b56"; source = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; - rev = "84436cf24c2b3176bfbb220922a0fdbd0141e406"; - hash = "sha256-oJuCd+2mTCEP/rNQzweShc7TZiqwKBIDRQqnV8VqQ4s="; + rev = "6675b56266b3f615fb112205b6b83a79315309c4"; + hash = "sha256-hU2QMiNfO5/Drjl0QoUb9ERaK/3ETGaIsDBHMZ70n/A="; }; meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; @@ -414,15 +426,26 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "cee9f88"; + version = "577a075"; source = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; - rev = "cee9f8865694b29bb9e85e0b90805f92ad3fc47e"; - hash = "sha256-Ne9D4c58AWvZz/2ytP0lJzKIss2hJtZFgSKsot9MOJE="; + rev = "577a075d46ea109905c5cb6179809df88da61ce9"; + hash = "sha256-gBfLmNf7aaqMY3yMF7svFuqif43BAmmY1yYkvVcNUhI="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; + gitcommit = buildGrammar { + language = "gitcommit"; + version = "d3c15bd"; + source = fetchFromGitHub { + owner = "gbprod"; + repo = "tree-sitter-gitcommit"; + rev = "d3c15bdf0165c89872cc1345c5f8815be3cad9cc"; + hash = "sha256-3ufluVDeCXLksgj68f7MfK+3QrtvLDoc9Xhbh7xz+t0="; + }; + meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; + }; gitignore = buildGrammar { language = "gitignore"; version = "f4685bf"; @@ -459,12 +482,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "a743ada"; + version = "e2c2214"; source = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "a743ada24fa17da9acc5665133f07d56e03530be"; - hash = "sha256-l2t2U4fZYMMpc1Nkv8JODtDny0/kSUsbiJ/VVD5VyhI="; + rev = "e2c2214045de2628b81089b1a739962f59654558"; + hash = "sha256-GrbheFLeJLAvm3LE4WOfmYnIjVcRkD9pfugJJuIc25A="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -570,12 +593,12 @@ }; help = buildGrammar { language = "help"; - version = "49cdef5"; + version = "ce20f13"; source = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "49cdef52ded4a886bf34bc474876b09f9270d48f"; - hash = "sha256-szNY2yw5i9pgF+MpaEAkP8BgSYEe6nrFW+17sbSZ6Yc="; + rev = "ce20f13c3f12506185754888feaae3f2ad54c287"; + hash = "sha256-XklORrP4ToX4klXFYxMv2s63INWugDyjl3mtLDdUHlg="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -592,12 +615,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "384b26e"; + version = "329e3c8"; source = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "384b26ec65e10f26cf147bfcde772c50ca5ef0d0"; - hash = "sha256-f6jKhC1vPpNTY0Rv1WMdJMNXRFiLsCApy/kIv7CBesA="; + rev = "329e3c8bd6f696a6128e0dccba34b2799dc3037e"; + hash = "sha256-unxcw0KTlMDtcdjvIZidU/QckjfHBtc+LzAR7SukdU0="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -647,12 +670,12 @@ }; javascript = buildGrammar { language = "javascript"; - version = "936d976"; + version = "7a29d06"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "936d976a782e75395d9b1c8c7c7bf4ba6fe0d86b"; - hash = "sha256-uZW1L9ZE1YSZbwxiqSDiKycWv5mSRG4k4MlWFYoWRbw="; + rev = "7a29d06274b7cf87d643212a433d970b73969016"; + hash = "sha256-fMPCHdfHHyg7yNi9LDA35z+WFfPRbctrh38dZV5qZt4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -790,12 +813,12 @@ }; lua = buildGrammar { language = "lua"; - version = "fb30e8c"; + version = "f5e84ff"; source = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "fb30e8cb605e2ebd6c643e6981325a63fbbde320"; - hash = "sha256-gT2WHH3rkFzb6iER0ryVU7bqVbh36RbTI9HSWMh3DsI="; + rev = "f5e84ffc2b06858401e0d2edf5dce009efbe34b3"; + hash = "sha256-9ig+F2W6MB5uSS3XFUL2OCW9PKYkb4KPpGN2DWKEdhY="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; @@ -823,24 +846,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "272e080"; + version = "16d0b5e"; source = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "272e080bca0efd19a06a7f4252d746417224959e"; - hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; + rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; + hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "272e080"; + version = "16d0b5e"; source = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "272e080bca0efd19a06a7f4252d746417224959e"; - hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; + rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; + hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -856,6 +879,17 @@ }; meta.homepage = "https://github.com/Kerl13/tree-sitter-menhir"; }; + mermaid = buildGrammar { + language = "mermaid"; + version = "d787c66"; + source = fetchFromGitHub { + owner = "monaqa"; + repo = "tree-sitter-mermaid"; + rev = "d787c66276e7e95899230539f556e8b83ee16f6d"; + hash = "sha256-JwQ3jfwwOvM9eJWP/D3wXUBDysRxpa+mktYFajwA3IA="; + }; + meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid"; + }; meson = buildGrammar { language = "meson"; version = "153d225"; @@ -960,12 +994,12 @@ }; pascal = buildGrammar { language = "pascal"; - version = "2fd40f4"; + version = "9e99540"; source = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; - rev = "2fd40f477d3e2794af152618ccfac8d92eb72a66"; - hash = "sha256-/nChZspacQymw+1P7yrkOpa7BIBVIKeLKUv0y9Hk8oc="; + rev = "9e995404ddff8319631d72d4b46552e737206912"; + hash = "sha256-y8xPnVZ15+eAnjrLSGjS5wIbLgSKbz9bipgL0o8acmA="; }; meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; }; @@ -1114,12 +1148,12 @@ }; rasi = buildGrammar { language = "rasi"; - version = "1239134"; + version = "5f04634"; source = fetchFromGitHub { owner = "Fymyte"; repo = "tree-sitter-rasi"; - rev = "12391343979463a2484e6353e5afb6dcb8c31e8b"; - hash = "sha256-JmL2Ei2DZhsZ4jFQ8s6B0ig9bflDs9dLr5/QknDqqRc="; + rev = "5f04634dd4e12de4574c4a3dc9d6d5d4da4a2a1b"; + hash = "sha256-2n8nHinlgtLKBlDLiphu7vqPi7W02brRY1h8BGkcoZc="; }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; @@ -1257,12 +1291,12 @@ }; sql = buildGrammar { language = "sql"; - version = "4f1b912"; + version = "41f1de2"; source = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "4f1b91246b43190e34957d9de9a0f3625879ba33"; - hash = "sha256-g1dQ897JQwthConYMlGY25hsypr4weDsDCOWyafriw8="; + rev = "41f1de238b7b4a8cc9e118759881aad8585d36ad"; + hash = "sha256-LORSWO5Ui/Nq1SReERSWZ+BEtxKEJ545LPpA6HbY8Z4="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1301,12 +1335,12 @@ }; swift = buildGrammar { language = "swift"; - version = "25f8de3"; + version = "cff1c9a"; source = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "25f8de356e3c33099ed691bd3b8b5c0fe3a11e15"; - hash = "sha256-x9m5QFQY33NWdkq0lkWiskfKxqRPz5ePSbVUDY7IBLU="; + rev = "cff1c9a62df89e8900d53ff48bc42862e6522dcf"; + hash = "sha256-tfpqnutY8uLzhPWPsDzsvwaRWOS8vIxAOPlcyPoSwNU="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1336,12 +1370,12 @@ }; tiger = buildGrammar { language = "tiger"; - version = "eb1d371"; + version = "a233ebe"; source = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; - rev = "eb1d3714998977ae76ca7c6a102b10ee37efc2b5"; - hash = "sha256-kbwERaTHk5Pj5AfpbXPuRS6speB+xLMfrhRXTVOyMNw="; + rev = "a233ebe360a73a92c50978e5c4e9e471bc59ff42"; + hash = "sha256-lQ3WkA1v3J2FuK2zPUwqahPnHPkAuevpBJrLtrlqaEs="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger"; }; @@ -1380,12 +1414,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0ab9d99"; + version = "0ae3828"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "0ab9d99867435a7667c5548a6617a6bf73dbd830"; - hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; + rev = "0ae382803abce0807e90f498105c713b9233e0b2"; + hash = "sha256-we8jkX8Nl9+eGw8c6ZmH5hW7yfzFaNhQ+WDzRvMMx9A="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1403,23 +1437,23 @@ }; twig = buildGrammar { language = "twig"; - version = "035f549"; + version = "2457993"; source = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "035f549ec8c043e734f04341d7ccdc669bb2ba91"; - hash = "sha256-XSE0E6a9o+WpvmMIXHu0N89VqzaIk9eFHofKAPHtT20="; + rev = "2457993b13a06dec2706e6a6c3d5b65bb23024b8"; + hash = "sha256-8H2luJtjSZt2AWP1L0A64jm+DeEH8cFaC+yvIDLKk4o="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; typescript = buildGrammar { language = "typescript"; - version = "0ab9d99"; + version = "0ae3828"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "0ab9d99867435a7667c5548a6617a6bf73dbd830"; - hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; + rev = "0ae382803abce0807e90f498105c713b9233e0b2"; + hash = "sha256-we8jkX8Nl9+eGw8c6ZmH5hW7yfzFaNhQ+WDzRvMMx9A="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1460,23 +1494,23 @@ }; vhs = buildGrammar { language = "vhs"; - version = "2f87b9d"; + version = "8a0df32"; source = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "2f87b9d973597e69552ecf6a4fe16470fbd8c44e"; - hash = "sha256-G1ytXVBeGN1606aFrPdNFp3Khlg/BTFq2VS176Knb7k="; + rev = "8a0df32b72a8cf8d3e3e84f16c19e9ba46d3dba5"; + hash = "sha256-bWI/MW7U5ht7jmL3BSm5HwD1BMDNGwkBShJIpRlhonI="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; vim = buildGrammar { language = "vim"; - version = "4ae7bd6"; + version = "55ff1b0"; source = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; - rev = "4ae7bd67706d7e10afed827ce2ded884ab41650f"; - hash = "sha256-5gNqs6ykt2m48ghFv9y5OxsHDPTWRicdT9eR+DDiXiA="; + rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9"; + hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA="; }; meta.homepage = "https://github.com/vigoux/tree-sitter-viml"; }; @@ -1493,12 +1527,12 @@ }; wgsl = buildGrammar { language = "wgsl"; - version = "af16e7d"; + version = "61d2604"; source = fetchFromGitHub { owner = "szebniok"; repo = "tree-sitter-wgsl"; - rev = "af16e7d9e230004888fb52d33599ad38b4cf6052"; - hash = "sha256-rp6SqiGVAxlAbrYhNLhwqawjpFXZd2R4A4cNQx6qFZs="; + rev = "61d2604525d47238ecbce8aa38f10cb81ba68fd3"; + hash = "sha256-dSWQAJN9+EyqPbGZv9wTR8upsK56ZWu9jOpJkJtkabs="; }; meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl"; }; @@ -1515,12 +1549,12 @@ }; yang = buildGrammar { language = "yang"; - version = "8e9d175"; + version = "2c0e6be"; source = fetchFromGitHub { owner = "Hubro"; repo = "tree-sitter-yang"; - rev = "8e9d175982afcefa3dac8ca20d40d1643accd2bd"; - hash = "sha256-QSOy5wLb52hKkfW8bJY827zGrXTsMO5sZtl2NaNLmBA="; + rev = "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"; + hash = "sha256-6EIK1EStHrUHBLZBsZqd1LL05ZAJ6PKUyIzBBsTVjO8="; }; meta.homepage = "https://github.com/Hubro/tree-sitter-yang"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index f4e0c99115f31..f1c72991a5064 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -62,6 +62,10 @@ let in { + postPatch = '' + rm -r parser + ''; + passthru = { inherit builtGrammars allGrammars withPlugins withAllGrammars; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d821dea94917a..c569941ed2bea 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -10,7 +10,6 @@ , substituteAll # Language dependencies -, python2 , python3 , rustPlatform @@ -310,7 +309,21 @@ self: super: { }); ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: { - buildInputs = [ python2 ]; + # drop Python 2 patches + # https://github.com/JazzCore/ctrlp-cmatcher/pull/44 + patches = [ + (fetchpatch { + name = "drop_python2_pt1.patch"; + url = "https://github.com/JazzCore/ctrlp-cmatcher/commit/3abad6ea155a7f6e138e1de3ac5428177bfb0254.patch"; + sha256 = "sha256-fn2puqYeJdPTdlTT4JjwVz7b3A+Xcuj/xtP6TETlB1U="; + }) + (fetchpatch { + name = "drop_python2_pt2.patch"; + url = "https://github.com/JazzCore/ctrlp-cmatcher/commit/385c8d02398dbb328b1a943a94e7109fe6473a08.patch"; + sha256 = "sha256-yXKCq8sqO0Db/sZREuSeqKwKO71cmTsAvWftoOQehZo="; + }) + ]; + buildInputs = with python3.pkgs; [ python3 setuptools ]; buildPhase = '' patchShebangs . ./install.sh @@ -749,6 +762,10 @@ self: super: { ''; }); + ssr = super.ssr-nvim.overrideAttrs (old: { + dependencies = with self; [ nvim-treesitter ]; + }); + statix = buildVimPluginFrom2Nix rec { inherit (statix) pname src meta; version = "0.1.0"; @@ -1174,7 +1191,7 @@ self: super: { }); vim-wakatime = super.vim-wakatime.overrideAttrs (old: { - buildInputs = [ python2 ]; + buildInputs = [ python3 ]; }); vim-xdebug = super.vim-xdebug.overrideAttrs (old: { @@ -1297,6 +1314,7 @@ self: super: { "coc-jest" "coc-json" "coc-lists" + "coc-ltex" "coc-markdownlint" "coc-metals" "coc-pairs" diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 291038bb6eb7d..032a3b6d001a3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -77,6 +77,7 @@ https://github.com/turbio/bracey.vim/,, https://github.com/fruit-in/brainfuck-vim/,, https://github.com/famiu/bufdelete.nvim/,, https://github.com/jlanzarotta/bufexplorer/,, +https://github.com/AndrewRadev/bufferize.vim/,HEAD, https://github.com/akinsho/bufferline.nvim/,, https://github.com/dkarter/bullets.vim/,, https://github.com/mattn/calendar-vim/,,mattn-calendar-vim @@ -415,6 +416,7 @@ https://github.com/Shougo/neco-syntax/,, https://github.com/Shougo/neco-vim/,, https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD, https://github.com/Shougo/neocomplete.vim/,, +https://github.com/folke/neoconf.nvim/,HEAD, https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/folke/neodev.nvim/,HEAD, https://github.com/sbdchd/neoformat/,, @@ -617,6 +619,7 @@ https://github.com/AndrewRadev/splitjoin.vim/,, https://github.com/tami5/sqlite.lua/,, https://github.com/srcery-colors/srcery-vim/,, https://github.com/chr4/sslsecure.vim/,, +https://github.com/cshuaimin/ssr.nvim/,HEAD, https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, https://github.com/darfink/starsearch.vim/,, @@ -687,6 +690,7 @@ https://github.com/akinsho/toggleterm.nvim/,, https://github.com/folke/tokyonight.nvim/,, https://github.com/markonm/traces.vim/,, https://github.com/tjdevries/train.nvim/,, +https://github.com/Wansmer/treesj/,main, https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, https://github.com/folke/trouble.nvim/,, @@ -804,6 +808,7 @@ https://github.com/kristijanhusak/vim-dirvish-git/,, https://github.com/tpope/vim-dispatch/,, https://github.com/radenling/vim-dispatch-neovim/,, https://github.com/jhradilek/vim-docbk/,, +https://github.com/tpope/vim-dotenv/,, https://github.com/junegunn/vim-easy-align/,, https://github.com/zhou13/vim-easyescape/,, https://github.com/neoclide/vim-easygit/,, @@ -943,6 +948,7 @@ https://github.com/tpope/vim-obsession/,, https://github.com/ocaml/vim-ocaml/,, https://github.com/rakr/vim-one/,, https://github.com/petRUShka/vim-opencl/,, +https://github.com/sirtaj/vim-openscad/,HEAD, https://github.com/kana/vim-operator-replace/,, https://github.com/rhysd/vim-operator-surround/,, https://github.com/kana/vim-operator-user/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3b0ba9efddfbd..36ce6758aed3c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -301,6 +301,23 @@ let }; }; + astro-build.astro-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "astro-vscode"; + publisher = "astro-build"; + version = "0.29.1"; + sha256 = "sha256-fMeEeYCZuORhZRds0A8HjHPncK0+SQbV0+f/zU5AIg4="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; + description = "Astro language support for VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=astro-build.astro-vscode"; + homepage = "https://github.com/withastro/language-tools"; + license = licenses.mit; + maintainers = with maintainers; [ wackbyte ]; + }; + }; + asvetliakov.vscode-neovim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-neovim"; @@ -874,8 +891,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.1.2"; - sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9"; + version = "2022.11.2204"; + sha256 = "0npr9fymfjnrq7xvfj6fdc04lysz28qncf9r8syv0w9873f3695h"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -966,8 +983,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.9.0"; - sha256 = "sha256-Yr7M4HyRNcsBf8YglQLvyZjblMhtkpMP+f9SH8oUav0="; + version = "9.10.3"; + sha256 = "sha256-BTuTTElPYRtbzQvUC3iMYlj7NDkGSDa/IppOGBXjfUM="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1287,8 +1304,8 @@ let mktplcRef = { name = "vscode-pull-request-github"; publisher = "github"; - version = "0.45.2022062709"; - sha256 = "119dz79vl2pngf6327zbfw97qnci8xg14d23wdd4n75jmra2wrbz"; + version = "0.55.2022120109"; + sha256 = "036gfgj3iyz4w3j74zhx3zh7m7rmakm2lg0h7mm11lqbpfwwrki1"; }; meta = { license = lib.licenses.mit; }; }; @@ -1322,8 +1339,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.215"; - sha256 = "sha256-WK9J6TvmMCLoqeKWh5FVp1mNAXPWVmRvi/iFuLWMylM="; + version = "0.0.220"; + sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk"; }; meta = with lib; { license = licenses.mit; @@ -1334,8 +1351,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "2.2.0"; - sha256 = "sha256-YGPytmI4PgH6GQuWaRF5quiKGoOabkv7On+WVupI92E="; + version = "2.2.1"; + sha256 = "14p9g07zsb3da4ilaasgsdvh3wagfzayqr8ichsf6k5c952zi8fk"; }; meta = with lib; { license = licenses.mit; @@ -1406,8 +1423,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.11.0"; - sha256 = "sha256-okvwyD0m2r8ar85VtuBUNMUZGGrCfJ4DB9v7aSX5PjM="; + version = "0.12.0"; + sha256 = "sha256-ZwdGcsvmEKDH5ZAkKiLEV/3ru74BittnxibMWbdkaco="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1451,8 +1468,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "8.29.0"; - sha256 = "sha256-khAlxN+y06aneZE97fqNg2esj/wvIUINiMdVc/exd38="; + version = "9.1.0"; + sha256 = "sha256-a/v8/5ztB9DXqYpGWMYSRIwZIj1D+iebG35fO0yDjQQ="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1502,8 +1519,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.19"; - sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq"; + version = "1.4.23"; + sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims"; }; meta = with lib; { license = licenses.mit; @@ -1514,8 +1531,8 @@ let mktplcRef = { name = "vscode-peacock"; publisher = "johnpapa"; - version = "4.0.1"; - sha256 = "sha256-oYXYOamwacgRqv3+ZREJ1vqRlwMz8LpO+wa6CVEEdbI="; + version = "4.2.2"; + sha256 = "1z9crpz025ha9hgc9mxxg3vyrsfpf9d16zm1vrf4q592j9156d2m"; }; meta = with lib; { license = licenses.mit; @@ -1629,8 +1646,8 @@ let mktplcRef = { name = "vscode-clangd"; publisher = "llvm-vs-code-extensions"; - version = "0.1.17"; - sha256 = "1vgk4xsdbx0v6sy09wkb63qz6i64n6qcmpiy49qgh2xybskrrzvf"; + version = "0.1.23"; + sha256 = "125incws4n688irqii3s2a1cznj0kvkbhv3sa8585chj5g4zvmfy"; }; meta = { license = lib.licenses.mit; @@ -1773,8 +1790,8 @@ let mktplcRef = { name = "direnv"; publisher = "mkhl"; - version = "0.7.0"; - sha256 = "sha256-MLBPhDBU8vPVvbde3fdwhxKvQa8orUMKAAXoOfNrbh4="; + version = "0.10.1"; + sha256 = "0m89sx1qqdkwa9pfmd9b11lp8z0dqpi6jn27js5q4ymscyg41bqd"; }; meta = with lib; { description = "direnv support for Visual Studio Code"; @@ -1812,8 +1829,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.1"; - sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52"; + version = "1.22.2"; + sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi"; }; meta = { license = lib.licenses.mit; @@ -1842,8 +1859,8 @@ let mktplcRef = { name = "cmake-tools"; publisher = "ms-vscode"; - version = "1.13.17"; - sha256 = "sha256-RF4KTHXnYBfRCD06GYmprwJNkdplyZyk4ioq5Nu+UDM="; + version = "1.13.26"; + sha256 = "1bkjqlv48slgb8nf8y2g4nf11c1appr0ycka2w3mmbiczwdmyjr5"; }; meta.license = lib.licenses.mit; }; @@ -1876,8 +1893,8 @@ let mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; - version = "2022.7.2"; - sha256 = "sha256-YL90dRmOvfbizT+hfkNu267JtG122LTMS9MHCfaMzkk="; + version = "2022.11.0"; + sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19"; }; meta = with lib; { description = "A Visual Studio Code extension for PowerShell language support"; @@ -1910,8 +1927,8 @@ let mktplcRef = { name = "pyright"; publisher = "ms-pyright"; - version = "1.1.250"; - sha256 = "sha256-UHSY32F5wzqAHmmBWyCUkLL0z+LMWDwn/YvUOF3q87I="; + version = "1.1.282"; + sha256 = "14qkk9gbpwnbkk3dk7b7s92smj374ha7axlsi74fllw74lp4ziwn"; }; meta = with lib; { description = "VS Code static type checking for Python"; @@ -1979,8 +1996,8 @@ let mktplcRef = { name = "jupyter-renderers"; publisher = "ms-toolsai"; - version = "1.0.4"; - sha256 = "sha256-aKWu0Gp0f28DCv2akF/G8UDaGfTN410CcH8CAmW7mgU="; + version = "1.0.12"; + sha256 = "12l5z60kpz3nx77l8ck6a6w4qdzyz3xkn6k9670r30w365q9lf0z"; }; meta = { license = lib.licenses.mit; @@ -2093,8 +2110,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.4.0"; - sha256 = "sha256-9q3ilNukx3sQ6Fr1LhuQdjHHS251SDoHxC33w+qrfAI="; + version = "1.14.2022120303"; + sha256 = "sha256-tlWb2rkDcEWgdpuidkBGN5Nxr3pmkYxnPJN/UdbQfEw="; }; buildInputs = [ jdk ]; meta = { @@ -2107,8 +2124,8 @@ let mktplcRef = { name = "vscode-xml"; publisher = "redhat"; - version = "0.22.0"; - sha256 = "sha256-7QOw0EVcfa7MFnZAHAsUtDZHXD5AFlW54f1qaN3h+2U="; + version = "0.23.2022120303"; + sha256 = "sha256-rQvbb7GOUwVwg/049jchJMJTwaFsOP63AovcEmr2HXs="; }; meta.license = lib.licenses.epl20; }; @@ -2117,8 +2134,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.9.1"; - sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w"; + version = "1.11.10112022"; + sha256 = "0i53n9whcfpds9496r4pa27j3zmd4jc1kpkf4m4rfxzswwngg47x"; }; meta = { license = lib.licenses.mit; @@ -2173,8 +2190,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.19.0"; - sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4"; + version = "4.22.0"; + sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk"; }; meta = { license = lib.licenses.mit; @@ -2451,6 +2468,16 @@ let }; }; + sonarsource.sonarlint-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sonarlint-vscode"; + publisher = "sonarsource"; + version = "3.12.0"; + sha256 = "sha256-vVOmqb0iEIGgN+LkJfazNN+KNWvnWRbIsqetXfeabJU="; + }; + meta.license = lib.licenses.lgpl3Only; + }; + spywhere.guides = buildVscodeMarketplaceExtension { mktplcRef = { name = "guides"; @@ -2517,8 +2544,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.11.0"; - sha256 = "sha256-ZYbkCe/FdSxmipV9TTq0AF/Ft01+LTUeo3sVyKMP3iQ="; + version = "2.11.1"; + sha256 = "sha256-o6Se+xpqwrdJIMnVE/HaDGIoDqZkeX0nTGHa8GjaqVQ="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2536,8 +2563,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "105.21.0"; - sha256 = "12p6msv8wi773piqm1y5zik3ky652bdaw9s83ffwnlndsh87s9n5"; + version = "106.3.0"; + sha256 = "sha256-xe1Ad24r2Ks85WAfaD5em8KGwaQ5h6i5qkUouU6lmtc="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -2622,8 +2649,8 @@ let mktplcRef = { name = "vscode-nushell-lang"; publisher = "thenuprojectcontributors"; - version = "0.7.0"; - sha256 = "sha256-+AGJkFx/uzgQzuRnRBZ44xGNQ6a/QWt7SNiQgwPTZxo="; + version = "0.8.0"; + sha256 = "0065ckgpsalqgv9zw8gvxxkqzwl7mjp6mydnlm1m3y9qxlfl010s"; }; meta.license = lib.licenses.mit; }; @@ -2802,8 +2829,8 @@ let mktplcRef = { name = "vscode-java-debug"; publisher = "vscjava"; - version = "0.44.0"; - sha256 = "sha256-8/H7rihSKAvXp8QxK949txgMKwt6aYVN4EQdwhphIiQ="; + version = "0.47.2022112823"; + sha256 = "0nlkkpc2v755g39lcb5bhx207b0kjn44q539w07al9b021y2vq54"; }; meta = { license = lib.licenses.mit; @@ -2814,8 +2841,8 @@ let mktplcRef = { name = "vscode-java-dependency"; publisher = "vscjava"; - version = "0.21.0"; - sha256 = "0rjxjf137qrn91nxmvv4j0a25xgwv2p2w2a1vb7yykkqlkfazmm6"; + version = "0.21.2022111900"; + sha256 = "1k5wk27s0lk2ywc6ajvraldhr1d48i0l2fj7jlaayds41zhyj73l"; }; meta = { license = lib.licenses.mit; @@ -2826,8 +2853,8 @@ let mktplcRef = { name = "vscode-java-test"; publisher = "vscjava"; - version = "0.37.1"; - sha256 = "sha256-QpDMG+0RbiRY9YQYXQhA6ESBoIjBeUxq+bEZ1Y71oSM="; + version = "0.37.2022090902"; + sha256 = "17i9jfwpjjxp81dg6nnviczzmr47pvz33zc4bwfvz69ckn6v74j4"; }; meta = { license = lib.licenses.mit; @@ -2838,8 +2865,8 @@ let mktplcRef = { name = "vscode-maven"; publisher = "vscjava"; - version = "0.39.0"; - sha256 = "1603s2s9abg1pqfakj43zp3dfl0y92pblra85wj2rccbzf3asba3"; + version = "0.40.2022120203"; + sha256 = "063b0k74zy62qg6mh2bms15jiydysv58mds8p82nw3iajm6ppm5i"; }; meta = { license = lib.licenses.mit; @@ -2947,8 +2974,8 @@ let mktplcRef = { name = "markdown-all-in-one"; publisher = "yzhang"; - version = "3.4.0"; - sha256 = "0ihfrsg2sc8d441a2lkc453zbw1jcpadmmkbkaf42x9b9cipd5qb"; + version = "3.4.4"; + sha256 = "2lZfWP+yk0Dp8INLjlJY5ROGu0sLaWhb4fT+O9xGg0s="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix index a427c1f8764aa..e713ba29e84bd 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -7,8 +7,8 @@ in buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2022.9.1202862440"; - sha256 = "sha256-0F6eTEXt0PJY0+1o/qZEuUcD9sjHSnUrI1OS4IO2WLc="; + version = "2022.11.1003381023"; + sha256 = "0cbnr52pq0yw6i4yzyrifyrz186l482m9s01h4l7d74fby9ska8h"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index 00121d29a34f8..f7765e6ceb1a6 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -19,8 +19,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2022.17.13011006"; - sha256 = "sha256-f5vbXcqKwCnL+vsTcOX7rWUfoXNih5ZaWr3XUpCYB/M="; + version = "2022.19.13351014"; + sha256 = "1562f4b0v76p1wfbljc5zydq7aq7k5hshxzm2v1whb77cjskiw8s"; }; buildInputs = [ icu ]; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index 9eba40330b96d..f87ab47726b04 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.7.4"; + version = "1.8.1"; vscodeExtUniqueId = "${publisher}.${pname}"; @@ -13,7 +13,7 @@ let owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-yAB0qxeC2sWCQ1EcKG/7LsuUrxV/kbxkcOzRfAotxFc="; + sha256 = "sha256-5wrw8LNH14WAyIKIRGFbvrISb5RUXeD5Uh/weja9p4Q="; }; # need to build a custom version of lldb and llvm for enhanced rust support @@ -23,7 +23,7 @@ let pname = "${pname}-adapter"; inherit version src; - cargoSha256 = "sha256-Ly7yIGB6kLy0c9RzWt8BFuX90dxu2QASocNTEdQA3yo="; + cargoSha256 = "sha256-Lpo2jaDMaZGwSrpQBvBCscVbWi2Db1Cx1Tv84v1H4Es="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index efcbe32f78d77..a036e05329773 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext, openmp, Cocoa }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoconf +, automake +, gettext +, libtool +, python3 +, wxGTK +, openmp +, Cocoa +}: stdenv.mkDerivation rec { pname = "wxHexEditor"; @@ -11,10 +23,22 @@ stdenv.mkDerivation rec { sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ wxGTK libtool python2 gettext ] - ++ lib.optionals stdenv.cc.isClang [ openmp ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + strictDeps = true; + + nativeBuildInputs = [ + autoconf + automake + gettext + libtool + python3 + wxGTK + ]; + + buildInputs = lib.optionals stdenv.cc.isClang [ + openmp + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; preConfigure = "patchShebangs ."; @@ -49,7 +73,7 @@ stdenv.mkDerivation rec { wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes. ''; homepage = "http://www.wxhexeditor.org/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ wegank ]; }; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 16331ba79e075..0796dbe72185b 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-aO5ilmlkSAxlkWYdSLmrcm7pC8GbITpCitd4TXp5tfY="; + sha256 = "sha256-ax769qjV0oZ6tnEE5FsXNbHETI6KNgvh0WviBsPs9j8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 2e7b99f4c607a..d2c325280e065 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-13"; + version = "2.0-17"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-0yomEJoXMKZV2PAjINegSvtDB6gbYxQ6XcXA60/ZkEM="; + hash = "sha256-ryFph55o7s3eiqQ8kx5+3Et5S2U9H5i3fmZTc1CaCnA="; }; patches = [ @@ -106,7 +106,13 @@ stdenv.mkDerivation rec { preFixup = let libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs; in '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}") + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" + + # Force X11 to be used until Wayland is natively supported + # <https://github.com/cemu-project/Cemu/pull/143> + --set GDK_BACKEND x11 + ) ''; meta = with lib; { diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 5472069f41681..74f179324675d 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , SDL2 , agg , alsa-lib @@ -32,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo="; }; + patches = [ + # Fix compiling on GCC for AArch64 + (fetchpatch { + url = "https://github.com/TASEmulators/desmume/commit/24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061.patch"; + hash = "sha256-J3ZRU1tPTl+4/jg0DBo6ro6DTUZkpQCey+QGF2EugCQ="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils intltool @@ -81,8 +90,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed }; }) -# TODO: investigate the patches -# TODO: investigate other platforms diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index c2d73d3e7fff3..5eec3c865df5a 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -6,7 +6,7 @@ , bluez , ffmpeg , libao -, gtk2 +, gtk3 , glib , libGLU , libGL @@ -21,7 +21,7 @@ , fetchFromGitHub , libusb1 , libevdev -, wxGTK30 +, wxGTK30-gtk3 , soundtouch , miniupnpc , mbedtls @@ -43,29 +43,33 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build with soundtouch 2.1.2 + # Fix FTBFS with glibc 2.26 (fetchpatch { - url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch"; - name = "dolphin-emu-5.0-soundtouch-exception-fix.patch"; - sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw"; + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/02_glibc-2.26.patch"; + name = "02_glibc-2.26.patch"; + sha256 = "sha256-LBXT3rf5klwmX9YQXt4/iv06GghsWZprNhLGYlKiDqk="; }) - # Fix build with gcc 8 + # Fix FTBFS with GCC 8 (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/9b7b4aeac1b60dcf28bdcafbed6bc498b2aeb0ad/debian/patches/03_gcc8.patch"; + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch"; name = "03_gcc8.patch"; - sha256 = "1da95gb8c95kd5cjhdvg19cv2z863lj3va5gx3bqc7g8r36glqxr"; + sha256 = "sha256-uWP6zMjoHYbX6K+oPSQdBn2xWQpvNyhZabMkhtYrSbU="; + }) + # Fix FTBFS with SoundTouch 2.1.2 + (fetchpatch { + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/05_soundtouch-2.1.2.patch"; + name = "05_soundtouch-2.1.2.patch"; + sha256 = "sha256-Y7CNM6GQC9GRhlOBLZlxkIpj1CFhIwA5L8lGXur/bwY="; + }) + # Use GTK+3 wxWidgets backend + (fetchpatch { + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/06_gtk3.patch"; + name = "06_gtk3.patch"; + sha256 = "sha256-pu5Q0+8kNwmpf2DoXCXHFqxF0EGTnFXJipkBz1Vh2cs="; }) ]; - postPatch = '' - substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \ - --replace " CHAR_WIDTH " " CHARWIDTH " - ''; - cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" "-DENABLE_LTO=True" ]; @@ -80,7 +84,7 @@ stdenv.mkDerivation rec { libao libGLU libGL - gtk2 + gtk3 glib gettext libpthreadstubs @@ -97,7 +101,7 @@ stdenv.mkDerivation rec { portaudio libusb1 libpulseaudio - wxGTK30 + wxGTK30-gtk3 soundtouch miniupnpc mbedtls @@ -117,6 +121,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MP2E ashkitten ]; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 48d77ce5e6fe1..a5b104d31abe3 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.249"; + version = "0.250"; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "sha256-im6y/E0pQxruX2kNXZLE3fHq+zXfsstnOoC1QvH4fd4="; + sha256 = "sha256-jexs/1ovRk9Is5orD7hT9fN+dYm+WA+57aZ6JH7zjL4="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index a738432a8ec36..1bcd1d8c5fd7b 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -6,7 +6,6 @@ , cmake , curl , fetchFromGitHub -, fetchpatch , ffmpeg , fluidsynth , gettext @@ -50,7 +49,7 @@ let mkLibretroCore = { core , src ? (getCoreSrc core) - , version ? "unstable-2022-10-18" + , version ? "unstable-2022-11-21" , ... }@args: import ./mkLibretroCore.nix ({ @@ -796,11 +795,6 @@ in puae = mkLibretroCore { core = "puae"; makefile = "Makefile"; - # https://github.com/libretro/libretro-uae/pull/529 - patches = fetchpatch { - url = "https://github.com/libretro/libretro-uae/commit/90ba4c9bb940e566781c3590553270ad69cf212e.patch"; - sha256 = "sha256-9xkRravvyFZc0xsIj0OSm2ux5BqYogfQ1TDnH9l6jKw="; - }; meta = { description = "Amiga emulator based on WinUAE"; license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index d0a281afc373a..c2c752f054afd 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -45,12 +45,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-doLWNA8aTAllxx3zABtvZaegBQEPIi8276zbytPSdBU="; + hash = "sha256-eEe0mM9gUWgEzoRH1Iuet20US9eXNtCVSBi2kX1njVw="; rev = "v${version}"; }; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index af63572e61c07..6d9ae4da539c6 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -38,8 +38,8 @@ "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "bd6b9ef3049fe3f70a18ee6f752a935ae83c2f2b", - "sha256": "CXcLMOF6IXUrp14nyTQ5KK2LR+FyWcF0UcvHTxEVSo0=" + "rev": "798fab9d5bc82dde26442d9b4861d377d4689e31", + "sha256": "wHCUSMdPbIudmNm4XXW/zH6TDz7x9DrMNV/L8H3aO/w=" }, "beetle-saturn": { "owner": "libretro", @@ -129,8 +129,8 @@ "dolphin": { "owner": "libretro", "repo": "dolphin", - "rev": "9810e29a1f3633d32b6643b97a1147d83311d73a", - "sha256": "iIaVSJSC3mD1k751vQvWI6x0C/HhfjEaMwfX53FpZv4=" + "rev": "a8188dbc4e63d6c0867ed2196f5125130955f012", + "sha256": "gf9OjeDazDPDnQ9S2+hV4CNxPAkCCaEhJDZF97a1//U=" }, "dosbox": { "owner": "libretro", @@ -141,8 +141,8 @@ "eightyone": { "owner": "libretro", "repo": "81-libretro", - "rev": "73f6cca62dabc84df946aea71cf457ce5ae5ea9d", - "sha256": "oovIKMZXxtLc+zmbguagTVoMPngokdN3xTBnb/+KUjY=" + "rev": "340a51b250fb8fbf1a9e5d3ad3924044250064e0", + "sha256": "Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA=" }, "fbalpha2012": { "owner": "libretro", @@ -153,14 +153,14 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "758f24740d81ff833c1868befd98ccd11909255f", - "sha256": "VhfsvohRWICWqKWry0fgUS76kiXBsnjY9DytxEvulKA=" + "rev": "a12455af75e60765da134b83051700e0fbe3803a", + "sha256": "ujO9KVn7o6xueeEr5GHfOy7NimwNIvYxgMM9xJvtjvo=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "3d3cc53c0177e296af2427c29bbb31902b26f3b8", - "sha256": "Z5LqP6IBq0H6uM0027PSkW6JLvVDA/4CrO6bI478Z1o=" + "rev": "8c3f690e61a1d65dfb25510426ae88eeae93e1ae", + "sha256": "vzPrAEII8SWj3Ki2OaZb0/9gbQDz04rp2dXf2LE1sXg=" }, "flycast": { "owner": "libretro", @@ -189,8 +189,8 @@ "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "5cdb31854074de1662266a0a675866ea7b787b42", - "sha256": "vMswSKM5aYlPZu5y4Z1L/+eaPBdQaLPPMKoC7B/xzqc=" + "rev": "3abf975785fe77267a399cc583ccf1469e081b86", + "sha256": "QdiWKS7j80Sw0L+hf6efmQ40lQi/f95pFLQfoohoUKg=" }, "gpsp": { "owner": "libretro", @@ -219,8 +219,8 @@ "mame": { "owner": "libretro", "repo": "mame", - "rev": "0d935696dce53a13eaf0705f4a108ee348f3c613", - "sha256": "HnJ3eHzTpR7Lsi1ATn3B314y0KNKJ0+qNGcDbFvmZEA=" + "rev": "57622367cb780013690d6ef23b2066b500f6ce92", + "sha256": "0iR1JGAhwYXXLnv8BDW1bsxfFywEI82aov2+MHw5w6Q=" }, "mame2000": { "owner": "libretro", @@ -231,14 +231,14 @@ "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "cb0c89304b2cd584cda7105c6be4e69fa304f0e0", - "sha256": "ob/aUh5NZCfQvpA+nEs2QhVXeNBBVZesX/xQfatY9wU=" + "rev": "dbdda8e7189d63061ac42f502c0cd2dc7f1f8651", + "sha256": "XED/gunYOc+NnQ8YORw/ALP2eCTyvRdIxPiFpNf5nuA=" }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "d88d5c118e8d7075ec0a4e6deebb4cd3f18a8dd1", - "sha256": "9offucQMCpMqo4StYscS6kivXCYHy4Sn+Cs/3MoNwsw=" + "rev": "5dd4a30500edc0b00c712750093aa287c9bb4ce2", + "sha256": "Nvm5U6rpsDZdUJONtvZ6YmztuupLaXz2QT0SBJtzO/4=" }, "mame2010": { "owner": "libretro", @@ -285,14 +285,14 @@ "mgba": { "owner": "libretro", "repo": "mgba", - "rev": "199a03e719436018779fe9299706c597fb2e9231", - "sha256": "3Q3MBzezCvl1Er45AeUM/QI0a+JiGn/PfYpqMaaiuds=" + "rev": "ec5ecb26deba8d7ac830fc66ade9fac0eeaeb4ae", + "sha256": "kDDs+M7TPu6UhFnj9+XGI9whQFQ5/+7fSb0YUN7oMsg=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "c10546e333d57eb2e5a6ccef1e84cb6f9274c526", - "sha256": "dbS32slJBfz8DHeIQy20lAYw0+ig0LRgIaGfqW082xs=" + "rev": "1b67122ff6a923c93a56ff94273e3768a6da5dff", + "sha256": "qORxhy7hXVdGUkQumOmGVXnF1kW0BShMNBVlaRu3a1w=" }, "neocd": { "owner": "libretro", @@ -303,8 +303,8 @@ "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "a9ee6ca84f04990e209880fe47144e62b14253db", - "sha256": "q3pD2Cm/a62x3xW8JymU9w82zHlT0BoPlaSfzjZzh/c=" + "rev": "5c360e55d5437ecd3520568ee44cf1af63d4696a", + "sha256": "+1QQc4gVZ5ZHt/I0bjRkW+kbPaeGUNrjbrzUoVz4drM=" }, "np2kai": { "owner": "AZO234", @@ -316,8 +316,8 @@ "nxengine": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "aa32afb8df8461920037bdbbddbff00bf465c6de", - "sha256": "Ic5YsNLoEZJ/vkjthwypwLN3ntB/5EX8bU92V80S7R4=" + "rev": "e271c6262d73f07e5d92d285503f1c049801c51a", + "sha256": "PfzHV6/nGUdbnfZ8+aHuoIQhvKcxdbuKnjIMWIIFt7Q=" }, "o2em": { "owner": "libretro", @@ -346,8 +346,8 @@ "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "5ced3945423cda0010597b27b7da6bce77b12baa", - "sha256": "8O2XyEr40HqQf8mHxmvB6/UT837HZw8SrKBy/JH66p4=" + "rev": "a4e249a1373cf6269e1e4e0d60105e72210e67d3", + "sha256": "NOz2NQonVWEhEhAgSFHSWv6bmuTPcw0R9ihISlGwkb0=" }, "picodrive": { "owner": "libretro", @@ -359,15 +359,15 @@ "play": { "owner": "jpd002", "repo": "Play-", - "rev": "1126c39cd8ebf56af347c475139d4db97fc7cc19", - "sha256": "H/cYFWl8rA/ZdoygEjr7h1y6Z0n29Z+OCzzVMvIuVyo=", + "rev": "ad3b855c6d8cc62c85e2a5d2f659159fdfaa8d80", + "sha256": "+uTf/xv2JHuNGx0bxFNXf0akRzonzRMT7gSvT2n12+o=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "4af4b0dddc638b00205d9943f17a2806e438fe83", - "sha256": "5n+Mg2ZDTJd5fk1OZAiYnCT13G3LAWahXPA+MwaOF08=", + "rev": "e654f6937a02f4a2ac8cce3574ab4f2db99f77d4", + "sha256": "LTqRA3KMV/VuQH0eTWjpOqy0U944c4ofPNEsexf93Kc=", "fetchSubmodules": true }, "prboom": { @@ -385,8 +385,8 @@ "puae": { "owner": "libretro", "repo": "libretro-uae", - "rev": "4d8ebafe3f91c4998e8d73940e9558d863ecf93b", - "sha256": "dzfZFm7L+Qe3WwSYiMLp3cQm8zk0pWVB68nBe/H1Hvc=" + "rev": "d9a8dfbde7f6967fea3cffe09cd87e1d79a1a3fd", + "sha256": "uMn9ejknjwGmbc0JOu/xl30z3ff7vpxtA3qr2sv0glI=" }, "quicknes": { "owner": "libretro", @@ -415,8 +415,8 @@ "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "28be1a196d2c59ed4b6489d487187569a7370aff", - "sha256": "FW4ynSS+R1ygQaCS0UrWGktfHGtcy0P/Mp/BXKfmII0=" + "rev": "3c4982edddfdba482204ed48cf0b1d41ccae5493", + "sha256": "d4luyBSU/4PdsDd2jLwWSyckBPAqXMJ3C1sNmLO+E6U=" }, "snes9x2002": { "owner": "libretro", @@ -439,8 +439,8 @@ "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "7193c405327e0f2156d24d53836162f4b44af079", - "sha256": "A9icQON+0WrknjGp/0wiFNSWs2ot2s0X5lucCdk4O/s=" + "rev": "fa49e034101a22344c7bd01648d514b6cc61ac7f", + "sha256": "Svv+j7/9PvZ6djk2kfpbr9iUC8xqX8B4Plnf43Hj62A=" }, "stella2014": { "owner": "libretro", @@ -451,8 +451,8 @@ "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "ff0b451a573885a5b3a4f291f7b22f3ffc667a17", - "sha256": "jz8tkvgonc4icRt12tt1BBCCiwec0ucix7Hp7PNPl8E=" + "rev": "27a224fc9e86e0f061504878d1c0cbf3fd6891af", + "sha256": "5kW9/4gMfyvo3ExlJVivx8LhW5as3Mq5fhlNrIFDUVM=" }, "tgbdual": { "owner": "libretro", @@ -494,8 +494,8 @@ "virtualjaguar": { "owner": "libretro", "repo": "virtualjaguar-libretro", - "rev": "263c979be4ca757c43fb525bd6f0887998e57041", - "sha256": "6Q6Y0IFUWS9ZPhnAK3EUo4hMGPdBn8eNEYCK/zLgAKU=" + "rev": "2cc06899b839639397b8b30384a191424b6f529d", + "sha256": "7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ=" }, "yabause": { "owner": "libretro", diff --git a/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/pkgs/applications/emulators/retroarch/libretro-core-info.nix index 1dd8b0e4b7481..13073d9c523e3 100644 --- a/pkgs/applications/emulators/retroarch/libretro-core-info.nix +++ b/pkgs/applications/emulators/retroarch/libretro-core-info.nix @@ -5,12 +5,12 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - hash = "sha256-ByATDM0V40UJxigqVLyTWkHY5tiCC2dvZebksl8GsUI="; + hash = "sha256-rTq2h+IGJduBkP4qCACmm3T2PvbZ0mOmwD1jLkJ2j/Q="; rev = "v${version}"; }; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 73e93707ceedd..90687a4e191db 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -29,15 +29,18 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.327"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.373"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "9719b6a1129c017d96532ff026e2bb933c0b2d0b"; - sha256 = "1vm1zwjm02jp64gjcfn923lxc4hqwgw44w9rspjy97q2z6r9vwjh"; + rev = "567c64e149f1ec3487dea34abdffc7bfa2f55400"; + sha256 = "0b4c3dmvnx4m7mzhm3kzw3bjnw53rwi3qr2p4i9kyxbb2790bmsb"; }; + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + nugetDeps = ./deps.nix; nativeBuildInputs = [ @@ -88,7 +91,7 @@ buildDotnetModule rec { "/p:ExtraDefineConstants=DISABLE_UPDATER" ]; - dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_6_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; + dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_7_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; executables = [ "Ryujinx.Headless.SDL2" diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 6486c13c7952f..780ec9dee8eed 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -41,7 +41,7 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.2.0"; sha256 = "1abck2gad29mgf9gwqgc6wr8iwl64v50n0sbxcj1bcxgkgndraiq"; }) - (fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; }) + (fetchNuGet { pname = "LibHac"; version = "0.17.0"; sha256 = "06ar4yv9mbvi42fpzs8g6j5yqrk1nbn5zssbh2k08sx3s757gd6f"; }) (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.10.4"; sha256 = "1bdgy6g15d1mln1xpvs6sy0l2zvfs4hxw6nc3qm16qb8hdgvb73y"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.10.4"; sha256 = "0ccbzp0d01dcahm7ban7xyh1rk7k2pkml3l5i7s85cqk5lnczpw2"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) @@ -60,9 +60,10 @@ (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.1"; sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.15.0"; sha256 = "0dwx7dk8jr10784nriqbi364qbxzfwq0c6xia0ac5rzrp7179r4d"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.25.0"; sha256 = "1zv220bfzwglzd22rzxmfymjb5z4sn3hydmkg8ciz133s58gdp3w"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.25.0"; sha256 = "0662zhcf7gfdiqwgw3kd8kclwc0pnlsksf5imd8axs87nvqvxbmr"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.25.0"; sha256 = "0v37h9xid7ils3r8jbd2k7p63i1bi5w6ad90m5n85bz3g233wkjm"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.25.0"; sha256 = "101dbcyf46xsf6vshwx567hbzsrgag896k5v4vya3d68gk57imwh"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -159,7 +160,7 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) - (fetchNuGet { pname = "SPB"; version = "0.0.4-build27"; sha256 = "16i10lp4w7gi5rzjs9v9vns858n735ixcb83kl2qqq9qwyrnv8mw"; }) + (fetchNuGet { pname = "SPB"; version = "0.0.4-build28"; sha256 = "1ran6qwzlkv6xpvnp7n0nkva0zfrzwlcxj7zfzz9v8mpicqs297x"; }) (fetchNuGet { pname = "Svg.Custom"; version = "0.5.14"; sha256 = "1wjghs2n5hk7zszzk2p2a8m6ga2gc8sfd5mdqi15sbfkmwg2nbw7"; }) (fetchNuGet { pname = "Svg.Model"; version = "0.5.14"; sha256 = "1xilk95bmnsl93sbr7pah0jrjrnccf1ikcn8s7rkm0yjkj382hc8"; }) (fetchNuGet { pname = "Svg.Skia"; version = "0.5.14"; sha256 = "02wv040wi8ijw9mwg3c84f8bfyfv9n99ji8q1v2bs11b463zsyd1"; }) @@ -198,7 +199,7 @@ (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.15.0"; sha256 = "0kzc9rqwn8xgixwm1z5zajf6bapa2rvi9lv8vgz7hlp1lgi964zk"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.25.0"; sha256 = "14xlnz1hjgn0brc8rr73xzkzbzaa0n1g4azz91vm7km5scdmql67"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) @@ -283,6 +284,7 @@ (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.0"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index 7650ebad343df..8dae647b89d6d 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -15,13 +15,13 @@ let in { mainline = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-mainline"; - version = "1162"; + version = "1245"; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "sha256-1UNgB/3l6RN0OLRrmXqzwcEUgXlWGSE7PvHbZ8YSDro="; + sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/file-managers/doublecmd/default.nix b/pkgs/applications/file-managers/doublecmd/default.nix index 46e8e96f2acb1..dc5f334de5b67 100644 --- a/pkgs/applications/file-managers/doublecmd/default.nix +++ b/pkgs/applications/file-managers/doublecmd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-kuqleoDoxzOj3baTK0lBJpbDECoHeFubWhLXAVkEqAk="; + hash = "sha256-ruZNHvHBRXRM4h0R571jvasW8rYawq4cn7Hnd9riMnk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 3e5a8c4cc98c9..79b1d62509b7c 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CLCzRnczItvnjXtS4BOc9FeBCPQm102U0bDIWAZPzYc="; + sha256 = "sha256-0wYYElXm7Nr1zjtWLSdBaUVsb+2CN4TwaJr5g1juUUs="; }; - cargoSha256 = "sha256-H+uOo3Cm1nFPYyA0qOAcaD4mfSd4Uaq5U20t6V4mmcg="; + cargoSha256 = "sha256-SnXZkMrAhhP8lVFCd6LKHFSg9o2K1Wy+z/4oUZOHoXw="; nativeBuildInputs = [ pkg-config ]; @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # extra test files not shipped with the repository + "--skip=functions::tests::test_list_up_contents" "--skip=magic_image::tests::test_inspect_image" "--skip=magic_packed::tests::test_inspect_signature" ]; diff --git a/pkgs/applications/file-managers/llama/default.nix b/pkgs/applications/file-managers/llama/default.nix index b71ab1cdf0f38..8f3f2c73ff8f5 100644 --- a/pkgs/applications/file-managers/llama/default.nix +++ b/pkgs/applications/file-managers/llama/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "llama"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "llama"; rev = "v${version}"; - sha256 = "sha256-/YnaKodMkuHrB0xH1UNRq+a6VknKRqcbBIehaYM6Gyc="; + sha256 = "sha256-32UyFy269rifw4Hjw18FO0F79sDNW8dgJ2MdGXSzLWo="; }; vendorSha256 = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ="; diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 5e474f81f1877..d9d570db6aa32 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -5,7 +5,7 @@ , perl , makeWrapper , writeText -, jdk11 +, jdk , gsettings-desktop-schemas }: @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { makeWrapper $out/share/mucommander/mucommander.sh $out/bin/mucommander \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ - --set JAVA_HOME ${jdk11} + --set JAVA_HOME ${jdk} ''; meta = with lib; { diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index 05f65df87b951..d9ff3b15c798a 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -19,19 +19,19 @@ assert withIcons -> withNerdIcons == false; assert withNerdIcons -> withIcons == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nnn"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "jarun"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+EAKOXZp1kxA2X3e16ItjPT7Sa3WZuP2oxOdXkceTIY="; + repo = "nnn"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ttG0aEqMlNyJaMhcVfrxbxlrhr1GSydrV58CYSq4CTM="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); - preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; + preBuild = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} src/nnn.h"; nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include"; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; - makeFlags = [ "PREFIX=${placeholder "out"}" ] + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals withIcons [ "O_ICONS=1" ] ++ lib.optionals withNerdIcons [ "O_NERD=1" ]; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; }; -} +}) diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 0b70d67b27197..50156802779c0 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -5,19 +5,19 @@ }: let - gitRev = "8fb4b0929ce84cf375bfb83a9d522ccd80681eaf"; + gitRev = "8b805c674adad536f9dd552b4be75fadcb3c7db6"; gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation { pname = "antimony"; - version = "2020-03-28"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "mkeeter"; repo = "antimony"; rev = gitRev; - sha256 = "1s0zmq5jmhmb1wcsyaxfmii448g6x8b41mzvb1awlljj85qj0k2s"; + sha256 = "NmOuBewfHqtAim2cNP62LXgRjVWuVUGweV46sY1qjGk="; }; patches = [ ./paths-fix.patch ]; diff --git a/pkgs/applications/graphics/ascii-image-converter/default.nix b/pkgs/applications/graphics/ascii-image-converter/default.nix index 708c3b4682862..ed99f1ac73aab 100644 --- a/pkgs/applications/graphics/ascii-image-converter/default.nix +++ b/pkgs/applications/graphics/ascii-image-converter/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ascii-image-converter"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "TheZoraiz"; repo = "ascii-image-converter"; rev = "v${version}"; - sha256 = "sha256-2kg5W5u6YjLce3wNS3A1e89ZYAVK2LyNmPGCm86HxPM="; + sha256 = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk="; }; vendorSha256 = "sha256-rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs="; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix deleted file mode 100644 index 2bb480a54f4d6..0000000000000 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }: - -stdenv.mkDerivation rec { - pname = "openexr_viewers"; - version = "2.2.1"; - - src = fetchurl { - url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz"; - sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8"; - }; - - configurePhase = '' - ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config - ''; - - buildPhase = '' - make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openexr fltk libGLU libGL ctl ]; - - meta = { - description = "Application for viewing OpenEXR images on a display at various exposure settings"; - homepage = "http://openexr.com"; - platforms = lib.platforms.linux; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index ee733a0b1b0c0..3ce6c56d94bb2 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -30,7 +30,6 @@ , ghostscript , aalib , shared-mime-info -, python2 , libexif , gettext , makeWrapper @@ -48,6 +47,8 @@ , AppKit , Cocoa , gtk-mac-integration-gtk2 +, withPython ? false +, python2 }: let @@ -116,9 +117,6 @@ in stdenv.mkDerivation rec { shared-mime-info libwebp libheif - python - # Duplicated here because python.withPackages does not expose the dev output with pkg-config files - python2.pkgs.pygtk libexif xorg.libXpm glib-networking @@ -130,6 +128,10 @@ in stdenv.mkDerivation rec { gtk-mac-integration-gtk2 ] ++ lib.optionals stdenv.isLinux [ libgudev + ] ++ lib.optionals withPython [ + python + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files + python2.pkgs.pygtk ]; # needed by gimp-2.0.pc @@ -144,6 +146,8 @@ in stdenv.mkDerivation rec { "--with-icc-directory=/run/current-system/sw/share/color/icc" # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) "--libdir=\${exec_prefix}/lib" + ] ++ lib.optionals (!withPython) [ + "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix deleted file mode 100644 index 3068ecd4c5cf2..0000000000000 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib -, fetchFromGitHub -, nix-update-script -, cmake -, pkg-config -, mkDerivation -, qtbase -, qtx11extras -, qtsvg -, makeWrapper -, vulkan-loader -, libglvnd -, xorg -, python3 -, python3Packages -, bison -, pcre -, automake -, autoconf -, addOpenGLRunpath -, waylandSupport ? false -, wayland -}: -let - custom_swig = fetchFromGitHub { - owner = "baldurk"; - repo = "swig"; - rev = "renderdoc-modified-7"; - sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; - }; - cmakeBool = b: if b then "ON" else "OFF"; -in -mkDerivation rec { - pname = "renderdoc"; - version = "1.22"; - - src = fetchFromGitHub { - owner = "baldurk"; - repo = "renderdoc"; - rev = "v${version}"; - sha256 = "sha256-eqMIOb9XAgXtoCJABvZkkS/rhHK7jNqabIFwdCgcSJU="; - }; - - buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 - ] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2]) - # TODO: figure out how to make cmake recognise pyside2 - ++ lib.optional waylandSupport wayland; - - nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; - - postUnpack = '' - cp -r ${custom_swig} swig - chmod -R +w swig - patchShebangs swig/autogen.sh - ''; - - cmakeFlags = [ - "-DBUILD_VERSION_HASH=${src.rev}" - "-DBUILD_VERSION_DIST_NAME=NixOS" - "-DBUILD_VERSION_DIST_VER=${version}" - "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" - "-DBUILD_VERSION_STABLE=ON" - "-DENABLE_WAYLAND=${cmakeBool waylandSupport}" - ]; - - # TODO: define these in the above array via placeholders, once those are widely supported - preConfigure = '' - cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" - cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" - ''; - - dontWrapQtApps = true; - preFixup = '' - wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" - wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" - ''; - - # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh - postFixup = '' - addOpenGLRunpath $out/lib/librenderdoc.so - ''; - - passthru.updateScript = nix-update-script { - attrPath = pname; - }; - - meta = with lib; { - description = "A single-frame graphics debugger"; - homepage = "https://renderdoc.org/"; - license = licenses.mit; - longDescription = '' - RenderDoc is a free MIT licensed stand-alone graphics debugger that - allows quick and easy single-frame capture and detailed introspection - of any application using Vulkan, D3D11, OpenGL or D3D12 across - Windows 7 - 10, Linux or Android. - ''; - maintainers = [ ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index b867269db057a..b7ee6d200af2a 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { pname = "sane-backends"; - version = "1.0.32"; + version = "1.1.1"; src = fetchurl { # raw checkouts of the repo do not work because, the configure script is @@ -24,9 +24,9 @@ stdenv.mkDerivation { # https://gitlab.com/sane-project/backends/-/issues/440 # unfortunately this make the url unpredictable on update, to find the link # go to https://gitlab.com/sane-project/backends/-/releases and choose - # the link with other in the URL. - url = "https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz"; - sha256 = "055iicihxa6b28iv5fnz13n67frdr5nrydq2c846f9x7q0vw4a1s"; + # the link under the heading "Other". + url = "https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/sane-backends-1.1.1.tar.gz"; + sha256 = "sha256-3UsEw3pC8UxGGejupqlX9MfGF/5Z4yrihys3OUCotgM="; }; patches = [ @@ -140,5 +140,6 @@ stdenv.mkDerivation { homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix deleted file mode 100644 index b62ca680cbc5d..0000000000000 --- a/pkgs/applications/graphics/screencloud/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }: - -with lib; -stdenv.mkDerivation rec { - pname = "screencloud"; - version = "1.2.0"; - - # API Keys. According to the author of the AUR package, these are only used - # for tracking usage. - consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6"; - consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216"; - - src = fetchFromGitHub { - owner = "olav-st"; - repo = "screencloud"; - rev = "v${version}"; - sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ]; - - patchPhase = '' - # Required to make the configure script work. Normally, screencloud's - # CMakeLists file sets the install prefix to /opt by force. This is stupid - # and breaks nix, so we force it to install where we want. Please don't - # write CMakeLists files like this, as things like this are why we can't - # have nice things. - substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" "" - ''; - - # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not - # to add the argument for us. - dontAddPrefix = true; - - cmakeFlags = [ - "-DQXT_QXTCORE_INCLUDE_DIR=${qxt}/include/QxtCore" - "-DQXT_QXTCORE_LIB_RELEASE=${qxt}/lib/libQxtCore.so" - "-DQXT_QXTGUI_INCLUDE_DIR=${qxt}/include/QxtGui" - "-DQXT_QXTGUI_LIB_RELEASE=${qxt}/lib/libQxtGui.so" - "-DCONSUMER_KEY_SCREENCLOUD=${consumerKey}" - "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}" - ]; - - setSourceRoot = '' - sourceRoot=$(echo */screencloud) - ''; - - preConfigure = '' - # This needs to be set in preConfigure instead of cmakeFlags in order to - # access the $prefix environment variable. - export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags" - ''; - - # There are a number of issues with screencloud's installation. We need to add - # pycrypto to the PYTHONPATH so that the SFTP plugin will work properly; and - # we need to move the libPythonQt library into a folder where it can actually - # be found. - postInstall = '' - patchShebangs $prefix/opt/screencloud/screencloud.sh - substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt" - sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" - mkdir $prefix/bin - mkdir $prefix/lib - ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud - ln -s $prefix/opt/screencloud/libPythonQt.so $prefix/lib/libPythonQt.so - ''; - - meta = { - homepage = "https://screencloud.net/"; - description = "Client for Screencloud, an easy to use screenshot sharing tool"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ forkk ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index ce262d73be438..b36ac5968b38a 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E/7S4JGLXR8u9fE8bTVPFb6XVKOC/BHnQwLhr7N2A48="; + sha256 = "sha256-Hn7IDnbrmK3V+iz8UqdmHRV2TS4MwYSgYtnH6igbGJ8="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8414db45d59ab..2a36b135f15ec 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -93,6 +93,7 @@ let grantleetheme = callPackage ./grantleetheme {}; gwenview = callPackage ./gwenview.nix {}; incidenceeditor = callPackage ./incidenceeditor.nix {}; + juk = callPackage ./juk.nix {}; k3b = callPackage ./k3b.nix {}; kaccounts-integration = callPackage ./kaccounts-integration.nix {}; kaccounts-providers = callPackage ./kaccounts-providers.nix {}; @@ -222,6 +223,7 @@ let messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; okular = callPackage ./okular.nix {}; + palapeli = callPackage ./palapeli.nix {}; picmi = callPackage ./picmi.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index f861c04a7287c..2a6e349f2f236 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -1,7 +1,17 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kio, kparts, kxmlgui, qtbase, qtscript, solid, qtquickcontrols2, kdeclarative +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kio +, kparts +, kxmlgui +, qtbase +, qtscript +, solid +, qtquickcontrols2 +, kdeclarative +, kirigami2 +, kquickcharts }: mkDerivation { @@ -15,7 +25,15 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - kio kparts kxmlgui qtscript solid qtquickcontrols2 kdeclarative + kio + kparts + kxmlgui + qtscript + solid + qtquickcontrols2 + kdeclarative + kirigami2 + kquickcharts ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/juk.nix b/pkgs/applications/kde/juk.nix new file mode 100644 index 0000000000000..70bd90b7e9edc --- /dev/null +++ b/pkgs/applications/kde/juk.nix @@ -0,0 +1,37 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, wrapQtAppsHook +, kdoctools +, kcoreaddons +, kxmlgui +, kio +, phonon +, taglib +}: + +mkDerivation { + pname = "juk"; + + nativeBuildInputs = [ + extra-cmake-modules + wrapQtAppsHook + kdoctools + ]; + + buildInputs = [ + kcoreaddons + kxmlgui + kio + phonon + taglib + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/multimedia/juk"; + description = "Audio jukebox app, supporting collections of MP3, Ogg Vorbis and FLAC audio files"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix new file mode 100644 index 0000000000000..13aa24df27d45 --- /dev/null +++ b/pkgs/applications/kde/palapeli.nix @@ -0,0 +1,22 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, shared-mime-info +, kconfig +, kdoctools +, kio +, ktextwidgets +, libkdegames +}: + +mkDerivation { + pname = "palapeli"; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; + buildInputs = [ libkdegames kio ktextwidgets ]; + meta = { + homepage = "https://apps.kde.org/palapeli/"; + description = "A single-player jigsaw puzzle game"; + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ harrisonthorne ]; + }; +} diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index e2f817bfdcb31..878924c20e771 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.3.1.2"; + version = "5.3.2.4"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-plimvkMUjQWQ0Ewm1TXL5IB1xe62DFhwBlBc4UeCguU="; + sha256 = "sha256-qjU5TcYkAFJVYTOCwePGOVR9hYKNtinzLt5P4aTs578="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index cc96bc66c27b0..5a3c3271fee05 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -66,13 +66,13 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.3.2"; sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -95,9 +95,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.0.4"; sha256 = "1p1am57q0fz684cc7snv9d9jvmcvg6ym03np26ngvgyrlh9ph68r"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.4"; sha256 = "0cy8a82ijgfv9zdlw9jjr8467h9781jlk90r94bhr8lanmjv3k1k"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.4"; sha256 = "1y31n9b29aydyakhqmgv3yxyzx27ys549zlc3ij3vf67n8by0jj8"; }) + (fetchNuGet { pname = "NLog"; version = "5.0.5"; sha256 = "1lrdpq5xikmda2rkh1b9jrhvi5r0d7nqdh5dglng92a7mkq2g75j"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.1.0"; sha256 = "0iq4gmaknz6yzb3qzbhrqqyfphqszgj05klipym3gs98qka6n568"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.5"; sha256 = "13mrmwfk26sn79zslr30wqkir0svg0njasc17px853sf78wqp9k0"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) @@ -171,6 +171,7 @@ (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 86a94575164ee..7bc5c7c76f89f 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -24,4 +24,5 @@ fi $(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file" +cd "$asf_path" exec "$asf_path/web-ui/update.sh" diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 86ce1163006e7..8130fd1391724 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,8 +11,8 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "855ca01e6ec94947404ce728c447baf805c9a655"; - sha256 = "1s16i7hrp61nbq8wgwa3mxcsjqh0kkw91jiikdqysxrk2dgbaz77"; + rev = "5f9969bf17e4c6915418655b35fc6b790cd2da0b"; + sha256 = "03y4ahq958rxjnddwnc6h95drdpnvpy16adk434aak4l8hqr24sg"; }; in diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index 4f761f55a1aee..873b479a5994f 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.19.3" = { + "@babel/compat-data-7.19.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.3.tgz"; - sha512 = "prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz"; + sha512 = "CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw=="; }; }; - "@babel/core-7.19.3" = { + "@babel/core-7.19.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.19.3"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz"; - sha512 = "WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz"; + sha512 = "D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -49,13 +49,13 @@ let sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; }; }; - "@babel/generator-7.19.3" = { + "@babel/generator-7.19.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.19.3"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz"; - sha512 = "fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.6.tgz"; + sha512 = "oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -166,13 +166,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.19.0" = { + "@babel/helper-module-transforms-7.19.6" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.19.0"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz"; - sha512 = "3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz"; + sha512 = "fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -211,13 +211,13 @@ let sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; }; }; - "@babel/helper-simple-access-7.18.6" = { + "@babel/helper-simple-access-7.19.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.6"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; - sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz"; + sha512 = "f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { @@ -238,13 +238,13 @@ let sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-string-parser-7.18.10" = { + "@babel/helper-string-parser-7.19.4" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.18.10"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; - sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; }; }; "@babel/helper-validator-identifier-7.19.1" = { @@ -274,13 +274,13 @@ let sha512 = "95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ=="; }; }; - "@babel/helpers-7.19.0" = { + "@babel/helpers-7.19.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.19.0"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz"; - sha512 = "DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz"; + sha512 = "G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw=="; }; }; "@babel/highlight-7.18.6" = { @@ -292,13 +292,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.19.3" = { + "@babel/parser-7.19.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.19.3"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz"; - sha512 = "pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz"; + sha512 = "h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -400,13 +400,13 @@ let sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.9" = { + "@babel/plugin-proposal-object-rest-spread-7.19.4" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.9"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; - sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz"; + sha512 = "wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { @@ -616,13 +616,13 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.18.9" = { + "@babel/plugin-transform-block-scoping-7.19.4" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.18.9"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; - sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz"; + sha512 = "934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ=="; }; }; "@babel/plugin-transform-classes-7.19.0" = { @@ -643,13 +643,13 @@ let sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.13" = { + "@babel/plugin-transform-destructuring-7.19.4" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.13"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; - sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz"; + sha512 = "t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -877,13 +877,13 @@ let sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; - "@babel/preset-env-7.19.3" = { + "@babel/preset-env-7.19.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.3.tgz"; - sha512 = "ziye1OTc9dGFOAXSWKUqQblYHNlBOaDl8wzqf2iKXJAltYiR3hKHUKmkt+S9PppW7RQpq4fFCrwwpIDj/f5P4w=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz"; + sha512 = "5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -913,22 +913,22 @@ let sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.19.3" = { + "@babel/traverse-7.19.6" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.19.3"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz"; - sha512 = "qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.6.tgz"; + sha512 = "6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ=="; }; }; - "@babel/types-7.19.3" = { + "@babel/types-7.19.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz"; - sha512 = "hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz"; + sha512 = "M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -940,13 +940,13 @@ let sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@eslint/eslintrc-1.3.2" = { + "@eslint/eslintrc-1.3.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz"; - sha512 = "AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz"; + sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg=="; }; }; "@fortawesome/fontawesome-common-types-6.2.0" = { @@ -994,22 +994,13 @@ let sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; }; }; - "@humanwhocodes/config-array-0.10.5" = { + "@humanwhocodes/config-array-0.11.6" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.10.5"; + version = "0.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz"; - sha512 = "XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug=="; - }; - }; - "@humanwhocodes/gitignore-to-minimatch-1.0.2" = { - name = "_at_humanwhocodes_slash_gitignore-to-minimatch"; - packageName = "@humanwhocodes/gitignore-to-minimatch"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz"; - sha512 = "rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz"; + sha512 = "jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg=="; }; }; "@humanwhocodes/module-importer-1.0.1" = { @@ -1093,31 +1084,31 @@ let sha512 = "54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; "@polka/url-1.0.0-next.21" = { @@ -1345,13 +1336,13 @@ let sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; }; }; - "@vue/compiler-sfc-2.7.10" = { + "@vue/compiler-sfc-2.7.13" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.10"; + version = "2.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"; - sha512 = "55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz"; + sha512 = "zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg=="; }; }; "@vue/component-compiler-utils-3.2.2" = { @@ -1750,15 +1741,6 @@ let sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; }; - "array-union-2.1.0" = { - name = "array-union"; - packageName = "array-union"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; - }; - }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -1858,13 +1840,13 @@ let sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; }; }; - "before-build-webpack-0.2.12" = { + "before-build-webpack-0.2.13" = { name = "before-build-webpack"; packageName = "before-build-webpack"; - version = "0.2.12"; + version = "0.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/before-build-webpack/-/before-build-webpack-0.2.12.tgz"; - sha512 = "k91crmYKGUiKNRVa6sbP5jVD1m8c2Atjt9UIlVrjOla5kKPe96g1m45J98peZbImOtUCFZCSkT4fr5HNfK/Vew=="; + url = "https://registry.npmjs.org/before-build-webpack/-/before-build-webpack-0.2.13.tgz"; + sha512 = "Vtx55X83giRl+DQ7EZBhU1leUrOLb0t4cKSfvlE9fSub2+TPXFEXjBTYP0jsEnUi7Hd4jdQmUtq/cL6ncBXDFA=="; }; }; "big.js-5.2.2" = { @@ -2731,13 +2713,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.24.0" = { + "eslint-8.26.0" = { name = "eslint"; packageName = "eslint"; - version = "8.24.0"; + version = "8.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz"; - sha512 = "dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz"; + sha512 = "kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2776,13 +2758,13 @@ let sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; }; }; - "eslint-plugin-vue-9.5.1" = { + "eslint-plugin-vue-9.6.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.5.1"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.5.1.tgz"; - sha512 = "Y0sL2RY7Xc9S8kNih9lbwHIDmewUg9bfas6WSzsOWRgDXhIHKxRBZYNAnVcXBFfE+bMWHUA5GLChl7TcTYUI8w=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.6.0.tgz"; + sha512 = "zzySkJgVbFCylnG2+9MDF7N+2Rjze2y0bF8GyUNpFOnT8mCMfqqtLDJkHBuYu9N/psW1A6DVbQhPkP92E+qakA=="; }; }; "eslint-scope-5.1.1" = { @@ -3280,15 +3262,6 @@ let sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; }; }; - "globby-11.1.0" = { - name = "globby"; - packageName = "globby"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; - }; - }; "globby-13.1.1" = { name = "globby"; packageName = "globby"; @@ -3829,6 +3802,15 @@ let sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; }; }; + "is-path-inside-3.0.3" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; + }; + }; "is-plain-obj-3.0.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -4090,13 +4072,22 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "linkifyjs-3.0.5" = { + "linkify-html-4.0.2" = { + name = "linkify-html"; + packageName = "linkify-html"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-html/-/linkify-html-4.0.2.tgz"; + sha512 = "YcN3tsyutK2Y/uSuoG0zne8FQdoqzrAgNU5ko0DWE7M2oQ3ms4z/202f2W4TvRm9uxKdrsWAullfynANLaVMqw=="; + }; + }; + "linkifyjs-4.0.2" = { name = "linkifyjs"; packageName = "linkifyjs"; - version = "3.0.5"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.5.tgz"; - sha512 = "1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg=="; + url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.0.2.tgz"; + sha512 = "/VSoCZiglX0VMsXmL5PN3lRg45M86lrD9PskdkA2abWaTKap1bIcJ11LS4EE55bcUl9ZOR4eZ792UtQ9E/5xLA=="; }; }; "loader-runner-4.2.0" = { @@ -5377,13 +5368,13 @@ let sha512 = "Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A=="; }; }; - "sass-loader-13.0.2" = { + "sass-loader-13.1.0" = { name = "sass-loader"; packageName = "sass-loader"; - version = "13.0.2"; + version = "13.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz"; - sha512 = "BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q=="; + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.1.0.tgz"; + sha512 = "tZS1RJQ2n2+QNyf3CCAo1H562WjL/5AM6Gi8YcPVVoNxQX8d19mx8E+8fRrMWsyc93ZL6Q8vZDSM0FHVTJaVnQ=="; }; }; "schema-utils-2.7.1" = { @@ -5566,15 +5557,6 @@ let sha512 = "qx9go5yraB7ekT7bCMqUHJ5jEaOC/GXBxUWv+jeWnb7WzHUFdcQPGWk7YmAwFBaQBrogpuSqd/azbC2lZRqqmw=="; }; }; - "slash-3.0.0" = { - name = "slash"; - packageName = "slash"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - }; "slash-4.0.0" = { name = "slash"; packageName = "slash"; @@ -6043,13 +6025,13 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "vue-2.7.10" = { + "vue-2.7.13" = { name = "vue"; packageName = "vue"; - version = "2.7.10"; + version = "2.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"; - sha512 = "HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz"; + sha512 = "QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ=="; }; }; "vue-eslint-parser-8.3.0" = { @@ -6142,13 +6124,13 @@ let sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; }; }; - "vue-template-compiler-2.7.10" = { + "vue-template-compiler-2.7.13" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.7.10"; + version = "2.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz"; - sha512 = "QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz"; + sha512 = "jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog=="; }; }; "vue-template-es2015-compiler-1.9.1" = { @@ -6196,13 +6178,13 @@ let sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; }; }; - "webpack-bundle-analyzer-4.6.1" = { + "webpack-bundle-analyzer-4.7.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; - version = "4.6.1"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz"; - sha512 = "oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw=="; + url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz"; + sha512 = "j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg=="; }; }; "webpack-cli-4.10.0" = { @@ -6385,8 +6367,8 @@ let dependencies = [ sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" - (sources."@babel/core-7.19.3" // { + sources."@babel/compat-data-7.19.4" + (sources."@babel/core-7.19.6" // { dependencies = [ sources."debug-4.3.4" sources."json5-2.2.1" @@ -6400,7 +6382,7 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.19.3" + sources."@babel/generator-7.19.6" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" (sources."@babel/helper-compilation-targets-7.19.3" // { @@ -6423,21 +6405,21 @@ let sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.18.9" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.19.0" + sources."@babel/helper-module-transforms-7.19.6" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-remap-async-to-generator-7.18.9" sources."@babel/helper-replace-supers-7.18.9" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.18.10" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.6" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.19.1" @@ -6449,7 +6431,7 @@ let sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-object-rest-spread-7.19.4" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -6473,10 +6455,10 @@ let sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-block-scoping-7.19.4" sources."@babel/plugin-transform-classes-7.19.0" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -6502,7 +6484,7 @@ let sources."@babel/plugin-transform-typeof-symbol-7.18.9" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.3" // { + (sources."@babel/preset-env-7.19.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -6510,15 +6492,15 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.18.10" - (sources."@babel/traverse-7.19.3" // { + (sources."@babel/traverse-7.19.6" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.19.3" + sources."@babel/types-7.19.4" sources."@discoveryjs/json-ext-0.5.5" - (sources."@eslint/eslintrc-1.3.2" // { + (sources."@eslint/eslintrc-1.3.3" // { dependencies = [ sources."debug-4.3.3" sources."globals-13.15.0" @@ -6530,13 +6512,12 @@ let sources."@fortawesome/free-brands-svg-icons-6.2.0" sources."@fortawesome/free-solid-svg-icons-6.2.0" sources."@fortawesome/vue-fontawesome-2.0.8" - (sources."@humanwhocodes/config-array-0.10.5" // { + (sources."@humanwhocodes/config-array-0.11.6" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@jridgewell/gen-mapping-0.3.2" @@ -6546,9 +6527,9 @@ let sources."@jridgewell/trace-mapping-0.3.13" sources."@leichtgewicht/ip-codec-2.0.3" sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" sources."@types/body-parser-1.19.2" sources."@types/bonjour-3.5.10" @@ -6574,7 +6555,7 @@ let sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.3" - sources."@vue/compiler-sfc-2.7.10" + sources."@vue/compiler-sfc-2.7.13" (sources."@vue/component-compiler-utils-3.2.2" // { dependencies = [ sources."picocolors-0.2.1" @@ -6655,7 +6636,7 @@ let sources."babel-plugin-polyfill-regenerator-0.4.1" sources."balanced-match-1.0.0" sources."batch-0.6.1" - sources."before-build-webpack-0.2.12" + sources."before-build-webpack-0.2.13" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" sources."bluebird-3.7.2" @@ -6781,10 +6762,9 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.24.0" // { + (sources."eslint-8.26.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."array-union-2.1.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -6795,14 +6775,13 @@ let sources."find-up-5.0.0" sources."glob-parent-6.0.2" sources."globals-13.17.0" - sources."globby-11.1.0" sources."has-flag-4.0.0" + sources."is-path-inside-3.0.3" sources."locate-path-6.0.0" sources."ms-2.1.2" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" - sources."slash-3.0.0" sources."supports-color-7.2.0" ]; }) @@ -6828,7 +6807,7 @@ let sources."doctrine-2.1.0" ]; }) - (sources."eslint-plugin-vue-9.5.1" // { + (sources."eslint-plugin-vue-9.6.0" // { dependencies = [ sources."debug-4.3.4" sources."eslint-scope-7.1.1" @@ -7062,7 +7041,8 @@ let sources."kind-of-6.0.3" sources."klona-2.0.5" sources."levn-0.4.1" - sources."linkifyjs-3.0.5" + sources."linkify-html-4.0.2" + sources."linkifyjs-4.0.2" sources."loader-runner-4.2.0" (sources."loader-utils-1.4.0" // { dependencies = [ @@ -7219,7 +7199,7 @@ let sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sass-1.55.0" - sources."sass-loader-13.0.2" + sources."sass-loader-13.1.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-2.1.1" @@ -7333,7 +7313,7 @@ let sources."uuid-8.3.2" sources."v-tooltip-2.1.3" sources."vary-1.1.2" - sources."vue-2.7.10" + sources."vue-2.7.13" (sources."vue-eslint-parser-8.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -7350,13 +7330,13 @@ let sources."vue-router-3.6.5" sources."vue-snotify-3.2.1" sources."vue-style-loader-4.1.3" - sources."vue-template-compiler-2.7.10" + sources."vue-template-compiler-2.7.13" sources."vue-template-es2015-compiler-1.9.1" sources."vuex-3.6.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" sources."webpack-5.74.0" - (sources."webpack-bundle-analyzer-4.6.1" // { + (sources."webpack-bundle-analyzer-4.7.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" diff --git a/pkgs/applications/misc/blender/darwin.patch b/pkgs/applications/misc/blender/darwin.patch index d5156bfad3d90..c86aa24446027 100644 --- a/pkgs/applications/misc/blender/darwin.patch +++ b/pkgs/applications/misc/blender/darwin.patch @@ -1,7 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1832,7 +1832,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) +@@ -1894,7 +1894,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) if(APPLE) @@ -58,10 +58,10 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake - theora theoradec theoraenc vorbis vorbisenc - vorbisfile vpx x264 xvidcore) + swresample swscale) - find_package(FFmpeg) - endif() - -@@ -270,7 +263,6 @@ if(WITH_BOOST) + if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a) + list(APPEND FFMPEG_FIND_COMPONENTS aom) + endif() +@@ -273,7 +266,6 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) @@ -69,7 +69,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake endif() if(WITH_PUGIXML) -@@ -399,7 +391,7 @@ endif() +@@ -402,7 +394,7 @@ endif() # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. if(WITH_OPENMP) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index accfcfa2c2371..dd551b83994dc 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "calibre"; - version = "6.8.0"; + version = "6.9.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-d9JaWjAjJzKldjyrdrl6OyX1JSatp9U8agRog7K5n2s="; + hash = "sha256-pAZy9YgAzEks5o4R5r46iGLTcitBrOHyltWg2ZyfzwA="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix index 32d9e527dd49c..6eb0e832bc951 100644 --- a/pkgs/applications/misc/conduktor/default.nix +++ b/pkgs/applications/misc/conduktor/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/conduktor/builds/releases/download/v${version}/Conduktor-linux-${version}.zip"; - sha256 = "1kr5yh9piqbl6njsnxgh6jzf3vifw8ja5x4qm4znmzi3r49sw0gx"; + sha256 = "sha256-9y/7jni5zIITUWd75AxsfG/b5vCYotmeMeC9aYM2WEs="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e003787efc460..07d0534f0734d 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -8,7 +8,7 @@ , freetype , glib , gtk3 -, jdk +, jdk17 , libX11 , libXrender , libXtst @@ -46,7 +46,7 @@ freetype glib gtk3 - jdk + jdk17 libX11 libXrender libXtst @@ -92,8 +92,8 @@ ln -s $out/Applications/DBeaver.app/Contents/MacOS/dbeaver $out/bin/dbeaver wrapProgram $out/Applications/DBeaver.app/Contents/MacOS/dbeaver \ - --prefix JAVA_HOME : ${jdk.home} \ - --prefix PATH : ${jdk}/bin + --prefix JAVA_HOME : ${jdk17.home} \ + --prefix PATH : ${jdk17}/bin runHook postInstall '' else '' @@ -107,7 +107,7 @@ patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ - --prefix PATH : ${jdk}/bin \ + --prefix PATH : ${jdk17}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index ad1660173159c..b2c5dfe2ccfea 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "feedbackd"; # Not an actual upstream project release, # only a Debian package release that is tagged in the upstream repo - version = "0.0.0+git20220520"; + version = "0.0.1"; outputs = [ "out" "dev" ] # remove if cross-compiling gobject-introspection works @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { owner = "Librem5"; repo = "feedbackd"; rev = "v${version}"; - hash = "sha256-4ftPC6LnX0kKFYVyH85yCH43B3YjuaZM5rzr8TGgZvc="; + hash = "sha256-l1FhECLPq8K9lzQ50sI/aH7fwR9xW1ATyk7EWRmLzuQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index 8178288ba56ea..5fd805994a6e5 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -1,26 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK30, boost, firebird }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, wxGTK32 +, boost +, firebird +}: stdenv.mkDerivation rec { - version = "0.9.3.1"; + version = "0.9.3.12"; pname = "flamerobin"; src = fetchFromGitHub { owner = "mariuz"; repo = "flamerobin"; rev = version; - sha256 = "1wwcsca01hpgi9z5flvbdhs9zv7jvahnbn97j6ymy0hdyb8lv6si"; + sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA="; }; - enableParallelBuilding = true; + patches = [ + # rely on compiler command line for __int128 and std::decimal::decimal128 + (fetchpatch { + url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch"; + sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM="; + }) + ]; - buildInputs = [ wxGTK30 boost firebird ]; + enableParallelBuilding = true; - preBuild = '' - sed -i 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -nostartfiles/' Makefile - ''; + nativeBuildInputs = [ cmake ]; - configureFlags = [ - "--disable-debug" + buildInputs = [ + wxGTK32 + boost + firebird ]; meta = with lib; { diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index f01a2b5595a35..8c730a2b48b76 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -12,7 +12,6 @@ , pixman , libpng , wayland -, wlroots , dbus , fcft }: @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { pixman libpng wayland - wlroots dbus fcft ]; diff --git a/pkgs/applications/misc/furtherance/default.nix b/pkgs/applications/misc/furtherance/default.nix new file mode 100644 index 0000000000000..1d1772dd67276 --- /dev/null +++ b/pkgs/applications/misc/furtherance/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, appstream-glib, desktop-file-utils +, glib, libadwaita, meson, ninja, pkg-config, wrapGAppsHook4, dbus , gtk4, sqlite }: + +stdenv.mkDerivation rec { + pname = "furtherance"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "lakoliu"; + repo = "Furtherance"; + rev = "v${version}"; + sha256 = "xshZpwL5AQvYSPoyt9Qutaym5IGBQHWwz4ev3xnVcSk="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "J/e8NYd9JjmANj+4Eh3/Uq2/vS711CwERgmJ7i5orNw="; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + dbus + glib + gtk4 + libadwaita + sqlite + ]; + + meta = with lib; { + description = "Track your time without being tracked"; + homepage = "https://github.com/lakoliu/Furtherance"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ CaptainJawZ ]; + }; +} diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 162b6362fd7da..76785c266a47b 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -17,7 +17,6 @@ , pngSupport ? true # Optional dependencies , cairo -, librsvg , libpng }: @@ -51,22 +50,21 @@ stdenv.mkDerivation rec { tllist fcft ] ++ lib.optional enableCairo cairo - ++ lib.optional pngSupport libpng - ++ lib.optional svgSupport librsvg; + ++ lib.optional pngSupport libpng; mesonBuildType = "release"; mesonFlags = [ "-Denable-cairo=${if enableCairo then "enabled" else "disabled"}" "-Dpng-backend=${if pngSupport then "libpng" else "none"}" - "-Dsvg-backend=${if svgSupport then "librsvg" else "none"}" + "-Dsvg-backend=${if svgSupport then "nanosvg" else "none"}" ]; meta = with lib; { description = "Wayland-native application launcher, similar to rofi’s drun mode"; homepage = "https://codeberg.org/dnkl/fuzzel"; - license = licenses.mit; - maintainers = with maintainers; [ fionera polykernel ]; + license = with licenses; [ mit zlib ]; + maintainers = with maintainers; [ fionera polykernel rodrgz ]; platforms = with platforms; linux; changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}"; }; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 0b7233e189c03..edd5f491cced2 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.24.0"; + version = "1.24.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-LGZjPkiX252IRgRG1fxVS4IdnKA3RgVjOhZLxYScIJo="; + sha256 = "sha256-pjm410aT4+Lj3PBAlibmglNPGlmBgkRoHAg7JrIDp0s="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 02f0a09e0df1d..591f26abbc725 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index a0af30ac84b9e..14173fc7057f6 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -55,8 +55,6 @@ in substituteInPlace Makefile \ --replace 'unknown' 'v${version}' - - export CFLAGS="-march=native" ''; makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1"; diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index 6052cf70facb7..d39ed4faf4dc0 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "6.5"; + version = "7.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - sha256 = "sha256-Hy2W7cvvzVcKtd/KzTn81awoolnfM3ST0Nm70YBLTYY="; + sha256 = "sha256-P/1lKmWpwidW3fz2zxgVnFoHmROTVB//byDedoOC4u0="; }; nativeBuildInputs = [ @@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec { glib gdk-pixbuf libadwaita - python3Packages.libpwquality.dev # Use python-enabled libpwquality ]; propagatedBuildInputs = with python3Packages; [ @@ -52,7 +51,8 @@ python3Packages.buildPythonApplication rec { construct pykeepass pyotp - libpwquality + validators + zxcvbn ]; # Prevent double wrapping, let the Python wrapper use the args in preFixup. @@ -63,7 +63,6 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - broken = stdenv.hostPlatform.isStatic; # libpwquality doesn't provide bindings when static description = "Password manager for GNOME which makes use of the KeePass v.4 format"; homepage = "https://gitlab.gnome.org/World/secrets"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/gostatic/default.nix b/pkgs/applications/misc/gostatic/default.nix new file mode 100644 index 0000000000000..240df1a913634 --- /dev/null +++ b/pkgs/applications/misc/gostatic/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "gostatic"; + version = "2.35"; + + src = fetchFromGitHub { + owner = "piranha"; + repo = pname; + rev = version; + hash = "sha256-pxk9tauB7u0oe6g4maHh+dREZXKwMz44v3KB43yYW6c="; + }; + + vendorHash = "sha256-9YCt9crLuYjd+TUXJyx/EAYIMWM5TD+ZyzLeu0RMxVc="; + + meta = with lib; { + description = "Fast static site generator"; + homepage = "https://github.com/piranha/gostatic"; + license = licenses.isc; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index d7177906287ef..8de8e30269a34 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,16 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, substituteAll -, qmake, qttools, qttranslations, qtlocation, qtpbfimageplugin, wrapQtAppsHook +{ lib +, stdenv +, fetchFromGitHub +, qmake +, nix-update-script +, substituteAll +, qtbase +, qttools +, qttranslations +, qtlocation ? null # qt5 only +, qtpositioning ? null # qt6 only +, qtpbfimageplugin +, qtsvg +, qt5compat ? null # qt6 only +, wrapQtAppsHook }: +let + isQt6 = lib.versions.major qtbase.version == "6"; + +in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.6"; + version = "11.9"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ="; + hash = "sha256-R/Kuk4nRJg3ozNNmzzNDnGcsmBmlk0g9d+F8JwLFz98="; }; patches = (substituteAll { @@ -19,7 +36,15 @@ stdenv.mkDerivation rec { inherit qttranslations; }); - buildInputs = [ qtlocation qtpbfimageplugin ]; + buildInputs = [ qtpbfimageplugin ] + ++ (if isQt6 then [ + qtbase + qtpositioning + qtsvg + qt5compat + ] else [ + qtlocation + ]); nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; @@ -49,5 +74,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ womfoo sikmir ]; platforms = platforms.unix; + broken = isQt6 && stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 706a8ff749551..7435d02c99c8b 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hr"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "LuRsT"; repo = "hr"; rev = version; - sha256 = "068kq37lbqfjzh28rlvkprni38ii991naawylwvq6d43y9dpzs2b"; + sha256 = "sha256-Pcnkiq7ipLoz6MFWZkCIxneUuZ3w/d+iqiyTz55WZvs="; }; dontBuild = true; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 49bacebdab93a..bfe380275899d 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.106.0"; + version = "0.107.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dyre/ou0kjEqbq8WGGM/n8+JBTMNslbnmj+5clYJUHs="; + sha256 = "sha256-8Ru1T6GSz5TfMxFvUU2QgpiWNLJK+ky723qc3flrDIw="; }; - vendorSha256 = "sha256-dhsGGu4uNrqKv6szGqruAcI2UTbbXknKaKk5pVCQB5A="; + vendorSha256 = "sha256-92QLkSUrwMEZ/8pIeOj4KKtC47oN+ITxJnpp7Fb0Z10="; doCheck = false; diff --git a/pkgs/applications/misc/itd/default.nix b/pkgs/applications/misc/itd/default.nix index facbda32238b7..6e6f32ad32043 100644 --- a/pkgs/applications/misc/itd/default.nix +++ b/pkgs/applications/misc/itd/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "itd"; - version = "0.0.9"; + version = "1.0.0"; # https://gitea.arsenm.dev/Arsen6331/itd/tags src = fetchFromGitea { @@ -14,10 +14,10 @@ buildGoModule rec { owner = "Arsen6331"; repo = "itd"; rev = "v${version}"; - hash = "sha256-FefffF8YIEcB+eglifNWuuK7H5A1YXyxxZOXz1a8HfY="; + hash = "sha256-von/gvKnm69r/Z3Znm9IW97LfRq4v1cpv5z05h0ahek="; }; - vendorHash = "sha256-LFzrpKQQ4nFoK4vVTzJDQ5OGDe1y5BSfXPX+FRVunjQ="; + vendorHash = "sha256-Sj1ASrb80AgZDfIwmSspArRXSaxP8FlXYi9xyWfCYWk="; preBuild = '' echo r${version} > version.txt diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 99e7850cbbea8..19cc2a7faef7d 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -16,28 +16,29 @@ GEM eventmachine (1.2.7) ffi (1.15.5) forwardable-extended (2.6.0) - gemoji (3.0.1) + gemoji (4.0.1) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.3.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) jekyll-mentions (1.6.0) @@ -51,8 +52,8 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) kramdown (2.4.0) @@ -66,7 +67,7 @@ GEM mercenary (0.4.0) mini_portile2 (2.8.0) minitest (5.16.3) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) pathutil (0.16.2) @@ -77,15 +78,16 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (3.30.0) + rouge (4.0.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) + unicode-display_width (2.3.0) + webrick (1.7.0) PLATFORMS ruby @@ -99,4 +101,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 2.3.22 + 2.3.25 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 54cf7534fabf5..2e20dc241dc07 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -87,10 +87,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + sha256 = "07lkqllgn7161rvnhnfy7adnfqv0xvr4c3ncsfxixdgmzi6acn5h"; type = "gem"; }; - version = "3.0.1"; + version = "4.0.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -125,15 +125,15 @@ version = "1.12.0"; }; jekyll = { - dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpvkd7i9szkps2acxbdqajn4qc9sqxxy80f3rf5dra1vj7yrhpp"; + sha256 = "0m866i41j7y5ipvl7f0vz82mypv5irqz9xxbx44s5pdsmi3dyawy"; type = "gem"; }; - version = "4.2.2"; + version = "4.3.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9"; + sha256 = "0z4yabsvqdb8x1rr60yyzbaf950cyzv984n3jwwvgcmv5j73wk2x"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.0"; }; kramdown = { dependencies = ["rexml"]; @@ -291,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -363,10 +363,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; + sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq"; type = "gem"; }; - version = "3.30.0"; + version = "4.0.0"; }; safe_yaml = { groups = ["default"]; @@ -395,10 +395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -416,9 +416,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; type = "gem"; }; - version = "1.8.0"; + version = "2.3.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; } diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 3d1a021307361..8d9fbb696d7ec 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -23,35 +23,36 @@ GEM http_parser.rb (~> 0) eventmachine (1.2.7) execjs (2.8.1) - faraday (2.6.0) + faraday (2.7.1) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.1) + faraday-net_http (3.0.2) fast-stemmer (1.0.2) ffi (1.15.5) forwardable-extended (2.6.0) - gemoji (3.0.1) + gemoji (4.0.1) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.3.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) jekyll-coffeescript (2.0.0) @@ -77,8 +78,8 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) kramdown (2.4.0) @@ -101,7 +102,7 @@ GEM mime-types-data (3.2022.0105) mini_portile2 (2.8.0) minitest (5.16.3) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.25.1) @@ -119,7 +120,7 @@ GEM rdoc (6.4.0) psych (>= 4.0.0) rexml (3.2.5) - rouge (3.30.0) + rouge (4.0.0) ruby2_keywords (0.0.5) safe_yaml (1.0.5) sassc (2.4.0) @@ -128,12 +129,13 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) stringio (3.0.2) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) tomlrb (1.3.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) + unicode-display_width (2.3.0) + webrick (1.7.0) yajl-ruby (1.4.3) PLATFORMS @@ -161,4 +163,4 @@ DEPENDENCIES yajl-ruby (~> 1.4) BUNDLED WITH - 2.3.22 + 2.3.25 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 08e93427769cc..334750398ff78 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -132,20 +132,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; + sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.1"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq"; + sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; fast-stemmer = { groups = ["default"]; @@ -194,10 +194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + sha256 = "07lkqllgn7161rvnhnfy7adnfqv0xvr4c3ncsfxixdgmzi6acn5h"; type = "gem"; }; - version = "3.0.1"; + version = "4.0.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -232,15 +232,15 @@ version = "1.12.0"; }; jekyll = { - dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpvkd7i9szkps2acxbdqajn4qc9sqxxy80f3rf5dra1vj7yrhpp"; + sha256 = "0m866i41j7y5ipvl7f0vz82mypv5irqz9xxbx44s5pdsmi3dyawy"; type = "gem"; }; - version = "4.2.2"; + version = "4.3.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -379,10 +379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9"; + sha256 = "0z4yabsvqdb8x1rr60yyzbaf950cyzv984n3jwwvgcmv5j73wk2x"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.0"; }; kramdown = { dependencies = ["rexml"]; @@ -552,10 +552,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -657,10 +657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; + sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq"; type = "gem"; }; - version = "3.30.0"; + version = "4.0.0"; }; ruby2_keywords = { groups = ["default"]; @@ -720,10 +720,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.2"; }; tomlrb = { groups = ["default"]; @@ -751,10 +751,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; + type = "gem"; + }; + version = "2.3.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; type = "gem"; }; - version = "1.8.0"; + version = "1.7.0"; }; yajl-ruby = { groups = ["default"]; diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh index 528f1062c733f..bc3c0d5248b08 100755 --- a/pkgs/applications/misc/jekyll/update.sh +++ b/pkgs/applications/misc/jekyll/update.sh @@ -9,7 +9,7 @@ readonly BASEDIR="$(dirname $(readlink -f $0))" for directory in "basic" "full"; do pushd "$BASEDIR/$directory" rm -f Gemfile.lock gemset.nix - bundix --magic + BUNDLE_FORCE_RUBY_PLATFORM=true bundix --magic rm -rf .bundle vendor popd done diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 85b409fe5ef31..be28d1185d24e 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.24"; + version = "1.2.25"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-s//GkCKvppqJ+7x8pNwVEaBsUOCKCGt+wLj9P+3N9hc="; + sha256 = "sha256-yBUvePVbNDLYL1d6cNrLBn6+/p1agVzSx29JB3EZ5Fk="; }; dontBuild = true; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 258a2a51e72dc..0275760af407d 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ]; dontWrapGApps = true; - postFixup = '' + preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 1dac72bd0d742..f50dd23ff013e 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -1,8 +1,18 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch -, cmake, boost -, portmidi, sqlite -, freetype, libpng, pngpp, zlib -, wxGTK30, wxsqlite3 +{ lib +, stdenv +, pkg-config +, fetchFromGitHub +, fetchpatch +, cmake +, boost +, portmidi +, sqlite +, freetype +, libpng +, pngpp +, zlib +, wxGTK30-gtk3 +, wxsqlite3 }: stdenv.mkDerivation rec { @@ -25,14 +35,28 @@ stdenv.mkDerivation rec { url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch"; sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn"; }) + (fetchpatch { + url = "https://github.com/lenmus/lenmus/commit/37ee8ac9c8faff65a14e8f7ed2bc22e6dc48d91f.patch"; + includes = [ "src/app/lenmus_midi_wizard.cpp" ]; + sha256 = "sha256-nlT6ZbSCIXUk2Ufv/SDn2A0Rt+s/7m+7l9HOoQmaIhc="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost - portmidi sqlite - freetype libpng pngpp zlib - wxGTK30 wxsqlite3 + portmidi + sqlite + freetype + libpng + pngpp + zlib + wxGTK30-gtk3 + wxsqlite3 ]; meta = with lib; { @@ -46,6 +70,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; - broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 77f2a6cb4a93d..5ac3e9938fc3e 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "3.0.3"; + version = "3.1.1"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2eB+VpMrhzs0Dg+X1sf7TVW7uK/URETUuWO82jQl57k="; + sha256 = "sha256-/CYZMuW5/YoZszTOaQZLRhJdZAGGMY+s7vMK01hyMvg="; }; - vendorSha256 = "sha256-VKxwdlyQUYmxubl4Y2uKvekuHd62GcGaoPeUBC+lcJU="; + vendorSha256 = "sha256-BwhbvCUOOp5ZeY/22kIZ58e+iPH0pVgiNOyoD6O2zPo="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index bb879bce1572c..54e3e98d48b8d 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.11"; + version = "0.8.12"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-c8gP7OJwnCEXnT2FQH1ttYRzZfbcJL86FX2JQezJI+s="; + sha256 = "sha256-I1jGPNGlZ53N3ZlN9nN/GSgQIfdoUeclyuMl+PpNVY4="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 5c39576ac6f3b..b4b2b2e2ac5df 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -30,7 +30,7 @@ in buildFHSUserEnv { # DGen // TODO: libarchive is broken # Dolphin - bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm + bluez ffmpeg gettext portaudio wxGTK30-gtk3 miniupnpc mbedtls lzo sfml gsm wavpack orc nettle gmp pcre vulkan-loader # DOSBox diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 85ef0c436691f..55aba845b0c04 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -51,7 +51,8 @@ let runHook preInstall mkdir -p $out/bin makeWrapper ${electron_18}/bin/electron $out/bin/obsidian \ - --add-flags $out/share/obsidian/app.asar + --add-flags $out/share/obsidian/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" install -m 444 -D resources/app.asar $out/share/obsidian/app.asar install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar install -m 444 -D "${desktopItem}/share/applications/"* \ diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 62d14957a4237..14055463fa3f1 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -4,6 +4,7 @@ , bison , flex , pkg-config +, libftdi1 , libuuid , cppunit , protobuf @@ -26,7 +27,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook bison flex pkg-config perl ]; - buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; + buildInputs = [ + # required for ola-ftdidmx plugin (support for 'dumb' FTDI devices) + libftdi1 + libuuid + cppunit + protobuf + zlib + avahi + libmicrohttpd + python3 + ]; propagatedBuildInputs = [ python3.pkgs.protobuf python3.pkgs.numpy diff --git a/pkgs/applications/misc/opentrack/aruco.nix b/pkgs/applications/misc/opentrack/aruco.nix index 9a315a1320736..2c28d0e8d397c 100644 --- a/pkgs/applications/misc/opentrack/aruco.nix +++ b/pkgs/applications/misc/opentrack/aruco.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ opencv4 ]; - NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3"; + NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; preInstall = '' mkdir -p $out/include/aruco diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index 34c6b3f712b5c..7be07093cd1d8 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -42,7 +42,7 @@ in nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems]; buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco]; - NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3"; + NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; dontWrapQtApps = true; cmakeFlags = [ diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 21075dcf5c566..b0268f9c18c28 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VMFkZsFx2pN0IrWTdc9OqkdQwuk6b4Ay4zsvN9HTHug="; + sha256 = "sha256-nZSP9JBbUPG9xk/ATXUYkjyP344m+e7RQS3BiFVzQf4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix new file mode 100644 index 0000000000000..5dd8fac6de8b1 --- /dev/null +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pe-bear"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "hasherezade"; + repo = "pe-bear"; + rev = "v${version}"; + sha256 = "jzgsjqic5rBsyuwJW9T44rKM8rKDce564VAogDvsLho="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ]; + + meta = with lib; { + description = "Portable Executable reversing tool with a friendly GUI"; + homepage = "https://hshrzd.wordpress.com/pe-bear/"; + + license = [ + # PE-Bear + licenses.gpl2Only + + # Vendored capstone + licenses.bsd3 + + # Vendored bearparser + licenses.bsd2 + ]; + + maintainers = with maintainers; [ blitz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index fc6b6a1e2d4a5..42143cbc9772d 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -10,8 +10,12 @@ , sassc , python3Packages , gobject-introspection -, gtk3 , wrapGAppsHook +, libappindicator-gtk3 +, libxcb +, qt5 +, ibus +, usbutils }: python3Packages.buildPythonApplication rec { @@ -28,11 +32,9 @@ python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs scripts - substituteInPlace scripts/build-styles.sh \ --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' - substituteInPlace pylib/common.py \ --replace "/usr/share/polychromatic" "$out/share/polychromatic" ''; @@ -40,7 +42,6 @@ python3Packages.buildPythonApplication rec { preConfigure = '' scripts/build-styles.sh ''; - nativeBuildInputs = with python3Packages; [ gettext gobject-introspection @@ -48,18 +49,22 @@ python3Packages.buildPythonApplication rec { ninja sassc wrapGAppsHook + qt5.wrapQtAppsHook ]; propagatedBuildInputs = with python3Packages; [ colorama colour - gtk3 openrazer - pygobject3 pyqt5 pyqtwebengine requests setproctitle + libxcb + openrazer-daemon + libappindicator-gtk3 + ibus + usbutils ]; dontWrapGapps = true; @@ -67,6 +72,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" + "\${qtWrapperArgs[@]}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index c52adbc4f0be2..9eca3cb6bb9dc 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "process-compose"; - version = "0.24.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - sha256 = "TKLLq6I+Mcvdz51m8nydTWcslBcQlJCJFoJ10SgfVWU="; + sha256 = "7UVCGyFay0yQAcO1NKb1+vsNqX1v9Hf5NUgjnHlgnG0="; }; - ldflags = [ "-X main.version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -37,6 +37,5 @@ buildGoModule rec { homepage = "https://github.com/F1bonacc1/process-compose"; license = licenses.asl20; maintainers = with maintainers; [ thenonameguy ]; - mainProgram = "process-compose"; }; } diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 75c1ed16e1d17..9c996e321152a 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -31,10 +31,10 @@ , wxGTK31 , xorg , fetchpatch -, wxGTK31-override ? null +, withSystemd ? stdenv.isLinux }: let - wxGTK31-prusa = wxGTK31.overrideAttrs (old: rec { + wxGTK-prusa = wxGTK31.overrideAttrs (old: rec { pname = "wxwidgets-prusa3d-patched"; version = "3.1.4"; src = fetchFromGitHub { @@ -45,7 +45,6 @@ let fetchSubmodules = true; }; }); - wxGTK31-override' = if wxGTK31-override == null then wxGTK31-prusa else wxGTK31-override; in stdenv.mkDerivation rec { pname = "prusa-slicer"; @@ -78,10 +77,11 @@ stdenv.mkDerivation rec { opencascade-occt openvdb pcre - systemd tbb - wxGTK31-override' + wxGTK-prusa xorg.libX11 + ] ++ lib.optionals withSystemd [ + systemd ] ++ checkInputs; patches = [ @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; # prusa-slicer uses dlopen on `libudev.so` at runtime - NIX_LDFLAGS = "-ludev"; + NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; prePatch = '' # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx @@ -139,6 +139,13 @@ stdenv.mkDerivation rec { substituteInPlace src/libslic3r/Format/STEP.cpp \ --replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";' fi + + # Fix resources folder location on macOS + substituteInPlace src/PrusaSlicer.cpp \ + --replace "#ifdef __APPLE__" "#if 0" + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + # Disable segfault tests + sed -i '/libslic3r/d' tests/CMakeLists.txt ''; src = fetchFromGitHub { @@ -149,6 +156,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ + "-DSLIC3R_STATIC=0" "-DSLIC3R_FHS=1" "-DSLIC3R_GTK=3" ]; @@ -157,7 +165,7 @@ stdenv.mkDerivation rec { ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" mkdir -p "$out/lib" - mv -v $out/bin/*.so $out/lib/ + mv -v $out/bin/*.* $out/lib/ mkdir -p "$out/share/pixmaps/" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index a3c8fc6cdcc62..147f3484f18fa 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31 }: +{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; pname = "super-slicer"; @@ -22,7 +22,13 @@ let # Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823 (fetchpatch { url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch"; - sha256 = "sha256-xMbUjumPZ/7ulyRuBA76CwIv4BOpd+yKXCINSf58FxI="; + # Excludes Linux-only patches + excludes = [ + "src/slic3r/GUI/FreeCADDialog.cpp" + "src/slic3r/GUI/Tab.cpp" + "src/slic3r/Utils/Http.cpp" + ]; + sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; }) ]; }; @@ -39,6 +45,12 @@ let fetchSubmodules = true; }; + # wxScintilla is not used on macOS + prePatch = super.prePatch + '' + substituteInPlace src/CMakeLists.txt \ + --replace "scintilla" "" + ''; + # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; separateDebugInfo = true; @@ -71,7 +83,6 @@ let passthru = allVersions; }; - prusa-slicer' = prusa-slicer.override { wxGTK31-override = wxGTK31; }; - allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions; + allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions; in allVersions.stable diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix new file mode 100644 index 0000000000000..f569932475534 --- /dev/null +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -0,0 +1,46 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libGL +, pipewire +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "pw-viz"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ax9d"; + repo = pname; + rev = "v${version}"; + sha256 = "1d46m7w6rzzjpxc2fxwka9xbz49szbfrl63kxlv6kw4lknrladjn"; + }; + + cargoSha256 = "sha256-jx1mUP6ezpwUhmDD9tCJBhHCHU8fEMlB738yYfB1psc="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libGL + pipewire + rustPlatform.bindgenHook + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libxcb + ]; + + postFixup = '' + patchelf $out/bin/pw-viz --add-rpath ${lib.makeLibraryPath [ libGL xorg.libXrandr ]} + ''; + + meta = with lib; { + description = "A simple and elegant pipewire graph editor "; + homepage = "https://github.com/ax9d/pw-viz"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index d5c1115acbf7c..75f09742c1e22 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,8 +1,25 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config, zip, gettext, perl -, wxGTK30, libXext, libXi, libXt, libXtst, xercesc -, qrencode, libuuid, libyubikey, yubikey-personalization -, curl, openssl, file, gitUpdater +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, zip +, gettext +, perl +, wxGTK30-gtk3 +, libXext +, libXi +, libXt +, libXtst +, xercesc +, qrencode +, libuuid +, libyubikey +, yubikey-personalization +, curl +, openssl +, file +, gitUpdater }: stdenv.mkDerivation rec { @@ -17,12 +34,26 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake gettext perl pkg-config zip + cmake + gettext + perl + pkg-config + zip ]; + buildInputs = [ - libXext libXi libXt libXtst wxGTK30 - curl qrencode libuuid openssl xercesc - libyubikey yubikey-personalization + libXext + libXi + libXt + libXtst + wxGTK30-gtk3 + curl + qrencode + libuuid + openssl + xercesc + libyubikey + yubikey-personalization file ]; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6dbe3d8404159..10bb6a782707b 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -123,13 +123,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "071f3iqdbblb3awnx48j19kspk6l2g3658za80i2mf4gacgq9fm1"; + sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; }; meta = redshift.meta // { diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index 5622c94d427f8..9b00abd14cd9f 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , rustPlatform , xorg }: @@ -17,6 +18,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx"; + patches = [ + # Fixes "error[E0308]: mismatched types; expected `u8`, found `i8`" on aarch64 + # Remove with next version update + (fetchpatch { + url = "https://github.com/PonasKovas/rlaunch/commit/f78f36876bba45fe4e7310f58086ddc63f27a57e.patch"; + hash = "sha256-rTS1khw1zt3i1AJ11BhAILcmaohAwVc7Qfl6Fc76Kvs="; + }) + ]; + # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch @@ -26,6 +36,7 @@ rustPlatform.buildRustPackage rec { description = "A lightweight application launcher for X11"; homepage = "https://github.com/PonasKovas/rlaunch"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ danc86 ]; }; } diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 371da82e2b070..eca870ed2ad0b 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , python3 +, installShellFiles , waylandSupport ? true , x11Support ? true @@ -16,18 +17,19 @@ buildPythonApplication rec { pname = "rofimoji"; - version = "5.6.0"; + version = "6.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - sha256 = "sha256-6W/59DjxrgejHSkNxpruDAws812Vjyf+GePDPbXzVbc="; + sha256 = "sha256-8gaoPn43uurZBCex5AQXHShgw46Fx3YM4BIVDjTN8OY="; }; nativeBuildInputs = [ - python3.pkgs.setuptools + python3.pkgs.poetry-core + installShellFiles ]; # `rofi` and the `waylandSupport` and `x11Support` dependencies @@ -42,8 +44,9 @@ buildPythonApplication rec { rm -rf extractors ''; - # no tests executed - doCheck = false; + postInstall = '' + installManPage src/picker/docs/rofimoji.1 + ''; meta = with lib; { description = "A simple emoji and character picker for rofi"; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 51ae6888b2a96..e7a21fab1f412 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -15,11 +15,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "1b5w887hivmdrkm1ydbar4nmnks6grpbbpvxgf9j9s46msj03c9x"; + sha256 = "sha256-SsZRyODeYRQk2pVspKzfJbSRX/zjD+M+aaK+YXPu6CE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix index 86c896b12776b..c2ab9ad29d87d 100644 --- a/pkgs/applications/misc/senv/default.nix +++ b/pkgs/applications/misc/senv/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "senv"; @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/SpectralOps/senv"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + broken = stdenv.isDarwin; # needs golang.org/x/sys bump }; } diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 2dc82b55df7c8..bfa0fb1d50559 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -78,6 +78,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ podocarp ]; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isAarch64; }; }) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 587b61d3af939..48eb65d8e18cd 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.14.1"; + version = "2.14.3"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-262tnSKX6M9ggm4JIs0pANeq2JSNYzKkTN8awpqLyMM="; + sha256 = "sha256-7bCl8VfkMhoTBnr+O+oBYQeSV2sRwlP/qUkNkYerZdU="; }; vendorSha256 = "sha256-E2Q+mXojMb8E0zSnaCOl9xp5QLeYcuTXjhcp3Hc8gH4="; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index cab49db654e28..384e4f10940ee 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -12,14 +12,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.12"; + version = "1.13"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-kAO8Qz4bTn3+YeIXAvPZ1SpKgn+g+rBgi9+TaqL1vOY="; + hash = "sha256-oirTDIbvG9/iAkYrquX+ciujAnLUmubkBVvTyaiz2g8="; }; postPatch = '' diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index be98b3713867a..a1179417719ba 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, poetry +, fetchpatch , copyDesktopItems , wrapQtAppsHook , writeText @@ -20,6 +20,14 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-5dk+5oefg5R68kv038gsZ2p5ixmpj/vBLBp/V7Sdos8="; }; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/timothycrosley/streamdeck-ui/commit/e271656c1f47b1619d1b942e2ebb01ab2d6a68a9.patch"; + hash = "sha256-wqYwX6eSqMnW6OG7wSprD62Dz818ayFduVrqW9E/ays="; + }) + ]; + desktopItems = [ (makeDesktopItem { name = "streamdeck-ui"; desktopName = "Stream Deck UI"; @@ -50,7 +58,7 @@ python3Packages.buildPythonApplication rec { format = "pyproject"; nativeBuildInputs = [ - poetry + python3Packages.poetry-core copyDesktopItems wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 10d4ffc77b4b2..55599a87b8615 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,17 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake -, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib -, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, writeShellScriptBin +, cmake +, wrapQtAppsHook +, pkg-config +, qmake +, curl +, grantlee +, libgit2 +, libssh2 +, libxml2 +, libxslt +, libzip +, zlib +, qtbase +, qtconnectivity +, qtlocation +, qtsvg +, qttools +, qtwebengine +, libXcomposite , bluez }: let - version = "5.0.2"; + version = "5.0.10"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "1yay06m8p9qp2ghrg8dxavdq55y09apcgdnb7rihgs3hq86k539n"; + hash = "sha256-KzUBhFGvocaS1VrVT2stvKrj3uVxYka+dyYZUfkIoNs="; fetchSubmodules = true; }); @@ -21,7 +42,7 @@ let src = subsurfaceSrc; - prePatch = "cd libdivecomputer"; + sourceRoot = "source/libdivecomputer"; nativeBuildInputs = [ autoreconfHook ]; @@ -30,7 +51,7 @@ let enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.libdivecomputer.org"; + homepage = "https://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = with maintainers; [ mguentner ]; license = licenses.lgpl21; @@ -40,14 +61,13 @@ let googlemaps = stdenv.mkDerivation rec { pname = "googlemaps"; - - version = "2021-03-19"; + version = "0.0.0.2"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "8f7def10c203fd3faa5ef96c5010a7294dca0759"; - sha256 = "1irz398g45hk6xizwzd07qcx1ln8f7l6bhjh15f56yc20waqpx1x"; + rev = "v.${version}"; + hash = "sha256-PfSLFQeCeVNcCVDCZehxyNLQGT6gff5jNxMW8lAaP8c="; }; nativeBuildInputs = [ qmake ]; @@ -74,17 +94,37 @@ let }; }; -in stdenv.mkDerivation { + get-version = writeShellScriptBin "get-version" '' + echo -n ${version} + ''; + +in +stdenv.mkDerivation { pname = "subsurface"; inherit version; src = subsurfaceSrc; + postPatch = '' + install -m555 -t scripts ${lib.getExe get-version} + ''; + buildInputs = [ - libdc googlemaps - curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip - qtbase qtconnectivity qtsvg qttools qtwebkit bluez + curl + googlemaps + grantlee + libdc + libgit2 + libssh2 + libxml2 + libxslt + libzip + qtbase + qtconnectivity + qtsvg + qttools + qtwebengine ]; nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index d83cf6c8484df..9b3787dec4ae8 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "swappy"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "jtheoof"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sINX7pJ0msis7diGFTCgD4Mamd3yGGJew1uD8de4VOg="; + sha256 = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo="; }; nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ]; diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index 15d187b1e9689..a3d64a25565bb 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "SwayNotificationCenter"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; rev = "v${version}"; - hash = "sha256-Z8CFSaH4RsZ/Qgj+l+36p7smbiGV5RRQhZBBcA3iyK8="; + hash = "sha256-RU6zzhRu7YK+zcazxj2wZ5vSwLwlilBaG9l+rEstefc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index a9a09d3340c41..b3d99cf69977e 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -1,23 +1,31 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.23.6"; + version = "0.23.7"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-QHaFx6NCKZKG9/pM/h9kqoCJwl74zT2rnDGh50x8OwE="; + sha256 = "sha256-D7+C02VlE42wWQSOkeTJVDS4rWnGB06RTZ7tzdpYmZw="; }; + nativeBuildInputs = [ installShellFiles ]; + # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-ccR5w563NBLDl7O61lkGpmrLgzfO/F3CnOJiLL6tog8="; + cargoSha256 = "sha256-b+bncWx7Z4GG2vwImRYeywc77THGMYVXlm4v/9YKCMI="; + + postInstall = '' + installManPage docs/taskwarrior-tui.1 + installShellCompletion completions/taskwarrior-tui.{bash,fish} --zsh completions/_taskwarrior-tui + ''; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 7eccdbcc8d48d..4d0936c0b431b 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-YgmePs0GxygR0hvcnRngzW77QZTOygSYvRaYk6oCVls="; + hash = "sha256-cDNaZ3ZYCUWg30Td1hlzzaB46tI7cFZLvgwCAZN72QI="; }; buildInputs = [ sqlite zlib ]; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index fa77f3b529934..e7a693b4ca49b 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_15, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_21, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.0.3"; + version = "1.0.9"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; - sha256 = "sha256-bHX/RWDfe+ht66U7xg4HBZxeWlNBu4gYlIVd+9OuMNU="; + sha256 = "sha256-DfNFDiGYTFGetVRlAjpV/cdWcGzRDEGZjR0Dc9aAtXc="; }; appimageContents = appimageTools.extractType2 { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_15}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" ''; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 933464b626318..22df6613008f7 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; - rev = version; - sha256 = "076r6l89gxjwxjpiklidcs8yajn5c2bnqjvbj4wc559iqdqj88lz"; + rev = "refs/tags/${version}"; + sha256 = "sha256-SrPjotEkP8Z2uYB/4eAJAk3Zmzmr0xET69PmkxQCwFQ="; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index 37cc10c3823ce..6bf83be75703c 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tty-share"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "elisescu"; repo = "tty-share"; rev = "v${version}"; - sha256 = "sha256-/oK2m2kxmF9HHYfTK6NlZxKKkDS7Oay+ed7jR/+szs0="; + sha256 = "sha256-7rNSBpiZslUGWw0P/Q1zRtNxo9MN8Vq6hG8pD6bJIsA="; }; # Upstream has a `./vendor` directory with all deps which we rely upon. diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 5ca1a9ea60f9a..1e7c61dca2bc8 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.17"; + version = "1.0.23"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-XuN1qpcCUX8xAE7tj21g6U3ilhQIeGWlSqMVik5Qc5Q="; + sha256 = "sha256-nFN0F80QZh3SALtG3xe6mH0zbhcLSRtmcHosD6aPvrE="; }; - vendorSha256 = "sha256-WdhTdF8kdjAg6ztwSwx+smaA0rrLZjE76r4oVJqMtFU="; + vendorSha256 = "sha256-Y5nHADLKCaqHIje7vMS3mAwiGx4tHixBzYZM+iHEZb8="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index cc02a5d1c8996..1c619c403291a 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -1,32 +1,38 @@ { lib +, stdenv , fetchFromGitHub , buildGoModule , unixODBC , icu +, nix-update-script +, testers +, usql }: buildGoModule rec { pname = "usql"; - version = "0.12.13"; + version = "0.13.1"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-F/eOD7/w8HjJBeiXagaf4yBLZcZVuy93rfVFeSESlZo="; + hash = "sha256-bdejXGyvY+HAE4sOxhsZYZ5fCISEVxvfOlEjL/CgBLQ="; }; - vendorHash = "sha256-7rMCqTfUs89AX0VP689BmKsuvLJWU5ANJVki+JMVf7g="; - buildInputs = [ unixODBC icu ]; - # Exclude broken impala driver - # The driver breaks too often and is not used. + vendorHash = "sha256-+4eRdr5MY9d0ordaDv8hZf4wGoZsp14MpOEp1vhr75w="; + proxyVendor = true; + + # Exclude broken impala & hive driver + # These drivers break too often and are not used. # # See https://github.com/xo/usql/pull/347 # excludedPackages = [ "impala" + "hive" ]; # These tags and flags are copied from build-release.sh @@ -52,9 +58,21 @@ buildGoModule rec { # All the checks currently require docker instances to run the databases. doCheck = false; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + tests.version = testers.testVersion { + inherit version; + package = usql; + command = "usql --version"; + }; + }; + meta = with lib; { description = "Universal command-line interface for SQL databases"; homepage = "https://github.com/xo/usql"; + changelog = "https://github.com/xo/usql/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ georgyo anthonyroussel ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 336a0821df1e4..36a7285b3d25d 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -20,19 +20,22 @@ , wcwidth , zstandard , setuptools +, importlib-metadata , git , withPcap ? true, dpkt, dnslib , withXclip ? stdenv.isLinux, xclip +, testers +, visidata }: buildPythonApplication rec { pname = "visidata"; - version = "2.9.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - hash = "sha256-PKj+imTSAGMpF1tkN0WmE3l/4FmWkm/ktIDzF2ku48s="; + hash = "sha256-OKCrlUWHgbaLZJPVvs9lnw4cD27pRoO7F9oel1NzT6A="; }; propagatedBuildInputs = [ @@ -64,6 +67,7 @@ buildPythonApplication rec { zstandard odfpy setuptools + importlib-metadata ] ++ lib.optionals withPcap [ dpkt dnslib ] ++ lib.optional withXclip xclip; @@ -75,6 +79,7 @@ buildPythonApplication rec { doCheck = stdenv.buildPlatform == stdenv.hostPlatform; checkPhase = '' + runHook preCheck # disable some tests which require access to the network rm tests/load-http.vd # http rm tests/graph-cursor-nosave.vd # http @@ -87,13 +92,21 @@ buildPythonApplication rec { substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd" bash dev/test.sh + runHook postCheck ''; + pythonImportsCheck = ["visidata"]; + + passthru.tests.version = testers.testVersion { + package = visidata; + version = "v${version}"; + }; + meta = { description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ raskin markus1189 ]; - homepage = "http://visidata.org/"; + homepage = "https://visidata.org/"; changelog = "https://github.com/saulpw/visidata/blob/v${version}/CHANGELOG.md"; }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index be770a3021e8b..1bd63b77b1397 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -29,18 +29,19 @@ , traySupport ? true, libdbusmenu-gtk3 , udevSupport ? true, udev , upowerSupport ? true, upower +, wireplumberSupport ? true, wireplumber , withMediaPlayer ? false, glib, gobject-introspection, python3, playerctl }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.15"; + version = "0.9.16"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-u2nEMS0lJ/Kf09+mWYWQLji9MVgjYAfUi5bmPEfTfFc="; + sha256 = "sha256-hcU0ijWIN7TtIPkURVmAh0kanQWkBUa22nubj7rSfBs="; }; nativeBuildInputs = [ @@ -67,7 +68,8 @@ stdenv.mkDerivation rec { ++ optional swaySupport sway ++ optional traySupport libdbusmenu-gtk3 ++ optional udevSupport udev - ++ optional upowerSupport upower; + ++ optional upowerSupport upower + ++ optional wireplumberSupport wireplumber; checkInputs = [ catch2_3 ]; doCheck = runTests; @@ -86,6 +88,7 @@ stdenv.mkDerivation rec { sndio = sndioSupport; tests = runTests; upower_glib = upowerSupport; + wireplumber = wireplumberSupport; } ) ++ [ "-Dsystemd=disabled" diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index 0f9631edbfaaa..1f5ee3ccfee42 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { description = "Build a digital writing community"; homepage = "https://github.com/writeas/writefreely"; license = licenses.agpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 2d90a836446ea..16c6bfac7ed0f 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK32 +, chmlib +}: stdenv.mkDerivation rec { pname = "xchm"; @@ -11,13 +17,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ wxGTK30 chmlib ]; + nativeBuildInputs = [ + autoreconfHook + ]; - configureFlags = [ "--with-wx-prefix=${wxGTK30}" ]; + buildInputs = [ + wxGTK32 + chmlib + ]; + + configureFlags = [ "--with-wx-prefix=${wxGTK32}" ]; preConfigure = '' - export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" + export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk3u_aui-3.2" ''; meta = with lib; { diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 580faa3602683..f3a0f25552d9e 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }: stdenv.mkDerivation rec { - version = "1.2.6.1"; + version = "unstable-2022-05-16"; pname = "xygrib"; src = fetchFromGitHub { owner = "opengribs"; repo = "XyGrib"; - rev = "v${version}"; - sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia"; + rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310"; + sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A="; }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ j03 SuperSandro2000 ]; + maintainers = with maintainers; [ j03 ]; }; } diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix deleted file mode 100644 index 8a1645239082c..0000000000000 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchurl -, mkDerivation -, qmake -, qtbase -, qtquickcontrols2 -, qtgraphicaleffects -, qtmultimedia -, python3 -, pyotherside -, pcsclite -, yubikey-personalization -, yubikey-manager -, makeWrapper -}: - -mkDerivation rec { - pname = "yubioath-desktop"; - version = "5.1.0"; - - src = fetchurl { - url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - hash = "sha256-Lm9F4eaG9T5brAV7XDAkoj0WClmXEYIhuUzh2rk0oc0="; - }; - - doCheck = false; - - buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects qtmultimedia python3 ]; - - nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; - - postPatch = '' - substituteInPlace QZXing/QZXing-components.pri \ - --replace 'target.path = $$PREFIX/lib' 'target.path = $$PREFIX/bin' - ''; - - pythonPath = [ yubikey-manager ]; - - # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary - # support that the yubicommon library uses to load libykpers - - postInstall = '' - buildPythonPath "$out $pythonPath" - wrapProgram $out/bin/yubioath-desktop \ - --prefix PYTHONPATH : "$program_PYTHONPATH" \ - --prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \ - --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ - --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" - - mkdir -p $out/share/applications - cp resources/com.yubico.yubioath.desktop \ - $out/share/applications/com.yubico.yubioath.desktop - mkdir -p $out/share/yubioath/icons - cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons - substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \ - --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ - --replace 'Icon=com.yubico.yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" - ''; - - meta = with lib; { - description = "Yubico Authenticator"; - longDescription = '' - Application for generating Open Authentication (OATH) time-based TOTP and - event-based HOTP one-time password codes, with the help of a YubiKey that - protects the shared secrets. - ''; - - homepage = "https://developers.yubico.com/yubioath-desktop"; - downloadPage = "https://developers.yubico.com/yubioath-desktop/Releases/"; - changelog = "https://developers.yubico.com/yubioath-desktop/Release_Notes.html"; - - license = lib.licenses.bsd2; - maintainers = with maintainers; [ mic92 risson ]; - }; -} diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix new file mode 100644 index 0000000000000..d858605e9044b --- /dev/null +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -0,0 +1,57 @@ +{ lib +, flutter +, python3 +, fetchFromGitHub +, stdenv +, pcre2 +}: + +let + vendorHashes = { + x86_64-linux = "sha256-BwhWA8N0S55XkljDKPNkDhsj0QSpmJJ5MwEnrPjymS8="; + aarch64-linux = "sha256-T1aGz3+2Sls+rkUVDUo39Ky2igg+dxGSUaf3qpV7ovQ="; + }; + + version = "6.0.2"; + src = fetchFromGitHub { + owner = "Yubico"; + repo = "yubioath-flutter"; + rev = version; + sha256 = "13nh5qpq02c6azfdh4cbzhlrq0hs9is45q5z5cnxg84hrx26hd4k"; + }; + meta = with lib; { + description = "Yubico Authenticator for Desktop"; + homepage = "https://github.com/Yubico/yubioath-flutter"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = builtins.attrNames vendorHashes; + }; + + helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; +in +flutter.mkFlutterApp rec { + pname = "yubioath-flutter"; + inherit src version meta; + + passthru.helper = helper; + + vendorHash = vendorHashes."${stdenv.system}"; + + postPatch = '' + substituteInPlace linux/CMakeLists.txt \ + --replace "../build/linux/helper" "${helper}/libexec/helper" + ''; + + preInstall = '' + # Make sure we have permission to delete things CMake has copied in to our build directory from elsewhere. + chmod -R +w build/ + ''; + postInstall = '' + # Swap the authenticator-helper symlink with the correct symlink. + ln -fs "${helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper" + ''; + + buildInputs = [ + pcre2 + ]; +} diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix new file mode 100644 index 0000000000000..a37ae01990ab2 --- /dev/null +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -0,0 +1,44 @@ +{ buildPythonApplication +, poetry-core +, yubikey-manager +, fido2 +, mss +, zxing_cpp +, pillow +, cryptography + +, src +, version +, meta +}: + +buildPythonApplication rec { + pname = "yubioath-flutter-helper"; + inherit src version meta; + + sourceRoot = "source/helper"; + format = "pyproject"; + + postPatch = '' + sed -i \ + -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \ + -e 's,mss = .*,mss = "*",g' \ + pyproject.toml + ''; + + postInstall = '' + install -Dm 0755 authenticator-helper.py $out/bin/authenticator-helper + install -d $out/libexec/helper + ln -fs $out/bin/authenticator-helper $out/libexec/helper/authenticator-helper + ''; + + propagatedBuildInputs = [ + poetry-core + yubikey-manager + fido2 + mss + zxing_cpp + pillow + cryptography + ]; +} diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 69ecb1cfd1b89..ea2c74fda3701 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "zathura-cb"; - version = "0.1.8"; + version = "0.1.10"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; + sha256 = "1j5v32f9ki35v1jc7a067anhlgqplzrp4fqvznlixfhcm0bwmc49"; }; nativeBuildInputs = [ meson ninja pkg-config gettext ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 6398b88ffccd0..29140b04dd99d 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "zathura"; - version = "0.4.9"; + version = "0.5.2"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0msy7s57mlx0wya99qpia4fpcy40pbj253kmx2y97nb0sqnc8c7w"; + sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6"; }; outputs = [ "bin" "man" "dev" "out" ]; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { # https://github.com/pwmt/zathura/blob/master/meson_options.txt mesonFlags = [ "-Dsqlite=enabled" - "-Dmagic=enabled" "-Dmanpages=enabled" "-Dconvert-icon=enabled" "-Dsynctex=enabled" diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 3584d24f14944..25856f0e58df3 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -14,16 +14,14 @@ }: stdenv.mkDerivation rec { - version = "0.3.8"; + version = "0.4.0"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-wgW0z1ANjP6ezqreVOX6jUzRKYzYXxem9QxkclkRYhc="; + sha256 = "0pcjxvlh4hls8mjhjghhhihyy2kza8l27wdx0yq4bkd1g1b5f74c"; }; - patches = [ ./fix-mupdf-1.20.patch ]; - nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/fix-mupdf-1.20.patch b/pkgs/applications/misc/zathura/pdf-mupdf/fix-mupdf-1.20.patch deleted file mode 100644 index 6790721a76c35..0000000000000 --- a/pkgs/applications/misc/zathura/pdf-mupdf/fix-mupdf-1.20.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5a5bb2634812f4c0530f5688a06269aaa4cd11dd Mon Sep 17 00:00:00 2001 -From: Osama Rebach <osamarebach@gmail.com> -Date: Fri, 19 Aug 2022 13:39:49 +0100 -Subject: [PATCH] fix fz_search_stext_page - ---- - zathura-pdf-mupdf/search.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zathura-pdf-mupdf/search.c b/zathura-pdf-mupdf/search.c -index f84dea0..419e5f4 100644 ---- a/zathura-pdf-mupdf/search.c -+++ b/zathura-pdf-mupdf/search.c -@@ -41,7 +41,7 @@ pdf_page_search_text(zathura_page_t* page, void* data, const char* text, zathura - - fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad); - int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text, -- text, hit_bbox, N_SEARCH_RESULTS); -+ text, NULL, hit_bbox, N_SEARCH_RESULTS); - - fz_rect r; - for (int i = 0; i < num_results; i++) { --- -2.37.1 diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index b76e72a6970ca..57f33559c6675 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "zathura-pdf-poppler"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"; + sha256 = "12qhkshpp1wjfpjmjccsyi6wscqyqvaa19j85prjpyf65i9jg0gf"; }; nativeBuildInputs = [ meson ninja pkg-config zathura_core ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index ee63a9df53bd9..151a63af33e83 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "zathura-ps"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; + sha256 = "0ilf63wxn1yzis9m3qs8mxbk316yxdzwxrrv86wpiygm9hhgk5sq"; }; nativeBuildInputs = [ meson ninja pkg-config gettext ]; diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index f8b1d37399b83..ee4348608ce5c 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -2,22 +2,22 @@ , rustPlatform , fetchCrate , pkg-config -, stdenv , openssl +, stdenv , CoreServices , Security }: rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.7.0"; + version = "0.8.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-teLx21vA4b+ft4zZqou4EiTHhh9Foq2Vukmk4z0pWUM="; + sha256 = "sha256-mcYBaNmfpXDMhZuDxZ8WgwRb0CM3WjATrMH5YcU2Dxo="; }; - cargoSha256 = "sha256-OaA090pvJ6rc29wcsUTiuV4/VY/oDDEOGo94Ol31OzI="; + cargoSha256 = "sha256-Xfy7RRQairzfhVmh2E5ny07/9jACDdTqU2aj4IT1rkE="; nativeBuildInputs = [ pkg-config @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple and opinionated tool to build your own magazine"; homepage = "https://github.com/zineland/zine"; + changelog = "https://github.com/zineland/zine/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya figsoda ]; }; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 320938eb39a66..c50e672d0753b 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-ut5a/tpWEQX1Jug9IZksnxbQ/rs2pGNh8zBb2a43KUE="; + sha256 = "sha256-UDyVPoQM78CKVWXgr08An77QTiFVmRNHwQPGaj1jAIM="; }; # just patch interpreter diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index e9c5cf66d9de8..6136b1d7ba759 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.43.89"; + version = "1.46.133"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-eqwqn4cvVzoEmh206ybG6PWWg56ct53wYyRBOQ8wN5g="; + sha256 = "sha256-362XVFFsVWR/H0mcn1XQh3tsemksEnqR5quOIwf2QQE="; }; dontConfigure = true; @@ -180,8 +180,8 @@ stdenv.mkDerivation rec { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ${optionalString vulkanSupport '' --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" - --add-flags ${escapeShellArg commandLineArgs} ''} + --add-flags ${escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 39a2f3d18369d..50cbc80e0c7e9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -261,7 +261,7 @@ let # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; # The default value is hardcoded instead of using pkg-config: - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; # Because we use a different toolchain / compiler version: treat_warnings_as_errors = false; # We aren't compiling with Chrome's Clang (would enable Chrome-specific @@ -295,7 +295,11 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; - use_system_libwayland_server = true; + # The default has changed to false. We'll build with libwayland from + # Nixpkgs for now but might want to eventually use the bundled libwayland + # as well to avoid incompatibilities (if this continues to be a problem + # from time to time): + use_system_libwayland = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e2911963fa7c4..5c9c3ae727010 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,63 +1,63 @@ { "stable": { - "version": "107.0.5304.110", - "sha256": "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk", - "sha256bin64": "06rlxwbvp7rpw2rdpnjzl1cn7cr1rwlb20wz8r0cndjcjyzd3rjj", + "version": "108.0.5359.94", + "sha256": "1zmndi4q9x8fyixwl1mp5qyf883x9xafq7ipzf9vk9d8h62521q6", + "sha256bin64": "03s85hf4vxpil27c1kkdicihb42diyyxwfcjji0bq950nl8vpx2d", "deps": { "gn": { - "version": "2022-09-14", + "version": "2022-10-05", "url": "https://gn.googlesource.com/gn", - "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", - "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" + "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", + "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" } }, "chromedriver": { - "version": "107.0.5304.62", - "sha256_linux": "13s0kl0k8c6q6h548ay2qssv8j4bmm5b4p3h8bgby30nj9014bsh", - "sha256_darwin": "0awd59xz4cllkbd9r5hhk6sinf291ii81chi361nw67aj5vmj7is", - "sha256_darwin_aarch64": "01fr6518qycwsn6js64k7727jmp3hxmj70jcghmw1cgxam59nh7w" + "version": "108.0.5359.71", + "sha256_linux": "0lxmzmjpy4j5k3hx7wxdbbk87fr883a6323r9fj5nmylb230i3p4", + "sha256_darwin": "14kl58qlxkfq7hipg717nwawzcx7qzg77v322ikgrvqi03f0saci", + "sha256_darwin_aarch64": "08rbp1dqv1xvy1w9jsip3140frbifzblgrn6i9xr612hxysxhap6" } }, "beta": { - "version": "108.0.5359.48", - "sha256": "0nk33rv4q22kgr9197y6a4w8yazgifsm5qvmmia41nnl24sqik57", - "sha256bin64": "062anw2i8rfi4v8zl0jdqxzn24xzl3ny24cbiyk8dyyf55r914v0", + "version": "109.0.5414.25", + "sha256": "1yl8bxbxnlvypqvnb0kd4z3c793m375pwza43gab35kc1azxfnrg", + "sha256bin64": "1rld29mq6dvd85nvsrxj155m79hylxknhphlmw82i74fa7r6lxhm", "deps": { "gn": { - "version": "2022-10-05", + "version": "2022-11-10", "url": "https://gn.googlesource.com/gn", - "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", - "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" + "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", + "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" } } }, "dev": { - "version": "109.0.5410.0", - "sha256": "00g8q0qzl8kyc9j60nsvvjkr2x9js2xvbkmwp77p8b6gg0pyymjn", - "sha256bin64": "0ljhc5lqdy01apzyj96xzl931d904i37x62257s1h35w0j78mps0", + "version": "110.0.5449.0", + "sha256": "1zims8jw7k53qpv4kml3n15hy587jgg0sai7j4zrv3i3lk8jr6g7", + "sha256bin64": "1ykgxr3jxbqdgrq6g6vzbxnig05vljzdx800j6hn3kxwr9cdqwxn", "deps": { "gn": { - "version": "2022-10-28", + "version": "2022-11-29", "url": "https://gn.googlesource.com/gn", - "rev": "a4d67be044b42963de801001e7146f9657c7fad4", - "sha256": "0wikkkx503ip5xr72bz6d6sh2k50h5wlz9y8vmasvnrz9kjmlv5b" + "rev": "70d6c60823c0233a0f35eccc25b2b640d2980bdc", + "sha256": "04md36i6l07c1bq8mqghrnbf308j9avmqkwqjqm8gciclnrnlsii" } } }, "ungoogled-chromium": { - "version": "107.0.5304.110", - "sha256": "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk", - "sha256bin64": "06rlxwbvp7rpw2rdpnjzl1cn7cr1rwlb20wz8r0cndjcjyzd3rjj", + "version": "108.0.5359.95", + "sha256": "1b3r2yl8qkp8k0kq5yi0a1xsmglniqn3v318fhx0k12cagrgbd5b", + "sha256bin64": null, "deps": { "gn": { - "version": "2022-09-14", + "version": "2022-10-05", "url": "https://gn.googlesource.com/gn", - "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", - "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" + "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", + "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" }, "ungoogled-patches": { - "rev": "107.0.5304.110-1", - "sha256": "14z9qi9i9l7kjx7gf74lzs63bpxqyd3wbqqpsvzvqgr2v0cgqahx" + "rev": "108.0.5359.95-1", + "sha256": "0fl95hw6ll0g4lrccfxhhnkz3plqm003z09dz8dr6ycx5x3vqk0b" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index ea6b8aa63f024..0716751b29d99 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "107.0"; + version = "107.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ach/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ach/firefox-107.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "2a451630b033a04be5b342710881773566efa77d75bea65dad8245f9f5dfade8"; + sha256 = "679049d8cf97256cd92a52296c435e414443ea0715edcf4bfcf14d43464ba572"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/af/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/af/firefox-107.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "dc10746ce96cfd3bc48a98edea5575b06e4e5630acd26875182ae7f70b36ce09"; + sha256 = "04addc678368a5c63014037c16e6af976016bca3fcfd5444d6cabdfd4216a954"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/an/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/an/firefox-107.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "72b88a955f2b669b45dd6ef02b8d97dc58b07b14985eb1f62b4a8c3f574fdcf2"; + sha256 = "fe222e59a9fd64fc35311b4f65b93798e9015cd3cef86ae401ba049d145722ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ar/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ar/firefox-107.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7e1e58addf79cc916701fe5a7275a07ab236f002859799bd2b9b7a7a65564077"; + sha256 = "bab5153a4d5e99f6851adcbe2ed3c4991a35ed0af71e2c2971fb11f513099ebf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ast/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ast/firefox-107.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4553f6fec247401cf9121ca053873cdeb5d14a72376030703e6d710203f6a0e8"; + sha256 = "ffbd3daa36feb9b822219e4b1ba1cb8bb1d879cc190f93c3e2722a4dd2fa8501"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/az/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/az/firefox-107.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3fbc89e662ec15e98d76fd2581bf2af54abeaf7df267b2632cde5bed00743207"; + sha256 = "5d127a505c13b65d37d3a6f13fa678be255dd3b529f8b1d8c601de4db4a033d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/be/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/be/firefox-107.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "08a7df701f51020fc0739bb3a6c01b0db7192771294040d8daf770c9655f4674"; + sha256 = "e42c84c5c04a29ad7a8603044ee1d5c7ca9a4d362b48e8526e1e37436adf13c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/bg/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/bg/firefox-107.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "11b16ae4041d6bf7cf71a8d5ad1b907156898b236d3d1823a72d3b9670d3dfa1"; + sha256 = "0257a1f6d4a98c0968af2634cb78fb3df9a16a4b116a0896ef63bfcd2db0833f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/bn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/bn/firefox-107.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "98519a45f46c5da7eecd1d34b952a3476e97c1b60e29e1ca6d1d10f65fdd4da9"; + sha256 = "b5cfd2e009df5746bd39cc043da1a4daeb43bac612ec76876c2f04824786d0bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/br/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/br/firefox-107.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "599522e92731cad2df9feb1723d04720259e431df948200d0e8e4c5f2261256f"; + sha256 = "2abdc59c0ae1567845202412b173748158f11afc21eee49d7bdbadf2dc5c41a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/bs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/bs/firefox-107.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b6d5a9bf10e53060409fe7a0e6cb6d10c9afe44df0bd54d0b443831077927ea6"; + sha256 = "2e618ec5a3ffe2d6680648eade01142d1e231aae7824fc3e81a316cd0f6ffd56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ca-valencia/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ca-valencia/firefox-107.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9d5dc9fc10a71eda2b84b86326113bb16cee089008c5c016cf3a50e4b8f27e8e"; + sha256 = "954913fa0b3b68b5d29da2d26687d13f0cc08f95b14b85d94af59ae785874e5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ca/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ca/firefox-107.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4581973d7e88a1904c9305413c0032d5dd0b0af77eac6927352100b793ff6706"; + sha256 = "6f243974105752147f98813fa392a53e2e22f09ca92633f233fbbae6c424ea61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/cak/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/cak/firefox-107.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1f71c61385e32645e17ca7f623deb142ef3e5245cb50b7099f424672ce4c5e76"; + sha256 = "897d28dcb54fe9eb9dd2fad53fb86e745d9581bd3b5d8a4b84d96c9af5025cfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/cs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/cs/firefox-107.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d37130c0fc1c53d58fbc733e6a7149fef026c9ad65a086da940d193bb0e7e3b9"; + sha256 = "fe9b41feae2a492156347637a901d0a4df29812ce4e4cfd8260a07a9eabce03c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/cy/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/cy/firefox-107.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "317a537fb797fa452e3e2cbaf4d930ee63fafed52c778d00573baa2c8945973a"; + sha256 = "4175f0ab0de25d7af5424a2d0fa0adc3bd0d077e4149e947508de0bfa67fb168"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/da/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/da/firefox-107.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "76efa965c7fff30db4df8a6a675681c13c4f64fed2f79b5ba1014ae46a88c92c"; + sha256 = "daa41afbf1a488a42162df4fb5010ec4bae0d3bf35dae62a137551f50b92e051"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/de/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/de/firefox-107.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2d086ef022ba6f4626c6ac7be77331c3047ad48254abcf3aaa050414ce6fd791"; + sha256 = "4136c703a113f0f5087c1e6d7f7d1b2ea65fa5360035ad4355d293157e0a8413"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/dsb/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/dsb/firefox-107.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "de33b08420e87d82f483f2b8f978deb9a60255b8da27c293484dbe7c57f2e20b"; + sha256 = "b06c087516c09db77c0cf8ba11abb3a0bd0ed86939dc39d4a8a4512fc3e7eb47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/el/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/el/firefox-107.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b67bf498b792f31aa48fa6fb4223788590393a795dd0edcebde41858e1bf7428"; + sha256 = "85352071cec3c2ed578132803a939b6385c230c192e5ec69ebca498d8ae71315"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/en-CA/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/en-CA/firefox-107.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7cd9bc900313cf4f03fba7a92826b6e346003abd1a33daa11b9a02ba8b8f42f5"; + sha256 = "69b4bf7143e5518b2c4592a0a74420896d6ba0acfdffef3d9c4dc6ff2df86cc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/en-GB/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/en-GB/firefox-107.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d8fc7d76aa7e4fc94818d13db2fa3af28d8497370f602c40b7b4038b66095c8f"; + sha256 = "e7bf37874eea05beff108ef9fcece799befda8373f7cfa105698ff5406b1d5e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/en-US/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/en-US/firefox-107.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6eff8b2938267bb0dc4018012764c19d25d36c2d2709582ae225a2db228c0472"; + sha256 = "dd08d4dfb69e379ce680a303c6c89c67056ce1d8ec0276345a8e8a0f04cd7dca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/eo/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/eo/firefox-107.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "501c1b84bfe461c5c2a5ffb1fe9075007372d50747e7c36a50b9c66e989ce4a3"; + sha256 = "022e776b11d369c1d97f32d09a492e030ec2e40994063eff412d43004c05bb1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/es-AR/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/es-AR/firefox-107.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "042674ce9c62a0206a7fa41f4f07cf6b7c180dc61b9cd689d53ce82e002bc776"; + sha256 = "a3937f1a972e2e67237c879a3ebd27b116f45508e8d7fd0d66e0cbf83eb06573"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/es-CL/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/es-CL/firefox-107.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "0c47956ac70fe8c86311146c1321031de09c777d50d7b35cdac3d343259a74e6"; + sha256 = "74263f87137d16b132f432b5af86061a55813c37c3fbdfb573b775fe09e16947"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/es-ES/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/es-ES/firefox-107.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7feb69963702a79e1d9f818cd337779c95685a7eaaf012313714084950ea1930"; + sha256 = "e94d261eec4c9b969e6ca87aac3f42fa68b7061485de416938f6cdb7793a18f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/es-MX/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/es-MX/firefox-107.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "eb7e8bd32223f008a733466c2d0dcad8cb17c2c98f40949d33cf30560d521115"; + sha256 = "58b5e70829eee800a36b04477d5a5f57ff7fa31b5efb4413042a5e1009dad6b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/et/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/et/firefox-107.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8f487b5631c5e428b54e66f42114fa62a271ef0617c98390b871138de44854d9"; + sha256 = "e4f86517ce715fe88ae66e38575768662dba80bf9e352fb9cc57caef4c44c775"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/eu/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/eu/firefox-107.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "56aa549ef38bbaff49441243c3f1ca21b4f456626c9e03f49c20aa2033d49015"; + sha256 = "94a75621210ace53265c076c2847070b28d131b08519e6e68320adacf2d3e84e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/fa/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/fa/firefox-107.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "761007d74e8b4594a22f317c46a80d53369e9256c5672732fb4b6ca17896c910"; + sha256 = "56d47f0162adcf5d08b5f5ee73d71c5d0bc4bb69a84b5222fd8217db35bf2110"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ff/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ff/firefox-107.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "61c00df22b958ae750d04771fff7e6734def889476a4edc391c39a71b4630e50"; + sha256 = "5dca9a9b42dd5d0a200ca7e94a7045b826ecddd7c9fc338b4027b421b4d31993"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/fi/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/fi/firefox-107.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "bc8b1d966a89297b3dd8577fe3bb8e133e8aa6dea8755e8b4f5d2726ad9f3da0"; + sha256 = "1646c4de234154e4c3e3c3ca8702dd82521c9bd59104741f0bbb612994d54c3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/fr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/fr/firefox-107.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f602101ff956ee0fb119adf897fa3f009a4b85ddf827eb3059d9978f4a7e3721"; + sha256 = "347f607a05bbfa7944f5b1ef769916059a3370d6a8b10839e58c85c2f2e965a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/fy-NL/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/fy-NL/firefox-107.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "76c13619dd72a2276fd95cf103f62e4fe8b497ba846d8329f17191ef025bc74e"; + sha256 = "a066356b7551cab7e138e555c4f41fa9c28272b78cd6449ec66b1493172741a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ga-IE/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ga-IE/firefox-107.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5f39fa70a66adeeba08de27e74ab52beed8afd79accbec5095538e6e3728b782"; + sha256 = "e54b7b37b6612f9b7fdba45285d4c56cb69807ec269625628c4e0780f6309156"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/gd/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/gd/firefox-107.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8c1e7297499c1b138d25be3d7c1d5f9f2adf1c962ee744e1a01bd9e21c5101fd"; + sha256 = "d4526b78c9531d6b7f77eb72f50b743e5a54723d70261ec08eb6b24c1989766d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/gl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/gl/firefox-107.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "68fb8d612c175912c6a788ad7dc587e7604910010f484181bbdbe690fa24510b"; + sha256 = "2b72e89ae20301a437591476e3c485bc03130b43a72fb394489e874e31852513"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/gn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/gn/firefox-107.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "316b4c596ec8c4ef35dd1a4979f27a827908f8abb5c8273f14cd4369de676c9e"; + sha256 = "737eae505377ab61a5c282b0eb8953716a314f3c9de477d32d64d7fb9a78f183"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/gu-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/gu-IN/firefox-107.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "8da4544ee6ecca5553ba527ceac0a952b5ed1bad14be529f03a43ef9fdb5e3fd"; + sha256 = "ce7c9e7729b56e042d1456dfcc319c96b1f750c9665830b6e1fde70de0b1ec60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/he/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/he/firefox-107.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "28f08bc46bb7a8a610a261f8a7c4904648298b1f433bd4f35b26b6e4b12719ee"; + sha256 = "99407349c83cba54c28f0183039c206cc39749679286f9cdf8ef24d060aeef3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hi-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/hi-IN/firefox-107.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "2fe944bddc1c92a5dcc468fb072231b4a33dfd74e7aef73f78d8d0a9c0b0116c"; + sha256 = "3acb62c55ec5dde45de80fce6a4b2062f9216cefc53ef2f05edd628d960e180e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/hr/firefox-107.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7a6dbb737d766338165472a462f30a03d9c42773dce1564488e43def3a9d36e1"; + sha256 = "bc37456f119e8b551e00ea8ed5a2ddaf9d46ab1902af9c88fc9ebe58af1a1839"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hsb/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/hsb/firefox-107.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "d85fc4a13990cb8cdb48a58eaa9cdbcef4c674223d3fe88cc3536e3b15102927"; + sha256 = "15f8ceed2e43cf430c116003bd90f738e86cb09e03c5031d9012f2ccddbfb2ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hu/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/hu/firefox-107.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6f9b3c7174f94ec27222a5c2a8c7ec635011ce76155d4baef902354e3cd3e4dc"; + sha256 = "553bb483a839d718a978c3de376b839f4545e4419c85e0ce9655e05a3e24d056"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hy-AM/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/hy-AM/firefox-107.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "cfc692f42801af6999c765a31ae8dc1213f10f27e59d240127fc0e3d074a75d3"; + sha256 = "93e245e49974914c61ae12fd5efa1811a998ebb095da30931757291f9e3b47b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ia/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ia/firefox-107.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5e96e9ee72a3fa8eec48d466056c7cab613eb0934b068b54fc1bf16397ceab01"; + sha256 = "140855a39273b8fff673b6ff0904fd09ccd878fb85ea923241fd77d7e738f5aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/id/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/id/firefox-107.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "aa79f2496aabe9a7b294c405732e59dd2a60f1889cfe52c6616d88eea7f28de5"; + sha256 = "c0a85f9d403adb33939d0a7e813a9a43021cf5631ca0ed60f65f9be0f10479a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/is/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/is/firefox-107.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ea72f659ad4a490fe93143459a2f81ba3bf71ca3622adc6aba93f94c23095d3d"; + sha256 = "7e73445563483fd100ab8ed16e2757e80f3e504e598d3110b92c1eeb3f5c1a79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/it/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/it/firefox-107.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9eb6cc0a3825f596be5a439df88678f2fb313ab0392078b4db22cdc26166e2e1"; + sha256 = "b715fb3c86ec071361b47bb4e85bec4372a7af998515429dac5a3f40d1e8feb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ja/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ja/firefox-107.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d5a5259613c6999ee1f71a1af4c4159fd9907962eee6ea71e3c1bcd4b2777cc6"; + sha256 = "7a8e53117ff5b8650b54bc4776fc07b2fbffe8a4ca3b457af020bf294459cc88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ka/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ka/firefox-107.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d98f0a730782c401458e8916f18d2dd20edc5fdc6cead007ae12037e4562b2be"; + sha256 = "6ec4c352f11249f0c088088f6b2c34c02e4e2476c1202e9b0be7d32971f68bdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/kab/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/kab/firefox-107.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1683775a306d9b2fb6f1bfa86b2807522548ca05150ca36cbfac75444e15ffa9"; + sha256 = "e8a15014c2b350b05e4e0a27d02e33fe9dbecccde6d33b218872fd1a0b5b345f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/kk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/kk/firefox-107.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a9b8d21b2f58dfa7c35812dd4286843f063e3ee25bee47f480057d90824bde68"; + sha256 = "c832f0ecb4552e60e8689100d9b05f198325bcf6e8c97b2909bfe5e5e8622604"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/km/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/km/firefox-107.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "faceace9fbbbd5220975a930107f667aa8efb9094c1bb1959507b5ed0d843e79"; + sha256 = "1ade8728a00304d5815e5adc346cbaaf5d7e46449361d07e29a6ad94051438ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/kn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/kn/firefox-107.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "b2c16780e3c0d989dddbb19fbf3f5113de85016b758042a15b7be3f81844a8dc"; + sha256 = "3adaaca262bcc56f6005b2f6eb1e0fd48e08b3898f438eda52986bdd41eb5275"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ko/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ko/firefox-107.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c16799429500a083fc704a5bf9675bc179324cdbc3a6945fa987f5bca68e324c"; + sha256 = "2fd33ab883f8f213c9a6cbc1ba78b4d531140fa0fecc6d9f78729a780a29f777"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/lij/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/lij/firefox-107.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b9c5e8d8689faec2d4f2a4f5d1535cea6f9272e0cb66eac14d35d8f0f1183eb5"; + sha256 = "c8f4b970079bc8b36b8237bd54fce184867dd30334a579643fa6e7753fbfda63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/lt/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/lt/firefox-107.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "d8e072e694eda686778169c595f0c43907c86ebf55a5a2f0431616fd985d1a5e"; + sha256 = "5fe663f86b54f5967bcae34aa406951fbbe5b8c542a9632b381c2ca675c648e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/lv/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/lv/firefox-107.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5141ecf8c81a7041845fc6219b3437f846ecb316980ecf91e166d476b8e2de33"; + sha256 = "d12493b3996270a75f881a97b0cee106ffe3b28c64655a04758f0b898bb14796"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/mk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/mk/firefox-107.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c71769e96fd0ea9c001f12825d1aaa9547c7b15be87ec5e8db34ed7e25233eef"; + sha256 = "3e8a93ec3d7776d778722cecab257a3c10bbb90844740cd26a06c2c8a8ab8d29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/mr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/mr/firefox-107.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "9e8eb99c481fa76a71313bd99804c0ed57678a0d3879dba20961da9ccb728744"; + sha256 = "01364a69e1a1369779e49c20135347b34ff57b652cbbd1b12898f77ead9fe005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ms/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ms/firefox-107.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "881013d91d5760e6d8c2dd3d15d249e1aeda207573cab647a9712a7da50dbb3c"; + sha256 = "0240a4907cd9e931c7b3fc7df64507317d4739867d19eddf6a89c3010fcd7a67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/my/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/my/firefox-107.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "af48084437b840ee42d5c9f09f6cd650ef782c6c34db60c7274ac6a4ed62eea4"; + sha256 = "8fb50408d531bd1fcc11888f2b3b96638f880bc014f41b1098548e7f344ee82a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/nb-NO/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/nb-NO/firefox-107.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "31a9306641cf3121cb8e5f68f25f1d82e1e4735e10e29ae3751a00e8760ad16f"; + sha256 = "e457b5ff990cfb6760d5292311b2f3267d2d46e86c8029afce7b8417b3f03fab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ne-NP/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ne-NP/firefox-107.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "4a551c857f8fc223e1306812d375e6d9674b9b7bfd22b8a6921b46d02efe3f80"; + sha256 = "01dbb19cc98844ba6a08adb881de8782607c2f441801582be1b182a12b4b6e66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/nl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/nl/firefox-107.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "02a38c8c886ca07239b1135e3e5b008b2087d7ba5a11e1540da9efbb80f588ec"; + sha256 = "7606cc6004726bfd004a067c59e22719afde54c2c229fc2c29cdfef064a01035"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/nn-NO/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/nn-NO/firefox-107.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "86cbd70d40fa565b548576abd9a73636dd1f4a36e1713e40dfc707cf6c831fe2"; + sha256 = "17e2abf060ac6483f6a441e94e1ac6cff9d08440ee815a5f8fa9dac4d7864a5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/oc/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/oc/firefox-107.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "5381d573a77300452066b0ce17be33a60b516df9476a3dd3bf7a2c6598d17cee"; + sha256 = "245d12e40994486041c22d9bf2a855011bcd83137bfd7ffdad724e44e5006403"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/pa-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/pa-IN/firefox-107.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1cc8138ad84e82ced5d0cb0eb793e1242427eea0f4dd302c6e49029b11df80c7"; + sha256 = "41250b0d8cb5e558344a82d740469a2df047411650d29d82704e7aa5471f164a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/pl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/pl/firefox-107.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "99ca0f34bb39d2b9c991b2d83b25f536aeace183b6e2c4fd7778e75dec587278"; + sha256 = "e6315515538b335d1566d09187ddd2576cbdbe5368f41bea7f25bc033f166287"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/pt-BR/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/pt-BR/firefox-107.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1fc6b9afdd9152846e0aa8aff840a27903b21a94394b11a807fb434381bc3215"; + sha256 = "b1857d4019af37b41c465298c1dd26da3b0a2b26a5e28cc40f9e09ec61d01332"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/pt-PT/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/pt-PT/firefox-107.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "343b3fb22481202a9dcac3174e954092847be9266a17c1d7ca5f0b164bffaaf4"; + sha256 = "45152bd04dc1fd55d0673f3d873909481383c31c2f77c90720dd5030937d25fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/rm/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/rm/firefox-107.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ea08447f73af2e851b84dc20ca880f0d8bfc90465454cedce269650670796e30"; + sha256 = "49c135e5f234e85422a549ff349e8a62ab710ee275704c30a0f6b7ed3cdcc328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ro/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ro/firefox-107.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "71f4c360fd0557b543d031c38d1748979afe84a088bd142c9cefbcd430571ef5"; + sha256 = "a7bf5c93b0524756b5e56ccd1485de42bee2a8e320488b819e38378cd1822544"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ru/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ru/firefox-107.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "9440aec707fcf6f9e695d1a0a7d7eae1193a244f4a30b597662bd54a1c2eaab9"; + sha256 = "ee0aa353c311cfb5bf9a267fc58fa93cab0560608f68761a06569c08e55793d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sco/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/sco/firefox-107.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "c491ba9306f4dca1ac40a25c33f8644215641633f7b7cd2e1e0fe75027032f10"; + sha256 = "535d7fd08a2df01e89d048ac48e6c37173be604f0ed5a0a413c0f5f1c8cb4ed5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/si/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/si/firefox-107.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "75a9a25cabdc6d62340d08ecc91badd6b133584659a3722bfbad3f1b6f399a7f"; + sha256 = "94ed849a09d72970d2612169b18e408ff196b8e68b7219acc84914d40b8d68e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/sk/firefox-107.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a726e151493e9062da11c48bc52ea0660016fcaee5fe1b39c4808850d8fad088"; + sha256 = "4b2069dc20127490a2581ce7cc1baad5dee291c1de31573c371bd257a282b12f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/sl/firefox-107.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "821c59416725224c985b677f34dd1af7ab029af8e205afd849baaa9a34fc2808"; + sha256 = "019ab5a41bf32aedb3d564e041b03f66cf05492a66626d4b535f9e9f833fe422"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/son/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/son/firefox-107.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "cf3a37253e16bf388677070ea8c6bbab4b27ae26ee4b22d9330e25d7ec8b0691"; + sha256 = "1b8d8fbf7cf533fa6b1604fd8cf8c42426fff5878f5569e025081ae330c19f8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sq/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/sq/firefox-107.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "581771fda181a9d14ef7e367b858ed49568916df40095457178f02254da6facd"; + sha256 = "7d81a2caafcefb19b3e1f4f3c086344b9c689e37f58048f6f853ba95296b8e47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/sr/firefox-107.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "505e692da01bc04e3993f2d3e4b942789fadfbbff859fe70d04c265d39aa632a"; + sha256 = "a608df5ff130f46d728fae614a1c46508f46dda6663b5fdd92ecd182a0542489"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sv-SE/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/sv-SE/firefox-107.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "21e35632a85ad4714c0cb0003f1eb23fbf87ed8d6b81f1e70eb86088c36f6e59"; + sha256 = "38231c4d903bc7a408b2198e0ebdfd12b9296cee50eea0ca666a1043d9f87fd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/szl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/szl/firefox-107.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "68ea55cfa9cb0ee43b2a681dc41b7abc3ea46f56718b8c867fc2fe2da0326b58"; + sha256 = "27a1971065f55272a013e70565846d245ae183d58c16162ae01cd2e5383e9f83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ta/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ta/firefox-107.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "b008660e2b48ffb0abac1750babf2c7e73447212628be0fa1490e07a12afeb05"; + sha256 = "0e2624c80ad6fbdd70bcd2714744e06e0a772dd068309b255cfb62fdfdd684f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/te/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/te/firefox-107.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "d1425a2765d92b62a6673d3402644f6eaf2f829acaf73a3dbf7520179cb8ff78"; + sha256 = "cdabaa4ff7a990df92824d59b3973b2748f8cfee8f186186cc5b2247180655d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/th/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/th/firefox-107.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "8728969cdd19bc163dc5617935d06890dadbc2d7fe827c5db6e13a682b06b2ab"; + sha256 = "eddf5f314dd9c485eda09565b92239f5b1e7ea5f09f6a4c01515cd11a168b968"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/tl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/tl/firefox-107.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e73184ce150e8fef78de03999f5cd2226e77827ee62bd16e3f99aee721f78fbe"; + sha256 = "f67fd064e27f9f9c5c9167a0a430d0f06d45b26b6f5fec49e542b613117281cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/tr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/tr/firefox-107.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b30d471530b2458d4a9431c085cbb2c7059a0d26e95620c62c6411ebda27e33c"; + sha256 = "ca484719e16ab2bc608b6d8208ba9c25a0ffa98bd838b625877d7845fd596b2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/trs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/trs/firefox-107.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d23e84dc92f83d97e28a880c5da8df646d2af36ad6844cd9cbc3e9a9c917b3f0"; + sha256 = "a799b5a3179c944bc18b09ab871f7077d6e3265900b4bb8449978e69410c4473"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/uk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/uk/firefox-107.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "cce237fdde76bcc0762e676b2a6d014975be6cf9c00ba377bf67a7b28aacb18e"; + sha256 = "3eb9a9f499607e925c427492a1b9b1214ee7c16155e31940a79dc3edc813a26e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ur/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/ur/firefox-107.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a056306bde59f3bd8059b00abd1d173d9efbcbc59566898a2f1b5413c597a451"; + sha256 = "7971c6e83e755916a151e7903af6b288733a63b24c398ba4cce7342c4081b38a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/uz/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/uz/firefox-107.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2f6a24d82a77ceaa26f294ac2b4bb96010b86cb86afaa46f4ebb31fe5a300225"; + sha256 = "0d886aa525269812703ffa190b099e000a57b4a9c57a25e13a4ce32568317c4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/vi/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/vi/firefox-107.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f6677a27e8a69fb50163417027ec619be269f6a23a2ea4ca1658a2a53c1c1d72"; + sha256 = "0a91a3c835e1d9d5711254eda497d46fa39706d0dd10884512589b44aa1e61b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/xh/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/xh/firefox-107.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "2fbb5974e9829cbc9e8f6d022c4f9676f454540c84c4a322680f4380cb5bb7e5"; + sha256 = "9123afc977a433d710ec1af0f36addd8659a326cab03b00405e74f20e9f9f117"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/zh-CN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/zh-CN/firefox-107.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "1e41dc9579bf523adf03474e207bf40f02d2217053f339dc8b265316170c0125"; + sha256 = "59d89538258bdb155222d4780a80a1c49f1b5c651534de7721d491b38c8e311c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/zh-TW/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-x86_64/zh-TW/firefox-107.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7068be87c3f0dcab6b5892b37c5696e847260d0a04c61565fa54d1dbeb5c70bb"; + sha256 = "26cd6d287862fa319529d77f337a8b676cc353d3bde0ee7b958d95729ce4ca7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ach/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ach/firefox-107.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "210c4ce1b2a19df8a31d7a4b5e2926e0d72dd59e6c2fb2d23080722c71833cb3"; + sha256 = "17916342b19ad39673f4a34d07be61def15e3799639ef54fb59d82226e7deaa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/af/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/af/firefox-107.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b8950e8cd9576a83b3bc5d9831ede0f7ceedb703a7abc81ef834a7742c27d652"; + sha256 = "226cb26dcd4499f51656fde0f8d2a803114d0535e43fcfb4cf7dd01eb1501f69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/an/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/an/firefox-107.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "14d35c3b433d3787cf12d0311e8a78fcab55b1782fba0319b69447fd9a4e9c8f"; + sha256 = "de833c13e1bcc4a4656b188b97a53a4a64f080cf71a929043b577c85ff54a267"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ar/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ar/firefox-107.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4a3ca5c74b2ef8d046c97f6abc16864a519cbbbdc7803b0bc3ae1ea91bc3932c"; + sha256 = "5fdd5b8bdcfea67f7175a4655e4afe1d68ce4a93a9b33d93946d51274804b2e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ast/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ast/firefox-107.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2f4691a658f960ef52b62b44d3a2e21c313c11ce202d7e8e0c1329e9d1e26943"; + sha256 = "19b7db5b389b5e30496c4a24bd0a85ee43352a6a9b6941514bdcc0974c7cadb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/az/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/az/firefox-107.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0310d9e0ce156ca8dc6f47a3c784a9283b68570e7e6b398e98e72add304f12b0"; + sha256 = "ec152cb4fc1de7b41dd7fd6fa340d942b0027f8ebc686a3afea9fc3dc7083e91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/be/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/be/firefox-107.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ba89cd37cdd5e3103604b040bc6f421c60a32c3ec080129bd7892dec717641ee"; + sha256 = "fae4640a3fe360990cc5f71856fa3e674ab36b7b26b1aa9d4fd6c67c6e71db5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/bg/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/bg/firefox-107.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "145a753d9ae540716d922ed1ba39d98eaa4bcd24ce414314a7b9e483e7e55911"; + sha256 = "aa642ee200a4b6cd46a50c2f8cfaecb827c7bf7d213997b409d2fba64d28af5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/bn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/bn/firefox-107.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "5e1736927a3c8f17cff0907f07312f615ccb33beddcd043555730a82f76b37e8"; + sha256 = "35bc8b83f5bd4ab35368700c095cc2943c8de72c091dc5fbe2b12e189a8b87ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/br/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/br/firefox-107.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8bc5b9d988e4ca045a507ebc6f69a93c708492b8cd33213b09417db8a0895907"; + sha256 = "c725df029f856eda9d8fb43ea0f9b87287adf125d32548c9e7f1c87e8a697e32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/bs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/bs/firefox-107.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "640bc5d6502123aaded43cf3763c6f2627a8139aca27c91007b9bafceb03dbe7"; + sha256 = "663746e7be72ce12ec9396670a49da3ab04abc75bd7f9f79d66ef4e424401c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ca-valencia/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ca-valencia/firefox-107.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "79ebc9b51afe4542658462df8d682ae192c26e8fc5ec703425d5bf3da81cf4d9"; + sha256 = "554ce3be6cbb09ad9a5d674686bf2c0a40688e6850869482f018c0d41de0f3c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ca/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ca/firefox-107.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "4ffae1ed0a335dcfc6e5893e83634b8730f6d61c3aa0fd979fd1b9a9b7c2cb5c"; + sha256 = "2ad814d95f190f98ded9359cb6168d5cc15771eb8541acd858fee5b094c5c425"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/cak/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/cak/firefox-107.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a0c62e889d53a5d36afc421f9447df9a144ac81b2c4712d850441472fc3c5312"; + sha256 = "291900dfcaa9c99a24d782f34c8cb62121e48f297a9d42aec2db66d1a7c84100"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/cs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/cs/firefox-107.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0ce1aec8f29f993208b4e19c270d43a80a8bb6215a6bf38d9cd1bbd82642be7f"; + sha256 = "fb986a313af88f69da9a1f257dba530d5b31e8e8d35dc702f7da5352a4ffcc77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/cy/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/cy/firefox-107.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "6f97a471ab266fa37007271dd8940e48d82397578e1f7462b5702c7768ad62d3"; + sha256 = "188e4e1ca521621329e14607df75f1df0ca3c355717e690113c8be5e11034b3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/da/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/da/firefox-107.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "611bb8c4f093966366583b32f267f631d75cd1b68f46052f05dbf070b8436d99"; + sha256 = "c432993913915a89d4f68d78bf41120b3e5d9976894d0076e2f8bffad9fa7722"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/de/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/de/firefox-107.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "cfd7d3e0178f9fb8d4f9b29620fc43868a9b562b4b524a9d1b58e2d9f89e82b1"; + sha256 = "4d750c064b5313b00d71c2fa66547d6be8c5c14966395b7d3fdbca63fd12769e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/dsb/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/dsb/firefox-107.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c7bd95f5ce3819f88764f7a0be9fbf23004607c569eeb5cfd848d4c7557436f8"; + sha256 = "b953dca01df3c55b049784a933e6df067021063e57b10dade22ffcbcfdf0131b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/el/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/el/firefox-107.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3da804cda7efdc32fd86dfd127227c486d4df1801812e81080c36a0f0cc01b03"; + sha256 = "8ae94ca0a9c6e73d6e51c410d171bb37e81998e626f59db1edbf921959c97cd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/en-CA/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/en-CA/firefox-107.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "7ee55f76cfa2ca813f4571f7d95a2b2226a04b5106beb2648fd1dda3b3d570c2"; + sha256 = "49c985c770df41cbc9e538a3c536bb1ba6d6858ba82a6c76b47caf48c8a626ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/en-GB/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/en-GB/firefox-107.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a8f6e6be6d86cd4710fd93c5ca93a7e591f473f451906685b5a48fabb115c7bb"; + sha256 = "967bc2dc6292dda1d2a6a99083a31d4ff078b65a0bd6540dd3bac189a314863b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/en-US/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/en-US/firefox-107.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "dd75d20f8e27f38c1776708ca6be9d19048c107342632a014e9781418098c27b"; + sha256 = "5e08758e3aabf09ffd6e142295c9ed00f048b49d5d74daee29e30f5ddbbb9fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/eo/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/eo/firefox-107.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "367235749f0d48d0fed119a998d1376ec9404437792c83093ec0591a71d9ba9d"; + sha256 = "5a668e9f4aff0d34f58d6d0042f8bcc08bc0c493bb6c335b354d7ca5b5deca2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/es-AR/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/es-AR/firefox-107.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b7607fba672ff36aa52325fdfbfd46ae7c3be9d519802246d6c804ce74a72021"; + sha256 = "eff5a4acce1eebfc21f547e383302c7f666c180883880d20f76b0f5561d68221"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/es-CL/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/es-CL/firefox-107.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9717dd09b2e891bef898cc25e571d23157ed0b08667e35cf0f563c18f72e91e8"; + sha256 = "6b515a3c1a64b3dd4c1eaadf97086ef125bc846987750e038f964c625106f53e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/es-ES/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/es-ES/firefox-107.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "785a8c94a101fb025483b9bd42ab5709f4d082325194c25891659961d45353ed"; + sha256 = "c3a162e0ff91620e5235c3ec315389fea5b3650c96cf8fc4c3df313ce49710f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/es-MX/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/es-MX/firefox-107.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "87c9be7eeb7a3aa6a361846087cf957e513dbf8d5d2002cc2ca161e0b9e440ac"; + sha256 = "4543dc01ef8fb7448963a4363685358470de9026d6d0f786f00d0dc1f64395cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/et/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/et/firefox-107.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "54ac1194940450206ba304126f2ac54a24b5714521164f8abcc332c1ce61972e"; + sha256 = "11ac8d0fe6f8c8d44be3b4f305bfbecbae2c6a34496627036bf65635cd43d093"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/eu/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/eu/firefox-107.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "35fa2afdf502685d4f045635421852e037727335206a4aea27837e747a91f59b"; + sha256 = "f5d83ec06b5ba3070e6399d5831ca8f4ec6ead4d8ba87de7f9e7d903da984803"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/fa/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/fa/firefox-107.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "48fa84d473a2c7befe92f7964cc15260f1719d1c03e8628d58179c0aafc9b63a"; + sha256 = "66e40da6369bc03b54bc71b6ac9cee85bf6dadbc1296f54190f6073fe65a72f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ff/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ff/firefox-107.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "0652b6eaecdc77a1b7d04eae1ca96186a272f16ea98ce614b03fddcb2f87f938"; + sha256 = "5de72fd8ee6fea17899d4409ca5dcc928193121e66ea34e62d4b71646b38f1ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/fi/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/fi/firefox-107.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "bd71abc232630a4270786eb26b89ca1e3fabe7e6788c4094bece058765866406"; + sha256 = "16cfc9f01a314842b7bb6bfe99c2f8f644c7b864d5d05e81d94797be3518a49f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/fr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/fr/firefox-107.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f8a52bc8668a4f527c9a44e9bee248997b8b95635e7768de2503c94cb10c8b68"; + sha256 = "cd9f6d103850f91111fdee1070f5ef73fc04b86d50b5d0ce660bf999009b11b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/fy-NL/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/fy-NL/firefox-107.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "a3f1841786fedf9d15ea2132db037d16a3153812c000123d25ca3268ffa534b8"; + sha256 = "5320380cf6e47e0e51f0572d9cf10ca61623365393557534f6b04c1e63b611b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ga-IE/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ga-IE/firefox-107.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "911b5cf7e92c4b50831be058f367df06bf5e1347ac554cfe9f2ddc7b6a7535e6"; + sha256 = "7f3828bf3a0981d308ab0af9f652ed4dbcc757f7777385fb38292618f20b97e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/gd/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/gd/firefox-107.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4aff8e95be98d8883e30d9eb33c4f825b5470462c64e7b57d1bc3d58447df1fe"; + sha256 = "9b2b54863ed580d246838c2b95af719883af9ceb3323aa6eab43c9481e7f95aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/gl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/gl/firefox-107.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "be348ab0ed669a338a86c567447d9233658ddb095a1e2ad684ff86e22d47ac99"; + sha256 = "586293da9f6da75c1b3eceb724f28cbd3b00146849ac86c170808881c376e48b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/gn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/gn/firefox-107.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5b52f6b247274aa880d151fd3c82a20788b0744caf9c45672b096fe0d7975e2c"; + sha256 = "6d480fc3647c544294fad67e6ce67d0146f236b38e78ce1a0d2ddca360fb133b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/gu-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/gu-IN/firefox-107.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "15ef4cc817f0944f1fa3803395e529402f01db315f3fb71f3c7036cd747a6350"; + sha256 = "a81b65482841b059e164355450092a20c20cd1e8461abdf6a8c5eae790e659d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/he/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/he/firefox-107.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7ed988c182e7094d262190d1881f8da18d378560d48f59ab758fb5d8e5c6e828"; + sha256 = "24bda19053a4ab3dde56c562b35bfc9c7e5cd315b615b67eda8f5531e32d6d49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hi-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/hi-IN/firefox-107.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4b0f931789ed91053776f3dc568cd4fee22b241ab8185e8193a86f6b563b8d41"; + sha256 = "e140eb8e2eb77e27fcabbfed85d53636803b6091a806031ee962bce56a478409"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/hr/firefox-107.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "fd8715969187d533f63028ecdbd2dacfad66e9a12f869b1b6a57cbbcd0a43930"; + sha256 = "30a32e8cf2f9515d3856fa666f2f3292e2c1fd9508b0fa2697bf8057e7b9be26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hsb/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/hsb/firefox-107.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "aa41df09dec18a120df021a95a95f6a145f5ada90abe794863279a58933c2498"; + sha256 = "0c6209f1e56c026effcf2939b1dffcb3989ff50ffca678d53640fa09e89085f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hu/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/hu/firefox-107.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "79fe852a1f9bb99b39017096c8f6c7ecdf7e6fb5e021e6ae9a1b179ccfff9d97"; + sha256 = "4524c4d5dd376fc1111556e7361c6c1aa22073edf5d25f0054a153cf728c2ffb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hy-AM/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/hy-AM/firefox-107.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1c1544a471208d08e28031f4df6e04c35aae7810c9f47e0aedfdd577cd32b0a5"; + sha256 = "8915e6fcbe7e8347aaedf68c34759280f666db986e9b5d9675aed8bb5ecbfa07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ia/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ia/firefox-107.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "983c97b0a87f7d2adacc51f7c219483ea4a6c067e00181f42ac6d967437112c7"; + sha256 = "35b60a830578ab16b5525151505fd793e1d9f67d2baeb27ab28f8cbe01e55ad5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/id/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/id/firefox-107.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b38d37af58610347d0892192f15363051cd2dd3e7841969c858222553343a607"; + sha256 = "4dc777ddf92d169f3f0cf546ce7fc2894aaa004a3faba22ce56125e84dade215"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/is/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/is/firefox-107.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e779cccb57ac31375563de4eb17d83ec8e1a2c0b4be8931c0390653905a7eec2"; + sha256 = "28dd54716bd8b9f3e3f91ba3bfa6d36a087e9b39d9aa8f81334d9c6895c2c41d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/it/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/it/firefox-107.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c5bfaee77e8db08471ebb85d71dcfd5839cadd9742dabafb96150b31f8b4ed95"; + sha256 = "2f26236e622b2bfb4913861641846e474c9d7931f069901355b0360b4aeedf3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ja/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ja/firefox-107.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b18a393ee915e2fd90ed9f7439c8e826a6c140bbbb90de6c5a24c2134b397973"; + sha256 = "95e7e60f5e1a2f2b432460ac44775316318a63b17a00f4f4b4f6281dd86c301f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ka/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ka/firefox-107.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "6590ac4b5124e552b9ff92ab9dceb2a801327e97dede4b798e93ded5b17c3019"; + sha256 = "f008c35f2146dc9f662457f03d347b1308a4a745c7048659d73640e687647a51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/kab/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/kab/firefox-107.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "90be62c9ab6260d630782223b4023aad102316138a99451bd76a524eed82856f"; + sha256 = "d49b7fcdafa3b67ab2b2daa07558f026ff87701b9c99666904de4612a24372bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/kk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/kk/firefox-107.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "41e6ce96227c213c835d184a299d38e4ef761cc919d0b83a57077d44b9686c7e"; + sha256 = "7e614c1f3dfd1d0e71b3c8542aeced1c8615e413af7a3005ac72c98a40a2db3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/km/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/km/firefox-107.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "47584b80836e5bad13230770f01aa79cad3f8645c55e65af504d86f182fb1e55"; + sha256 = "335d3c85e557cbb57e8bacb4956f36f71ee9cc37be9bd4bd57e9517ed26b4c4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/kn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/kn/firefox-107.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "b5f7ddd26856c7e18aa6e426be337d062e2c37f4606336aa2f93d9b0e1c5d572"; + sha256 = "01b3463e6ac28725811c61cc85f3d88ede4e146f6c7773d761b48a4988691511"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ko/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ko/firefox-107.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "20a23f3a72e67a5b3922bdfba8861ec9eaa338e822ffb1cf1187db7db25774c5"; + sha256 = "a763244ae30a28a46b7ab448504e8cf5668d9b6d2c170dd93fcf1a4a800e5d6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/lij/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/lij/firefox-107.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "e5629b3d053578bffea07b2c71e2bf7c0914d98cd61490e0607ddec7e5ff39cc"; + sha256 = "eb7728f8355a8787c17fc928803a23e43070c1a4a41e4858a1517b081bc1098a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/lt/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/lt/firefox-107.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "dc2052684031e5ce391bb660aa79f1c877d47f2f6e92631ec067c3c6f1f315fe"; + sha256 = "386746b9fc800d3fb43d43676b1b34fa59d4e8aa971e70a39f5f21cc1e728a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/lv/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/lv/firefox-107.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "b541de50e2395bfc49a848d0d04d6fdf99fb921ce452dea4954b35b72e7fffee"; + sha256 = "c1059ba74bef1156290331081f24e1781c7cad51c3347c6b334c643b0a64ed36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/mk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/mk/firefox-107.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f302b5387f5f5cfdfeb95e3a52b42dcf4abee0a77def4ae296de72325427c18e"; + sha256 = "b109b661e34c6f2d64b61fba854af116bdeb71b15eb2863c0d1cadac4337c83c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/mr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/mr/firefox-107.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "10cfd2d5acd8769cd5b26048ac4870104b5c210b1ae74ccf7159cec8bc02bcb6"; + sha256 = "e6f51c3d75f395438fa16a694a1280a30ba505e70dfe514bea8b0554f77e3369"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ms/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ms/firefox-107.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ceccfe52a071f5d10b7e6fb2ad393597b9ec915184315ae8b1e48147d972ff19"; + sha256 = "6d63dfeb4b2086c300d6308cbaf191060b756985bf61a10a3d4ed9206ca4d424"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/my/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/my/firefox-107.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "98beb6874d31aed5b747fdaccdfebd1fda78607ab5af5ddf945660c7f15f7a8d"; + sha256 = "b4cf51f0be13cc81d0b3234e221f8d7863aadc06d2bf661283ed828e7d517cf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/nb-NO/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/nb-NO/firefox-107.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b0262b927cd384c9467f163d7022e957efcad733e7b5f691699995fbea0845ea"; + sha256 = "e50e376e80cbbc81d1f8d3a157bd3dd62b138cdbf8c28e76a1a05787b2b8fbab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ne-NP/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ne-NP/firefox-107.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "31b3c9e4b915756709fe05269683b76fc089f3250e4b1ce8ba2b1fde70d3567a"; + sha256 = "d2ebcf67804929f4be1eed4b9e8eaf91d21413bc2fa68cb89c446b5466c01109"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/nl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/nl/firefox-107.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "455f4be29f9d566dc7b00d74084695740f37c84e09e78373dae51d5cad7ca658"; + sha256 = "d7b03f8903477a769e55bff76c913a17c6947435d609fe1899682daf73a772dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/nn-NO/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/nn-NO/firefox-107.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "816accf7fc50fc154408dbfacad2e1850728a92158b432ab57e9e4effc08a82d"; + sha256 = "bbb2935b8bfe2dce798cdd6c63ff495561aa1a39814090cbb91dca77a98fc53f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/oc/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/oc/firefox-107.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ee2a8f89dd345282755f920d9376e273bd08495d51c75b127d7ac365450b2af7"; + sha256 = "7a087519d0b36cf1e341837944ed2ebb86c293f4e208e7150ef458d89acf87b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/pa-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/pa-IN/firefox-107.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8863b188619c6305d35ad00ba6082e20a8b6aac9c0101bef6a52528c7a4e5a80"; + sha256 = "af120c7110f8923f21ae9b29e30700cb21bfe396af15c283d4222afc92e794e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/pl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/pl/firefox-107.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "73c0d2ddcaefd7d280d54e959aaf8aea784a9361a8698af1e831bc770f8bd82b"; + sha256 = "e772270c68859cb1be157f861d45b96d261b40d54ba01f8641f0cd36e8b93eb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/pt-BR/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/pt-BR/firefox-107.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6ec87c3013434be5c893795e6510388ef25059dc220805001bf7a149fe95be6b"; + sha256 = "eeced9960d8d45f6603adc0b8163fcb9f85b5b10c636fe2b6c9343a989820dac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/pt-PT/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/pt-PT/firefox-107.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "dc6d7826edad501cc347a1e8442058bf41383cebb29068c2914f38122d0e272c"; + sha256 = "457dc498fa2ae9a489c260436258f380c6553be5597c66668f5b983e7a15ab81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/rm/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/rm/firefox-107.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "285ad81097f0625c9acdf4eca34ccaf864cb17b271bc8b2aac0709ca45ca3c21"; + sha256 = "a3adeb8c4d8041ed213960fecb786258b38f9403473f85fe26de4becedd8b615"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ro/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ro/firefox-107.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e5fed78a63fb031d18fcf56b373a0917a742785401033a9c55049540dcc01114"; + sha256 = "aabdc4124e2ee756f36a2dda6004cbaf8fbc33f6de41374f59b9d86401ebff2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ru/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ru/firefox-107.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e0ccbf07c7bf16fbf03c885b62210990513a084cc935001a044d2890ad1ff81a"; + sha256 = "92d2a7b0a67bbe71d19cb9e2bf7d702f1c5ad9c50693d1a47030da6fa0581b28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sco/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/sco/firefox-107.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "7e0c5fd3705b111de01001674e3f8b11ae31398caae7c197a53e81250e51e202"; + sha256 = "688890b0cea77ef5c89f84bb8e8949a41a925e1ccfdeb7f4fcb9224f1b264457"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/si/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/si/firefox-107.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8756227810d59b4531fe194520e0693400453ea3fc7ae1c46ab991cd81acac6b"; + sha256 = "190283d7ef6c61ce73c59a6c04b6f046c7001b1f5909e252ccc104147a5b109b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/sk/firefox-107.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7a975da237adf1232f14f65b77868643d1027d7fe3bca11c09111ff49770de8e"; + sha256 = "52b401719a52ce606aa84fabdf858f2aa5302155f8266f7a35fb493697ccd7d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/sl/firefox-107.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4ff972a88113e02024a91d0d42959e3a24c1a0a8ea5eef8373cf7d20f77f09c9"; + sha256 = "a271eec2e80adcbf81fe2f97a4bb6dc3177a901486329898c652152820093acf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/son/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/son/firefox-107.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "0dc7501391381269f8c0481b80d2298e79f256f5159bec05a0a672383feadba0"; + sha256 = "6573f0fb20dd563c1d534f293d510a3954929c3f2b4313838e239108a75f214a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sq/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/sq/firefox-107.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "1e462c174ae58dcb717bacbfb5511f823df34910b9294a2e4bceef6952a17155"; + sha256 = "3c8c319eff5722f370b084be6b6ffda15d18ee21321d90833f7216d76aaacafa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/sr/firefox-107.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "515666a6a4b649987458fb6c32474d02971ddafaeee9dda78ddbae96d7e55a71"; + sha256 = "6dc3a73c53684c59d69e20d28b263e43cf00c05855c0c12c67ccb91d575ce324"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sv-SE/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/sv-SE/firefox-107.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "68bdbd58469b9f064f1b43e82bf69db5ae09bd15877e7f599b7c239d7dda7028"; + sha256 = "46693aaae23b4395517bd3b2e76818ed3042c9a667110eafe0e817340cfecc1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/szl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/szl/firefox-107.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c444bbe063c222fae7502f09a79e09e80c51aae9b4ece871a999e51b85232c48"; + sha256 = "afbd85b5a417c3ccd8bb1ecabcac238265fe152c12f89410315abe7849843302"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ta/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ta/firefox-107.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9d49ce0a84a974e6c91e6de54e37ddd8fa12c10f7500db21734c83138a1e48af"; + sha256 = "cb06f14c4e95fd4715d23c35312ae6d0b11ada176f8dc4dcfcc0c500343f8f1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/te/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/te/firefox-107.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "0731b02e9d6cb81c2822be6833cf4b3aa463680dfcfbf648fefb8d3cca85d044"; + sha256 = "267ed08bc07e24c5ce31018ed1315777d9c7f8b764616a4cdb9e57be8b86464e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/th/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/th/firefox-107.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ccf4ed6eecf8f06ec3569b808296e195d5791737da917646bae8720bc4a22ea1"; + sha256 = "383c3b0a28815b4e47db8b88a5bcda8f30af0cc71872262a459f55b1d69a822f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/tl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/tl/firefox-107.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "4e62341fb007d85f698df462c1e9392f07507172d5024f87d6ff235a30c57c02"; + sha256 = "1fe44aae6c7faf704ccd164c7365eb1ec15f1ae7a33738bda835020787659a87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/tr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/tr/firefox-107.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fb9c6e4cb10989b8c2035a82676763bde55ae316041fcb50b12884cd1989ae29"; + sha256 = "1e0db7166c51e00cb0f3a861b30ead22f943091b0b99bb102cb681d19f7c3b13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/trs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/trs/firefox-107.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "962cb775d8183fd471e21fd827285d5fb2b1b6a114d2564338b8eda95a0a778e"; + sha256 = "656b9f67aa76d6a7c910ed6ca5728ec0863ae793849f064cef140f0f8d801d80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/uk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/uk/firefox-107.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4d9891fcae30f71f443f5dc261c5c0da246bc65dab0d08300fffe20adfda6ab3"; + sha256 = "72ead37f19177664e038c6b7dccc10a4c12559bf6d7cf06e7fe69a97c62949aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ur/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/ur/firefox-107.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e9321b199e7b7be1a9fbf730add917e22d5395950d6a209751201c732655a26d"; + sha256 = "971c4b0fc84af8ea3a083f7547c960c76ea8a2f3f6f030ef3eca5ac2d9fb241a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/uz/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/uz/firefox-107.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d6672f1f61ae608660270208ff21e37e4ce4d10f60eb539a301b506899896c05"; + sha256 = "8df8449366f676e0162dbd6a03548625c1d4ba57bf552636b84bccd0f63bf1ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/vi/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/vi/firefox-107.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c1cd0c716fc6f2a4f1fb37a70318a887d92a86050984cd30c7c1afb186ae60de"; + sha256 = "092a3098c6a0baf1cce80b414eb7a37133d1eb374170475c4da421ec4d1fcf0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/xh/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/xh/firefox-107.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b703bebdcc28656a6f8205ffacb691fa04dab808022e33039aceff7cb9614521"; + sha256 = "4a33a349b668ff856ec8c37d0a2db3d444f21d97568b0ce1e506562a960f51e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/zh-CN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/zh-CN/firefox-107.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "03b77986482e86075562deda483e003cf2dce6c5512b68bafefb5b3250165244"; + sha256 = "e8a972eb36404d073e33f401f9600b2db18c288976fafb78e3910de9af7f45cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/zh-TW/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0.1/linux-i686/zh-TW/firefox-107.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e6363101881c6722e3b7018642c921788c0e338aa489077ec39706b779f94be6"; + sha256 = "cf695fe37a1bc36da284882d48b824292c15fb1bd2de2386dd7a3bfa4134fe57"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 19e0f2e966116..49cd312592f24 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -142,7 +142,7 @@ assert stdenv.cc.libc or null != null; assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}: pipewireSupport requires both wayland and webrtc support."; let - flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; + inherit (lib) enableFeature; # Target the LLVM version that rustc is built with for LTO. llvmPackages0 = rustc.llvmPackages; @@ -291,11 +291,9 @@ buildStdenv.mkDerivation ({ # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 unset AS - '' + lib.optionalString (lib.versionAtLeast version "100.0") '' # Use our own python export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system - '' + lib.optionalString (lib.versionAtLeast version "95.0") '' # RBox WASM Sandboxing export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++ @@ -357,6 +355,7 @@ buildStdenv.mkDerivation ({ "--with-system-png" # needs APNG support "--with-system-webp" "--with-system-zlib" + "--with-wasi-sysroot=${wasiSysRoot}" # for firefox, host is buildPlatform, target is hostPlatform "--host=${buildStdenv.buildPlatform.config}" "--target=${buildStdenv.hostPlatform.config}" @@ -369,28 +368,26 @@ buildStdenv.mkDerivation ({ # elf-hack is broken when using clang+lld: # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" - ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" - - ++ flag alsaSupport "alsa" - ++ flag jackSupport "jack" - ++ flag pulseaudioSupport "pulseaudio" - ++ lib.optional (lib.versionAtLeast version "100") (flag sndioSupport "sndio") - ++ flag ffmpegSupport "ffmpeg" - ++ flag jemallocSupport "jemalloc" - ++ flag geolocationSupport "necko-wifi" - ++ flag gssSupport "negotiateauth" - ++ flag webrtcSupport "webrtc" - ++ flag crashreporterSupport "crashreporter" ++ lib.optional (!drmSupport) "--disable-eme" - - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] - else [ "--disable-debug" "--enable-optimize" ]) - # --enable-release adds -ffunction-sections & LTO that require a big amount of - # RAM and the 32-bit memory space cannot handle that linking - ++ flag (!debugBuild && !stdenv.is32bit) "release" - ++ flag enableDebugSymbols "debug-symbols" + ++ [ + (enableFeature alsaSupport "alsa") + (enableFeature crashreporterSupport "crashreporter") + (enableFeature ffmpegSupport "ffmpeg") + (enableFeature geolocationSupport "necko-wifi") + (enableFeature gssSupport "negotiateauth") + (enableFeature jackSupport "jack") + (enableFeature jemallocSupport "jemalloc") + (enableFeature pulseaudioSupport "pulseaudio") + (enableFeature sndioSupport "sndio") + (enableFeature webrtcSupport "webrtc") + (enableFeature debugBuild "debug") + (if debugBuild then "--enable-profiling" else "--enable-optimize") + # --enable-release adds -ffunction-sections & LTO that require a big amount + # of RAM, and the 32-bit memory space cannot handle that linking + (enableFeature (!debugBuild && !stdenv.is32bit) "release") + (enableFeature enableDebugSymbols "debug-symbols") + ] ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] - ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; @@ -435,7 +432,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed - ++ lib.optional (sndioSupport && lib.versionAtLeast version "100") sndio + ++ lib.optional sndioSupport sndio ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional jemallocSupport jemalloc diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 5668e58c74823..3d4e5755600d0 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "107.0"; + version = "107.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e"; + sha512 = "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea"; }; meta = { diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 0bd3cc79df257..1bba399997f46 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -1,5 +1,5 @@ { lib -, gcc11Stdenv +, stdenv , fetchFromGitHub , cmake , ninja @@ -7,7 +7,6 @@ , wrapQtAppsHook , libxcrypt , qtbase -, qttools , nixosTests }: @@ -17,8 +16,8 @@ let serenity = fetchFromGitHub { rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5"; hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8="; }; - -in gcc11Stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "ladybird"; version = "unstable-2022-09-29"; @@ -30,6 +29,11 @@ in gcc11Stdenv.mkDerivation { hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "MACOSX_BUNDLE TRUE" "MACOSX_BUNDLE FALSE" + ''; + nativeBuildInputs = [ cmake ninja @@ -49,6 +53,20 @@ in gcc11Stdenv.mkDerivation { "-DENABLE_UNICODE_DATABASE_DOWNLOAD=false" ]; + # error: use of undeclared identifier 'aligned_alloc' + NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [ + "-include mm_malloc.h" + "-Daligned_alloc=_mm_malloc" + ]); + + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + + # https://github.com/SerenityOS/serenity/issues/10055 + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath $out/lib $out/bin/ladybird + ''; + passthru.tests = { nixosTest = nixosTests.ladybird; }; @@ -58,7 +76,6 @@ in gcc11Stdenv.mkDerivation { homepage = "https://github.com/awesomekling/ladybird"; license = licenses.bsd2; maintainers = with maintainers; [ fgaz ]; - # SerenityOS only works on x86, and can only be built on unix systems. - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index b41f95b0b0cc8..9899033297781 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -15,15 +15,15 @@ , enableTUI ? false, ncurses, sealcurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.13.8"; + version = "1.14.1"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; - rev = "v${version}"; - sha256 = "sha256-SdncFkMCAY28njw361R70h6gcK0YHSU7AUwf9wzxCRo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-xS6cyramlcItjRBSSunzm39zcGXdX9s/pvi0tsaTkW8="; }; nativeBuildInputs = [ cmake pkg-config zip ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { - attrPath = pname; + attrPath = finalAttrs.pname; }; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index b3bc0b85b7a4e..8cc32b8e3b319 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "107.0-1", + "packageVersion": "107.0.1-2", "source": { - "rev": "107.0-1", - "sha256": "1fm4z3s0z9shxj8667pnz3gly7jv1kmm1arbn52hq7n52ywykrv7" + "rev": "107.0.1-2", + "sha256": "1s009nbsqihmhnaa20j9g1qyifl3kgsbpgxc8ms5ahx3j97hbpk5" }, "firefox": { - "version": "107.0", - "sha512": "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e" + "version": "107.0.1", + "sha512": "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea" } } diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 3d3339d06b5ef..3e08b228159c0 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,7 +45,7 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.3.1"; + version = "31.4.1.1"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-oLtCS5Izdk2ImyzKx2IXkzv6pJp86mvP99P0+XIteRA="; + sha256 = "sha256-lr8xT9tRxVjg1DxUZuCyWuCFBPPdmkvsnmAsoX8o/6Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig index d680dc1ab44c6..c481dbc29e8e4 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -19,7 +19,7 @@ ac_add_options --enable-jemalloc ac_add_options --enable-strip ac_add_options --enable-devtools ac_add_options --enable-av1 -ac_add_options --enable-phoenix-extensions +ac_add_options --enable-jxl ac_add_options --disable-eme ac_add_options --disable-webrtc diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index ad7f6e5154ada..87dc7dcb1d019 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -7,7 +7,7 @@ let src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "eujv99L5svMhDIKHFOfm7sOwNZ4xiUaIsimfOf4BBik="; + sha256 = "sha256-J0D49VESNgdBEWAf01LkiiU2I01r4PBLyWKpnE9t45Q="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index df10fc4742571..56bf61aa03bfd 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5.7"; + version = "11.5.8"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-K50T9Fe6tMuP1J5gfwK9f/25ZeakQ9vsJi4IOPa6fMk="; + sha256 = "sha256-/KK9oTijk5dEziAwp5966NaM2V4k1mtBjTJq88Ct7N0="; }; i686-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-tbL/iTI3vR0gdMcLwOoWlfIDZNefIKA2hfvWKNNM9vE="; + sha256 = "sha256-TGdJ5yIeo0YQ4XSsb9lv3vuW6qEjhFe7KBmkjYO6fAc="; }; }; in diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index a0a9b10f068a0..ab81254c710fe 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { NO_AT_BRIDGE=1 \ XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs runHook postCheck ''; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 66ec0a7c7b470..f7749946f42ef 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -34,6 +34,7 @@ let src = fetchurl { url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz"; + curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; # HTTP 104 otherwise inherit sha256; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 3885db4b30a87..d6ca151e7a6ad 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-xiqxCYGSpsREZyylWJCIbFPPr3jISxD0wS/L/P77BF8="; + sha256 = "sha256-cL1QV0D8m8rqSDuQgsYBPY7n5K2dy9s9c8VRx65+SV0="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 8ce7b0dcae00b..e76b7fc157546 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-5zchElzEjrIgODRUvQTQwlBz5371iJU5VOpz12Xtbcg="; + sha256 = "sha256-wDyRXdlkZEzdqVSGYSzLroqMWZDTpPzsu94Mx7lvh2I="; }; - vendorSha256 = "sha256-n2yzqNjmPDP+8/ipiuUt6BqFYF0Oh0Y0TCdKsqCcrIQ="; + vendorSha256 = "sha256-I3fKo4lsNGQTTi8a6de85rVGoTEvr8wwE2y4OQHks7o="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 16635f17600f3..c1e4df0a3893b 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.13.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iL8quRwW4idY880aEM2rwXRh6JXIvMzlfBDcz2TgHjw="; + sha256 = "sha256-6NUuKU8KQBfHE6fcN3a9lBcUk7p5I9SuY9g+qJxGXmU="; }; - vendorSha256 = "sha256-pr33Ya6cg3EKIVTBTY8DD0lyTMPF1FcRQK2jdyPiE44="; + vendorSha256 = "sha256-vZwADD7fi9ZvJby9Ijdeueid8jRfUyyj6Nu4kgkO5Wo="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index da3f684398e25..36666b901da06 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CNicDFmWq2tgw3LEw8nOlwewY3cpzwS9ea4fxbwVJc0="; + sha256 = "sha256-wsCVeCAgZ2RPT6cle1YHB5CZdcPmKOVuUQlA5d3H7iI="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 9399d5b7fb9bb..c0711bf5fd86d 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.12.7"; + version = "0.12.11"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-libZapDj6Y/tGJEXAX3iZH2+pS64dg7IUsgTxT0Z6JA="; + sha256 = "sha256-50D3iH5KAWvX7lAPHY7cUKc4d4ww47ti2QOgdrfY1BY="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 06ca40b7d4677..fef3619fa2a03 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, clusterctl }: buildGoModule rec { pname = "clusterctl"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-Cmff3tIy60BDO3q5hzPqSLwjc6LzUSpoorJD/yxha9c="; + sha256 = "sha256-lqHHZtEtedU0Qtm6o6iy6JrQ1UiB9nSTZVyfq0cj0vI="; }; - vendorSha256 = "sha256-jvadtm8NprVwNf4+GaaANK1u4Y4ccbsTCZxQk21GW7c="; + vendorSha256 = "sha256-7e2ZJa6MfzznOoaBq0xQIXrdmDAzPzKh9QFlRfbxYMM="; subPackages = [ "cmd/clusterctl" ]; @@ -32,6 +32,12 @@ buildGoModule rec { --zsh <($out/bin/clusterctl completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = clusterctl; + command = "HOME=$TMPDIR clusterctl version"; + version = "v${version}"; + }; + meta = with lib; { description = "Kubernetes cluster API tool"; homepage = "https://cluster-api.sigs.k8s.io/"; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 22e23e72656d6..6e0340cc8b974 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cmctl"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; - rev = "da3265115bfd8be5780801cc6105fa857ef71965"; - sha256 = "0s6nki61crx62v6ypmm0yjbyy71ygifffhkp5554jh4g9hvcfbmr"; + rev = "a96bae172ddb1fcd4b57f1859ab9d1a9e94f7451"; + sha256 = "0wj2fshkfdrqrjyq3khzpdjiw5x3djjw9x7qq8mdgzyj84cmz11w"; }; vendorSha256 = "sha256-WPFteR3t9qQiuBcCLqvp8GterqcD2SxJi59Wb7BvDT4="; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 898b7fe613f85..c9d3f778b5545 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.36.0"; - sha256 = "1rjsdisj2cib8pyfc1lx5jgx0dksh0zhiqccgvqvfja24azvhc4n"; - manifestsSha256 = "0kzbzn43i35kyl7h9kb4f21sbrz90jx9pj35002j2i1j20b2xzh8"; + version = "0.37.0"; + sha256 = "10f0k6k02n981vf0bjh70qf4kdax2qc40ld278p7mrsqri38r1q9"; + manifestsSha256 = "0srg7184sb1brxj8kzzf0ilmx5ym96h78v919xcmbdd6v4f2ycy9"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-2N91+anR0nD9E563MgSQPwslR9J/uvSHLs6kD4Yc3So="; + vendorSha256 = "sha256-zB7Fo+Lw0+hWuzkYLDb9I+swhm9kGfjYNkU96hF6QTg="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 78eee8746c51f..af39304e9c444 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.20"; + version = "0.6.22"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-HeyWMzxSga6T2/BRVwrmgb3utjnVTJk3zhhcVfq8/Cc="; + hash = "sha256-FXgDCZcHcKvgkV1YFjMKl+5oJ5H1DV/Gj9am5VJuIjw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/func/default.nix b/pkgs/applications/networking/cluster/func/default.nix new file mode 100644 index 0000000000000..306ce8ba25e40 --- /dev/null +++ b/pkgs/applications/networking/cluster/func/default.nix @@ -0,0 +1,46 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, func }: + +buildGoModule rec { + pname = "func"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "knative"; + repo = "func"; + rev = "knative-v${version}"; + sha256 = "sha256-LrWRY22deh+YL/cLb+ZwK93okVPgysBoMCmo2MrbqIs="; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/func" ]; + + ldflags = [ + "-X main.vers=v${version}" + "-X main.date=19700101T000000Z" + "-X main.hash=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + + postInstall = '' + installShellCompletion --cmd func \ + --bash <($out/bin/func completion bash) \ + --zsh <($out/bin/func completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = func; + command = "func version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "The Knative client library and CLI for creating, building, and deploying Knative Functions"; + homepage = "https://github.com/knative/func"; + changelog = "https://github.com/knative/func/releases/tag/knative-v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ maxwell-lt ]; + }; +} diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index b4ae402fa0c97..5e0f118918b49 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-mgf3xQIsd4j3a5pqZz2UHhsHizACjVC4St1GfsDJsfY="; + sha256 = "sha256-uXFBXIPsWskEHHvqB+VagNLL4blySabuZvTBBcGGhhg="; }; - vendorSha256 = "sha256-P40VPtPxbfL0xpAMLJrqPhyyB7xFTsXMfBSCGL3S4Gg="; + vendorSha256 = "sha256-x/+y3te+DC16Cs7kAnuhiskL5I44WDK1QTjAWheDwC8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 6dff7385d705b..555af740b9266 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_25 = mkKops rec { - version = "1.25.2"; - sha256 = "sha256-JJGb12uuOvZQ+bA82nrs9vKRT2hEvnPrOH8XNHfYVD8="; + version = "1.25.3"; + sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index a2d646e061000..b6a96f0675982 100644 --- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.25.3"; + version = "1.25.4"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2Ny3tzeFOZR63fweb+/q1kocIDboD8fJzlLOzcoR0nA="; + sha256 = "sha256-Og8ippw9rPH0Ni72mSlCjo4i/cfZXLAjG38jPvfs9ro="; }; subPackages = ["."]; - vendorSha256 = "sha256-iY4CmtWwQQwZBQM4iJXedFePL4vzSBfNWrVOxYvrhMs="; + vendorSha256 = "sha256-E7I8GNcI/QRgbrstc2Ky0q/DPaqNP11BaDzrrfZofLQ="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 92899fdacf0f6..0197fe79c742c 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.23"; + version = "0.0.24"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6aYa5C0RMCKrnBl3YNbdMUxGOJYwVZ303PLt5RRBjmw="; + sha256 = "sha256-xHMUS08gtfN72sMkGZ+2Cazgkd2HgvHSKqugYg+j1So="; }; vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 6ff8edd737ff3..b1d486c518017 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-pwT+fzFzJBkQkWmeHlqbTVSmmh7p3h7M4p5Wrrq+vJM="; + sha256 = "sha256-U0VcLxI5hSVqU9N+99/qOjueKi6EdVMT2dTyZUSpNXw="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-QE2OWymT/ke/5+f3Sw5MBadorcn/vXJXvwOaFNqhxWQ="; + vendorSha256 = "sha256-nqJZdMkpJEG6VFCTwGUzXcCZPshJnY2FYHDm3xMlU0g="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix index 7e08eee1f390b..eba9a8375dcca 100644 --- a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix +++ b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nomad-driver-podman"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-33hyMKwU04ywXKv4JEhRvEbe2DWQEAQ0moy6zypXdpU="; + sha256 = "sha256-miarvcV+b/6kbjHru7MpBIBU/v9ldHJGeXh2ATQ3BQ0="; }; - vendorSha256 = "sha256-5PQIWSGSR5vizWEsResBLd//yWs99o/bj5DVpRMBwhA="; + vendorSha256 = "sha256-AtgxHAkNzzjMQoSqROpuNoSDum/6JR+mLpcHLFL9EIY="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix deleted file mode 100644 index c0d0855bc17f0..0000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.2.14"; - sha256 = "sha256-BEbRXakMbgE44z1NOGThUuT1FukFUc1cnPkV5PXAY+4="; - vendorSha256 = "sha256-bOJ/qlvY3NHlR9C08vwfVn4Z/bSH15EPs3vvq78JoKs="; -} diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix deleted file mode 100644 index cc64d677d044e..0000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.3.7"; - sha256 = "sha256-hMMR7PdCViZdePXy9aFqTFBxoiuuXqIldXyCGkkr5MA="; - vendorSha256 = "sha256-unw2/E048jzDHj7glXc61UNZIr930UpU9RrXI6DByj4="; -} diff --git a/pkgs/applications/networking/cluster/nomad/1.4.nix b/pkgs/applications/networking/cluster/nomad/1.4.nix deleted file mode 100644 index 5bdf975af92c5..0000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.4.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.4.2"; - sha256 = "sha256-GGLy/6FgMTSZ701F0QGwcw1EFZSUMyPOlokThOTtdJg="; - vendorSha256 = "sha256-dd8rTGcO4GVMRuABwT4HeucZqYKxrgRUkua/bSPLNH0="; -} diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix new file mode 100644 index 0000000000000..faec094807740 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildGoModule +, buildGo119Module +, fetchFromGitHub +, nixosTests +}: + +let + generic = + { buildGoModule, version, sha256, vendorSha256, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorSha256" ]; + in + buildGoModule (rec { + pname = "nomad"; + inherit version vendorSha256; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + inherit sha256; + }; + + # ui: + # Nomad release commits include the compiled version of the UI, but the file + # is only included if we build with the ui tag. + tags = [ "ui" ]; + + meta = with lib; { + homepage = "https://www.nomadproject.io/"; + description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; + platforms = platforms.unix; + license = licenses.mpl20; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ]; + }; + } // attrs'); +in +rec { + # Nomad never updates major go versions within a release series and is unsupported + # on Go versions that it did not ship with. Due to historic bugs when compiled + # with different versions we pin Go for all versions. + # Upstream partially documents used Go versions here + # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md + + nomad = nomad_1_4; + + nomad_1_2 = generic { + buildGoModule = buildGo119Module; + version = "1.2.15"; + sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI="; + vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto="; + }; + + nomad_1_3 = generic { + buildGoModule = buildGo119Module; + version = "1.3.8"; + sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I="; + vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00="; + }; + + nomad_1_4 = generic { + buildGoModule = buildGo119Module; + version = "1.4.3"; + sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg="; + vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A="; + passthru.tests.nomad = nixosTests.nomad; + }; +} diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix deleted file mode 100644 index c5d92eaf1f7ea..0000000000000 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, version -, sha256 -, vendorSha256 -, nixosTests -}: - -buildGoModule rec { - pname = "nomad"; - inherit version; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = pname; - rev = "v${version}"; - inherit sha256; - }; - - inherit vendorSha256; - - # ui: - # Nomad release commits include the compiled version of the UI, but the file - # is only included if we build with the ui tag. - tags = [ "ui" ]; - - passthru.tests.nomad = nixosTests.nomad; - - meta = with lib; { - homepage = "https://www.nomadproject.io/"; - description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.unix; - license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ]; - }; -} diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index fb3dd48505064..ac5342bb29d2e 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-nevwmw2d8HARRwOy8dPsjtjQj+W3psknphcmebRjrNE="; + sha256 = "sha256-Np2O3mO9wBxDcCHG8/zMdIU2N+3RNRT2SN3kh7+l2Nc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 570481f49b27e..eb68de91c233b 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -1,25 +1,31 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "pachyderm"; - version = "1.8.5"; - rev = "v${version}"; - - goPackagePath = "github.com/pachyderm/pachyderm"; - subPackages = [ "src/server/cmd/pachctl" ]; + version = "2.4.1"; src = fetchFromGitHub { - inherit rev; owner = "pachyderm"; repo = "pachyderm"; - sha256 = "1b9x2xn0sxsjid15lnwr79lps8xzf24i7jfl0i48nabdigmi04wp"; + rev = "v${version}"; + hash = "sha256-hU1Li3ZTgCbvyfBQ7TcmmeXOfcb1DHeo/K7iT7vc+vE="; }; + vendorHash = "sha256-j7zg0vIhdYbzyi4owdVEF4XyUNwGds6J01+3k5K90Yg="; + + subPackages = [ "src/server/cmd/pachctl" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/pachyderm/pachyderm/v${lib.versions.major version}/src/version.AppVersion=${version}" + ]; + meta = with lib; { description = "Containerized Data Analytics"; - homepage = "https://github.com/pachyderm/pachyderm"; - license = licenses.asl20; - maintainers = with maintainers; [offline]; + homepage = "https://www.pachyderm.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ offline ]; mainProgram = "pachctl"; }; } diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix new file mode 100644 index 0000000000000..0d76b62a8e18c --- /dev/null +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "rke"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "rancher"; + repo = pname; + rev = "v${version}"; + hash = "sha256-H5T7Hr6/YL93lbCLOxfQ+Kmv3C+FS074418mHhBV3Bs="; + }; + + vendorHash = "sha256-zV1lrJhzrUAcEk6jYLCFrHcYw3CZart46qXErCTjZyQ="; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" "-X=main.VERSION=v${version}" ]; + + meta = with lib; { + homepage = "https://github.com/rancher/rke"; + description = "An extremely simple, lightning fast Kubernetes distribution that runs entirely within containers"; + changelog = "https://github.com/rancher/rke/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index fa6976d5a3f7d..bbea935af9a3b 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "551bf68c694927839c3add25a2512f880902ee9b"; +let rev = "5b97033257d0276c7b0d1b20412667a69d79261e"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.56.10"; # Do not forget to update `rev` above + version = "0.56.12"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-Hykm8h0kJzTL6XbaBe3vtoghmP4LmvPfBhrTgCmNyRE="; + sha256 = "sha256-i+fg5tPkpnNl1Oef1KPmhHC+5t4y9vvfRpw9DHbsf4w="; }; - vendorSha256 = "sha256-jBm3t/kvijAv5KOLhDJ1kGLdzpFJiBs/Vtu2mO2lnPM="; + vendorSha256 = "sha256-SRR4TmNHbMOOMv6AXv/Qpn2KUQh+ZsFlzc5DpdyPLEU="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index f5129e6d9a5d9..93f6f97a6a39e 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-KvwW5VJ5HDXDxaPssmVnqBWmk3Y1qbu9PcZsd+CLeXE="; + sha256 = "sha256-AQTBiHlaVFV1fvZ278DYf2XnktnLNa1Hb4qS2D2r/fM="; }; - vendorSha256 = "sha256-i+SUDFOffh4Ky2kawIb3M6M2Han25yYQbWI0wFjZwtU="; + vendorSha256 = "sha256-GKDhqIfYmPwbxt+hId3Axr64xOTXkLklZzNYWDo9SG8="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 0362095bce697..1bc55b3db4ff7 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zLPZueKdUNauIzqXOV773SZ/RWg7UuMNeJHr7z6ZJ+E="; + sha256 = "sha256-8OW0n6aS7bDDbzbrMfJLL8Yvq3vJg47qHQB4zY0xxAw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index abaff42f3a32e..f806a1d35ae84 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal-cli"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-rdDtgSM2wZsHYv9tBNdcSHYXdvvEk5wqdLr1KjoPz1E="; + hash = "sha256-QID0VtARbJiTIQm2JeaejQ5VpJsAIHfZtws7i2UN8dM="; }; - vendorSha256 = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; + vendorHash = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 9f9471627cf69..d2759931b7edc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -17,17 +17,21 @@ let ({ owner , repo , rev - , version + , spdx ? "UNSET" + , version ? lib.removePrefix "v" rev , hash ? throw "use hash instead of sha256" # added 2202/09 , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 , deleteVendor ? false , proxyVendor ? false , mkProviderFetcher ? fetchFromGitHub , mkProviderGoModule ? buildGoModule - # Looks like "registry.terraform.io/vancluever/acme" - , provider-source-address + # "https://registry.terraform.io/providers/vancluever/acme" + , homepage ? "" + # "registry.terraform.io/vancluever/acme" + , provider-source-address ? lib.replaceStrings [ "https://registry" ".io/providers" ] [ "registry" ".io" ] homepage , ... }@attrs: + assert lib.stringLength provider-source-address > 0; mkProviderGoModule { pname = repo; inherit vendorHash version deleteVendor proxyVendor; @@ -42,6 +46,11 @@ let inherit owner repo rev hash; }; + meta = { + inherit homepage; + license = lib.getLicenseFromSpdxId spdx; + }; + # Move the provider to libexec postInstall = '' dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} @@ -52,6 +61,7 @@ let # Keep the attributes around for later consumption passthru = attrs // { + inherit provider-source-address; updateScript = writeShellScript "update" '' provider="$(basename ${provider-source-address})" ./pkgs/applications/networking/cluster/terraform-providers/update-provider "$provider" @@ -67,9 +77,11 @@ let # These are the providers that don't fall in line with the default model special-providers = { - netlify = automated-providers.netlify.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); - pass = automated-providers.pass.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); - tencentcloud = automated-providers.tencentcloud.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); + netlify = automated-providers.netlify.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); + pass = automated-providers.pass.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); + tencentcloud = automated-providers.tencentcloud.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); + # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. + checkly = automated-providers.checkly.override { spdx = "MIT"; }; gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; }; # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); @@ -79,17 +91,21 @@ let removed-providers = let archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}"; + license = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date} because of unclear licensing"; removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { b2 = removed "b2" "2022/06"; checkpoint = removed "checkpoint" "2022/11"; dome9 = removed "dome9" "2022/08"; + logicmonitor = license "logicmonitor" "2022/11"; ncloud = removed "ncloud" "2022/08"; + nsxt = license "nsxt" "2022/11"; opc = archived "opc" "2022/05"; oraclepaas = archived "oraclepaas" "2022/05"; panos = removed "panos" "2022/05"; template = archived "template" "2022/05"; + vercel = license "vercel" "2022/11"; }; # excluding aliases, used by terraform-full diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bfc5e828cb276..b4a9d3db3ac83 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -2,1286 +2,1261 @@ "aci": { "deleteVendor": true, "hash": "sha256-Y2cNp2BuPEH5wAEwaMVSBgKoHrcy6d4eOlsGPqAxmoU=", + "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", - "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "proxyVendor": true, "repo": "terraform-provider-aci", "rev": "v2.5.2", - "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=", - "version": "2.5.2" + "spdx": "MPL-2.0", + "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=" }, "acme": { "hash": "sha256-H+1/Au/jCxNxrV+kk6tylUF85taZcs44uWed1QH1aRo=", + "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", - "provider-source-address": "registry.terraform.io/vancluever/acme", "proxyVendor": true, "repo": "terraform-provider-acme", "rev": "v2.11.1", - "vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=", - "version": "2.11.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", + "homepage": "https://registry.terraform.io/providers/clementblaise/age", "owner": "clementblaise", - "provider-source-address": "registry.terraform.io/clementblaise/age", "repo": "terraform-provider-age", "rev": "v0.1.1", - "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=", - "version": "0.1.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-2QdpXNCnnYh75CyqeKJbYgFB63TCcMrWlUPLe/puvOw=", + "hash": "sha256-PeIb/HErJ3iIBwzeUmdhNXCYZBqayI2cRSDrye8A3Ys=", + "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", - "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.8.1", - "vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=", - "version": "3.8.1" + "rev": "v3.9.0", + "spdx": "MIT", + "vendorHash": "sha256-J/x5oc4Qr4c/K5RKswFeWgUDE+ns1bUxfpRlj29uCY0=" }, "akamai": { - "hash": "sha256-QbCDaDII+xEA3lXjODsz8jai2mg3N/3uC4fruiLqvWc=", + "hash": "sha256-SKaSKBV47B9Y0w2zmNOek/UEbUQLtB1qAm6866RAhdA=", + "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", - "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v3.0.0", - "vendorHash": "sha256-LYoRZIr2+NqxwZYaN1HFTSaCl0wJPVr2Wf0OjdqM5YM=", - "version": "3.0.0" + "rev": "v3.1.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-byReViTX0KRFVgWMkte00CDB/3Mw8Ov5GyD48sENmIA=" }, "alicloud": { - "hash": "sha256-rscu2gCvf/8MJBx1coUmne+8DO8b6RFyfMAwhTUPU+w=", + "hash": "sha256-YdXnw0j2PSuT2BoQQUxyomH+dycjy6Fed7+xVuOwJhk=", + "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", - "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.192.0", - "vendorHash": null, - "version": "1.192.0" + "rev": "v1.193.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "ansible": { "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", + "homepage": "https://registry.terraform.io/providers/nbering/ansible", "owner": "nbering", - "provider-source-address": "registry.terraform.io/nbering/ansible", "repo": "terraform-provider-ansible", "rev": "v1.0.4", - "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=", - "version": "1.0.4" + "spdx": "MPL-2.0", + "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { "hash": "sha256-EzqsTJwjDQ6pIQxdGPOTbNom0RDurAGT0eJmuwAzO4Y=", + "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/archive", "repo": "terraform-provider-archive", "rev": "v2.2.0", - "vendorHash": null, - "version": "2.2.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "argocd": { "hash": "sha256-yWhq2WolfL7PQVuWr5P7EH0cM78wGyL2+yezh2WzL2c=", + "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", - "provider-source-address": "registry.terraform.io/oboukili/argocd", "repo": "terraform-provider-argocd", "rev": "v4.1.0", - "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=", - "version": "4.1.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=" }, "auth0": { "hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=", + "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", - "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", "rev": "v0.40.0", - "vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=", - "version": "0.40.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=" }, "avi": { "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", + "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/avi", "proxyVendor": true, "repo": "terraform-provider-avi", "rev": "v22.1.2", - "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=", - "version": "22.1.2" + "spdx": "MPL-2.0", + "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" }, "aviatrix": { "hash": "sha256-1zHaSdDcGynLhgLMDRbRgRzt0IvQI25TDZrYzZwwQ34=", + "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", - "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", "rev": "v2.24.1", - "vendorHash": null, - "version": "2.24.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "aws": { - "hash": "sha256-xI+hH6al6zOYzgmpoOjKNy5QgVVFhnqiGm9OIUWevSk=", + "hash": "sha256-g38aJ8JN/0PZ0ArSti1/5nzflIlkz/qhn5Qz4yXCie8=", + "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.40.0", - "vendorHash": "sha256-OScGmmFaGq7JD9+GmX3c9t/s4BqplMt7UNa2RXq5HKE=", - "version": "4.40.0" + "rev": "v4.45.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-C3wr/3huORBacbe0+Z0qqH+iSaJCxQwLq9wqLSirDiM=" }, "azuread": { - "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=", + "hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.30.0", - "vendorHash": null, - "version": "2.30.0" + "rev": "v2.31.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "azurerm": { - "hash": "sha256-zLNlT2CK2Rbvpxftsi6WlMQoHn8S11l/5ySIKsfQ8no=", + "hash": "sha256-2RjraGiMtITdBJ47crqlqFR51WbKpk4U6fkGHCTNXuo=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.32.0", - "vendorHash": null, - "version": "3.32.0" + "rev": "v3.34.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azurestack", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", "rev": "v1.0.0", - "vendorHash": null, - "version": "1.0.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "baiducloud": { "deleteVendor": true, - "hash": "sha256-0L/T12jeSkdZDJknVu5JffyaniZ1RVWgMpPu3qKNmWU=", + "hash": "sha256-Yw0dtfPiXLSLDvlAL3OUfZsd8ihc/OCBedsSSUcedOU=", + "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", - "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.18.2", - "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=", - "version": "1.18.2" + "rev": "v1.18.3", + "spdx": "MPL-2.0", + "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=" }, "bigip": { "hash": "sha256-erJeg7KF3QUi85ueOQTrab2woIC1nkMXRIj/pFm0DGY=", + "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", - "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", "rev": "v1.16.0", - "vendorHash": null, - "version": "1.16.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "bitbucket": { "hash": "sha256-eU8vA2fxtdsObgh2dTExGLzzBnfSc2DSGdFHrLXR3SA=", + "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", - "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", "rev": "v2.22.0", - "vendorHash": "sha256-Qkla3OEcyiMn6eqBj+4LB8JwpIwceLAASI1qvOcUBD0=", - "version": "2.22.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-Qkla3OEcyiMn6eqBj+4LB8JwpIwceLAASI1qvOcUBD0=" }, "brightbox": { "hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=", + "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", - "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", "rev": "v3.0.5", - "vendorHash": "sha256-ZT+SOHn/8aoZLXUau9toc3NtQNaXfttM0agIw8T28tk=", - "version": "3.0.5" + "spdx": "MPL-2.0", + "vendorHash": "sha256-ZT+SOHn/8aoZLXUau9toc3NtQNaXfttM0agIw8T28tk=" }, "buildkite": { "hash": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=", + "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", - "provider-source-address": "registry.terraform.io/buildkite/buildkite", "proxyVendor": true, "repo": "terraform-provider-buildkite", "rev": "v0.11.0", - "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=", - "version": "0.11.0" + "spdx": "MIT", + "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=" }, "checkly": { "hash": "sha256-OKLmcy0egQ9z/eBsdXzGiswByWQ9fiOq4N7ndTW2nso=", + "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", - "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", "rev": "v1.6.3", - "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=", - "version": "1.6.3" + "spdx": null, + "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", + "homepage": "https://registry.terraform.io/providers/CiscoDevNet/ciscoasa", "owner": "CiscoDevNet", - "provider-source-address": "registry.terraform.io/CiscoDevNet/ciscoasa", "repo": "terraform-provider-ciscoasa", "rev": "v1.3.0", - "vendorHash": null, - "version": "1.3.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "cloudamqp": { "hash": "sha256-EtFGqYNfyDbS4f1tjRTKcrQNFqEZmmILeuEOpwkx6/4=", + "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", - "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", "rev": "v1.20.0", - "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=", - "version": "1.20.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=" }, "cloudflare": { - "hash": "sha256-a0zJ1n4nKHEyjqJeey5MxPhqJU8Bq9a+hqLOCEdTfEE=", + "hash": "sha256-1Ak5NPaOSqF0mJU2/CnssQjz7ekyVE/kqDOS5rYSN10=", + "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", - "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.28.0", - "vendorHash": "sha256-Jvaud6rkaNMZZ/L/pb8JKGaAYw1MieGq7aU4Abe2VJA=", - "version": "3.28.0" + "rev": "v3.29.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-2H+xp/A3J/xUf02voYyWP+J5MSsFM7Kz7KlgjaF99ao=" }, "cloudfoundry": { - "hash": "sha256-VfGB0NkT36oYT5F1fh1N/2rlZdfhk+K76AXNh0NkO50=", + "hash": "sha256-RYUs35sSL9CuwrOfUQ/S1G6W8ILgpJqVn8Xk9s2s35Y=", + "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", - "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.15.5", - "vendorHash": "sha256-dj0XBy3dvpn9aEt+Xab6ZelvXZmt2+BX6qytdsMbIXo=", - "version": "0.15.5" + "rev": "v0.50.2", + "spdx": "MPL-2.0", + "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, "cloudinit": { "hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=", + "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/cloudinit", "repo": "terraform-provider-cloudinit", "rev": "v2.2.0", - "vendorHash": null, - "version": "2.2.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "cloudscale": { "hash": "sha256-Eo7zT/KiJdzo7fhAcCg6EV29ENM/XSBumAHmL9J8agU=", + "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", - "provider-source-address": "registry.terraform.io/cloudscale-ch/cloudscale", "repo": "terraform-provider-cloudscale", "rev": "v4.0.0", - "vendorHash": null, - "version": "4.0.0" + "spdx": "MIT", + "vendorHash": null }, "constellix": { "deleteVendor": true, "hash": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=", + "homepage": "https://registry.terraform.io/providers/Constellix/constellix", "owner": "Constellix", - "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", "rev": "v0.4.5", - "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=", - "version": "0.4.5" + "spdx": "MPL-2.0", + "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { "hash": "sha256-DS27LGhXDYVr+c0wIZe5PjssK8l8Aq4zzh3I+G4WCU8=", + "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", "rev": "v2.16.2", - "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=", - "version": "2.16.2" + "spdx": "MPL-2.0", + "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=" }, "ct": { "hash": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=", + "homepage": "https://registry.terraform.io/providers/poseidon/ct", "owner": "poseidon", - "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", "rev": "v0.11.0", - "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=", - "version": "0.11.0" + "spdx": "Apache-2.0", + "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { "hash": "sha256-QKUmbCyB9Xlr+wfEGiCR+xn8xz81FJ77pY90AzMc/Bw=", + "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", - "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", "rev": "v3.18.0", - "vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=", - "version": "3.18.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", + "homepage": "https://registry.terraform.io/providers/awakesecurity/dhall", "owner": "awakesecurity", - "provider-source-address": "registry.terraform.io/awakesecurity/dhall", "repo": "terraform-provider-dhall", "rev": "v0.0.3", - "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=", - "version": "0.0.3" + "spdx": "BSD-3-Clause", + "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-JCqYTBgwcyppZ/xKPRE/SrTI0nDWw5QYqrld8YL+Blw=", + "hash": "sha256-l/p2HStjvxF6UB1SnY3EoGjC/3t5FdlC6LMk7jn11KI=", + "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", - "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.24.0", - "vendorHash": null, - "version": "2.24.0" + "rev": "v2.25.2", + "spdx": "MPL-2.0", + "vendorHash": null }, "dme": { "hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=", + "homepage": "https://registry.terraform.io/providers/DNSMadeEasy/dme", "owner": "DNSMadeEasy", - "provider-source-address": "registry.terraform.io/DNSMadeEasy/dme", "repo": "terraform-provider-dme", "rev": "v1.0.6", - "vendorHash": null, - "version": "1.0.6" + "spdx": "MPL-2.0", + "vendorHash": null }, "dns": { "hash": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", + "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/dns", "repo": "terraform-provider-dns", "rev": "v3.2.3", - "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=", - "version": "3.2.3" + "spdx": "MPL-2.0", + "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=" }, "dnsimple": { - "hash": "sha256-dge7slNS1EkWwjt3+WS8tlKjFHw6LV/q1Bxrl1RflBw=", + "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", + "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", - "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.14.1", - "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=", - "version": "0.14.1" + "rev": "v0.15.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" }, "docker": { - "hash": "sha256-/vz4rjENlVl9gqtxfqCV+k2SgsHZBcmA9Mz10Y2ay/E=", + "hash": "sha256-SWfA3WaShBa+5FTyqLv+idVdvavet7V6qRKRGwYePUM=", + "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", - "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.23.0", - "vendorHash": "sha256-0JRJAwc4LbPXi6GJdrIGwuIaCzaP5MtIMuijYoOEjYA=", - "version": "2.23.0" + "rev": "v2.23.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-EaWVf8GmNsabpfeOEzRjKPubCyEReGjdzRy7Ohb4mno=" }, "elasticsearch": { "hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=", + "homepage": "https://registry.terraform.io/providers/phillbaker/elasticsearch", "owner": "phillbaker", - "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", "rev": "v2.0.6", - "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=", - "version": "2.0.6" + "spdx": "MPL-2.0", + "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=", + "hash": "sha256-hU0mqMuB3yvLWJ6ggDvATQeSFdpsEfs/hmvLV6A2Md4=", + "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", - "provider-source-address": "registry.terraform.io/equinix/equinix", + "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.10.0", - "vendorHash": "sha256-ZGPSNz/6qwEU5EY72fIJ1x9bnsN9OZQ6MQ+XNotMGgA=", - "version": "1.10.0" + "rev": "v1.11.1", + "spdx": "MIT", + "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" }, "exoscale": { "hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=", + "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", - "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", "rev": "v0.41.1", - "vendorHash": null, - "version": "0.41.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "external": { "hash": "sha256-o9vCr3ayqg9Ehi39FgR6vJFZYF1iTcVD4QfYHcs+YbQ=", + "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", "rev": "v2.2.3", - "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=", - "version": "2.2.3" + "spdx": "MPL-2.0", + "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { - "hash": "sha256-Zcev9EegZ/LVRGcjn1rHbp+jdZ5x4OowCD23E/MEYQA=", + "hash": "sha256-X2T/t3uDY1jDPhx7IZOwVLx1o4pse5/0T+nrJtRB1Lk=", + "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", - "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v3.0.0", - "vendorHash": null, - "version": "3.0.0" + "rev": "v3.0.2", + "spdx": "MPL-2.0", + "vendorHash": null }, "flexibleengine": { - "hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=", + "hash": "sha256-LPMSYBp9qSx6PDKAHfFpO6AAR13E9oMCXyH0tkyXamU=", + "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", - "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.34.0", - "vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=", - "version": "1.34.0" + "rev": "v1.35.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-KoqhPXacce8ENYC3nsOOOzYW6baVUfnMbaVbfADyuSw=" }, "fortios": { "deleteVendor": true, "hash": "sha256-nvK5mbQdCB6lmdyhJbMS15eOER8eIAYv26mc1FCifXs=", + "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", - "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "proxyVendor": true, "repo": "terraform-provider-fortios", "rev": "v1.16.0", - "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=", - "version": "1.16.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" }, "gandi": { "hash": "sha256-uXZcYiNsBf5XsMjOjjQeNtGwLhTgYES1E9t63fBEI6Q=", + "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", - "provider-source-address": "registry.terraform.io/go-gandi/gandi", "repo": "terraform-provider-gandi", "rev": "v2.2.0", - "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=", - "version": "2.2.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=" }, "github": { - "hash": "sha256-3ivfHKoj7jXQ3WsoTNSCL1zD93Pr0pjtZ9LneW9My4o=", + "hash": "sha256-1C/GG3VhQfnU71rucYefpRsfrS//lpPXHqT/QAHM2z0=", + "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", - "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.9.0", - "vendorHash": null, - "version": "5.9.0" + "rev": "v5.11.0", + "spdx": "MIT", + "vendorHash": null }, "gitlab": { - "hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=", + "hash": "sha256-lNEkUleH0Y3ZQnHqu8cEIGdigqrbRkVRg+9kOk8kU3c=", + "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", - "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.19.0", - "vendorHash": "sha256-e9J4g5ZuiKcI/WSXMFY3Qglgt87qbXv7tDpxYbRRuaU=", - "version": "3.19.0" + "rev": "v3.20.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks=" }, "google": { - "hash": "sha256-qOB4UV53j0Bm0332U1YETzLfyBtGwfXs2hGDAL2BCCk=", + "hash": "sha256-e2jVnL13j4iSb288CB/H6G3vR58bjwi+2ZHzve1tuUo=", + "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.43.1", - "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", - "version": "4.43.1" + "rev": "v4.44.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=" }, "google-beta": { - "hash": "sha256-nNz9BgTJ8Aj3QZNpT0XK14s44+thDu4EfLvbEB8OFRc=", + "hash": "sha256-ejMWZTSrkGMAKr02TIg0yngzpqEVL8y56JSoQrCJ7lA=", + "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.43.1", - "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", - "version": "4.43.1" + "rev": "v4.44.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", + "homepage": "https://registry.terraform.io/providers/hashicorp/googleworkspace", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", "repo": "terraform-provider-googleworkspace", "rev": "v0.7.0", - "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=", - "version": "0.7.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-HeUPa0xMQx5n1Wnv58v8Wi6VWbIWmfVwyO5badxi7Qo=", + "hash": "sha256-DAuG1VYLYr3cz+PR5wNlPBKuUcnbYAO0d9tNxnBiGuU=", + "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", - "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.30.0", - "vendorHash": "sha256-Mc8BkC7ZhTmmWYKAMR+aQ9lBr7IFll7vAIWFbZc/Rqw=", - "version": "1.30.0" + "rev": "v1.31.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo=" }, "gridscale": { "hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=", + "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", - "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", "rev": "v1.16.2", - "vendorHash": null, - "version": "1.16.2" + "spdx": "MPL-2.0", + "vendorHash": null }, "hcloud": { - "hash": "sha256-d/qLN5ev8ywiJr97rrlS9rwfvsEheBD2n8I6D9a7krQ=", + "hash": "sha256-LbMnERF4ymsM5TLyAxIuawmwnTQMA8A96xKtluPj/2s=", + "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", - "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.36.0", - "vendorHash": "sha256-HsWkHoFs/77b5+6HSV7YgLOwpE2BZyxbGNty8p+OBSM=", - "version": "1.36.0" + "rev": "v1.36.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" }, "helm": { "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", + "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", "rev": "v2.7.1", - "vendorHash": null, - "version": "2.7.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "heroku": { "hash": "sha256-NabwjOTbBRlDNFBpCshxZMO9E958tfAIPPuyArvacFI=", + "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", - "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", "rev": "v5.1.6", - "vendorHash": null, - "version": "5.1.6" + "spdx": "MPL-2.0", + "vendorHash": null }, "hetznerdns": { "hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=", + "homepage": "https://registry.terraform.io/providers/timohirt/hetznerdns", "owner": "timohirt", - "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", "repo": "terraform-provider-hetznerdns", "rev": "v2.2.0", - "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=", - "version": "2.2.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", + "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd", "owner": "loafoe", - "provider-source-address": "registry.terraform.io/loafoe/htpasswd", "proxyVendor": true, "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", - "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=", - "version": "1.0.4" + "spdx": "MIT", + "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" }, "http": { "hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=", + "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", "rev": "v3.2.1", - "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=", - "version": "3.2.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-cr7xV7Z4UU+kRykVSOKeuXDiHQPL4CsCJVXf2uTZOms=", + "hash": "sha256-3fNNip9KZywpW/0xSQbdtTipHsYwLIUBzKIOdYsm+Bk=", + "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", - "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.42.0", - "vendorHash": null, - "version": "1.42.0" + "rev": "v1.43.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "huaweicloudstack": { "hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=", + "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloudstack", "owner": "huaweicloud", - "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloudstack", "repo": "terraform-provider-huaweicloudstack", "rev": "v1.3.0", - "vendorHash": null, - "version": "1.3.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "hydra": { "hash": "sha256-A9BemEPLhvYzhksvYRfmhQXY3EEdTxQcmjE9+2+BKqg=", + "homepage": "https://registry.terraform.io/providers/DeterminateSystems/hydra", "owner": "DeterminateSystems", - "provider-source-address": "registry.terraform.io/DeterminateSystems/hydra", "repo": "terraform-provider-hydra", "rev": "v0.1.2", - "vendorHash": null, - "version": "0.1.2" + "spdx": "MPL-2.0", + "vendorHash": null }, "ibm": { - "hash": "sha256-VFJ86dMKOHzfq5W154+kmX9poRFjT+LlLRl3HNA52pc=", + "hash": "sha256-XWoEUHGTtQ0MFRs5NbW7nA9gvhrlqh78KNqA6M7s+yE=", + "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", - "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.47.1", - "vendorHash": "sha256-9UIM6T6ceF6WXIbjhSuDv1lNn9rphcZoePPk11X2Olo=", - "version": "1.47.1" + "rev": "v1.48.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-uzXtXpS2reCJK63vipri8nCyHRCLmQxakFuIoMyl95E=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", + "homepage": "https://registry.terraform.io/providers/Icinga/icinga2", "owner": "Icinga", - "provider-source-address": "registry.terraform.io/Icinga/icinga2", "repo": "terraform-provider-icinga2", "rev": "v0.5.0", - "vendorHash": null, - "version": "0.5.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "infoblox": { "hash": "sha256-VquTyQxbVFPImZCwthwf8hJPlUxAxhmed/r1V+qm/ak=", + "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", - "provider-source-address": "registry.terraform.io/infobloxopen/infoblox", "repo": "terraform-provider-infoblox", "rev": "v2.1.0", - "vendorHash": null, - "version": "2.1.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "kafka": { "hash": "sha256-bKbY2cOIORy3D9yCBqVuKUZb650sx+87d4wtUB3dPdg=", + "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", - "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", "rev": "v0.5.1", - "vendorHash": "sha256-03QV6C2DEN5xwMwABwSvv5Ts6pTHQDBP2zUUqIcOtVQ=", - "version": "0.5.1" + "spdx": "MIT", + "vendorHash": "sha256-03QV6C2DEN5xwMwABwSvv5Ts6pTHQDBP2zUUqIcOtVQ=" }, "kafka-connect": { "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", + "homepage": "https://registry.terraform.io/providers/Mongey/kafka-connect", "owner": "Mongey", - "provider-source-address": "registry.terraform.io/Mongey/kafka-connect", "repo": "terraform-provider-kafka-connect", "rev": "v0.3.0", - "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=", - "version": "0.3.0" + "spdx": "MIT", + "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=", + "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak", "owner": "mrparkers", - "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", "rev": "v4.0.1", - "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=", - "version": "4.0.1" + "spdx": "MIT", + "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" }, "ksyun": { - "hash": "sha256-Rye7gKARdbrB6KDEygEJy9m7VqlGw6QeE2F1oa3n8as=", + "hash": "sha256-PfUTE8j2tb4piNeRx4FRy8s45w8euQU773oJHbcdlVE=", + "homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun", "owner": "kingsoftcloud", - "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.58", - "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=", - "version": "1.3.58" + "rev": "v1.3.59", + "spdx": "MPL-2.0", + "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=" }, "kubectl": { "hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=", + "homepage": "https://registry.terraform.io/providers/gavinbunney/kubectl", "owner": "gavinbunney", - "provider-source-address": "registry.terraform.io/gavinbunney/kubectl", "repo": "terraform-provider-kubectl", "rev": "v1.14.0", - "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=", - "version": "1.14.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { "hash": "sha256-hWFC8VBbM3BRGrX1Y45Znd/W3klYy/7aS7JbbKN7EUg=", + "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", "rev": "v2.16.0", - "vendorHash": null, - "version": "2.16.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "launchdarkly": { "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", + "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", - "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", "rev": "v2.9.4", - "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", - "version": "2.9.4" + "spdx": "MPL-2.0", + "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" }, "libvirt": { "hash": "sha256-j5EcxmkCyHwbXzvJ9lfQBRBYa3SbrKc3kbt1KZTm0gY=", + "homepage": "https://registry.terraform.io/providers/dmacvicar/libvirt", "owner": "dmacvicar", - "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", "repo": "terraform-provider-libvirt", "rev": "v0.7.0", - "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=", - "version": "0.7.0" + "spdx": "Apache-2.0", + "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", + "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", - "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", "rev": "v1.29.4", - "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=", - "version": "1.29.4" + "spdx": "MPL-2.0", + "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", + "homepage": "https://registry.terraform.io/providers/numtide/linuxbox", "owner": "numtide", - "provider-source-address": "registry.terraform.io/numtide/linuxbox", "repo": "terraform-provider-linuxbox", "rev": "v0.4.3", - "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=", - "version": "0.4.3" + "spdx": "BSD-3-Clause", + "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { "hash": "sha256-l9XQpIMMar7ForZuBcGOmqrRuSnthIrilr4CHJ5SiaU=", + "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", "rev": "v2.2.3", - "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=", - "version": "2.2.3" - }, - "logicmonitor": { - "hash": "sha256-GQPTFf+JxJB3iO1Us0zOAAG2NonuJ/b5la6f1j2Nd4k=", - "owner": "logicmonitor", - "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor", - "repo": "terraform-provider-logicmonitor", - "rev": "v2.0.3", - "vendorHash": null, - "version": "2.0.3" + "spdx": "MPL-2.0", + "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=" }, "lxd": { "hash": "sha256-DfRhPRclg/hCmmp0V087hl66WSFbEyXHFUGeehlU290=", + "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", - "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", "proxyVendor": true, "repo": "terraform-provider-lxd", "rev": "v1.8.0", - "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=", - "version": "1.8.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=" }, "mailgun": { - "hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=", + "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", + "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", - "provider-source-address": "registry.terraform.io/wgebis/mailgun", "repo": "terraform-provider-mailgun", - "rev": "v0.7.2", - "vendorHash": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=", - "version": "0.7.2" + "rev": "v0.7.4", + "spdx": "MPL-2.0", + "vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc=" }, "matchbox": { "hash": "sha256-vWhdStfwReeD1PHTihBoj4GoKnP85nzNzIV/Tjfcz1M=", + "homepage": "https://registry.terraform.io/providers/poseidon/matchbox", "owner": "poseidon", - "provider-source-address": "registry.terraform.io/poseidon/matchbox", "repo": "terraform-provider-matchbox", "rev": "v0.5.2", - "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=", - "version": "0.5.2" + "spdx": "Apache-2.0", + "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=" }, "metal": { "hash": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=", + "homepage": "https://registry.terraform.io/providers/equinix/metal", "owner": "equinix", - "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", "rev": "v3.3.0", - "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=", - "version": "3.3.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { "hash": "sha256-mtguRBSa+XrpUqEXb9voDHraae9fOaayX1nQpaeAlo4=", + "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", - "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", "rev": "v1.9.1", - "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=", - "version": "1.9.1" + "spdx": "Apache-2.0", + "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=" }, "mongodbatlas": { "hash": "sha256-rHT/x3Wpd7b4u7v1/g6DY85TwRkf5A7KaOiqoWeN05Y=", + "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", - "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", "rev": "v1.6.0", - "vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=", - "version": "1.6.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", + "homepage": "https://registry.terraform.io/providers/namecheap/namecheap", "owner": "namecheap", - "provider-source-address": "registry.terraform.io/namecheap/namecheap", "repo": "terraform-provider-namecheap", "rev": "v2.1.0", - "vendorHash": null, - "version": "2.1.0" + "spdx": "Apache-2.0", + "vendorHash": null }, "netlify": { "hash": "sha256-7U+hHN/6GqcbI1gX7L01YqVjlUgvdfhgpXvLF2lwbkA=", + "homepage": "https://registry.terraform.io/providers/AegirHealth/netlify", "owner": "AegirHealth", - "provider-source-address": "registry.terraform.io/AegirHealth/netlify", "repo": "terraform-provider-netlify", "rev": "v0.6.12", - "vendorHash": null, - "version": "0.6.12" + "spdx": "MPL-2.0", + "vendorHash": null }, "newrelic": { - "hash": "sha256-d5JRqxMmG7fku8+C8e700nfghz2wbL0n1TrOZb1hkpY=", + "hash": "sha256-wTQmqe7oicD7MOZdKgRHlz4Vs8dQqEUjnrKU/1pldRI=", + "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", - "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.7.1", - "vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=", - "version": "3.7.1" + "rev": "v3.8.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-CIiRPwzlx5WWyRmg2tXEB+yp05ZbN5mLBGuFxm0h//4=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", + "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", "rev": "v1.4.19", - "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=", - "version": "1.4.19" + "spdx": "MPL-2.0", + "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { "hash": "sha256-qHR3KJa1y10B+iQPgH6lTt/JUqTmiK/60rPCa3gQDP8=", + "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", - "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", "rev": "v1.13.0", - "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=", - "version": "1.13.0" - }, - "nsxt": { - "hash": "sha256-TOoRtCKdR1fBjk39dbMgBd7pDJGfjvkQAqfpJzWRwRg=", - "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/nsxt", - "repo": "terraform-provider-nsxt", - "rev": "v3.2.9", - "vendorHash": null, - "version": "3.2.9" + "spdx": "MPL-2.0", + "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", + "homepage": "https://registry.terraform.io/providers/hashicorp/null", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/null", "repo": "terraform-provider-null", "rev": "v3.2.1", - "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=", - "version": "3.2.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=" }, "nutanix": { "deleteVendor": true, "hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=", + "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", - "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", "rev": "v1.7.1", - "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.7.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { "hash": "sha256-t8GrhKnKredpbRmx/MAA4tx0kV0yZoFNnacKsp0Htro=", + "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", - "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", "rev": "v4.100.0", - "vendorHash": null, - "version": "4.100.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "okta": { - "hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=", + "hash": "sha256-2AR416LkqgfHdY18m4k/jqSet7G77HwHuGKilvS3Yig=", + "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", - "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.38.0", - "vendorHash": "sha256-iGQ3JPJ78Qhj+izR8D4H5oWGq4fF5lXuNHQCmpr7zFE=", - "version": "3.38.0" + "rev": "v3.39.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", + "homepage": "https://registry.terraform.io/providers/oktadeveloper/oktaasa", "owner": "oktadeveloper", - "provider-source-address": "registry.terraform.io/oktadeveloper/oktaasa", "repo": "terraform-provider-oktaasa", "rev": "v1.0.1", - "vendorHash": null, - "version": "1.0.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "opennebula": { "hash": "sha256-jm7k0k28TSfnUA6P2RjSfF36o/nznvDWcDmJz/MAMXU=", + "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", - "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", "rev": "v1.0.2", - "vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=", - "version": "1.0.2" + "spdx": "MPL-2.0", + "vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=" }, "openstack": { "hash": "sha256-k5UyK9jmjZzHw8AwmDRtyCyJgILAcCK+nN+hklJ9VFw=", + "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", - "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", "rev": "v1.49.0", - "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=", - "version": "1.49.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-bDhtGpS8dqQdjcLqtJwae9dmUO41l4DeTRYMARBpnrM=", + "hash": "sha256-H1X+wWxdP7MwUtUaQiw0usOO6jwAAVLYMoG5Ut2OcqM=", + "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", - "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.31.8", - "vendorHash": "sha256-TnsdOX0Tt0oYavBI2fPcO+OV8VkWQEgGasqDTm5XkDU=", - "version": "1.31.8" + "rev": "v1.31.9", + "spdx": "MPL-2.0", + "vendorHash": "sha256-n7Ez596JnRwsKYPuR8lCLo6ez/TFch2kMgoScg7pPUI=" }, "opsgenie": { - "hash": "sha256-OTwQ/sF4/xSyJjYy1TvLOr1guGcho+Es9/WkonfVvcg=", + "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=", + "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", - "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.17", - "vendorHash": null, - "version": "0.6.17" + "rev": "v0.6.18", + "spdx": "MPL-2.0", + "vendorHash": null }, "ovh": { - "hash": "sha256-QaJZQU6bnjXoTCxfP1NcsPqegFyZ6JwP2QgN7zrE0z0=", + "hash": "sha256-6lBhEmeAvTv8xRMi5ZabcJg/59xJ9o4/MaAJP+H7pqk=", + "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", - "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.22.0", - "vendorHash": null, - "version": "0.22.0" + "rev": "v0.23.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "pagerduty": { "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=", + "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", - "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", "rev": "v2.6.4", - "vendorHash": null, - "version": "2.6.4" + "spdx": "MPL-2.0", + "vendorHash": null }, "pass": { "hash": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=", + "homepage": "https://registry.terraform.io/providers/camptocamp/pass", "owner": "camptocamp", - "provider-source-address": "registry.terraform.io/camptocamp/pass", "repo": "terraform-provider-pass", "rev": "v2.0.0", - "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=", - "version": "2.0.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" }, "postgresql": { - "hash": "sha256-pi3st4phjCRq2jlRIW2Z4jt9qp7a1ghmlkjAQSbxhI4=", + "hash": "sha256-6QqXp0riYy6pJPmESrUv3J9BDY9Sl44/U2sIB663Gfw=", + "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", - "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.17.1", - "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=", - "version": "1.17.1" + "rev": "v1.18.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", + "homepage": "https://registry.terraform.io/providers/pan-net/powerdns", "owner": "pan-net", - "provider-source-address": "registry.terraform.io/pan-net/powerdns", "repo": "terraform-provider-powerdns", "rev": "v1.5.0", - "vendorHash": null, - "version": "1.5.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "rabbitmq": { "hash": "sha256-ZhK9zwBaod+s4tGCSBUjW7ijKeucyToXVQDPlMFmIvk=", + "homepage": "https://registry.terraform.io/providers/cyrilgdn/rabbitmq", "owner": "cyrilgdn", - "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", "rev": "v1.7.0", - "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=", - "version": "1.7.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=" }, "rancher2": { - "hash": "sha256-TqztIk0sHevfv+BpNZJUs1XbwrbzJtcqdafGN5fTVaE=", + "hash": "sha256-DInP+DpCBOsBdlg1tiujlmN20WB5VQbeHgOiabEv9Zc=", + "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", - "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.24.2", - "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=", - "version": "1.24.2" + "rev": "v1.25.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=" }, "random": { "hash": "sha256-oYtvVK0OOHyLUG6amhkvmr6zlbzy0CKoS3DxztoLbdE=", + "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", "rev": "v3.4.3", - "vendorHash": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=", - "version": "3.4.3" + "spdx": "MPL-2.0", + "vendorHash": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=" }, "remote": { "hash": "sha256-up4+W2mLii7alqdcBoMBTAWI5Vwfc1QtsDK592sAcDM=", + "homepage": "https://registry.terraform.io/providers/tenstad/remote", "owner": "tenstad", - "provider-source-address": "registry.terraform.io/tenstad/remote", "repo": "terraform-provider-remote", "rev": "v0.1.1", - "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=", - "version": "0.1.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" }, "rundeck": { "hash": "sha256-GkX5p6hV66G45JG3aJmYD5e2LQvf6kmfa6fQK10tc68=", + "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", "owner": "rundeck", - "provider-source-address": "registry.terraform.io/rundeck/rundeck", "repo": "terraform-provider-rundeck", "rev": "v0.4.3", - "vendorHash": null, - "version": "0.4.3" + "spdx": "MPL-2.0", + "vendorHash": null }, "scaleway": { - "hash": "sha256-HQljeUvK010LSWObuZmTkkB6ByrtgBRAeZPYv3d/KSs=", + "hash": "sha256-0NQRAv05GuVRAkZd580TINEur/G+c0jUmMtyMv05+PY=", + "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", - "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.6.0", - "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=", - "version": "2.6.0" + "rev": "v2.7.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", + "homepage": "https://registry.terraform.io/providers/numtide/secret", "owner": "numtide", - "provider-source-address": "registry.terraform.io/numtide/secret", "repo": "terraform-provider-secret", "rev": "v1.2.1", - "vendorHash": null, - "version": "1.2.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "selectel": { "hash": "sha256-glIvlf5lWwkdZKn4rxhR+XnBqUdu9RO+loxke07i2c0=", + "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", - "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", "rev": "v3.9.0", - "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=", - "version": "3.9.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" }, "sentry": { "hash": "sha256-D6w2HfgIcNFfDXeqzuerK8msrFF7vajk80MUxbUxA+A=", + "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", - "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", "rev": "v0.10.0", - "vendorHash": "sha256-OxapqNRE5Poz6qsFjDv5G5zzivbBldzjC7kbwG2Cswg=", - "version": "0.10.0" + "spdx": "MIT", + "vendorHash": "sha256-OxapqNRE5Poz6qsFjDv5G5zzivbBldzjC7kbwG2Cswg=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", + "homepage": "https://registry.terraform.io/providers/scottwinkler/shell", "owner": "scottwinkler", - "provider-source-address": "registry.terraform.io/scottwinkler/shell", "repo": "terraform-provider-shell", "rev": "v1.7.10", - "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=", - "version": "1.7.10" + "spdx": "MPL-2.0", + "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { "hash": "sha256-alLC61bEaFiVtoH0Fczj7G0m70ie1RNvTBR+MgYZGkQ=", + "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", - "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", "rev": "v6.18.0", - "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=", - "version": "6.18.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", + "homepage": "https://registry.terraform.io/providers/skytap/skytap", "owner": "skytap", - "provider-source-address": "registry.terraform.io/skytap/skytap", "repo": "terraform-provider-skytap", "rev": "v0.15.1", - "vendorHash": null, - "version": "0.15.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "snowflake": { "hash": "sha256-V2N9Lq425fdjlJ+lCVQzMAYfEiS2/Oqevz1dIve//FA=", + "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", - "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", "rev": "v0.52.0", - "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=", - "version": "0.52.0" + "spdx": "MIT", + "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=" }, "sops": { "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", + "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", - "provider-source-address": "registry.terraform.io/carlpett/sops", "repo": "terraform-provider-sops", "rev": "v0.7.1", - "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=", - "version": "0.7.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-9i8mHWn9+ey0tHPXOjZyNixcrdgAl2Y8sJq/q4WlZzo=", + "hash": "sha256-yzFbSTSxvnTu3v6A3DRTh5Le79dHaYFcqBu2xZ9pSXM=", + "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", - "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.87.0", - "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=", - "version": "1.87.0" + "rev": "v1.87.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-dMqXpKHnIjJEq84Bxoio+jxQMwQ2Yt41/grU6LRSo/A=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", + "homepage": "https://registry.terraform.io/providers/stackpath/stackpath", "owner": "stackpath", - "provider-source-address": "registry.terraform.io/stackpath/stackpath", "repo": "terraform-provider-stackpath", "rev": "v1.4.0", - "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=", - "version": "1.4.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=" }, "statuscake": { "hash": "sha256-rT+NJBPA73WCctlZnu0i952fzrGCxVF2vIIvE0SzvNI=", + "homepage": "https://registry.terraform.io/providers/StatusCakeDev/statuscake", "owner": "StatusCakeDev", - "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", "rev": "v2.0.5", - "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=", - "version": "2.0.5" + "spdx": "MPL-2.0", + "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=" }, "sumologic": { "hash": "sha256-lhMPA4ub3NlaYs0pX6FkWuR3LQxytrQxu9DjAjDja2Q=", + "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", - "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", "rev": "v2.19.2", - "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=", - "version": "2.19.2" + "spdx": "MPL-2.0", + "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=" }, "tailscale": { - "hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=", + "hash": "sha256-X3YV640d3pLyKm/v88oEhXfYnox+ksrEWKgiJbYl6gk=", + "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", - "provider-source-address": "registry.terraform.io/tailscale/tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.13.5", - "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=", - "version": "0.13.5" + "rev": "v0.13.6", + "spdx": "MIT", + "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-HSZP6O9s6KkvaJK3xpy7uT3sjBlhBYEOu5k7VYW8MdU=", + "hash": "sha256-beoS4io1KffsMCvYHwpWzo6NNwdi7JyPBBi/BwGFU9Y=", + "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", - "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.12", - "vendorHash": null, - "version": "1.78.12" + "rev": "v1.79.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "tfe": { "hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=", + "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", "rev": "v0.39.0", - "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=", - "version": "0.39.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", + "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", - "provider-source-address": "registry.terraform.io/a10networks/thunder", "repo": "terraform-provider-thunder", "rev": "v1.0.0", - "vendorHash": null, - "version": "1.0.0" + "spdx": "BSD-2-Clause", + "vendorHash": null }, "time": { "hash": "sha256-FehWmIkL0o2pleafN/mlBa46cdFqCFUS+coOwFPdb9M=", + "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", "rev": "v0.9.1", - "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=", - "version": "0.9.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=" }, "tls": { "hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=", + "homepage": "https://registry.terraform.io/providers/hashicorp/tls", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", "rev": "v4.0.4", - "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=", - "version": "4.0.4" + "spdx": "MPL-2.0", + "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=" }, "triton": { "deleteVendor": true, "hash": "sha256-NrXK1ic5F8fBC0lvq7GxlrZe9lMbHvNhodijsC/VG0o=", + "homepage": "https://registry.terraform.io/providers/joyent/triton", "owner": "joyent", - "provider-source-address": "registry.terraform.io/joyent/triton", "repo": "terraform-provider-triton", "rev": "v0.8.2", - "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=", - "version": "0.8.2" + "spdx": "MPL-2.0", + "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { "hash": "sha256-x27daeW4M5/7sUtFcMeJMVBO5TPRXSLuFoREdgJ2J6g=", + "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", - "provider-source-address": "registry.terraform.io/turbot/turbot", "repo": "terraform-provider-turbot", "rev": "v1.9.1", - "vendorHash": null, - "version": "1.9.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "ucloud": { - "hash": "sha256-x3+OuRzZdS429v0JNyZkM3v1etUgURSyi9qkt7RhqlI=", + "hash": "sha256-x1YQYan1W2AVg/L6BP8HfORpR2neoljZkQP3tDBM+MI=", + "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", - "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.32.5", - "vendorHash": null, - "version": "1.32.5" + "rev": "v1.33.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "utils": { - "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", + "hash": "sha256-B2FdeukUD+xuJHBT1Yv9G2txjX/OmkxAGXDUw2HItig=", + "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", - "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "1.5.0", - "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=", - "version": "1.5.0" + "rev": "1.6.0", + "spdx": "Apache-2.0", + "vendorHash": "sha256-jyGp0HIu+VxZ7n6Cctq6pi6Z7IKZ7W7FeqnGXk9Pt7o=" }, "vault": { "hash": "sha256-y5pK+sZ1xWnzlhT4sFUy5Mp6sggLLtaY4Cx2OPamDIc=", + "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/vault", "proxyVendor": true, "repo": "terraform-provider-vault", "rev": "v3.11.0", - "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=", - "version": "3.11.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, "vcd": { - "hash": "sha256-qEElcMl6tCBfOTTTpTFjVYg6E6K9iTXfgmDDozrgNVg=", + "hash": "sha256-/Xb9SzOT300SkJU6Lrk6weastVQiGn6FslziXe85hQ0=", + "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.7.0", - "vendorHash": "sha256-u5W7zeOv53VAr4M5T2AAVFRDF/6PNhSm1A2WFo6pnJU=", - "version": "3.7.0" + "rev": "v3.8.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-UHSrQsu59Lr0s1YQ4rv7KT5e20Tz/qhGGl1sv7Dl1Dc=" }, "venafi": { "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", + "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", - "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", "rev": "v0.16.1", - "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=", - "version": "0.16.1" - }, - "vercel": { - "hash": "sha256-/LHyNxal5Il/UzXdCKfVRzK/VVfSYMgoeKerWsedmho=", - "owner": "ondrejsika", - "provider-source-address": "registry.terraform.io/ondrejsika/vercel", - "repo": "terraform-provider-vercel", - "rev": "v2.1.0", - "vendorHash": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=", - "version": "2.1.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=" }, "vpsadmin": { "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", + "homepage": "https://registry.terraform.io/providers/vpsfreecz/vpsadmin", "owner": "vpsfreecz", - "provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin", "repo": "terraform-provider-vpsadmin", "rev": "v1.0.0", - "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=", - "version": "1.0.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { "hash": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=", + "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/vra7", "repo": "terraform-provider-vra7", "rev": "v3.0.6", - "vendorHash": null, - "version": "3.0.6" + "spdx": "MPL-2.0", + "vendorHash": null }, "vsphere": { "hash": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=", + "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", "rev": "v2.2.0", - "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=", - "version": "2.2.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=" }, "vultr": { "hash": "sha256-6NiVW6kqUCeit6Dc9GbP4mV03UJkqo+UwHsDE4xMwzQ=", + "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", - "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", "rev": "v2.11.4", - "vendorHash": null, - "version": "2.11.4" + "spdx": "MPL-2.0", + "vendorHash": null }, "wavefront": { "hash": "sha256-goiYeZ2iV9KjacBr/MMkA+t2WNTJGHHmwebr/ci+Ezg=", + "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", "rev": "v3.4.0", - "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=", - "version": "3.4.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-HBGQ+WrAy+f0nK0iyd/Z+Mj5AshvHyGyBEN0E61ftn0=", + "hash": "sha256-PX6bqNdfIc7gZDYw3yVpxNgJnHuzr6Cu80puMTQqv4U=", + "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", - "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", + "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.82.0", - "vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=", - "version": "0.82.0" + "rev": "v0.83.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-q9Rs2yJtI7MVqBcd9wwtyqR9PzmVkhKatbRRZwFm3po=" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 288c2f345c2ce..9c39282bc969c 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -9,7 +9,7 @@ readarray -t providers < <( jq -r 'to_entries | map_values(.value + { alias: .key }) | .[] - | select(."provider-source-address"?) + | select(."homepage"?) | .alias' providers.json ) @@ -21,5 +21,5 @@ ${providers[*]} EOF for provider in "${providers[@]}"; do - ./update-provider "$@" "${provider}" + ./update-provider --no-spdx "$@" "${provider}" done diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index f9626148a37de..5630cbe9ed573 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -28,14 +28,13 @@ Options: * --force: Force the update even if the version matches. * --no-build: Don't build provider - * --vendor-hash <SRI-hash>: Override the SHA256 or "null". DOC } +build=1 force= provider= -build=1 -vendorHash= +spdx=1 while [[ $# -gt 0 ]]; do case "$1" in @@ -51,10 +50,9 @@ while [[ $# -gt 0 ]]; do build=0 shift ;; - --vendor-hash) - force=1 - vendorHash=$2 - shift 2 + --no-spdx) + spdx=0 + shift ;; *) if [[ -n ${provider} ]]; then @@ -103,40 +101,33 @@ echo_provider() { pushd "$(dirname "$0")" >/dev/null if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then - echo_provider "init" - source_address=registry.terraform.io/${provider} + homepage="https://registry.terraform.io/providers/${provider}" provider=$(basename "${provider}") - update_attr "provider-source-address" "${source_address}" - update_attr version "0" + echo_provider "init" + update_attr homepage "${homepage}" # create empty stings so nix-prefetch works update_attr hash "" update_attr vendorHash "" -else - source_address="$(read_attr provider-source-address)" fi -old_vendor_hash=$(read_attr vendorHash) -old_version=$(read_attr version) +homepage="$(read_attr homepage)" -# The provider source address (used inside Terraform `required_providers` block) is -# used to compute the registry API endpoint -# -# registry.terraform.io/hashicorp/aws (provider source address) -# registry.terraform.io/providers/hashicorp/aws (provider URL for the website) -# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API) -registry_response=$(curl -s https://"${source_address/\///v1/providers/}") - -version="$(jq -r '.version' <<<"${registry_response}")" -if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorHash} && ${old_vendor_hash} != "${vendorHash}" ]]; then - echo_provider "already at version ${version}" - exit -fi -if [[ ${version} =~ [[:alpha:]] && ${force} != 1 ]]; then - echo_provider "not updating to unstable version ${version}" - exit +registry_response=$(curl -s "${homepage//providers/v1/providers}") + +old_rev="$(read_attr rev)" +rev="$(jq -r '.tag' <<<"${registry_response}")" +if [[ ${force} != 1 ]]; then + if [[ ${old_rev} == "${rev}" ]]; then + echo_provider "already at version ${rev}" + exit + fi + if [[ ${rev//v/} =~ [[:alpha:]] ]]; then + echo_provider "not updating to unstable version ${rev}" + exit + fi fi -echo_provider "updating from ${old_version} to ${version}" -update_attr version "${version}" +echo_provider "updating from ${old_rev} to ${rev}" +update_attr rev "${rev}" provider_source_url="$(jq -r '.source' <<<"${registry_response}")" @@ -144,23 +135,23 @@ org="$(echo "${provider_source_url}" | cut -d '/' -f 4)" update_attr owner "${org}" repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" -rev="$(jq -r '.tag' <<<"${registry_response}")" -update_attr rev "${rev}" + +if [[ ${spdx} == 1 ]]; then + spdx="$(curl -L -s "https://api.github.com/repos/${org}/${repo}/license" | jq -r '.license.spdx_id')" + update_attr spdx "${spdx}" +fi + echo_provider "calculating hash" hash=$(generate_hash src) update_attr hash "${hash}" -if [[ -z ${vendorHash} ]]; then - if [[ ${old_vendor_hash} == null ]]; then - vendorHash=null - else - echo_provider "calculating vendorHash" - vendorHash=$(generate_hash go-modules) - fi +old_vendor_hash="$(read_attr vendorHash)" +if [[ ${old_vendor_hash} != null ]]; then + echo_provider "calculating vendorHash" + vendorHash=$(generate_hash go-modules) + update_attr vendorHash "${vendorHash}" fi -update_attr vendorHash "${vendorHash}" - # Check that the provider builds if [[ ${build} == 1 ]]; then echo_provider "building" diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b6601bb91bfe4..fe105fa3b71ab 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,8 +168,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.5"; - sha256 = "sha256-+jmZcIF9+vvjoA/PXWCc3F4l3YnlpZgxs0eGxchiIBE="; + version = "1.3.6"; + sha256 = "sha256-aETsvcHoHSwqWCAdn9JPJLcX1Wi1umUghSjkq37OYDU="; vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 55086342d7915..b15f60afe016d 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.40.2"; + version = "0.41.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wNedd6C4NPLPw8CA1tyKx2MWsKatFbN4xt3Us2SC/ME="; + sha256 = "sha256-1if7Z+4Lr5eevf1NUJn//pcVU3Ts/FznDd/604aJO/c="; }; vendorSha256 = "sha256-Qc0FnNxyErtieVvEj/eKPW5PpvYFwiYtv+ReJTVFAPA="; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index fb19070e45919..f1137e231c0a6 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.190"; + version = "1.2.191"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-xjZVBLdDLLlfnXX87lwgIeQ6ySI9cNoE5nrRJVBS/l0="; + hash = "sha256-MNIHY3bswPGd8hhR0/9ZxifSv+/kWvLmNESqYRVPao8="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix new file mode 100644 index 0000000000000..6b3b7f2843021 --- /dev/null +++ b/pkgs/applications/networking/diswall/default.nix @@ -0,0 +1,33 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "diswall"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "dis-works"; + repo = "diswall-rs"; + rev = "v${version}"; + sha256 = "sha256-zT8RRg+Ver7dYtJL9htrZ8nXoD0V7IvdIqHTKDmbZ7c="; + }; + + cargoSha256 = "sha256-N+w1OiCy3scahFdYI49GpL301t1qNd/X4fdLMoQE/2s="; + + doCheck = false; + + meta = with lib; { + description = "Distributed firewall"; + longDescription = '' + Diswall (distributed firewall) - a client of distributed firewall + working on many servers and using NATS for the transport level. + Its purpose - blocking IPs with a blink of the eye on all servers + in any infrastructure when some IP checks any of the closed ports + of anyone of these servers. Therefore, diswall provides good + protection of whole infrastructure (as anti-shodan) preventing + intruder to get any system information. + ''; + homepage = "https://www.diswall.stream"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index d4f567022c2dc..6012ed489ba7b 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.22.1"; + version = "3.23.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lv4ZX8QXRkicPH69kvUAPcgesGvhQkNiwZiNcFbReSU="; + sha256 = "sha256-eIFrVeaNJcYSzMHo5I2g0isdkz/VZmw5mPTSBtdUgzM="; }; - vendorSha256 = "sha256-gKsYy3izx8i7nOazBF4w1SPUJT9D2hbjOr6LqonVqno="; + vendorSha256 = "sha256-fVxzPYyMihxcwWEey5b5mhiRkoSPK4ZOqzYg7zSj0zM="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/pkgs/applications/networking/feedreaders/fluent-reader/default.nix new file mode 100644 index 0000000000000..968e8dd84a141 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/fluent-reader/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "fluent-reader"; + version = "1.1.3"; + + src = fetchurl { + url = "https://github.com/yang991178/fluent-reader/releases/download/v${version}/Fluent.Reader.${version}.AppImage"; + hash = "sha256-CzvhOaWfZ4rt2HmL/yv6P7IxEPLoyuBhftOxcjdMInU="; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications + cp -a ${appimageContents}/usr/share/icons $out/share/ + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Modern desktop RSS reader built with Electron, React, and Fluent UI"; + homepage = "https://hyliu.me/fluent-reader"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index a684ac49d2968..f4b7feab5d7f1 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-8LLhrAArqa7t9vPe9TE2F0eTfScHFtfolfcXcfboKZQ="; + sha256 = "sha256-RdkGwhSx/zluCtBj8hGjkvJ11ZgPRMM9wWoE+/ynnDc="; }; patches = [ diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 16461e4d0c4fc..90193971cd75b 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.5"; + version = "3.5.6"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-jyMjcFQXv9wGcvBU+Ki970HAgSQD57Zx3G9gf/mj25A="; + hash = "sha256-MO/BwlgSAt9rZC+kELdjJm6F15MJJPpvn412CndvqXk="; }; postPatch = '' diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index f2d34b602ee3c..c0a69479d451b 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -13,13 +13,13 @@ gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.27"; + version = "11.28"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-ZIWqCR5/8qaK9Qcb0Uzi/wu3Do8nZ5DGAw8sfwUhCZg="; + sha256 = "sha256-3eYvXClMdOCdl35S1d7nP2kiYZZOjyydi2gKY62K/qM="; }; # Patches from ROSA Linux diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 44c9477c1c436..b17986daf5882 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -3,7 +3,7 @@ }: let - stableVersion = "2.2.34"; + stableVersion = "2.2.35.1"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -12,23 +12,18 @@ let extraArgs = rec { mkOverride = attrname: version: sha256: self: super: { - ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + "${attrname}" = super."${attrname}".overridePythonAttrs (oldAttrs: { inherit version; src = oldAttrs.src.override { inherit version sha256; }; }); }; - commonOverrides = [ - (self: super: { - jsonschema = super.jsonschema_3; - }) - ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "sha256-1YsVMrUYI46lJZbPjf3jnOFDr9Hp54m8DVMz9y4dvVc="; - serverSrcHash = "sha256-h4d9s+QvqN/EFV97rPRhQiyC06wkZ9C2af9gx1Z/x/8="; + guiSrcHash = "sha256-iVvADwIp01HeZoDayvH1dilYRHRkRBTBR3Fh395JBq0="; + serverSrcHash = "sha256-41dbiSjvmsDNYr9/rRkeQVOnPSVND34xx1SNknCgHfc="; in { guiStable = mkGui { diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index be08fe4f4c76b..756cbd7c8b978 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -3,25 +3,15 @@ , version , sha256Hash , mkOverride -, commonOverrides }: { lib , python3 , fetchFromGitHub , wrapQtAppsHook -, packageOverrides ? self: super: {} }: -let - defaultOverrides = commonOverrides ++ [ - ]; - - python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); - }; - -in python.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "gns3-gui"; inherit version; @@ -36,7 +26,7 @@ in python.pkgs.buildPythonPackage rec { wrapQtAppsHook ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ distro jsonschema psutil @@ -55,10 +45,8 @@ in python.pkgs.buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "sentry-sdk==" "sentry-sdk>=" \ --replace "psutil==" "psutil>=" \ - --replace "distro==" "distro>=" \ - --replace "setuptools==" "setuptools>=" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" ''; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index a07409810c015..5eee199d69155 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -3,24 +3,14 @@ , version , sha256Hash , mkOverride -, commonOverrides }: { lib , python3 , fetchFromGitHub -, packageOverrides ? self: super: {} }: -let - defaultOverrides = commonOverrides ++ [ - ]; - - python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); - }; - -in python.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication { pname = "gns3-server"; inherit version; @@ -33,23 +23,17 @@ in python.pkgs.buildPythonApplication { postPatch = '' substituteInPlace requirements.txt \ - --replace "aiohttp==" "aiohttp>=" \ - --replace "aiofiles==" "aiofiles>=" \ - --replace "Jinja2==" "Jinja2>=" \ - --replace "sentry-sdk==" "sentry-sdk>=" \ - --replace "async-timeout==" "async-timeout>=" \ --replace "psutil==" "psutil>=" \ - --replace "distro==" "distro>=" \ - --replace "py-cpuinfo==" "py-cpuinfo>=" \ - --replace "setuptools==" "setuptools>=" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiofiles aiohttp aiohttp-cors async_generator distro + importlib-resources jinja2 jsonschema multidict diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix index 1b16786649f90..67edd3d1b2748 100644 --- a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix @@ -1,7 +1,8 @@ { lib , stdenv -, fetchzip +, fetchurl , openjdk +, libnotify , makeWrapper , tor , p7zip @@ -18,14 +19,15 @@ let in stdenv.mkDerivation rec { pname = "briar-desktop"; - version = "0.2.1-beta"; + version = "0.3.1-beta"; - src = fetchzip { - url = "https://code.briarproject.org/briar/briar-desktop/-/jobs/18424/artifacts/download?file_type=archive"; - sha256 = "sha256-ivMbgo0+iZE4/Iffq9HUBErGIQMVLrRZUQ6R3V3X8II="; - extension = "zip"; + src = fetchurl { + url = "https://desktop.briarproject.org/jars/linux/0.3.1-beta/briar-desktop-linux-0.3.1-beta.jar"; + sha256 = "841dc198101e6e8aa6b5ab6bd6b80e9c6b2593cb88bc3b2592f947baf963389d"; }; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper p7zip @@ -33,9 +35,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,lib} - cp ${src}/briar-desktop.jar $out/lib/ + cp ${src} $out/lib/briar-desktop.jar makeWrapper ${openjdk}/bin/java $out/bin/briar-desktop \ - --add-flags "-jar $out/lib/briar-desktop.jar" + --add-flags "-jar $out/lib/briar-desktop.jar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + libnotify + ]}" ''; fixupPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 3e0e0362f2007..8fc36454310e2 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,4 +1,5 @@ { lib +, buildNpmPackage , copyDesktopItems , electron_18 , buildGoModule @@ -8,9 +9,9 @@ , libdeltachat , makeDesktopItem , makeWrapper -, nodePackages , noto-fonts-emoji , pkg-config +, python3 , roboto , rustPlatform , sqlcipher @@ -20,52 +21,48 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.86.0"; + version = "1.102.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0="; + hash = "sha256-xw/lUNs39nkBrydpcgUBL3j6XrZFafKslxx6zUiElWw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; + hash = "sha256-CiqYKFABHcFSjYUH/qop1xWCoygQJajI7nhv04ElD10="; }; - patches = [ - (fetchpatch { - name = "turn-off-hard-errors-for-lints.patch"; - url = "https://github.com/deltachat/deltachat-core-rust/commit/7598c50dbaa2abcbd417d96a02743269f666597b.patch"; - hash = "sha256-Xss44v6Wf6mL3FK9hH+oFYZ0fBA9rSh4wDrr7nSUibQ="; - }) - ]; }); esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.12.29"; + version = "0.14.54"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; + hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w="; }; - vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; + vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; -in nodePackages.deltachat-desktop.override rec { +in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.30.1"; + version = "1.34.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-gZjZbXiqhFVfThZOsvL/nKkf6MX+E3KB5ldEAIuzBYA="; + hash = "sha256-M2ZLWaxVq9PvxJemwv+7jd0cXKQb6T5VCyLvIRF+9d0="; }; + npmDepsHash = "sha256-wCsPKEgRpPsNmM0HzvS5QjlPnw8COPrOhQRIf+vYeig="; + nativeBuildInputs = [ makeWrapper pkg-config + python3 ] ++ lib.optionals stdenv.isLinux [ copyDesktopItems ]; @@ -81,20 +78,25 @@ in nodePackages.deltachat-desktop.override rec { USE_SYSTEM_LIBDELTACHAT = "true"; VERSION_INFO_GIT_REF = src.rev; - postRebuild = '' + preBuild = '' rm -r node_modules/deltachat-node/node/prebuilds - - npm run build4production ''; - postInstall = '' + npmBuildScript = "build4production"; + + installPhase = '' + runHook preInstall + npm prune --production - install -D $out/lib/node_modules/deltachat-desktop/build/icon.png \ - $out/share/icons/hicolor/scalable/apps/deltachat.png + mkdir -p $out/lib/node_modules/deltachat-desktop + cp -r . $out/lib/node_modules/deltachat-desktop awk '!/^#/ && NF' build/packageignore_list \ - | xargs -I {} sh -c "rm -rf {}" || true + | xargs -I {} sh -c "rm -rf $out/lib/node_modules/deltachat-desktop/{}" || true + + install -D build/icon.png \ + $out/share/icons/hicolor/scalable/apps/deltachat.png ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \ $out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji @@ -106,6 +108,8 @@ in nodePackages.deltachat-desktop.override rec { makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop + + runHook postInstall ''; desktopItems = lib.singleton (makeDesktopItem { @@ -117,7 +121,12 @@ in nodePackages.deltachat-desktop.override rec { comment = meta.description; categories = [ "Network" "InstantMessaging" "Chat" ]; startupWMClass = "DeltaChat"; - mimeTypes = [ "x-scheme-handler/openpgp4fpr" "x-scheme-handler/mailto" ]; + mimeTypes = [ + "x-scheme-handler/openpgp4fpr" + "x-scheme-handler/dcaccount" + "x-scheme-handler/dclogin" + "x-scheme-handler/mailto" + ]; }); passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json deleted file mode 100644 index 96778eda7aa6b..0000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "name": "deltachat-desktop", - "version": "1.30.1", - "dependencies": { - "@blueprintjs/core": "^4.1.2", - "@deltachat/message_parser_wasm": "^0.4.0", - "@deltachat/react-qr-reader": "^4.0.0", - "@mapbox/geojson-extent": "^1.0.0", - "application-config": "^1.0.1", - "classnames": "^2.3.1", - "debounce": "^1.2.0", - "deltachat-node": "1.86.0", - "emoji-js-clean": "^4.0.0", - "emoji-mart": "^3.0.1", - "emoji-regex": "^9.2.2", - "error-stack-parser": "^2.0.7", - "filesize": "^8.0.6", - "immutable": "^4.0.0", - "mapbox-gl": "^1.12.0", - "mime-types": "^2.1.31", - "moment": "^2.29.2", - "path-browserify": "^1.0.1", - "rc": "^1.2.8", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-string-replace": "^1.0.0", - "react-virtualized-auto-sizer": "^1.0.5", - "react-window": "^1.8.6", - "react-window-infinite-loader": "^1.0.7", - "react-zoom-pan-pinch": "^2.1.3", - "source-map-support": "^0.5.19", - "stackframe": "^1.2.1", - "url-parse": "^1.5.9", - "use-debounce": "^3.3.0", - "@babel/core": "^7.7.7", - "@babel/preset-env": "^7.7.7", - "@babel/preset-react": "^7.7.4", - "@types/debounce": "^1.2.0", - "@types/emoji-mart": "^3.0.9", - "@types/mapbox-gl": "^0.54.5", - "@types/mime-types": "^2.1.0", - "@types/node": "^14.14.20", - "@types/rc": "^1.1.0", - "@types/react": "^17.0.2", - "@types/react-dom": "^17.0.2", - "@types/react-window": "^1.8.4", - "@types/react-window-infinite-loader": "^1.0.4", - "@types/url-parse": "^1.4.3", - "electron": "^18.0.3", - "esbuild": "^0.12.29", - "glob-watcher": "^5.0.5", - "sass": "^1.26.5", - "typescript": "^4.4.4", - "xml-js": "^1.6.8" - } -} diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index a21a97b3b83c0..f31279cf4f0ea 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch +#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps set -euo pipefail cd "$(dirname "$0")" @@ -28,18 +28,5 @@ tac default.nix \ | sponge default.nix src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) - -jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@types/node-fetch","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","node-fetch","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \ - "$src/package.json" > package.json.new - -if cmp --quiet package.json{.new,}; then - echo "package.json not changed, skip updating nodePackages" - rm package.json.new -else - echo "package.json changed, updating nodePackages" - mv package.json{.new,} - - pushd ../../../../development/node-packages - ./generate.sh - popd -fi +hash=$(prefetch-npm-deps $src/package-lock.json) +sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9fd1027055631..56f58e3e566c5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.21"; ptb = "0.0.35"; - canary = "0.0.143"; + canary = "0.0.144"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-K+yyg9GTAvggfn4JQCTmq016tMyyzq+nD7aL3+bWFlo="; + sha256 = "sha256-/le3YT8djSj60H+Pq1qUxqc8CNgEZladOeFa9D2ZGl8="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 2ba3cf79a6181..6ec3f86b7b552 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-10-10"; + version = "unstable-2022-12-01"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "7a04cb57dff43f328de78addc234e9d21ff079a8"; - hash = "sha256-6zYXv+iAfDEFHQ4FwNVEA4+zWiDyeLvkm17f4LuaCJg="; + rev = "f2da613f2b803ad97b43be5a7803f510619e578e"; + hash = "sha256-WQIqbyD7QXa5mfX7X3BQ0Hx2+Ye4k8csx9fhvowvYKw="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 864c70f1917b6..6af1c2ec738ad 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -16,7 +16,6 @@ let pinData = lib.importJSON ./pin.json; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org - piwik = false; # disable analytics }; unwrapped = stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 436a8a8f4bf6d..d3d4eb06ba1d4 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.14", - "desktopSrcHash": "91WCtb+ylVz9gSqOHb5GuSC1YZjDS3M8gdFIZYVls3c=", - "desktopYarnHash": "1ng9fwpwxsw91bzgd2kb2pdq927rkjv5rrrkmszvn55bj6ry7sqi", - "webSrcHash": "ss7Pmjg205EE/V/xIV7nvfZFRyyJfuB8MDM9dCnPckQ=", - "webYarnHash": "1v6qlk58msam9dglal4jzcyqcsrspa6idsdb8acjnscdkj26bkps" + "version": "1.11.15", + "desktopSrcHash": "l+IjI3uvnOjaJA6IszDSuOO08SMqbUf8rI/u12g5Rxo=", + "desktopYarnHash": "024vd7xiwialfrag325558qjrqlfxzy9xq7jb15ysawand1k2xyv", + "webSrcHash": "YLQ4z333RMx9qyVRTBbDCWLTy5QqLlHmYpmOa8vlCbg=", + "webYarnHash": "1ll2sj9q3h2b76383bqv8a8ckqlk8b131zwx223fnz8mfqsc9br0" } diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index bfc322fea6cfa..67762c63f72f8 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -92,6 +92,10 @@ stdenv.mkDerivation rec { patchShebangs scripts/meson_post_install.py scripts/test.sh ''; + preConfigure = '' + export GETTEXT_DIR="${gettext}" + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; @@ -103,5 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]); + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index b23b647907108..648569a9c0302 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -56,11 +56,11 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ extraPythonPackages python3.pkgs; - checkInputs = [ xvfb-run dbus.daemon ]; + checkInputs = [ xvfb-run dbus ]; checkPhase = '' xvfb-run dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ ${python3.interpreter} -m unittest discover -s test/gtk -v ${python3.interpreter} -m unittest discover -s test/no_gui -v ''; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 695089c23e61f..55b3ef6899f7a 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -13,28 +13,22 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c="; + sha256 = "sha256-gLyjqmGZudj8PmsYUGXHOjetZzi6u5CFI7Y50y2XAzk="; }; - vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE="; + vendorSha256 = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU="; doCheck = false; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ olm ]; - # Upstream issue: https://github.com/tulir/gomuks/issues/260 - patches = lib.optional stdenv.isLinux (substituteAll { - src = ./hardcoded_path.patch; - soundTheme = sound-theme-freedesktop; - }); - postInstall = '' cp -r ${ makeDesktopItem { @@ -49,7 +43,9 @@ buildGoModule rec { }/* $out/ substituteAllInPlace $out/share/applications/* wrapProgram $out/bin/gomuks \ - --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" + --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" \ + --set-default GOMUKS_SOUND_NORMAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/message-new-instant.oga" \ + --set-default GOMUKS_SOUND_CRITICAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/complete.oga" ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch deleted file mode 100644 index dd89c92fd3d4a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go -index 7f102b8..996c15f 100644 ---- a/lib/notification/notify_xdg.go -+++ b/lib/notification/notify_xdg.go -@@ -26,8 +26,8 @@ import ( - var notifySendPath string - var audioCommand string - var tryAudioCommands = []string{"ogg123", "paplay"} --var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga" --var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga" -+var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga" -+var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga" - - func getSoundPath(env, defaultPath string) string { - if path, ok := os.LookupEnv(env); ok { diff --git a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix index 7733b05168b61..2ce1aba4af55d 100644 --- a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix +++ b/pkgs/applications/networking/instant-messengers/jami/client.nix @@ -2,6 +2,7 @@ , src , jami-meta , lib +, fetchpatch , stdenv , pkg-config , cmake @@ -25,13 +26,20 @@ }: stdenv.mkDerivation { - pname = "jami-client-qt"; + pname = "jami-client"; inherit version src; sourceRoot = "source/client-qt"; + patches = [ + (fetchpatch { + name = "fix-build-without-webengine.patch"; + url = "https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/9b2dbb64eaa9256f800dfa69d897545f4b0affd2.patch"; + hash = "sha256-lgDlSlXIjtdymBa7xSe1PabSK9DnSG5KnJggOLWyn+A="; + }) + ]; + preConfigure = '' - python gen-resources.py echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h ''; @@ -61,8 +69,8 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DRING_BUILD_DIR=${jami-daemon}/include" - "-DRING_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" + "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami" + "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" ] ++ lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index a2d53141f413d..92fbe4d45e170 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -12,11 +12,11 @@ }: let - version = "20220825.0828.c10f01f"; + version = "20221031.1308.130cc26"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg="; + hash = "sha256-+xpSoSsG+G+w8+g0FhXx+6Phroj83ijW8xWvYO+kdqY="; stripRoot = false; postFetch = '' @@ -87,7 +87,7 @@ rec { inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; }; - jami-client-qt = qt6Packages.callPackage ./client-qt.nix { + jami-client = qt6Packages.callPackage ./client.nix { inherit version src jami-meta ffmpeg-jami; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index 7c076cb372413..388f633f3dabf 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -1,20 +1,41 @@ -{ lib, stdenv, fetchurl, pidgin, intltool, python2 } : +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pidgin +}: stdenv.mkDerivation rec { pname = "purple-plugin-pack"; - version = "2.7.0"; + version = "2.8.0"; + src = fetchurl { - url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-${version}.tar.bz2"; - sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; + url = "mirror://sourceforge/pidgin/purple-plugin-pack-2.8.0.tar.xz"; + hash = "sha256-gszemnJRp1t+A6P5qSkBTY4AjBtvRuWGOPX0dto+JC0="; }; - nativeBuildInputs = [ intltool ]; - buildInputs = [ pidgin python2 ]; + postPatch = '' + substituteInPlace meson.build \ + --replace "PURPLE.get_pkgconfig_variable('plugindir')" "'$out/lib/purple-2'" \ + --replace "PURPLE.get_pkgconfig_variable('datadir')" "'$out/share'" \ + --replace "PIDGIN.get_pkgconfig_variable('plugindir')" "'$out/lib/pidgin'" \ + --replace "PIDGIN.get_pkgconfig_variable('datadir')" "'$out/share'" + ''; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + pidgin + ]; meta = with lib; { - homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; - description = "Plugin pack for Pidgin 2.x"; - license = licenses.gpl2; + homepage = "https://keep.imfreedom.org/pidgin/purple-plugin-pack"; + description = "Collection of plugins for purple-based clients such as Pidgin"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ bdimcheff ]; }; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 3e0dc4695bb0a..a71cad3224af8 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.63.1"; # Please backport all updates to the stable channel. + version = "6.0.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-+zeYjWRFEY09f3o49TcJU14fM1Wks7uR0GsyU2eMJPk="; + sha256 = "sha256-aJLsRxxpLWKl0Y/91uR56nIUUOALd572LtXpqXGTXSg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 34514b5dcd466..01e08946cb73a 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20221025"; + version = "20221130"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-icUyuohJ+nUrmFx/q5+hvjY1My25TwIqh6W6hq1pG4k="; + sha256 = "sha256-xz9HSqDrkPP+5L499cT7cF/S3JYpBirTUze1Apkw120="; }; postPatch = '' @@ -17,15 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ openssl sqlite ]; - # Manually define `CXXFLAGS` and `LDFLAGS` on Darwin since the build scripts includes flags - # that don't work on Darwin. buildPhase = '' runHook preBuild - '' + lib.optionalString stdenv.isDarwin '' - export CXXFLAGS="-Wall -Wextra -Wshadow -Wold-style-cast -Woverloaded-virtual -pedantic -O3" - export LDFLAGS="-Wall -Wextra -O3" - '' + '' - ./BUILDSCRIPT_MULTIPROC.bash44 + ./BUILDSCRIPT_MULTIPROC.bash44${lib.optionalString stdenv.isDarwin " --config nixpkgs-darwin"} runHook postBuild ''; diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index b6c6d982fb87f..a9e023cdf63a9 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl +{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle, git, perl , makeWrapper, fetchpatch, substituteAll, jre_minimal }: @@ -36,7 +36,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - nativeBuildInputs = [ gradle_6 perl ]; + nativeBuildInputs = [ gradle perl ]; patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ git gradle_6 makeWrapper ]; + nativeBuildInputs = [ git gradle makeWrapper ]; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index fe386cab5ac49..ca89b0d5fcf30 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -31,6 +31,7 @@ , webkitgtk_4_1 , jemalloc , rnnoise +, protobuf , abseil-cpp # Transitive dependencies: , util-linuxMinimal @@ -74,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.3.1"; + version = "4.3.4"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -83,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0j05hcl5nkvcl74jl8d0inkh6ha9xh299z87br1vr1mblflh087m"; + sha256 = "0x18m48k6abpbfgavjad5sg3mf3j0kfmyayyvkqxr31viw8kq6m5"; }; postPatch = '' @@ -135,6 +136,7 @@ env.mkDerivation rec { webkitgtk_4_1 jemalloc rnnoise + protobuf tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 3b1775a7ba8cd..343e9069bcaf0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus -, sqlite, libsoup, libnice, gnutls}: +{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python3, libxml2, dbus-glib, dbus +, sqlite, libsoup, libnice, gnutls +, fetchpatch +}: stdenv.mkDerivation rec { pname = "telepathy-gabble"; @@ -10,10 +12,17 @@ stdenv.mkDerivation rec { sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; - nativeBuildInputs = [ pkg-config libxslt ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ]; + patches = [ + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/edcf78c831894000f2fbfd3e5818e363911c746a/trunk/telepathy-gabble-0.18.4-python3.patch"; + hash = "sha256-bvcZW6gbCNogqwPDaXHTbohe7c2GAYjXeHGyBEDVsB4="; + }) + ]; - checkInputs = [ dbus.daemon ]; + nativeBuildInputs = [ pkg-config libxslt python3 ]; + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ]; + + checkInputs = [ dbus ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 27df1273c083b..4b8d2f6104abb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze${version}.tar.gz"; - sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; + url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-${version}.tar.gz"; + hash = "sha256-cEvvpC7sIXPspLrAH/0AQBRmXyutRtyJSOVCM2TN4wo="; }; - buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ]; + buildInputs = [ glib telepathy-glib dbus-glib pidgin ]; - nativeBuildInputs = [ pkg-config libxslt ]; - - patches = [ - # Patch from Gentoo that helps telepathy-haze build with more - # recent versions of pidgin. - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch"; - sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c"; - }) - ]; + nativeBuildInputs = [ pkg-config libxslt python3 ]; meta = { description = "A Telepathy connection manager based on libpurple"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index fe7ef49cd0d3f..1a546ed1aef51 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python3, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; + hash = "sha256-g4fiXl+wtMvnAeXcCS1mbWUQuDP9Pn5GLpFw027DwV8="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ]; + nativeBuildInputs = [ pkg-config python3 makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt (lib.getLib dconf) ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 1bf0e329073dd..ac03ee20ff95a 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config -, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: +{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config +, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus +, fetchpatch +}: stdenv.mkDerivation rec { pname = "telepathy-logger"; @@ -10,12 +12,20 @@ stdenv.mkDerivation rec { sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; + patches = [ + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/2b5bdbb4739d3517f5e7300edc8dab775743b96d/trunk/0001-tools-Fix-the-build-with-Python-3.patch"; + hash = "sha256-o1lfdZIIqaxn7ntQZnoOMqquc6efTHgSIxB5dpFWRgg="; + }) + ]; + nativeBuildInputs = [ makeWrapper pkg-config intltool libxslt gobject-introspection + python3 ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib - dbus python2 + dbus ]; configureFlags = [ "--enable-call" ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 8f78f0d9add8a..10f06393bfc54 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -47,23 +47,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.12.3.11845"; - versions.x86_64-darwin = "5.12.3.11845"; - versions.x86_64-linux = "5.12.2.4816"; + versions.aarch64-darwin = "5.12.9.13190"; + versions.x86_64-darwin = "5.12.9.13190"; + versions.x86_64-linux = "5.12.9.367"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-iDLxqG7/cdo60V0mFE3tX/Msi0rRUjoM8X9yq2rlvf0="; + hash = "sha256-Htug/hmp0OjysUY4q8RO1oqjSsa2sgpqiAERr6ahBuw="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-+YOtdoh8S50+GHRLb6TPYCqDtry7SnnNqo7USzkDc7c="; + hash = "sha256-nl+hrAZECaC5uceK8OZ/em3rY9pK4VrtezT6qCNmbCA="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-kgjooMqeZurzqIn3ADcgFjlqaC58dQNuIAHLx4M0S9I="; + hash = "sha256-7B9wS0myf6QkDq4ooqWen03s/36BeF7cSsOzjDdIw8g="; }; }; diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index 7fd54b70e9cd6..0721d720cc7c8 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2022-11-04"; + version = "unstable-2022-11-15"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "3be87831281af1c91a6e406986f317936a0b98bc"; - sha256 = "sha256-v8r2q2H4I9FnsIOGv1zkC4xJ5E9cQavfILZ6mnbFbr8="; + rev = "cb0ba0669522ecf8ab0b0c3ccd0f14827eb65832"; + sha256 = "sha256-Ny7TAKdh7RFGlrMRVIyCFFLqOanNWK+qGBbh+dVngMs="; }; - vendorSha256 = "sha256-FBpk9TpAD5i3+brsVNWHNHJtZsHmShmWlldQrMs/VGU="; + vendorSha256 = "sha256-dCADJ+k2vWLpgN251/gEyAg6WhPGK2DEWRaAHSHp1aM="; subPackages = [ "cmd/senpai" diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index 01a8dd9ffface..a02be05d6473b 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.16.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.17.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-FS7lwQS7ybyoIKPkcUtPIe3srO1O/cZN+x1nzWUlF20="; + hash = "sha256-Ls46Dds8lRP2KTOkjiVWtqB8aqPW5jdQ/xwBcQYIwbQ="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 1be323decab42..62f44f6f134a3 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -56,9 +56,11 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "GUI front-end for maestral (an open-source Dropbox client) for Linux"; + homepage = "https://maestral.app"; + changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg sfrijters ]; platforms = platforms.linux; - homepage = "https://maestral.app"; + mainProgram = "maestral_qt"; }; } diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index d875e39fb7a9b..ddc0f4b932ad0 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -7,6 +7,7 @@ , python3 , w3m , dante +, gawk }: buildGoModule rec { @@ -46,7 +47,7 @@ buildGoModule rec { python3.pkgs.colorama ]; - buildInputs = [ python3 notmuch ]; + buildInputs = [ python3 notmuch gawk ]; installPhase = '' runHook preInstall @@ -57,10 +58,13 @@ buildGoModule rec { ''; postFixup = '' - wrapProgram $out/bin/aerc --prefix PATH ":" \ - "${lib.makeBinPath [ ncurses ]}" - wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \ - ${lib.makeBinPath [ w3m dante ]} + wrapProgram $out/bin/aerc \ + --prefix PATH ":" "${lib.makeBinPath [ ncurses ]}" + wrapProgram $out/share/aerc/filters/html \ + --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]} + wrapProgram $out/share/aerc/filters/html-unsafe \ + --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]} + patchShebangs $out/share/aerc/filters ''; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index f454a8b43daf4..3cce58258a8a5 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "5.0.1"; + version = "5.1.2"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-w6ZZPIJnAlA8WhNHtM9gsjr7U6wMYT21fGFmkDDAVJU="; + sha256 = "sha256-PLDzAtH7T7QMrLavvcF3zOVTayCqEA1IghIUAAxkbEE="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index a5a9b3ac89b41..07de3be996518 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.5"; + version = "1.10.7"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-eVwb7E04DzGdqfH4T+gkvmBtvN7ja4o8u7LvHk/581I="; + sha256 = "sha256-r/xutH3BLYCsFmmYJ1hdphLLktCzdAeM1Uwp1l1C1LQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix new file mode 100644 index 0000000000000..12a2437121a53 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -0,0 +1,29 @@ +{ notmuch +, lib +, stdenv +, fetchFromGitHub +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "notmuch-mailmover"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "michaeladler"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-b2Q1JcXIp56Niv5kdPgQSM91e8hPPdyhWIG4f7kQn78="; + }; + + buildInputs = [ notmuch ]; + + cargoSha256 = "sha256-AW0mCdQN3WJhSErJ/MqnNIsRX+C6Pb/zHCQh7v/70MU="; + + meta = with lib; { + description = "Application to assign notmuch tagged mails to IMAP folders"; + homepage = "https://github.com/michaeladler/notmuch-mailmover/"; + license = licenses.asl20; + maintainers = with maintainers; [ michaeladler archer-65 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 495764bf5ee24..9ffd8ad55f365 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.5.0"; + version = "102.5.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/af/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/af/thunderbird-102.5.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "80b1e18e826369d4f34449e8a90630cfa8425b43a4b113f49026a909e591916a"; + sha256 = "022e4fff1601664d07aa8afc8fcdeb0b4a47eecb98112729479f7eafe6763393"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ar/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ar/thunderbird-102.5.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bcc6d43b1fd182f15ad502a622a74f97fd02374ecd89168b1c165e62f12c1841"; + sha256 = "69afe5dd3e3d0bb9ce5f2f50388474d5903d480c51a25f25741e66d8c317b3ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ast/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ast/thunderbird-102.5.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6fbd2e7c1f8c86c7a5aed8362ae3df99ffe7b03ad4885024983e58d9f71b137a"; + sha256 = "5b15b30662794fa76b855f3acc6f743141ba10f11812c03c2c2ea16b6d3091fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/be/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/be/thunderbird-102.5.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b353f925236872f35aded0b8b3992ce83284debf7f1c774a4600f9a67e548de6"; + sha256 = "61f6f60a95977920f7090c2308f5c40d6be3ac43e2a65cc1488329132de3353e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/bg/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/bg/thunderbird-102.5.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "149c22f4f4674800320e204d287d09c6143517276e113cf7ba9e73c193ef7d77"; + sha256 = "232014912bc2c8ef0fda808269eef8b882f9918f57772f4935a18bc3c183a79c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/br/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/br/thunderbird-102.5.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "23d114474845d0d6a6f044baa59421b81f14badfdf306c154e9739b03d28995a"; + sha256 = "2be8e2f6a4dbe553305092959df30f9c89b0e54570e4fa598b9fa941bd088ccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ca/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ca/thunderbird-102.5.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "43bf01934dee664033adeb22ee3af77a693f7cc9ec3c6357dabff08277f94f91"; + sha256 = "731e90e54124cf4291eb8002c54eaefbc5e0d120e142baf65a6046aa1e482c1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cak/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/cak/thunderbird-102.5.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "274a3dc9b29e9a1684cd60c5401adb180a4996aaceeaa64546101c1920007ab3"; + sha256 = "81b9d512da5e32bfeb65041fc048f350a12175d31db839f1106f25a89edbc591"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cs/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/cs/thunderbird-102.5.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "382e85e0b46d539c9b39b9488cd1a24eb9a5e62a20e59575d094b8efb4423d02"; + sha256 = "97f1dfd7936e6b7e52709bcebb9c379a4f6a6d6fff9bd35d006f32439f30f36c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cy/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/cy/thunderbird-102.5.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e33f9cf6a06e7e60e7238ef6f55d4f68ec348809e5be20881ac86f5414613b89"; + sha256 = "28a13d2020686d2f69c991a56fcf268c6bd15396b08da148bd4c1db3d9432de4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/da/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/da/thunderbird-102.5.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "939195d3a4d184582aba103150dd220a471ba2a932bf7b78f91c17260374900c"; + sha256 = "b7c231fb033ab97925e6e593224b03c26aea4f8804279cb3de7271ec46c69b55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/de/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/de/thunderbird-102.5.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "aebba6f46e94b3988273def89f0381d3993054ca7f2b3eae07870447ed1f0f56"; + sha256 = "2041b42d8de83027b446b8797f3eb772130ec5f4e32c2204f778a2b16b98a065"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/dsb/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/dsb/thunderbird-102.5.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7b9da40217aef8b8c77c97bc64ae18084142dba0e380848037a512e2b82bcd6a"; + sha256 = "f12ae254ad8fe9606241d307e1559cd0f6c7a201f51715cdb5410604ed221502"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/el/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/el/thunderbird-102.5.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f992c7476b31e664755fa53c3310baa28da2d22482cb3a9804787fc53a93646c"; + sha256 = "7a871c675be87cc6465e20157dea4d64b39bc134ccaee3ab981bb34100f2cfb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-CA/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/en-CA/thunderbird-102.5.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6910ec50a0e227cac5e2e1abbf60bcb0c913884b31c71db8a66141939e4ed5af"; + sha256 = "b7ed0cfbd07ad87b8ddbc16e0e553ceb00102731a8f97c8d0f740f72115cd733"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-GB/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/en-GB/thunderbird-102.5.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "fb3bc64c3b7266e1531d56ab0607e7031b6425435fc452fab1b38bea3623e73e"; + sha256 = "c860d010ba7e3209a77698f5e0272a9fa9d9dc07b7740fdfcae8926dc17988b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-US/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/en-US/thunderbird-102.5.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e803a265cc40c8a0a306939a7e9effb087bacbfaeacee0ffea291d5948c14741"; + sha256 = "71f8b1fcba6a97750ecb2a29121625ff10ae9b530e489847f92e4b078b34e909"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-AR/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/es-AR/thunderbird-102.5.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "42ed5e1d668a75a04f3d2ef2c0429dabc1a64a2c03c7c946a936c160ce98f3a7"; + sha256 = "ff9fa05a2b8ea0621a04ce8bee10a35278e0582dc9b67ad66d274f415c70f58f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-ES/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/es-ES/thunderbird-102.5.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "d9bbb9197b48231ce1b62983cf51cca7d21db8f7530fd036e5c4706564dc5ad5"; + sha256 = "24729235226c06db657ddddf3899410c367234badf9963aa8dafb671545e333f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-MX/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/es-MX/thunderbird-102.5.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b6aaf5311c8f7156fea7a4c32fc7e45828edae7515776f6d2f531aadb46ced71"; + sha256 = "f90d96ba75824043bea772f32d83075a1fb39ad75d2e0fe21326e646eca44482"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/et/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/et/thunderbird-102.5.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fda67cbf589f6c16b8b70f9a9adf4e66ced2a075cccdd7082257936f36515f26"; + sha256 = "30d6f63a9f911fafe51998f9380a5c160296faac0f43ab248eb5624feb03fc79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/eu/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/eu/thunderbird-102.5.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1f2b63138db4722f93479134c9496d5764d0022b98f883859ef993eb1d1a354a"; + sha256 = "e6becb7a97b693cd09da1f4b6c5fd3044fe33d9823313b9158a713349ddabe7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fi/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/fi/thunderbird-102.5.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3903b745f2e630e7e9eb373fe1be824f658098427a022885e8e4b3702dd0e3ff"; + sha256 = "f0581172b340513a67f50bece99fa30e682df7c561d62fbaeb1edec227ddd340"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/fr/thunderbird-102.5.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e55f2383cf4724a2730e4c9cbea45b94e248516457422b9a4f351ec5490166f9"; + sha256 = "bc832fe989f6a3ec9789b61fa85e94deb951c0021b49b3623990e44c3d9e12a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fy-NL/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/fy-NL/thunderbird-102.5.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "662a3cccc13461e42dfac524285e1d0e632da195d962cb0e5d8464174c28cd9b"; + sha256 = "5a91a9d738770dc311577ec6d785bed328ef68dc2877d65d1095fb7270e395a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ga-IE/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ga-IE/thunderbird-102.5.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "703ff33f3d096f5f96e447ea8753c485eea44f5c4337146e8cd8b142660891d8"; + sha256 = "76a3836e5105d2408ebc2f23096f8fc2e98ecf83c5de7a0a6e374a2b077b30f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/gd/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/gd/thunderbird-102.5.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "94892f71e8fcae4061d37ba2b30f4a097af3472cdd9233836063616db1e71628"; + sha256 = "b0566176c1397920d353887653f6ba25a5107c47769fcedddbb70ee133cb304b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/gl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/gl/thunderbird-102.5.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d7539b557ea31966780c6f6c892ac3041f3976f94869f386106c3815031e6ac6"; + sha256 = "24a9dd5cd2ee711a2196a327a05dd90bb00aba0c9306908a76a31d2c8c5d241a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/he/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/he/thunderbird-102.5.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "96ceac6f559f636d11d433e05bc0997f70c0dc055d04e2a378e35a69437ea93e"; + sha256 = "5f3f1e2b41fe3900303f16b2f18334e3c0476c0fa48e8d9ce45e320ccea59ca1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/hr/thunderbird-102.5.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "50ea1a69e96ec98fba3469ced119d70d020b061bd261267a5aaaf9a50293bf6d"; + sha256 = "f7fca03b59bafc1be88561897f7f485c7338421bce1ce293546de17db96a3dd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hsb/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/hsb/thunderbird-102.5.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6df3cb2437541cb897c9bd7c65d019fa0938df54c13c513547a36ad9f6409d14"; + sha256 = "c8d4fcbe1a3f46204d8c2bba4c8a766a9377c089983506da7bedcc751072fdca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hu/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/hu/thunderbird-102.5.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8798d9f4deb2b1d75f38e10dcd184a0d82d1e5ca69fb171b024b636cc5366bb7"; + sha256 = "4573d9125730fa5ef6b00a504e7a5cfde64d5279c1bc71c96034a3420dbb32aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hy-AM/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/hy-AM/thunderbird-102.5.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e5e569436fb883fce500ccbf138f2237e8d641957177b0e9323a0091713c25d1"; + sha256 = "041839467f50289859bb42361024fe29acf92a7974cd6f7ce41dbb57911be0a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/id/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/id/thunderbird-102.5.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "dfb81f988c1a6bfe2ba9913e5b31ec2c172dae9ade4a05961202a867e4192367"; + sha256 = "4d53597943e0ee03264abc34f96fb71fdf6777981bb92f91c103629703764d50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/is/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/is/thunderbird-102.5.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a3f1a999a31b02c130a74408c7fb3e910124ade35e4d8ce4274d162d4dd1e30a"; + sha256 = "6e1bfc0f88394ac9bdce3619ce5deaf48147c2edc30104bb2f958a74956acabf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/it/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/it/thunderbird-102.5.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ed75d139aff75595f05c42e621a71c42316fd9b4c82f9c63b32ea2bcbafb9f97"; + sha256 = "9dd7e6a1f3d59b1676c478e1a71454ea03d6f7e4e08d809656f9e4373895ae29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ja/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ja/thunderbird-102.5.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "deff788766133ecd6d1f8d01d36f58c6d89cf9dca41005e97a3bfca1f4ac8de7"; + sha256 = "5404b2210aea94ac4a4b1e2c7e1d659feabdd1bf3d9a4ebade84950c293253c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ka/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ka/thunderbird-102.5.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5a7de96a5f4d933a420694810ab32c7ce397c1a31e539dcad42ada81c7edfdb9"; + sha256 = "c436cad480e85f7dc9981c55a4b42d9b2e6be2da4ef0df95d7a8b3046ea95ab4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/kab/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/kab/thunderbird-102.5.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ecd5bc56051fbed9641c7adb9a4d9ba627586b50b3fc1f564fcaf8b4f891c643"; + sha256 = "e6395901575b49a64bdff1b297ebb6c868ca903760a28047c17051cc5e845b04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/kk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/kk/thunderbird-102.5.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "dc46b7cb231dc71b7481796bcebcf12f50cb0b1212fc0a619747524567aef257"; + sha256 = "000e8cad8e8ef7a37e4ec3c828f2f18b89087655fc998a62b26e29bc848b8222"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ko/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ko/thunderbird-102.5.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "919b35ed688c7a0f6deba8e31e696ca804c62abd5cde119af2a2f4300a83c8d0"; + sha256 = "bece869e4ef62922b4ba46be92f5d0effdd816d8b593132e8dd628de646bc039"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/lt/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/lt/thunderbird-102.5.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "50f1a50545befdafee3c0ec1df0386d28ac041dde3e72653cd3834d8c136f705"; + sha256 = "2ee26dc533d87508979b2ecb4d8d73f3b1e78d097d3362cded53acb033f68a99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/lv/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/lv/thunderbird-102.5.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "943abb80c6c57437a62923c311fa17b28a0381da727f5d2e492cf68cce11917d"; + sha256 = "c14e6b4657bc57f9e9b91cb4aaa60db5ec7d423e2c897677e66eded373e34753"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ms/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ms/thunderbird-102.5.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c6918b2df57f5ca08f6a24b1e9d0355bbda199ca8a08a950200e344c360388e6"; + sha256 = "6f24347a5a55d860e71b5efebc765cbeec48d34bdfc41034ee64e1289a38e463"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nb-NO/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/nb-NO/thunderbird-102.5.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "44ef771b91f4310332e2cb79c81a323cef65bdbeae2dfc44eb1b4ebe81516278"; + sha256 = "0b00787718bfda701dda7ba340fe4a272ed8002caac2700f02a02b6662eaf4ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/nl/thunderbird-102.5.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "43e16f65802000586493e38901de3c5acfbc2ac7fbd96964a6fc815ea9d1a2b6"; + sha256 = "3727de8cf3f4b61ad7533da67d7489a5a0d55355aa6c10027c16219a5644e7e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nn-NO/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/nn-NO/thunderbird-102.5.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "eac4fec574f33372499f94c9a1d4995ba88c41f5e7d1d9dfc2b34001857a007c"; + sha256 = "4723382e7addcecf908a7662f2c4e81b029569fd2cac1cbf2b429aaea8c8801c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pa-IN/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/pa-IN/thunderbird-102.5.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "fb3d7789404180960fcd59b8b16cb9e16c5c3fedabe872e330d73b944654a0ac"; + sha256 = "01501e486fe30267bca6dfc09aa0e1fafa99dbf4f71339c63183a3f7983976c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/pl/thunderbird-102.5.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e9f6c26b6956114ad0a56a9690d4f8edd96e23ca82afe68d28e990e5f0f67408"; + sha256 = "bab780870c2f4644e0231d3d69f7c4df98a60c901a48d7105bba88a44aea6007"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pt-BR/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/pt-BR/thunderbird-102.5.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "675132e4f4faaeaa6b4a4853d4b47d3d09cab5842d271cd3243c49c783afa45b"; + sha256 = "735aef3055f56bc6700363ecd1c1855f6dda8a2957e291de9799e084ac5b415a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pt-PT/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/pt-PT/thunderbird-102.5.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "abfc6b22ea322d70973624e3b3544887adba99eda1a086d8ae67f3904d47dc06"; + sha256 = "961354a60b20ecf8789f2cf9c91e7ad11c099f2ca945605ac760d6a1e386bfe3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/rm/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/rm/thunderbird-102.5.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "652d391ee8e934914d158b0c9e1f8df5078290dc5ddac321a11297360b22c982"; + sha256 = "1f9c65e928af6a9183d5b96fbadfb098552ef8feb5f863a6b8d1e311fd597074"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ro/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ro/thunderbird-102.5.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "2e2326714706b12c8123d9952da8630b02a621eeda398631614d638a9a2aeec4"; + sha256 = "90fdb7f8b65f870d19933bf9bed7a894b1cefb7948ffa4b0d820ec35c8c22c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ru/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/ru/thunderbird-102.5.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8fdcfb3fa172755204fb9263202988fef1d70a8f0be16b59bacc05fe47a9c124"; + sha256 = "93edb7d86ec2332eed8d877a81fd0e9e6aa6e7cfc45ff61f881302fcf97aaa75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/sk/thunderbird-102.5.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e722b0e8e80e20c169f8d691ba81bd81bc97f77e1b9a03778f8ee93850dd9c29"; + sha256 = "7603f2dedb6b4d4013d40422c66f95c38c607dfa6513ec51f4f483bd108d739b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/sl/thunderbird-102.5.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8322877e87880e76a41eeebd268858a20caf7c5c95e728f21c4ab29959e96e9a"; + sha256 = "a8a9f4483176c25dfe4b764ba356cda07f23efee8e342998f3834ff78930802f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sq/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/sq/thunderbird-102.5.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "88297cb69a678af8db0dfe7584fefb518df1a9cfe0f87f1ff8cc30f52d5a3d64"; + sha256 = "cc3295d7cdea78f9bdc6443859bab410090580b5bf9ad9b08d0cc8db57a52459"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/sr/thunderbird-102.5.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4c8382d66320d98a3dfd9e254c8e72c371a39e49e07267ed6a9d4e0ba1a2d343"; + sha256 = "703e339978980d1458929f26e5df3277e5ef09a48bacdbbb4045e07ef1ebc922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sv-SE/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/sv-SE/thunderbird-102.5.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1dd4ad25cf7557119588e98f31fb8875ab1cac2fba6c08be6a18eed8ed7f7008"; + sha256 = "0cc199e9095d305c54b4536311fd7eb7d8c78f4cf88541a0ae62998476bb2f41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/th/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/th/thunderbird-102.5.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "cec22b02870bdcd60e1ffdd3524a36e71bff5d32497787bf10af7e257c02aada"; + sha256 = "b0f55acc7a7c256f0cb000fd5b640b6ec40148b00cffc1733ce1359eab2982b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/tr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/tr/thunderbird-102.5.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "68aebdfba935442388825991682280092920b1bbd6aaf14c5f8aa4b48d6fb38a"; + sha256 = "ccc4357b4f596287addaf3c2c6d1dd2156fc77eeb13f3e1e45b40e01a6d5236d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/uk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/uk/thunderbird-102.5.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f9f2f91cce1c6a41ea6783cabdcced5132174c0064bd1571ea1c425e8ee9050a"; + sha256 = "7a54f6a151e324590c19e5864ab23ddf9dca700005c307b6f2582918e3b44266"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/uz/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/uz/thunderbird-102.5.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "bc5236d3a61b35c674694605e5ee65c7b2599cb8969eab112767f0510ba14c81"; + sha256 = "239896c9e00fe5d0e36f8f75921ebdd7e16b07946fd5f00e38761d6edc82573d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/vi/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/vi/thunderbird-102.5.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b32afcecb7c1e7b67dff0a4b07e7d9eeb9cd939d017f5a1aea594fb282222118"; + sha256 = "1c8a9ae90633196b169131b62cb063a0f0052f95a724b8979ca9d9c463d45314"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/zh-CN/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/zh-CN/thunderbird-102.5.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "866371f13123180e76a0be8adcde3bde1123633a18012e9f0e71a2e75f61c838"; + sha256 = "1b0899844f478e8767fd00d002a1758d3c9576dc46c057baea3915403079b6bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/zh-TW/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-x86_64/zh-TW/thunderbird-102.5.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "fec9c01a6bc7c46a5febbd9c7f9e0fb29d9e2cfc44bd05109a3e4fe65d8f6471"; + sha256 = "b5a622ebbc95d7b69c8e6a53caf1cfca27c38fd8c3ab23b0dd0642228efeac26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/af/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/af/thunderbird-102.5.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "18ac6f84834865ae4dc1db83c025a1a1f48619aa59a29e0db52f312c9e0706eb"; + sha256 = "bc333f62ae84fa18cbef767ad5122d50d525f3c49ab274efa427d9b9a9174244"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ar/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ar/thunderbird-102.5.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "00903f552a47f6d206ece18a67367ba13035f962a68566700f7ed8416a88b570"; + sha256 = "1a089afdad940bc0681577226cd7510ec0bd01a0ad0da7932e81b532dd7568b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ast/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ast/thunderbird-102.5.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "800b55130ed716abf55dcd08644bb6df5c3588388e4d713e027dda144146bea9"; + sha256 = "347f34294e37725443148fed0f81e4a698ca6dd711d10f9ca94598358a0bac3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/be/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/be/thunderbird-102.5.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "78cd3a41302afc90580327c94f0ea6c3d3d4d9444e264549767f485f18a796e8"; + sha256 = "b8472ca415dfedb71794ebd01f985b1b3ddbeea895e02a803ecd3a36ad616fd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/bg/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/bg/thunderbird-102.5.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "fcbc8017e9cf0de78d615b89aa844c0d2453a47e000995cd1077bb0125afb08d"; + sha256 = "f1513e559fdda3b1c7eb170bdebb814dc783470b129e533481d664c0725adbaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/br/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/br/thunderbird-102.5.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f22aa80ee04d152e8485c111b52fd8a40029c7f3b0abd558f37eca6ea1f2f3aa"; + sha256 = "4f4ca538703c2b27e8fe98d7958ce8c90c352513fc6f598b2bd97ed7770d5721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ca/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ca/thunderbird-102.5.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1c98fd50645a51bfb57f0c8a5800144603230535901a0790b137a854f600df19"; + sha256 = "6cf6657c5c06681870cc28d4f13ea167483500a2c739e3389d3ae522b8baa5a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cak/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/cak/thunderbird-102.5.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f1a4711b1613bedca484ee594c5ad415fe617f5d950c47153810918afacdddf9"; + sha256 = "5e2c1a8fafbe2dcd812933adbf3afa44bd4778a2e7352f10b617471a2411d940"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cs/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/cs/thunderbird-102.5.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "572401b5d7fb5919e48d67c992a8bccc0f7989cfb4e4a59b703a99d93b64bd58"; + sha256 = "edfd38c9c8b5b6964ce04526054293451f415861050bf9ec2b4a26f7f17ccfe3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cy/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/cy/thunderbird-102.5.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "023f03cd9a84547d7a427bfd4d7989b687573f591e327a15d888d2fb0baabd38"; + sha256 = "c71b9e2cc20bfb6d74b356bd44177e45411b93afa6e56820ec25b9972d2606a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/da/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/da/thunderbird-102.5.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "94e11b08163e7608b6aeb772b6571174468951bb99d97e7de2f3e8623c26702c"; + sha256 = "0257e4613e014aabc4ea4425077f6a1956b0d45ae77c115576c57dc5a97370d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/de/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/de/thunderbird-102.5.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f5a85b5ab6dc1241b7d51dc2cdad97aa29eebf4d4ed5bbe8906199ae634c0598"; + sha256 = "50c1f4ec2aa0b1d3c473d512c4b00118bc5b8ee45f725f924403142937656a7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/dsb/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/dsb/thunderbird-102.5.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9f592e41dff37d58ef081b5219026c37e1d6822116e769ccab52071e1721052a"; + sha256 = "62109922ce3e481d8cf68c33f6087ea2fb314d7b674a6b825990ad47a8f00b3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/el/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/el/thunderbird-102.5.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "14d8c519f366a101e0389a81f8a15e15241c69b1b523e07a71a1dce4d785eba0"; + sha256 = "72331c165536c210533901b6f0a164bff3b53db1ef13d96dfcb2ee48f150acdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-CA/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/en-CA/thunderbird-102.5.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "22f6c1dbebaf52bd33f169229ddcaa487c5016d549e1b511af69e89f07ca862c"; + sha256 = "51aa64f06e8b5d05f6061d4ef8a3bcab171b77f3df73793292f128413d8b3abe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-GB/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/en-GB/thunderbird-102.5.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "eca6df9a2ffbae931a786dfe33bc447bb4e5470afe8f21da24b4d50a1bed8deb"; + sha256 = "106bd1a45e2ecd7fed5f15904d68c8586e4caa94a4ade54a945d5191e0e88efc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-US/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/en-US/thunderbird-102.5.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8d7882f46d4d78626749c200688c2d9713a00a60357e745e60464ab11c1ae4a3"; + sha256 = "0ece75286cc564fd2dbbc64ec14b45b1b2e5b01fea1cc1802596df20c55ef65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-AR/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/es-AR/thunderbird-102.5.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "3cb2a530cac1b0b5f6c7da7bd17b62fab1a196ae554469a76636782e55f7ee4a"; + sha256 = "7a81581788c1845610a9791907f322f39b81d1ff8f298d6ed84e1b4a86e54e61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-ES/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/es-ES/thunderbird-102.5.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8f19d223a4a212144d2cd88e594f746ae611d12d891fd39bfcb4c72046b2a96a"; + sha256 = "b919c334c2f5a8805df97108975051742173c3e77bd2937f6944f9866ae38089"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-MX/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/es-MX/thunderbird-102.5.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "89f530f790c8b33b880bc67b652a1c351bec41625808c2a78664b9e521a711a0"; + sha256 = "9e90957afb49c8d66ceb8e9589a394868bd1da3c504419cec304be63fcbd0ad1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/et/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/et/thunderbird-102.5.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "361eedd14a241b87d38a5f0768f8bea70fb5e94ea300b17b3bf5b6b1b63f1c88"; + sha256 = "7cc3b7ef44ae0d31fe340ccd6dc52d7b84e6dded6f0a3c864f228263a905e502"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/eu/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/eu/thunderbird-102.5.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a563c1f6e8c207d656227adafb164948cf81638bc2293a5eca3383a78da48fac"; + sha256 = "c8dc683aa45b0ebf44ad85d50591407cdd2b727e9c1019b078c425b38d780b9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fi/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/fi/thunderbird-102.5.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e6770ae91921874ffa980daef3c9b687aff460a9658aecdcce05723fcd1a6ac6"; + sha256 = "3f2211ea0b76062c521b15f585d4f1b76a7f0c892f4c807447630fe51fc4ca66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/fr/thunderbird-102.5.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2fb45cb868ac4da79ff4b2d3d664b5dd2e8e7eefcc488785da812cceed36336c"; + sha256 = "bbbb35e48a5dc7e684ee9ac070569a3d56297bbe29f9def6fa666cd6c0405467"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fy-NL/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/fy-NL/thunderbird-102.5.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "38282f455d0ff8096634c6bff0a953b5654a80185925712ce5a774140c06fab2"; + sha256 = "d550a7c0faa682c129ee04fff918151e1376b07db0b6c0fedb407339b2d31317"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ga-IE/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ga-IE/thunderbird-102.5.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "45a8b6c21f7a086ce3d0ed75b4043e3cf546fa4a9bd2cdfe89f47633ea5a0337"; + sha256 = "aa0744bc9fa180d12d0197fd10e99b5a3520c8d04389bbe6e50cef84a4cb8a92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/gd/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/gd/thunderbird-102.5.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "065fc2c78c66ee04fd4343bc4247b3a24f83a6f50d0511b2555249310f3053e0"; + sha256 = "dbbb9e6fe01d95f3286510c89b84017ab5a9e5cd67a7bb080fac96c1ba0f76fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/gl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/gl/thunderbird-102.5.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "85c3ba755fc279b4ec746113f194f54f476bf60d359050c585e4d33698bbb750"; + sha256 = "6230208395f441c9b80f27e43ee9e7e9d2ff38332ce96e11f8bfe24052274438"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/he/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/he/thunderbird-102.5.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "12cf7e48c98de087b0c4aa20e61bf2aa012ed4ad9e356e6e9f1a9bb9764d62e6"; + sha256 = "d3d8e18ab9863d85de54f828587f842e00fcf5870bc28e55041202cea973dd61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/hr/thunderbird-102.5.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "60e56d042f45bfb6a297e4cd9bbb7dc4855a576e37adb3a630f8f2aac460d24f"; + sha256 = "f73eabbbf81f87e4993f30435c5266d1e4925a52d194dfa3242341da9be94a4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hsb/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/hsb/thunderbird-102.5.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "cd8f0e82622ff4617d659b7df38f6d07dbfacd0a262c56039f0667cbb474db86"; + sha256 = "8511d6094e66855158d03c6974fcc56a9d1256cf6c189af55733111c0b0f916e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hu/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/hu/thunderbird-102.5.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ab2f1fcd4fc076862ec2f2c6102712f45b7bf2e3da8577fdcc5ca6803773ab92"; + sha256 = "e0e38379e1746b384f5ec3cfe81334a7510652e006d07934899bf9c0f62f54f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hy-AM/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/hy-AM/thunderbird-102.5.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "84626379ebcc40f60ab94ec22d60b6a0a60b1af86d0d815a22b875e123d4b7fb"; + sha256 = "88cc7ad905abaf0b4d2be846646efb163a6a60e3c08c42bb3202ef484e129df7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/id/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/id/thunderbird-102.5.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d49834cf21d985738d17306a7dff8fd158032c0b32fe6df2e2bebe722350ae6b"; + sha256 = "bc266abd6260e1dc4c9d7e2a61e83dbdac9c9226c5e10c66ef039e31804356c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/is/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/is/thunderbird-102.5.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "50f16148a4937381824691023d0acc736fcd517ca1523a5e2113fc0611b9f599"; + sha256 = "bde3eafb9ddcdf54b8353754340758ffb7c18d021daa1fe7e2695b5208b5b475"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/it/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/it/thunderbird-102.5.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "85a75ac95e8533f7fe186e49cdf335e71332be527f801d775c85cf5a1acf9835"; + sha256 = "8a21227dadadb0e7c7dec84fc05fdd1489106966e67182931707a3fc38afb3e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ja/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ja/thunderbird-102.5.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "732df69293cf19d05aa081dbc815533352049f21bec37ad020fbf81764790bc4"; + sha256 = "76a92e5798701a2ed0851d0d85a3856a3aecd2c64f795d27a431df07b13681a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ka/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ka/thunderbird-102.5.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bc8a0520e86296f8cb23187bfc35420a15c21e52d915fb8c272b872694e84697"; + sha256 = "5ed46f0330c90bcd704af128e5c2b7d99fec1aeb86cf6fae86eedfa2f7a5ac94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/kab/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/kab/thunderbird-102.5.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "907055485720ac96fc4fcff5a2458cb8978d7ac1047d61c304524f20058db227"; + sha256 = "41ca6f58f081a2ff6647289095d43b39af5b632fff7d045ad8ccbf942ef9a099"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/kk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/kk/thunderbird-102.5.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a0b5629060637275083d189f33196f06b23f00dfdc96c45a08e6934ea9ba31aa"; + sha256 = "14274dab0ede8a4d11ccb5e22d51eee9388b56e517942b1133544fb007652a0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ko/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ko/thunderbird-102.5.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "52a37de38cd370042f80e1d3e008850fc37de4e08dfead8cb0d1a8dce90a577a"; + sha256 = "5ef387d0a28f4519eed731a8011b7c32b9757191d77095a0ed62ef6a859a914e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/lt/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/lt/thunderbird-102.5.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "77d60e886dd86a1c31c427dfcea2f74b0fd9f9b1ed6c21b6239032cc009edda9"; + sha256 = "8b0acea66c76838f21f29517be3ebff35751cd3f2bf009cf440634e9ef07bf03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/lv/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/lv/thunderbird-102.5.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d8b96ce3750df74fd789c28ad13fbc4bff739e7085de1b05a898e242663e75a5"; + sha256 = "d29187226a3cf6751d40d9b6d4efbba38cc95469d0770fca59f532712e5cddc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ms/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ms/thunderbird-102.5.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e3e8c88bb5d57ec84f2e84717a1c98be462ce0463744de5cdf2c7b74bbd0905c"; + sha256 = "2de9dd57119921d5cf3b93b1585a041ec69f4b852399cab7a04913bbc35f7182"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nb-NO/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/nb-NO/thunderbird-102.5.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d6fe64522d534b17b0e97cd670df853a352d65b105e0fe09415a46fcdd49d0fb"; + sha256 = "5e34774bbf89751aa71af65e130c7bafa3838f5c4a86233a961d87768533e46c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/nl/thunderbird-102.5.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e6a7b5ff2d6fcae50791a6376369c5c87021e0970f21f303a67e970eb6663d16"; + sha256 = "9304ceddd24589b1e1438a57aeeaf9dfaa1d01b1e4b36817f65eb5f6c9c06abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nn-NO/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/nn-NO/thunderbird-102.5.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5861a050a47871f9c443daa363497ddc007d964be1b3a27ca6c5c1e2cacd82a7"; + sha256 = "447a08a21791b040f972626bee78a78aad42767957bb1f9a3ce4dc715553b8ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pa-IN/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/pa-IN/thunderbird-102.5.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "58ef386087cdc68fdbe58444baa13375c40ae2e9447600ece3acf88373915533"; + sha256 = "3ee272399e72058c403fa1fb804cde018d08509d9d1eebfd8ce949e486b4f97f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/pl/thunderbird-102.5.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "09b33a0a5230f58b867018f74146d40e63cfb9a321eb587ac92f70b2806fbd20"; + sha256 = "12be706b5d5779b32e982443f2d90a62ecd08771174f99747260a1d39ba5a2c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pt-BR/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/pt-BR/thunderbird-102.5.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "83e0a0b52d3d92e892389f308bb52a05728bfedfde0c9216ed687534aede07e1"; + sha256 = "b3465600b88fb1f31820b7afbad708b286464b56f92a7907708a6af638d038ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pt-PT/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/pt-PT/thunderbird-102.5.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5c9523ecf41e306c01b884caa30fc23d02a5d9f871a39fcd186776851530ea14"; + sha256 = "ce9ceaf049485073df4394596ab7e35b1380d519e37447b97f97e6f2effa579e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/rm/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/rm/thunderbird-102.5.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "54aeaf1ea767343a144f85f65618e2ee0d300d11efd520615690d1620fba47c2"; + sha256 = "3e1c6d332ae490e09c4ab7ae1743e17d4995fb47fb87515ffbe679325fc31a02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ro/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ro/thunderbird-102.5.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "345f4952d17240eb03da38ec4c1b99e46b488ab058b13d258f013668d2e26651"; + sha256 = "415c71eb609fda2ab2a7d9b9e119170c370e84982eb67ad00c42f7775a152099"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ru/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/ru/thunderbird-102.5.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "67e5b2cd8ca619592d57935fcbfe128c79ee167ef535614ab7f1c5b65b091365"; + sha256 = "9aa00ac8a199a6d87550f68566c373d8b7a0aafde914ac3df63531cee266b2a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/sk/thunderbird-102.5.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e6a55333fcb707f1b7f1302168799dc42efe2eec5bc371087bacba1182560870"; + sha256 = "3bb5c5c29b57b45e5523fb919e352789cc9df1b290a89d0bd444f9de26a45864"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/sl/thunderbird-102.5.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3995e35537d02a660231e8ef900a5912b1eab8b551a579e75cb306940ae9976b"; + sha256 = "3214466bdb8cf9f4ca926851f7d5fafc24d63654469d2493a4e199934d1997a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sq/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/sq/thunderbird-102.5.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6b742595020681bd1066de0aca867954a273e10c076f39d0df1d83e5d8504b6c"; + sha256 = "f955889b901e9483e30b875ea2434a4cffb8cdf79736adbd5df5b21abb0a927f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/sr/thunderbird-102.5.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "ffa7e636f5c0d541c007f52a2e829155e95b01ad0b279580d68260f6fe9132c7"; + sha256 = "150d2df595d340f2c95430917c6bba6e8a2b07a30386d632ffe58db890466400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sv-SE/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/sv-SE/thunderbird-102.5.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7172e07df01e6685873b99150fc6f3da77623ff7e90edc88c37497e5114bad9e"; + sha256 = "815d0f858d19ac3213a3c07d105d48568549b0bba380352e5b9516b9df39c2e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/th/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/th/thunderbird-102.5.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "47fad6489e19b7acb53bc1f1b3001ad55b933d612271d08cfec642875f0cafe9"; + sha256 = "3863673ea9a9288fe9a5631ae9eab9502d31feda08db53743733eacae3f69cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/tr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/tr/thunderbird-102.5.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "05d2eb31e99c09350aa0ec4cba2b046ea0c9871f32e9328b3c50c27fd4219b81"; + sha256 = "bf9ed30c6e2426e33f0524b2083a3ad50a6fd6b5371ad81320a46f490392c904"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/uk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/uk/thunderbird-102.5.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8475840589710c68c996ba9740308d07677edc7ccb97585b4f9bcdc17d8397a9"; + sha256 = "22c91fa68b171eef552a642351bdc08bf020a11934c659688633309e5841f0a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/uz/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/uz/thunderbird-102.5.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "944077ed7e95392123f5a8bc1521cf23693c8cf968ef8b9b14127d3e1bf40747"; + sha256 = "86d80dc56ff68a3bc38d3fb6bcf543aac25b53a5497c10eeb1ad6dea6672c1ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/vi/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/vi/thunderbird-102.5.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "7d7188470c3e0e4056df45f0032a7e5d31229ee4f07255d074eeea58801edb1f"; + sha256 = "6de9b607020b319eb62d3b3008ed4bbb33bf877f8302fc86ffe2fb9ecee0243f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/zh-CN/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/zh-CN/thunderbird-102.5.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a7c995a24c9f75ecf2c87e7c4651cfd5efb57b4ae5f6efabd1fc2b2458a47830"; + sha256 = "be54bb20c51fadb6c5bdead76bbfa85371405b95bd7cffaddacb846194950ecc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/zh-TW/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.1/linux-i686/zh-TW/thunderbird-102.5.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6e2f90e0ccfc26cc834a97b32bd70903e51926631bb3eb7df3e1b0b4db46350c"; + sha256 = "da4731c4f2769817a5b32850997e78bf91a1f7211e63a776adc61e252a6e4e40"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 7721834fea2d3..5db4afd276349 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.5.0"; + version = "102.5.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "b6f2828b23616db5620e0364a1ebb02a8676e184d5e361c0aa87f36b64eb6b7f4b1bc3c42675b3ae3092953fbda6b01c18c068b167d40469481b1e18af1dcaa1"; + sha512 = "bebd20f1435793be1ead5ac962ef49c6f01909eeb16f3d909e8a57bd42f4ae1d99ae50cf55439dc395be94abd920f8239ffb98eba7a0653657c454918f6df9c7"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index ec2857753d7e3..b0ed32511910d 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -28,13 +28,13 @@ let packages = [ in python3Packages.buildPythonApplication rec { pname = "mkchromecast-unstable"; - version = "2020-10-17"; + version = "2022-10-31"; src = fetchFromGitHub rec { owner = "muammar"; repo = "mkchromecast"; - rev = "eb9da74d887acd70ed179e6e4c0cbed4ff83de04"; - sha256 = "1l565n3rmyghc4vzh80gazvdks1i97j1h94x33pkmxxlf9a9rncj"; + rev = "0de9fd78c4122dec4f184aeae2564790b45fe6dc"; + sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; }; propagatedBuildInputs = with python3Packages; [ @@ -80,5 +80,6 @@ python3Packages.buildPythonApplication rec { description = "Cast macOS and Linux Audio/Video to your Google Cast and Sonos Devices"; license = licenses.mit; maintainers = with maintainers; [ shou ]; + mainProgram = "mkchromecast"; }; } diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index d3d6d5aa8069e..b6f93ede05eee 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.37.11"; + version = "1.38.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-BOmu4OjDq1IwsPjbqzV2OtvKpaYFqP/XdYL2Ug28TbU="; + sha256 = "sha256-dJ/3MBEsA8M4pfE+GPT/bNnK3n4fL3Hwk0umgMTJAfY="; }; - vendorSha256 = "sha256-M2PlvUsEG3Um+NqbpHdtu9g+Gj6jSXZ9YZ7t1MwjjdI="; + vendorSha256 = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index a08ea4b8bbc2e..05cc0466264f3 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,72 +1,58 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: +{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll, nixosTests, jna }: let + version = "build01494"; freenet_ext = fetchurl { - url = "https://downloads.freenetproject.org/latest/freenet-ext.jar"; - sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; + url = "https://github.com/freenet/fred/releases/download/${version}/freenet-ext.jar"; + sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="; }; - - bcprov_version = "jdk15on-154"; bcprov = fetchurl { - url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar"; - sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk"; + url = "https://github.com/freenet/fred/releases/download/${version}/bcprov-jdk15on-1.59.jar"; + sha256 = "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU="; }; seednodes = fetchurl { url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; - version = "build01480"; freenet-jars = stdenv.mkDerivation { pname = "freenet-jars"; inherit version; - src = fetchFromGitHub { - owner = "freenet"; - repo = "fred"; - rev = version; - sha256 = "0wddkfyhsgs7bcq9svicz6l0a35yv82yqzmji3c345hg4hbch3kb"; + src = fetchurl { + url = "https://github.com/freenet/fred/releases/download/${version}/freenet.jar"; + sha256 = "sha256-1Pjc8Ob4EN7N05QkGTMKBn7z3myTDaQ98N48nNSLstg="; }; - patchPhase = '' - cp ${freenet_ext} lib/freenet/freenet-ext.jar - cp ${bcprov} lib/bcprov-${bcprov_version}.jar - - sed '/antcall.*-ext/d' -i build.xml - sed 's/@unknown@/${version}/g' -i build-clean.xml - ''; - - buildInputs = [ ant jdk ]; - - buildPhase = "ant package-only"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/freenet - cp lib/bcprov-${bcprov_version}.jar $out/share/freenet - cp lib/freenet/freenet-ext.jar $out/share/freenet - cp dist/freenet.jar $out/share/freenet + ln -s ${bcprov} $out/share/freenet/bcprov.jar + ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar + ln -s ${jna}/share/java/jna-platform.jar $out/share/freenet/jna_platform.jar + ln -s ${jna}/share/java/jna.jar $out/share/freenet/jna.jar + ln -s $src $out/share/freenet/freenet.jar ''; }; in stdenv.mkDerivation { - name = "freenet-${version}"; + pname = "freenet"; inherit version; src = substituteAll { src = ./freenetWrapper; - inherit bash coreutils seednodes bcprov_version; + inherit bash coreutils jdk seednodes; freenet = freenet-jars; - jre = jdk.jre; }; - jars = freenet-jars; - dontUnpack = true; + passthru.tests = { inherit (nixosTests) freenet; }; + installPhase = '' mkdir -p $out/bin - cp $src $out/bin/freenet - chmod +x $out/bin/freenet + install -Dm555 $src $out/bin/freenet ln -s ${freenet-jars}/share $out/share ''; @@ -75,7 +61,8 @@ in stdenv.mkDerivation { homepage = "https://freenetproject.org/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ nagy ]; platforms = with lib.platforms; linux; + changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md"; }; } diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper index f3106265801fd..76faf601e69c2 100755 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -1,18 +1,17 @@ #! @bash@/bin/bash - +set -eo pipefail PATH=@coreutils@/bin:$PATH +export CLASSPATH=@freenet@/share/freenet/bcprov.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/jna_platform.jar:@freenet@/share/freenet/jna.jar:@freenet@/share/freenet/freenet.jar export FREENET_HOME="$HOME/.local/share/freenet" -if [ -n "$XDG_DATA_HOME" ] - then export FREENET_HOME="$XDG_DATA_HOME/freenet" +if [ -n "$XDG_DATA_HOME" ] ; then + FREENET_HOME="$XDG_DATA_HOME/freenet" fi -if [ ! -d $FREENET_HOME ]; then - mkdir -p $FREENET_HOME -fi +mkdir -p -- $FREENET_HOME -cp -u @seednodes@ $FREENET_HOME/seednodes.fref -chmod u+rw $FREENET_HOME/seednodes.fref +cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref +chmod u+rw -- $FREENET_HOME/seednodes.fref -cd $FREENET_HOME -@jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter +cd -- $FREENET_HOME +exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" diff --git a/pkgs/applications/networking/p2p/lokinet/default.nix b/pkgs/applications/networking/p2p/lokinet/default.nix index 9b1421efa88a9..574380ed697dd 100644 --- a/pkgs/applications/networking/p2p/lokinet/default.nix +++ b/pkgs/applications/networking/p2p/lokinet/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "lokinet"; - version = "0.9.10"; + version = "0.9.11"; src = fetchFromGitHub { owner = "oxen-io"; repo = "lokinet"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "sha256-dLkIFp1yz5MgUDxYQHN4zv2mexEb4GfkxlTOZyECsew="; + hash = "sha256-aVFLDGTbRUOw2XWDpl+ojwHBG7c0miGeoKMLwMpqVtg="; }; nativeBuildInputs = [ @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Anonymous, decentralized and IP based overlay network for the internet"; homepage = "https://lokinet.org/"; + changelog = "https://github.com/oxen-io/lokinet/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wyndon ]; }; diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix index 40f6f1ed4edb3..1364acc16cced 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/applications/networking/p2p/rqbit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - sha256 = "sha256-PkU3QJvAK2b1KQC1o5md35iucjq+SYoKAGxqiojf4rw="; + sha256 = "sha256-AzlYeHPCDri/FxAh5R5AES+OAfzhwqB8/ewRwDU1nnU="; }; - cargoSha256 = "sha256-Jj2CK3nwktv2MU+EHXzQ/lKDUlC+4HkaItMTtoGF1Pw="; + cargoSha256 = "sha256-CqEnQNbwiB6+zM8gWhplvFPblKp+mPMAtnHP8JZiKv4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e74db03b5332c..5bc1cb7264435 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -8,8 +8,7 @@ }: let - libtorrent = (python3.pkgs.toPythonModule ( - libtorrent-rasterbar-1_2_x.override { python = python3; })).python; + libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; in stdenv.mkDerivation rec { pname = "tribler"; diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index f04a3e07a052b..b43ba703baf3c 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "zeronet-conservancy"; - version = "0.7.7"; + version = "0.7.8"; format = "other"; src = fetchFromGitHub { owner = "zeronet-conservancy"; repo = "zeronet-conservancy"; rev = "v${version}"; - sha256 = "sha256-6qBdq6DoIKZUUGflz7kWu3S3pMJB4vkGUytpU5EatP0="; + sha256 = "sha256-U61cQzZfEKCrnk/80yEwh8rh+VojXsvrAQV0ckFqM/4="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 9f4fa9ce751a6..4acc2c57f19fb 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -13,49 +13,6 @@ let # # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "21.01.0" = { - major = "21"; - minor = "1"; - patch = "0"; - x64hash = "01m9g1bs6iiqbd778gjps2zznvqijlyn3mfw38aa0w1rr6ms326a"; - x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5"; - x64suffix = "14"; - x86suffix = "14"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2101.html"; - }; - - "21.03.0" = { - major = "21"; - minor = "3"; - patch = "0"; - x64hash = "004pgvxl81l99sqvrs5xzvjivjlc21rrlm2gky9hmbsm53nsl3zc"; - x86hash = "11nn9734a515dm1q880z9wmhvx8ikyh3riayyn42z22q4kd852n3"; - x64suffix = "38"; - x86suffix = "38"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2103.html"; - }; - - "21.06.0" = { - major = "21"; - minor = "6"; - patch = "0"; - x64hash = "f3f98c60b0aaac31eb44dc98f22ee7ae7df229c960d5d29785eb5e9554f85f68"; - x86hash = "c2d9652ad9488a9ff171e62df8455ebe6890bcfade1cc289893ee35322d9d812"; - x64suffix = "28"; - x86suffix = "28"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2106.html"; - }; - - "21.08.0" = { - major = "21"; - minor = "8"; - patch = "0"; - x64hash = "69ddae29cc8b4b68341c3d9503a54ee70ab58a5795fd83e79573f013eda5518c"; - x86hash = "b6d1bde5a8533f22374e1f5bbb3f5949e5b89773d0703e021fbe784b455aad3f"; - x64suffix = "40"; - x86suffix = "40"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2108.html"; - }; "21.09.0" = { major = "21"; @@ -94,10 +51,21 @@ let major = "22"; minor = "7"; patch = "0"; - x64hash = "a17e4478ad3eac4b0cbc9fb7be0dba2758393ba2d3b6a82b3074ff053586c5f5"; - x86hash = "f08d9c83a1af7873cbb864b26ec24d731fdc2e5045adee982eeef4083982c5bc"; - x64suffix = "20"; - x86suffix = "20"; + x64hash = "ba88490e457e0fe6c610778396e40293067173c182f2343c8c1fda5e2444985c"; + x86hash = "ed9ff8b3be968cacaf6121c783326091899b987e53fac1aafae68ea3e5883403"; + x64suffix = "14"; + x86suffix = "14"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-OLD1.html"; + }; + + "22.12.0" = { + major = "22"; + minor = "12"; + patch = "0"; + x64hash = "3ec5a3d5526a6bac17bb977b173542f5bdd535a53baa6dca80c83a0d61229d74"; + x86hash = "b73f90fe51bbb7391c188a394ea614b67f128ed0d9481bd7824cbcadc0338dae"; + x64suffix = "12"; + x86suffix = "12"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 8a39e31aa9c68..6bf837236f44f 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,8 +3,8 @@ , freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core -, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz +, libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core +, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome , withLibsecret ? true @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.27"; + version = "1.4.28"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-WIppHK4ucvKqgXB8VPy9ldbw22ZuDaEn1gNaLpyb4jA="; + sha256 = "sha256-w0z7teful/sdp7/f4X8eqF9Ny3bhP542V0tutQi/yXI="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; @@ -31,11 +31,10 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsoup spice-protocol - # https://gitlab.com/Remmina/Remmina/-/issues/2754 - spice-gtk_libsoup2 + libsoup_3 spice-protocol + spice-gtk libepoxy at-spi2-core - openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk + openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk_4_1 harfbuzz python3 ] ++ optionals withLibsecret [ libsecret ] ++ optionals withVte [ vte ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 44ce12aeeb48e..f127d7c53d32b 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,18 +1,36 @@ -{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus -, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc -, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils +{ mkDerivation +, lib +, fetchurl +, autoPatchelfHook +, makeWrapper +, xdg-utils +, dbus +, qtbase +, qtwebengine +, qtx11extras +, getconf +, glibc +, libXrandr +, libX11 +, libXext +, libXdamage +, libXtst +, libSM +, libXfixes +, coreutils , wrapQtAppsHook +, icu63 }: mkDerivation rec { pname = "teamviewer"; # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime outputs = [ "out" "dev" ]; - version = "15.29.4"; + version = "15.35.7"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-jkFqOtU+D62S7QmNPvz58Z8wJ79lkN11pWQrtNdD+Uk="; + sha256 = "sha256-KNUhe0c6Th2pW7+Lmo62FYdOv+8t7Z5/eQkYPN8eusc="; }; unpackPhase = '' @@ -21,8 +39,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ]; - propagatedBuildInputs = [ qtquickcontrols ]; + buildInputs = [ qtbase qtwebengine qtx11extras icu63 ]; installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications @@ -30,10 +47,28 @@ mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ - $out/share/teamviewer/tv_bin/RTlib \ $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,tv-delayed-start.sh} + # Teamviewer packages its own qt library files. + # Most of them can be replaced by nixpkgs libraries, but the following need to be used beginning at version 15.35.7 + # because teamviewer will not start without them, either stalling at startup or even segfaulting. In the logfiles, some missing qt libraries + # can be observed, although they are present from nixpkgs. AutoPatchelfHook will automatically choose the included libraries, if present. + # See https://github.com/NixOS/nixpkgs/pull/202024 + + # delete all library files except "qt" folder + find $out/share/teamviewer/tv_bin/RTlib -depth -maxdepth 1 ! -type d -execdir rm -rf {} + + + # remove all other folders except "qml" and "plugins" from the qml directory + find $out/share/teamviewer/tv_bin/RTlib/qt -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "qml" -o -name "plugins" \) -execdir rm -rf {} + + + # keep "QtQuick" and "QtQuick.2" directory + find $out/share/teamviewer/tv_bin/RTlib/qt/qml -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "QtQuick" -o -name "QtQuick.2" \) -execdir rm -rf {} + + + # delete all folders except "platforms" from the plugins directory + # it contains libqxcb.so from qtbase which seems to be incompatible with our nixpkgs version + find $out/share/teamviewer/tv_bin/RTlib/qt/plugins -depth -maxdepth 1 -mindepth 1 -type d ! -name "platforms" -execdir rm -rf {} + + ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications @@ -79,7 +114,7 @@ mkDerivation rec { makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ getconf coreutils ]}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus icu63 ]}" ]; postFixup = '' @@ -100,6 +135,6 @@ mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga jraygauthier ]; + maintainers = with maintainers; [ jagajaga jraygauthier gador ]; }; } diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 3d12b11b51410..c52e96066f8c5 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; + maintainers = with maintainers; [ domenkozar thoughtpolice cwoac jwoudenberg ]; }; } diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 70cb96ed1364f..31af7b140f2c7 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -12,7 +12,7 @@ let version = "0.7.0"; src = old.src.override { inherit version; - sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; + hash = "sha256-ejyIIBqlRIH5OZRlYVy+e5rs6AgUlqbQKHt8uOIy9Ec="; }; }); }; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 4016ca04b4547..8d404d4ebd25a 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.10.4"; + version = "0.10.8"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "ov1hA+3sKh9Ms5D3/+ubwcAp+skuIfB3pvsvNSUKiSE="; + sha256 = "BtD22Ss5PuVx2RVLQIsUeGBJBl5lh1XHJ0vcM2bOEwk="; }; modRoot = "./agent"; - vendorSha256 = "sha256-IYDy3teo+hm+yEfZa9V9MFNGmO2tqeh3lAq+Eh4Ek+A="; + vendorSha256 = "sha256-tvKiTQioj999oIUDHUSXTMXOh/LKoykzu8JEUnrelws="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index b0a0fded80aeb..331e6a7c3a264 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: +{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "cb2bib"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; configurePhase = '' runHook preConfigure @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - dontWrapQtApps = true; - meta = with lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a562548242b6e..e88ae758d2ad2 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -32,12 +32,12 @@ , which , icu , boost -, jdk +, jdk17 , ant , cups , xorg , fontforge -, jre_minimal +, jre17_minimal , openssl , gperf , cppunit @@ -121,7 +121,7 @@ let getDev getLib optional optionals optionalString; - jre' = jre_minimal.override { + jre' = jre17_minimal.override { modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; }; @@ -460,7 +460,7 @@ in bison fontforge gdb - jdk + jdk17 libtool pkg-config ] diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 53d4dc4261ef7..b84502170bf13 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-ADhTz6OMntgDg3TcAlf3lGBFb+fdZ0Lw7+UYYY1RD8M="; + sha256 = "sha256-0zUZBkdFLvc32gkGqu0pYlVsHuwjhaVZzu9acSmNfu8="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 81fc8c075f1c9..387e6c2d7657c 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -83,7 +83,7 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ dbus.daemon ]; + checkInputs = [ dbus ]; nativeBuildInputs = [ wrapGAppsHook @@ -114,7 +114,7 @@ python3Packages.buildPythonApplication rec { # only need to run a virtual X server + dbus but also have a large enough # resolution, because the Cairo test tries to draw a 200x200 window. xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ $out/bin/paperwork-gtk chkdeps # content of make test, without the dep on make install diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 9f98e4eb0abf1..030d5cdb7eb28 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -11,6 +11,7 @@ , makeDesktopItem , webkitgtk , wrapGAppsHook +, writeScript }: let desktopItem = makeDesktopItem { @@ -26,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.59.3"; + version = "0.59.4"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-HYzDenWicKbYTEWGaTtoEoruLrqPCxx64eLJBEHC+A0="; + sha256 = "sha256-Yjp69p1UCLkGgTm8jn/sJfh2dYSKVbHdi1OLIYeB18w="; }; nativeBuildInputs = [ @@ -60,12 +61,20 @@ stdenv.mkDerivation rec { ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/buchen/portfolio/tags" | jq '.[0].name' --raw-output)" + update-source-version portfolio "$version" + ''; + meta = with lib; { description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; maintainers = with maintainers; [ elohmeier oyren shawn8901 ]; + mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index c176248d1f4df..73c470259f14d 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.11.5"; + version = "22.11.7"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "451c7bed728710d1ff7ddc5bcc5a32b829dfac3ed2bbfdb6f7c2c328e6676a8c"; + sha256 = "2fbc20f17422bc44c35dd3e78feb710ca275ecb34c550b2a9c743939531f7878"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index b1b24c3e6cb56..4e731de72d18a 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -5,9 +5,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. , officeVersion ? { - version = "982"; - edition = "2018"; - hash = "sha256-euoZfAaDDTXzoaNLc/YdTngreTiYOBi7sGU161GP83w="; + version = "1054"; + edition = "2021"; + hash = "sha256-dqmJUm0Qi1/GzGrI4OCHo1LwQ5KxMwZZw5EsYTMF6XU="; } , ... } @ args: @@ -20,7 +20,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { inherit (officeVersion) hash; - url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; + url = "https://www.softmaker.net/down/softmaker-freeoffice-${edition}-${version}-amd64.tgz"; }; archive = "freeoffice${edition}.tar.lzma"; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 0c913cd7df20b..7e171f7d702c7 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,11 +1,11 @@ { lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: mkDerivation rec { pname = "tagainijisho"; - version = "1.2.1"; + version = "1.2.2"; src = fetchzip { url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; - hash = "sha256-NYmvkjGl+lgFh4PPWGxitupYJ2DOyCBAYlITGb3FMj8="; + hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9c233f4692479..c638a4b2713bc 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.16"; + version = "6.0.18"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-PqC7PqpRSm/Yt3pK8TuzcrhtfJSeJX6th2xb2n/Bul8="; + sha256 = "sha256-MIBhvhgttqfUO42ipVNXhdKbcN/0YPtFK8Ox8KlafG0="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index 5fc3f900da662..b26e8ae7225f5 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { libsamplerate ]; + hardeningDisable = lib.optional stdenv.isAarch64 "format"; + postFixup = '' substituteInPlace "$out"/lib/pkgconfig/csdr.pc \ --replace '=''${prefix}//' '=/' \ @@ -30,11 +32,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://github.com/jketterl/csdr"; description = "A simple DSP library and command-line tool for Software Defined Radio"; license = licenses.gpl3Only; platforms = platforms.unix; + broken = stdenv.isDarwin; maintainers = teams.c3d2.members; }; } diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 54ff58cce717a..99d13d1ab8953 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -1,36 +1,27 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - _name = "muscle"; - name = "${_name}-${version}"; - version = "3.8.31"; + name = "muscle"; + version = "5.1.0"; - src = fetchurl { - url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz"; - sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3"; - }; - patches = [ - ./muscle-3.8.31-no-static.patch - ]; + src = fetchFromGitHub { + owner = "rcedgar"; + repo = "${name}"; + rev = "${version}"; + hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; + }; - preBuild = '' - cd ./src/ - patchShebangs mk - ''; + sourceRoot = "source/src"; installPhase = '' - install -vD muscle $out/bin/muscle + install -m755 -D Linux/muscle $out/bin/muscle ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "A multiple sequence alignment method with reduced time and space complexity"; - license = licenses.publicDomain; + description = "Multiple sequence alignment with top benchmark scores scalable to thousands of sequences"; + license = licenses.gpl3Plus; homepage = "https://www.drive5.com/muscle/"; - maintainers = [ maintainers.unode ]; - # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. - # Anyone with access to these platforms is welcome to give it a try - platforms = lib.platforms.linux; + maintainers = with maintainers; [ unode thyol ]; }; } diff --git a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch deleted file mode 100644 index 7f4b2129518d3..0000000000000 --- a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/mk 2010-05-02 01:15:42.000000000 +0200 -+++ b/src/mk 2018-01-27 17:07:23.539092748 +0100 -@@ -5,14 +5,14 @@ - rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt - for CPPName in $CPPNames - do -- echo $CPPName >> /dev/tty -+ echo $CPPName - g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt - done - - LINK_OPTS= --if [ `uname -s` == Linux ] ; then -- LINK_OPTS=-static --fi -+#if [ `uname -s` == Linux ] ; then -+# LINK_OPTS=-static -+#fi - g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt - tail muscle.make.stderr.txt - diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix new file mode 100644 index 0000000000000..d5d4c6231e699 --- /dev/null +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "veryfasttree"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "citiususc"; + repo = "${name}"; + rev = "v${version}"; + hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + install -m755 -D VeryFastTree $out/bin/VeryFastTree + ''; + + meta = with lib; { + description = "Speeding up the estimation of phylogenetic trees for large alignments through parallelization and vectorization strategies"; + license = licenses.gpl3Plus; + homepage = "https://github.com/citiususc/veryfasttree"; + maintainers = with maintainers; [ thyol ]; + }; +} diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index c4bb788798d6a..fc24ec7e1aab2 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "QtRVSim"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; rev = "refs/tags/v${version}"; - sha256 = "BV/nHRvimPaBtY1nfK1PZ2yJ9xWZpNlwiTRfI/9KQec="; + sha256 = "U9jqFdksD1D9+mFoyj57eHCPi8raWKpf6iB+mRXMG8o="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/applications/science/electronics/flopoco/default.nix new file mode 100644 index 0000000000000..7ce1087209e2c --- /dev/null +++ b/pkgs/applications/science/electronics/flopoco/default.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, cmake +, installShellFiles +, bison +, boost +, flex +, gmp +, libxml2 +, mpfi +, mpfr +, scalp +, sollya +, wcpg +}: + +stdenv.mkDerivation rec { + pname = "flopoco"; + version = "4.1.3"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + # flopoco-4.1.3 is not tagged on GitLab + rev = "67598298207c9f3261c35679c8a5966480c4343c"; + sha256 = "sha256-0jRjg4/qciqBcjsi6BTbKO4VJkcoEzpC98wFkUOIGbI="; + }; + + patches = [ + (fetchpatch { + name = "fix-clang-error-sin-cos.patch"; + url = "https://gitlab.com/flopoco/flopoco/-/commit/de3aa60ad19333952c176c2a2e51f12653ca736b.patch"; + postFetch = '' + substituteInPlace $out \ + --replace 'FixSinCosCORDIC.hpp' 'CordicSinCos.hpp' + ''; + sha256 = "sha256-BlamA/MZuuqqvGYto+jPeQPop6gwva0y394Odw8pdwg="; + }) + (fetchpatch { + name = "fix-clang-error-atan2.patch"; + url = "https://gitlab.com/flopoco/flopoco/-/commit/a3ffe2436c1b59ee0809b3772b74f2d43c6edb99.patch"; + sha256 = "sha256-dSYcufLHDL0p1V1ghmy6X6xse5f6mjUqckaVqLZnTaA="; + }) + ]; + + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + sed -i "s/-pg//g" {,src/Apps/TaMaDi/}CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + bison + cmake + installShellFiles + ]; + + buildInputs = [ + boost + flex + gmp + libxml2 + mpfi + mpfr + scalp + sollya + wcpg + ]; + + postBuild = '' + ./flopoco BuildAutocomplete + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 flopoco $out/bin/flopoco + cp bin* fp* ieee* longacc* $out/bin/ + installShellCompletion --bash flopoco_autocomplete + + runHook postInstall + ''; + + meta = with lib; { + description = "The FloPoCo arithmetic core generator"; + homepage = "https://flopoco.org/"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index f81710cfb911c..91834642681d8 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { libdatrie libxkbcommon libepoxy - dbus.daemon + dbus at-spi2-core libXtst ]; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index eb2a29382e60f..61b63ff1d7a46 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config +{ lib, stdenv, fetchFromGitHub, autoreconfHook, automake, pkg-config , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: stdenv.mkDerivation rec { - version = "3.10.12"; + version = "3.10.37"; pname = "xcircuit"; - src = fetchurl { - url = "http://opencircuitdesign.com/xcircuit/archive/xcircuit-${version}.tgz"; - sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn"; + src = fetchFromGitHub { + owner = "RTimothyEdwards"; + repo = "XCircuit"; + rev = "0056213308c92bec909e8469a0fa1515b72fc3d2"; + sha256 = "sha256-LXU5VEkLF1aKYz9ynI1qQjJUwt/zKFMPYj153OgJOOI="; }; nativeBuildInputs = [ autoreconfHook automake pkg-config ]; @@ -26,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "http://opencircuitdesign.com/xcircuit"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ spacefrogg thoughtpolice ]; + maintainers = with maintainers; [ john-shaffer spacefrogg thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index d7396d5d9a61b..7077d56f8069b 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -21,6 +21,9 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex seq stdlib-shims zarith ]; + preBuild = '' + substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"' + ''; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index a9e39b3daf33e..6b0e75de80661 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -23,8 +23,10 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile \ --replace "GCC = g++" "GCC = c++" - - patchShebangs . + substituteInPlace src/main.cc \ + --replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)" + substituteInPlace src/MaxSatSolver.cc \ + --replace "occ[i][sign(softLiterals[j])] > 0" "occ[i][sign(softLiterals[j])] != 0" ''; preBuild = '' @@ -45,9 +47,5 @@ stdenv.mkDerivation { platforms = platforms.unix; license = licenses.asl20; homepage = "https://alviano.net/software/maxino/"; - # See pkgs/applications/science/logic/glucose/default.nix - badPlatforms = [ "aarch64-linux" ]; - # src/MaxSatSolver.cc:280:62: error: ordered comparison between pointer and zero ('unsigned int *' and 'int') - broken = (stdenv.isDarwin && stdenv.isx86_64); # broken since 2019-05-07 on hydra }; } diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index fe2f30a55a33d..f6f43f1b0bb30 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -43,8 +43,5 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.linux; - # See pkgs/applications/science/logic/glucose/default.nix - # (The error is different due to glucose-fenv.patch, but the same) - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/avy/glucose-fenv.patch b/pkgs/applications/science/logic/avy/glucose-fenv.patch index dd19f7ec80e7b..eb0b196966b8d 100644 --- a/pkgs/applications/science/logic/avy/glucose-fenv.patch +++ b/pkgs/applications/science/logic/avy/glucose-fenv.patch @@ -1,24 +1,15 @@ -From d6e0cb60270e8653bda3f339e3a07ce2cd2d6eb0 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 17 Oct 2017 23:01:36 -0500 -Subject: [PATCH] glucose: use fenv to set double precision - ---- - core/Main.cc | 8 ++++++-- - simp/Main.cc | 8 ++++++-- - utils/System.h | 2 +- - 3 files changed, 13 insertions(+), 5 deletions(-) - diff --git a/core/Main.cc b/core/Main.cc -index c96aadd..994132b 100644 +index fd8fca1..37d2ed5 100644 --- a/core/Main.cc +++ b/core/Main.cc -@@ -96,8 +96,12 @@ int main(int argc, char** argv) +@@ -95,9 +95,13 @@ int main(int argc, char** argv) + setUsageHelp("c USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n"); // printf("This is MiniSat 2.0 beta\n"); - - #if defined(__linux__) + +-#if defined(__linux__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) + fenv_t fenv; + + fegetenv(&fenv); @@ -29,15 +20,17 @@ index c96aadd..994132b 100644 #endif // Extra options: diff --git a/simp/Main.cc b/simp/Main.cc -index 4f4772d..70c2e4b 100644 +index 4f4772d..c605f6e 100644 --- a/simp/Main.cc +++ b/simp/Main.cc -@@ -97,8 +97,12 @@ int main(int argc, char** argv) +@@ -96,9 +96,13 @@ int main(int argc, char** argv) + setUsageHelp("c USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n"); - #if defined(__linux__) +-#if defined(__linux__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) + fenv_t fenv; + + fegetenv(&fenv); @@ -48,18 +41,17 @@ index 4f4772d..70c2e4b 100644 #endif // Extra options: diff --git a/utils/System.h b/utils/System.h -index 004d498..a768e99 100644 +index 004d498..2f6d922 100644 --- a/utils/System.h +++ b/utils/System.h -@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA +@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Glucose_System_h #define Glucose_System_h - #if defined(__linux__) +-#if defined(__linux__) -#include <fpu_control.h> ++#if defined(__linux__) && defined(__x86_64__) +#include <fenv.h> #endif #include "glucose/mtl/IntTypes.h" --- -2.14.2 - diff --git a/pkgs/applications/science/logic/avy/minisat-fenv.patch b/pkgs/applications/science/logic/avy/minisat-fenv.patch index 686d5a1c5b499..31e481bd66962 100644 --- a/pkgs/applications/science/logic/avy/minisat-fenv.patch +++ b/pkgs/applications/science/logic/avy/minisat-fenv.patch @@ -1,24 +1,15 @@ -From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 17 Oct 2017 22:57:02 -0500 -Subject: [PATCH] use fenv instead of non-standard fpu_control - ---- - core/Main.cc | 8 ++++++-- - simp/Main.cc | 8 ++++++-- - utils/System.h | 2 +- - 3 files changed, 13 insertions(+), 5 deletions(-) - diff --git a/core/Main.cc b/core/Main.cc -index 2b0d97b..8ad95fb 100644 +index 2b0d97b..9ba985d 100644 --- a/core/Main.cc +++ b/core/Main.cc -@@ -78,8 +78,12 @@ int main(int argc, char** argv) +@@ -77,9 +77,13 @@ int main(int argc, char** argv) + setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n"); // printf("This is MiniSat 2.0 beta\n"); - #if defined(__linux__) +-#if defined(__linux__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) + fenv_t fenv; + + fegetenv(&fenv); @@ -29,15 +20,17 @@ index 2b0d97b..8ad95fb 100644 #endif // Extra options: diff --git a/simp/Main.cc b/simp/Main.cc -index 2804d7f..39bfb71 100644 +index 2804d7f..7fbdb33 100644 --- a/simp/Main.cc +++ b/simp/Main.cc -@@ -79,8 +79,12 @@ int main(int argc, char** argv) +@@ -78,9 +78,13 @@ int main(int argc, char** argv) + setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n"); // printf("This is MiniSat 2.0 beta\n"); - #if defined(__linux__) +-#if defined(__linux__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) + fenv_t fenv; + + fegetenv(&fenv); @@ -48,18 +41,17 @@ index 2804d7f..39bfb71 100644 #endif // Extra options: diff --git a/utils/System.h b/utils/System.h -index 1758192..c0ad13a 100644 +index 1758192..840bee5 100644 --- a/utils/System.h +++ b/utils/System.h -@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA +@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Minisat_System_h #define Minisat_System_h - #if defined(__linux__) +-#if defined(__linux__) -#include <fpu_control.h> ++#if defined(__linux__) && defined(__x86_64__) +#include <fenv.h> #endif #include "mtl/IntTypes.h" --- -2.14.2 - diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 0c2b497e9cc47..ddee2351f6f3c 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.70.0"; + version = "5.71.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-fzc/WrHo+B9oscnTqN8nETcKc34aq4fUX8VLpYJUvRY="; + sha256 = "sha256-GApVmLTa1GsZNhwVW6R0KsNJOQH/2qP1CfR7VyP+o8I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/applications/science/logic/formula/default.nix index 5b39e9153192f..20267e6071c56 100644 --- a/pkgs/applications/science/logic/formula/default.nix +++ b/pkgs/applications/science/logic/formula/default.nix @@ -25,7 +25,6 @@ buildDotnetModule rec { passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; meta = with lib; { - broken = stdenv.isLinux && stdenv.isAarch64; description = "Formal Specifications for Verification and Synthesis"; homepage = "https://github.com/VUISIS/formula-dotnet"; license = licenses.mspl; diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index 5ba8208d6e18a..b9ca741a34770 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji"; }; + postPatch = '' + substituteInPlace Main.cc \ + --replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)" + ''; + buildInputs = [ zlib ]; sourceRoot = "glucose-syrup-${version}/simp"; @@ -23,7 +28,5 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; - # Build uses _FPU_EXTENDED macro - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix index 7fca547f67c8e..565537cf439c0 100644 --- a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix +++ b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix @@ -2,16 +2,28 @@ stdenv.mkDerivation rec { pname = "isabelle-linter"; - version = "Isabelle2021-1-v1.0.0"; + version = "unstable-2022-09-05"; src = fetchFromGitHub { owner = "isabelle-prover"; repo = "isabelle-linter"; - rev = version; - sha256 = "0v6scc2rhj6bjv530gzz6i57czzcgpkw7a9iqnfdnm5gvs5qjk7a"; + rev = "0424fc05426d5f7a23adf19ad08c690c17184e86"; + sha256 = "02afbgmi195ibichjkpni2wjgjkszv7i6qkmmprwrmb4jd2wdvd5"; }; - installPhase = import ./mkBuild.nix { inherit isabelle; path = "${pname}-${version}"; }; + nativeBuildInputs = [ isabelle ]; + + buildPhase = '' + export HOME=$TMP + isabelle components -u $(pwd) + isabelle scala_build + ''; + + installPhase = '' + dir=$out/Isabelle${isabelle.version}/contrib/${pname}-${version} + mkdir -p $dir + cp -r * $dir/ + ''; meta = with lib; { description = "Linter component for Isabelle."; diff --git a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix b/pkgs/applications/science/logic/isabelle/components/mkBuild.nix deleted file mode 100644 index a05b5196b0076..0000000000000 --- a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ isabelle, path }: - -let - dir = "$out/isabelle/${isabelle.dirname}"; - iDir = "${isabelle}/${isabelle.dirname}"; -in '' - shopt -s extglob - mkdir -p ${dir}/lib/classes - - cDir=$out/${isabelle.dirname}/contrib/${path} - mkdir -p $cDir - cp -r !(isabelle) $cDir - - cd ${dir} - ln -s ${iDir}/!(lib|bin) ./ - ln -s ${iDir}/lib/!(classes) lib/ - ln -s ${iDir}/lib/classes/* lib/classes/ - - mkdir bin/ - cp ${iDir}/bin/* bin/ - - export HOME=$TMP - bin/isabelle components -u $cDir - bin/isabelle scala_build - - cd lib/classes - for f in ${iDir}/lib/classes/*; do - rm $(basename $f) - done - - lDir=$out/${isabelle.dirname}/lib/classes/ - mkdir -p $lDir - cp -r * $lDir - cd $out - rm -rf isabelle -'' diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 009af3463a25a..1bb7ede6da7b7 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,5 +1,24 @@ -{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin, fetchhg }: -# nettools needed for hostname +{ lib +, stdenv +, fetchurl +, coreutils +, nettools +, java +, scala_3 +, polyml +, z3 +, veriT +, vampire +, eprover-ho +, naproche +, rlwrap +, perl +, makeDesktopItem +, isabelle-components +, isabelle +, symlinkJoin +, fetchhg +}: let sha1 = stdenv.mkDerivation { @@ -29,7 +48,7 @@ let }; in stdenv.mkDerivation rec { pname = "isabelle"; - version = "2021-1"; + version = "2022"; dirname = "Isabelle${version}"; @@ -39,26 +58,27 @@ in stdenv.mkDerivation rec { fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc"; + sha256 = "0b84rx9b7b5y8m1sg7xdp17j6yngd2dkx6v5bkd8h7ly102lai18"; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; + sha256 = "1ih4gykkp1an43qdgc5xzyvf30fhs0dah3y0a5ksbmvmjsfnxyp7"; }; + nativeBuildInputs = [ java ]; + buildInputs = [ polyml z3 veriT vampire eprover-ho nettools ] ++ lib.optionals (!stdenv.isDarwin) [ java ]; - sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; + sourceRoot = dirname; - postUnpack = if stdenv.isDarwin then '' - mv $sourceRoot ${dirname} - sourceRoot=${dirname} - '' else null; + postUnpack = lib.optionalString stdenv.isDarwin '' + mv $sourceRoot.app $sourceRoot + ''; postPatch = '' - patchShebangs . + patchShebangs lib/Tools/ bin/ cat >contrib/z3*/etc/settings <<EOF Z3_HOME=${z3} @@ -111,7 +131,8 @@ in stdenv.mkDerivation rec { substituteInPlace src/Tools/Setup/src/Environment.java \ --replace 'cmd.add("/usr/bin/env");' "" \ - --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" + --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" \ + --replace 'private static read_file(path: Path): String =' 'private static String read_file(Path path) throws IOException' substituteInPlace src/Pure/General/sha1.ML \ --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' @@ -120,15 +141,18 @@ in stdenv.mkDerivation rec { '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' substituteInPlace lib/scripts/isabelle-platform \ --replace 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" - '' + (if ! stdenv.isLinux then "" else '' + '' + lib.optionalString stdenv.isLinux '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" done + for f in contrib/*/platform_$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" + done for d in contrib/kodkodi-*/jni/$arch; do patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so done - ''); + ''; buildPhase = '' export HOME=$TMP # The build fails if home is not set @@ -145,11 +169,12 @@ in stdenv.mkDerivation rec { do ARGS["''${#ARGS[@]}"]="src/Tools/Setup/$SRC" done - ${java}/bin/javac -d "$TARGET_DIR" -classpath ${scala}/lib/scala-compiler.jar "''${ARGS[@]}" - ${java}/bin/jar -c -f "$TARGET_DIR/isabelle_setup.jar" -e "isabelle.setup.Setup" -C "$TARGET_DIR" isabelle + echo "Building isabelle setup" + javac -d "$TARGET_DIR" -classpath "${scala_3.bare}/lib/scala3-interfaces-${scala_3.version}.jar:${scala_3.bare}/lib/scala3-compiler_3-${scala_3.version}.jar" "''${ARGS[@]}" + jar -c -f "$TARGET_DIR/isabelle_setup.jar" -e "isabelle.setup.Setup" -C "$TARGET_DIR" isabelle rm -rf "$TARGET_DIR/isabelle" - # Prebuild HOL Session + echo "Building HOL heap" bin/isabelle build -v -o system_heaps -b HOL ''; diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix index 047ed73262eee..ecc347080081b 100644 --- a/pkgs/applications/science/logic/naproche/default.nix +++ b/pkgs/applications/science/logic/naproche/default.nix @@ -2,13 +2,13 @@ with haskellPackages; mkDerivation { pname = "Naproche-SAD"; - version = "2022-04-19"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "naproche"; repo = "naproche"; - rev = "2514c04e715395b7a839e11b63046eafb9c6a1da"; - sha256 = "1bdgyk4fk65xi7n778rbgddpg4zhggj8wjslxbizrzi81my9a3vm"; + rev = "c8c4ca2d5fdb92bf17e0e54c99bd2a9691255d80"; + sha256 = "0xvh6kkl5k5ygp2nrbq3k0snvzczbmcp1yrwdkah3fzhf9i3yykx"; }; isExecutable = true; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 9fe60db79a37a..ade194cc6cb84 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-BvENPCrQ9XWg4NgFIcOP04BysBGBmCRakA6NCFccKWE="; + sha256 = "sha256-v0CyVMi7Hb4Kdw8v/ZcKXpVHabq4m2cOhsNGXXVI4dw="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index c3e127282cb97..00a5b13598ced 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -5,7 +5,7 @@ , python3 , pkg-config , libuuid -, openjdk11 +, openjdk , gperftools , flatbuffers , fetchpatch @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - openjdk11 + openjdk (python3.withPackages (p: with p; [ psutil orderedmultidict diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 03db1cf3cf85b..90830ae9ffcab 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -1,41 +1,41 @@ { # Nix - lib, - buildPythonApplication, - fetchPypi, - - # Build inputs - altair, - blinker, - click, - cachetools, - GitPython, - importlib-metadata, - jinja2, - pillow, - pyarrow, - pydeck, - pympler, - protobuf, - requests, - rich, - semver, - setuptools, - toml, - tornado, - tzlocal, - validators, - watchdog, + lib +, buildPythonApplication +, fetchPypi +, # Build inputs + altair +, blinker +, click +, cachetools +, GitPython +, importlib-metadata +, jinja2 +, pillow +, pyarrow +, pydeck +, pympler +, protobuf3 +, requests +, rich +, semver +, setuptools +, toml +, tornado +, tzlocal +, validators +, watchdog +, }: buildPythonApplication rec { pname = "streamlit"; - version = "1.13.0"; - format = "wheel"; # source currently requires pipenv + version = "1.15.0"; + format = "wheel"; # source currently requires pipenv src = fetchPypi { inherit pname version format; - hash = "sha256-MjGm9CT4p/Nl3J5G1Pu2ajY0/VcMdHabimn3ktkoXTo="; + hash = "sha256-QtBr3INWBwCBab+FzmvzrjGjwVVHC8NCET9wtRVeVbc="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildPythonApplication rec { importlib-metadata jinja2 pillow - protobuf + protobuf3 pyarrow pydeck pympler @@ -63,7 +63,7 @@ buildPythonApplication rec { ]; postInstall = '' - rm $out/bin/streamlit.cmd # remove windows helper + rm $out/bin/streamlit.cmd # remove windows helper ''; meta = with lib; { diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 8dd55efaeb529..88330a579015f 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,42 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, eigen, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; - version = "9.0.1"; + version = "9.6.0"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; rev = version; - sha256 = "sha256-ZUurY2bmTKKIW4GR4oiIpLxb6DSRUNJI/EyNSOu9D9c="; + sha256 = "sha256-iSsxpeTRZjIhZaYBeoKLHl9j1aBIXWjONmAInmKvU/I="; }; + patches = [ + # Fix x86_64-linux build by adding missing include + # https://github.com/VowpalWabbit/vowpal_wabbit/pull/4275 + (fetchpatch { + url = "https://github.com/VowpalWabbit/vowpal_wabbit/commit/0cb410dfc885ca1ecafd1f8a962b481574fb3b82.patch"; + sha256 = "sha256-bX3eJ+vMTEMAo3EiESQTDryBP0h2GtnMa/Fz0rTeaNY="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost - flatbuffers + eigen rapidjson spdlog zlib ]; - # -DBUILD_TESTS=OFF is set as both it saves time in the build and the default - # cmake flags appended by the builder include -DBUILD_TESTING=OFF for which - # this is the equivalent flag. - # Flatbuffers are an optional feature. - # BUILD_FLATBUFFERS=ON turns it on. This will still consume Flatbuffers as a - # system dependency cmakeFlags = [ "-DVW_INSTALL=ON" - "-DBUILD_TESTS=OFF" "-DBUILD_JAVA=OFF" "-DBUILD_PYTHON=OFF" - "-DUSE_LATEST_STD=ON" "-DRAPIDJSON_SYS_DEP=ON" "-DFMT_SYS_DEP=ON" "-DSPDLOG_SYS_DEP=ON" - "-DBUILD_FLATBUFFERS=ON" + "-DVW_BOOST_MATH_SYS_DEP=ON" + "-DVW_EIGEN_SYS_DEP=ON" ]; meta = with lib; { diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 41adb1cfbe6cb..d521da2f114cd 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.1.0"; + version = "2.14.1.2"; src = fetchurl { urls = [ - "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" + "https://github.com/lcn2/calc/releases/download/v${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-C1YWZS4x7htUWF3MhRLQIYChL4rdwJxASdPQjttUr0A="; + sha256 = "sha256-3o8jKmEYxNQtExOkjqTVU24mtSok+T/RnRw6goNzThM="; }; postPatch = '' diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix index 00f7d7e453656..73fe0cfb5dc36 100644 --- a/pkgs/applications/science/math/form/default.nix +++ b/pkgs/applications/science/math/form/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, gmp, zlib }: stdenv.mkDerivation { - version = "4.2.1"; + version = "4.3.0"; pname = "form"; # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub src = fetchurl { - url = "https://github.com/vermaseren/form/releases/download/v4.2.1/form-4.2.1.tar.gz"; - sha256 = "0a0smc10gm85vxd85942n5azy88w5qs5avbqrw0lw0yb9injswpj"; + url = "https://github.com/vermaseren/form/releases/download/v4.3.0/form-4.3.0.tar.gz"; + sha256 = "sha256-sjTg0JX3PssJBM3DsNjYMjqfp/RncKUvsiJnxiSq+/Y="; }; buildInputs = [ gmp zlib ]; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index fef154f03e947..cde4ed20c2d82 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; - version = "5-0-723-0"; + version = "5-0-745-0"; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; - sha256 = "01sy7ggfvck350hwv0cla9ynrvghvssqm3c59x4q5lwsxjsxdpjm"; + hash = "sha256-Vd7Wteya04JJT4WNirXe8O1sfVKUgc0hKGOy7d47Xgc="; }; desktopItem = makeDesktopItem { @@ -45,9 +45,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "https://web.archive.org/web/20220807021654/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "https://web.archive.org/web/20221126102702/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "fc05e2ae35b91f2d30650df08da0c20e060f559ef1fac1375cb70093c1d20507"; + hash = "sha256-DhZ9inK/6Cc/vunYNHhyP4tI/9/toUOgV4lZWmFIj3c="; }; nativeBuildInputs = [ makeWrapper ]; @@ -76,9 +76,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" - "https://web.archive.org/web/20220807021931/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" + "https://web.archive.org/web/20221126102602/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" ]; - sha256 = "83aa702625c88be00ee005b40bdac0822af37dc1bba7dbf0ba6c4f547d7387d7"; + hash = "sha256-La7NzEoao4ExUw3mBGstvSHm94/JM5LHlhOE9ewJePY="; }; dontUnpack = true; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index de75e558dc679..22978347f4c0f 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,15 +1,27 @@ { lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-723-0"; + version = "6-0-745-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; - meta = with lib; geogebra.meta // { - license = licenses.geogebra; + meta = with lib; { + description = "Dynamic mathematics software with graphics, algebra and spreadsheets"; + longDescription = '' + Dynamic mathematics software for all levels of education that brings + together geometry, algebra, spreadsheets, graphing, statistics and + calculus in one easy-to-use package. + ''; + homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ voidless sikmir ]; + license = licenses.geogebra; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode # some jars include native binaries + ]; platforms = with platforms; linux ++ darwin; + hydraPlatforms = []; }; linuxPkg = stdenv.mkDerivation { @@ -18,9 +30,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20220807022226/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20221126110648/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" ]; - sha256 = "f0b8a5bdadd3599489872ffe8e0bfd9e42ce3d28b1f6072001cc74f7d3e9e647"; + hash = "sha256-UksHZt7bEs/aRzFiJrT1Quz/SFSvA88sdhoi1IEVdBc="; }; dontConfigure = true; @@ -53,9 +65,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" - "https://web.archive.org/web/20220807022337/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20221126111123/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" ]; - sha256 = "463ca067c5187e0b639b72bef577b2f1bf73c394c9a1a88071c547e3e1c1888c"; + hash = "sha256-Qn2MD3W5icX45Tfs19oRV8J3lYmL8T+hp7A+crRb9tQ="; }; dontUnpack = true; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 434291861d674..df7639dc6c213 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; - version = "1.9.0-5"; # TODO try to remove preCheck phase on upgrade + version = "1.9.0-29"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; - sha256 = "sha256-EP8wRi8QZPrr1lfKN6da87s1FCy8AuDYbzcvsJCWyLE="; + sha256 = "sha256-9jUVcsrV8jMfqrmnymZ4vIaWlabF9ppCuq7VDlZ5Cw4="; }; patches = [ @@ -22,13 +22,28 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0"; sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k="; }) + + # giac calls scanf/printf with non-constant first arguments, which + # the compiler rightfully warns about (with an error nowadays). + (fetchpatch { + name = "fix-string-compiler-error.patch"; + url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/fix-string-compiler-error.patch"; + sha256 = "sha256-K4KAJY1F9Y4DTZFmVEOCXTnxBmHo4//3A10UR3Wlliw="; + }) + + # increase pari stack size for test chk_fhan4 + (fetchpatch { + name = "increase-pari-stack-size.patch"; + url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/increase-pari-size.patch"; + sha256 = "sha256-764P0IJ7ndURap7hotOmYJK0wAhYdqMbQNOnhJxVNt0="; + }) ] ++ lib.optionals (!enableGUI) [ # when enableGui is false, giac is compiled without fltk. That # means some outputs differ in the make check. Patch around this: (fetchpatch { name = "nofltk-check.patch"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26"; - sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw"; + sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY="; }) ]; @@ -85,7 +100,11 @@ stdenv.mkDerivation rec { "--enable-ao" "--enable-ecm" "--enable-glpk" ] ++ lib.optionals enableGUI [ "--enable-gui" "--with-x" - ] ++ lib.optional (!enableMicroPy) "--disable-micropy"; + ] ++ lib.optionals (!enableGUI) [ + "--disable-fltk" + ] ++ lib.optionals (!enableMicroPy) [ + "--disable-micropy" + ]; postInstall = '' # example Makefiles contain the full path to some commands @@ -114,6 +133,7 @@ stdenv.mkDerivation rec { homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin); + broken = stdenv.isDarwin && stdenv.isAarch64; maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 933ad45fd5197..91cf4ae4f3894 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -14,7 +14,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.13.4"; + version = "2.15.1"; src = fetchurl { urls = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-vN6ezq4VkoFDgcFpfNtwY1Z7ZQQgGxvke7WJIPO84YU="; + hash = "sha256-RUGdt3xmhb7mfkLg7LeOGe9WK+eq/GN8ikGXDy6Qnj0="; }; buildInputs = [ @@ -40,17 +40,12 @@ stdenv.mkDerivation rec { "--with-gmp=${lib.getDev gmp}" "--with-readline=${lib.getDev readline}" ] - ++ lib.optional stdenv.isDarwin "--host=x86_64-darwin" ++ lib.optional withThread "--mt=pthread"; preConfigure = '' export LD=$CC ''; - postConfigure = lib.optionalString stdenv.isDarwin '' - echo 'echo x86_64-darwin' > config/arch-osname - ''; - makeFlags = [ "all" ]; meta = with lib; { @@ -83,7 +78,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; - broken = stdenv.isDarwin && stdenv.isAarch64; mainProgram = "gp"; }; } diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 099f0ec6067c5..6050438e1d922 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ _4825764518 ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch b/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch new file mode 100644 index 0000000000000..40bbbe23f1a3f --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch @@ -0,0 +1,26 @@ +diff --git a/src/sage/geometry/polyhedron/backend_normaliz.py b/src/sage/geometry/polyhedron/backend_normaliz.py +index 86b89632a5..ca8a43b248 100644 +--- a/src/sage/geometry/polyhedron/backend_normaliz.py ++++ b/src/sage/geometry/polyhedron/backend_normaliz.py +@@ -53,7 +53,7 @@ def _number_field_elements_from_algebraics_list_of_lists_of_lists(listss, **kwds + 1.732050807568878? + sage: from sage.geometry.polyhedron.backend_normaliz import _number_field_elements_from_algebraics_list_of_lists_of_lists + sage: K, results, hom = _number_field_elements_from_algebraics_list_of_lists_of_lists([[[rt2], [1]], [[rt3]], [[1], []]]); results # optional - sage.rings.number_field +- [[[-a^3 + 3*a], [1]], [[-a^2 + 2]], [[1], []]] ++ [[[-a^3 + 3*a], [1]], [[a^2 - 2]], [[1], []]] + """ + from sage.rings.qqbar import number_field_elements_from_algebraics + numbers = [] +diff --git a/src/sage/lfunctions/pari.py b/src/sage/lfunctions/pari.py +index d2b20f1891..6c31efe239 100644 +--- a/src/sage/lfunctions/pari.py ++++ b/src/sage/lfunctions/pari.py +@@ -339,7 +339,7 @@ def lfun_eta_quotient(scalings, exponents): + 0.0374412812685155 + + sage: lfun_eta_quotient([6],[4]) +- [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4])]], 0, [0, 1], 2, 36, 1] ++ [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4]), 0]], 0, [0, 1], 2, 36, 1] + + sage: lfun_eta_quotient([2,1,4], [5,-2,-2]) + Traceback (most recent call last): diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index c0a92454ac191..cd553843d69d3 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -147,6 +147,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-9BhQLFB3wUhiXRQsK9L+I62lSjvTfrqMNi7QUIQvH4U="; }) + # https://trac.sagemath.org/ticket/34537 + (fetchSageDiff { + name = "pari-2.15.1-upgrade.patch"; + squashed = true; + base = "54cd6fe6de52aee5a433e0569e8c370618cb2047"; # 9.8.beta1 + rev = "1e86aa26790d84bf066eca67f98a60a8aa3d4d3a"; + sha256 = "sha256-LUgcMqrKXWb72Kxl0n6MV5unLXlQSeG8ncN41F7TRSc="; + excludes = ["build/*" + "src/sage/geometry/polyhedron/base_number_field.py" + "src/sage/geometry/polyhedron/backend_normaliz.py" + "src/sage/lfunctions/pari.py"]; + }) + # Some files were excluded from the above patch due to + # conflicts. The patch below contains rebased versions. + ./patches/pari-2.15.1-upgrade-rebased.patch + # Sage uses mixed integer programs (MIPs) to find edge disjoint # spanning trees. For some reason, aarch64 glpk takes much longer # than x86_64 glpk to solve such MIPs. Since the MIP formulation diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index aa7431504adde..641e5a8997b5c 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,6 +1,28 @@ -{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl, -libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, -sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: +{ fetchFromGitHub +, lib +, stdenv +, autoconf +, automake +, pkg-config +, m4 +, curl +, libGLU +, libGL +, libXmu +, libXi +, freeglut +, libjpeg +, libtool +, wxGTK32 +, xcbutil +, sqlite +, gtk3 +, patchelf +, libXScrnSaver +, libnotify +, libX11 +, libxcb +}: let majorVersion = "7.20"; @@ -22,8 +44,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; buildInputs = [ - curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver - libnotify patchelf libX11 libxcb xcbutil + curl + libGLU + libGL + libXmu + libXi + freeglut + libjpeg + wxGTK32 + sqlite + gtk3 + libXScrnSaver + libnotify + patchelf + libX11 + libxcb + xcbutil ]; NIX_LDFLAGS = "-lX11"; @@ -45,11 +81,7 @@ stdenv.mkDerivation rec { description = "Free software for distributed and grid computing"; homepage = "https://boinc.berkeley.edu/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; # arbitrary choice - # checking for gcc options needed to detect all undeclared functions... cannot detect - # configure: error: in `/build/boinc-7.18.1-src': - # configure: error: cannot make gcc report undeclared builtins - broken = stdenv.isAarch64; + platforms = platforms.linux; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index f254947060803..a4aa6457d608d 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 -, xylib, readline, gnuplot, swig3 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK32 +, boost +, lua +, zlib +, bzip2 +, xylib +, readline +, gnuplot +, swig3 +}: stdenv.mkDerivation rec { pname = "fityk"; @@ -13,8 +25,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline - gnuplot swig3 ]; + buildInputs = [ + wxGTK32 + boost + lua + zlib + bzip2 + xylib + readline + gnuplot + swig3 + ]; NIX_CFLAGS_COMPILE = [ "-std=c++11" diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index ce712ef182b04..b06cfaae66b5f 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -2,6 +2,7 @@ , lib , cmake , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , qtbase , qtquickcontrols2 @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "graphia"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; rev = version; - sha256 = "sha256-mqoK5y2h0JSiE9VtwawCgc1+qETzuefLVUpgFPcNFnk="; + sha256 = "sha256-9kohXLXF4F/qoHm8qmvPM1y9ak0Thb4xvgKJlVuOPTg="; }; patches = [ @@ -24,6 +25,12 @@ stdenv.mkDerivation rec { # https://github.com/pytorch/pytorch/issues/70297 # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e ./breakpad-sigstksz.patch + + # FIXME: backport patch fixing build with Qt 5.15, remove for next release + (fetchpatch { + url = "https://github.com/graphia-app/graphia/commit/4b51bb8d465afa7ed0b2b30cb1c5e1c6af95976f.patch"; + hash = "sha256-GDJAFLxQlRWKvcOgqqPYV/aVTRM7+KDjW7Zp9l7SuyM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 30ff02c1f2caa..12b181d2edd43 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -207,6 +207,8 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ @@ -262,9 +264,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.veprbl ]; license = licenses.lgpl21; - - # See https://github.com/NixOS/nixpkgs/pull/192581#issuecomment-1256860426 - # for some context on issues on aarch64. - broken = stdenv.isAarch64 && stdenv.isLinux; }; } diff --git a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix index 1629a6bba268c..3d20eeabe2685 100644 --- a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix +++ b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "ViennaRNA"; - version = "2.4.18"; + version = "2.5.1"; src = fetchurl { - url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/${pname}-${version}.tar.gz"; - sha256 = "17b0mcfkms0gn1a3faa4cakig65k9nk282x6mdh1mmjwbqzp5akw"; + url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_5_x/${pname}-${version}.tar.gz"; + sha256 = "sha256-BUAEN88VWV4QsaJd9snEiFbzVhMPnR44D6iGa20n9Fc="; }; buildInputs = [ @@ -34,7 +34,5 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = platforms.unix; - # Perl bindings fail on aarch64-darwin with "Undefined symbols for architecture arm64" - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix new file mode 100644 index 0000000000000..8c6330e69fbf4 --- /dev/null +++ b/pkgs/applications/system/asusctl/default.nix @@ -0,0 +1,89 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, e2fsprogs +, systemd +, coreutils +, pkg-config +, cmake +, fontconfig +, gtk3 +, libappindicator +}: + +rustPlatform.buildRustPackage rec { + pname = "asusctl"; + version = "4.5.2"; + + src = fetchFromGitLab { + owner = "asus-linux"; + repo = "asusctl"; + rev = version; + hash = "sha256-hrmH4DDNzc7iMa5YJUQEb3Ng4QekPG+CoGWoHtv9e58="; + }; + + cargoSha256 = "sha256-7JOy5mKkP021+tx8a579WvmqQewEkjFgcwD/f7gzDt8="; + + postPatch = '' + files=" + daemon/src/config.rs + daemon/src/ctrl_anime/config.rs + daemon-user/src/daemon.rs + daemon-user/src/ctrl_anime.rs + daemon-user/src/user_config.rs + rog-control-center/src/main.rs + " + for file in $files; do + substituteInPlace $file --replace /usr/share $out/share + done + + substituteInPlace daemon/src/ctrl_platform.rs --replace /usr/bin/chattr ${e2fsprogs}/bin/chattr + + substituteInPlace data/asusd.rules --replace systemctl ${systemd}/bin/systemctl + substituteInPlace data/asusd.service \ + --replace /usr/bin/asusd $out/bin/asusd \ + --replace /bin/sleep ${coreutils}/bin/sleep + substituteInPlace data/asusd-user.service \ + --replace /usr/bin/asusd-user $out/bin/asusd-user \ + --replace /usr/bin/sleep ${coreutils}/bin/sleep + ''; + + nativeBuildInputs = [ pkg-config cmake ]; + + buildInputs = [ systemd fontconfig gtk3 ]; + + # upstream has minimal tests, so don't rebuild twice + doCheck = false; + + postInstall = '' + install -Dm444 -t $out/share/dbus-1/system.d/ data/asusd.conf + install -Dm444 -t $out/share/rog-gui/layouts/ rog-aura/data/layouts/* + + install -Dm444 -t $out/share/applications/ rog-control-center/data/rog-control-center.desktop + install -Dm444 -t $out/share/icons/hicolor/512x512/apps/ rog-control-center/data/rog-control-center.png data/icons/asus_notif_* + install -Dm444 -t $out/share/icons/hicolor/scalable/status/ data/icons/scalable/* + + install -Dm444 -t $out/share/asusd/anime/asus/rog/ rog-anime/data/anime/asus/rog/Sunset.gif + install -Dm444 -t $out/share/asusd/anime/asus/gaming/ rog-anime/data/anime/asus/gaming/Controller.gif + install -Dm444 -t $out/share/asusd/anime/custom/ rog-anime/data/anime/custom/* + + install -Dm444 -t $out/share/asusd/data/ data/asusd-ledmodes.toml + + install -Dm444 data/asusd.rules $out/lib/udev/rules.d/99-asusd.rules + install -Dm444 -t $out/share/dbus-1/system.d/ data/asusd.conf + install -Dm444 -t $out/lib/systemd/system/ data/asusd.service + install -Dm444 -t $out/lib/systemd/user/ data/asusd-user.service + ''; + + postFixup = '' + patchelf --add-rpath "${libappindicator}/lib" "$out/bin/rog-control-center" + ''; + + meta = with lib; { + description = "A control daemon, CLI tools, and a collection of crates for interacting with ASUS ROG laptops"; + homepage = "https://gitlab.com/asus-linux/asusctl"; + license = licenses.mpl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ k900 aacebedo ]; + }; +} diff --git a/pkgs/applications/system/supergfxctl/default.nix b/pkgs/applications/system/supergfxctl/default.nix new file mode 100644 index 0000000000000..f1a88e39e4e73 --- /dev/null +++ b/pkgs/applications/system/supergfxctl/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, pkg-config +, systemd +}: + +rustPlatform.buildRustPackage rec { + pname = "supergfxctl"; + version = "5.0.1"; + + src = fetchFromGitLab { + owner = "asus-linux"; + repo = "supergfxctl"; + rev = version; + hash = "sha256-4q+7F8s6y+oDkBUKIBBsXZ2EtADcChdnjmABjBUnH9k="; + }; + + cargoSha256 = "sha256-nfs9sUq9569qXsC7JYMzrRPdQQm/l4HZANlG7827K8o="; + + postPatch = '' + substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd + substituteInPlace data/99-nvidia-ac.rules --replace /usr/bin/systemctl ${systemd}/bin/systemctl + ''; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ systemd ]; + + # upstream doesn't have tests, don't build twice just to find that out + doCheck = false; + + postInstall = '' + install -Dm444 -t $out/lib/udev/rules.d/ data/*.rules + install -Dm444 -t $out/share/dbus-1/system.d/ data/org.supergfxctl.Daemon.conf + install -Dm444 -t $out/lib/systemd/system/ data/supergfxd.service + ''; + + meta = with lib; { + description = "A GPU switching utility, mostly for ASUS laptops"; + homepage = "https://gitlab.com/asus-linux/supergfxctl"; + license = licenses.mpl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.k900 ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 9d2d1751ad79f..65b0274ca20dc 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -26,14 +26,14 @@ let in stdenv.mkDerivation rec { pname = "blackbox"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "blackbox"; rev = "v${version}"; - sha256 = "sha256-BJtRzjNmJzabI30mySTjWXfN81xj+AWpKhIberXf6Io="; + sha256 = "sha256-4/rtviBv5KXheLLExxOvaF0wU87eRKMNxlYCVxuIQgU="; }; postPatch = '' diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index bce0f731add56..dbc4c444c7df0 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.17"; + version = "3.4.18"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "sha256-t7DWK1KqHChKR+ru0wYvdDOuJDBQBaOgyol1lMjMeTU="; + sha256 = "sha256-jXaymp0GIM+UD51z1zsgz8OBHP1LiqKFGvrzutw8ecY="; }; dontFixup = true; diff --git a/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch b/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch deleted file mode 100644 index e717c58f30f16..0000000000000 --- a/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:28.000000000 +0200 -+++ iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:42.000000000 +0200 -@@ -189,7 +189,7 @@ - kPreferenceKeyInstantReplayMemoryMegabytes: @4, - kPreferenceKeySavePasteAndCommandHistory: @NO, - kPreferenceKeyAddBonjourHostsToProfiles: @NO, -- kPreferenceKeyCheckForUpdatesAutomatically: @YES, -+ kPreferenceKeyCheckForUpdatesAutomatically: @NO, - kPreferenceKeyCheckForTestReleases: @NO, - kPreferenceKeyLoadPrefsFromCustomFolder: @NO, - kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO, diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix index da5342aa683fb..4bcd3191af7dc 100644 --- a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix @@ -9,16 +9,15 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kermit"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { - name = "${pname}-${version}-src"; owner = "orhun"; - repo = pname; - rev = version; - hash = "sha256-O5jpiQ+aaOTPst4/Z+H5e7ylA8CNBevqNoH50p4uEA4="; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-XPHF33Nu+H8OcQFwsuUOhDBDWKm8sh5B36sfROeSWPg="; }; nativeBuildInputs = [ @@ -37,8 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/orhun/kermit"; description = "A VTE-based, simple and froggy terminal emulator"; + changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; }; -} +}) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 9fe78e30ae3da..639c7b5dda507 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -52,6 +52,8 @@ let --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; + inherit (rxvt-unicode-unwrapped) meta; + passthru = { plugins = plugins; tests.test = nixosTests.terminal-emulators.urxvt; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index c63c3e6bf4927..cece7cb8a01e6 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -30,16 +30,24 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220905-102802-7d4b8249"; + version = "20221119-145034-49b9839f"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-Xvi0bluLM4F3BFefIPhkhTF3dmRvP8u+qV70Rz4CGKI="; + sha256 = "sha256-1gnP2Dn4nkhxelUsXMay2VGvgvMjkdEKhFK5AAST++s="; }; + # Rust 1.65 does better at enum packing (according to + # 40e08fafe2f6e5b0c70d55996a0814d6813442ef), but Nixpkgs doesn't have 1.65 + # yet (still in staging), so skip these tests for now. + checkFlags = [ + "--skip=escape::action_size" + "--skip=surface::line::storage::test::memory_usage" + ]; + postPatch = '' echo ${version} > .tag @@ -47,7 +55,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-XJAeMDwtLtBzHMU/cb3lZgmcw5F3ifjKzKVmuP85/RY="; + cargoSha256 = "sha256-D6/biuLsXaCr0KSiopo9BuAVmniF8opAfDH71C3dtt0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index ff0856734628b..24a698ba80358 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig -, pkg-config, makeWrapper, nixosTests, writeScript, common-updater-scripts, git +, pkg-config, makeWrapper, nixosTests, gitUpdater , nixfmt, nix, gnused, coreutils, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; - version = "375"; + version = "377"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "sha256-MCxZor+B55xqcBUl13gWGiGNEjnyFWjYnivdMcAVIX8="; + hash = "sha256-2xCP56Rdjtl+YEchtYRDtHNknmHiY2Mb+HWfhhipkLI="; }; strictDeps = true; @@ -81,37 +81,13 @@ stdenv.mkDerivation rec { standardTest = nixosTests.terminal-emulators.xterm; }; - updateScript = let + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://github.com/ThomasDickey/xterm-snapshots.git"; + rev-prefix = "xterm-"; # Tags that end in letters are unstable - suffixes = lib.concatStringsSep " " - (map (c: "-c versionsort.suffix='${c}'") - (lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz")); - in writeScript "update.sh" '' - #!${stdenv.shell} - set -o errexit - PATH=${ - lib.makeBinPath [ - common-updater-scripts - git - nixfmt - nix - coreutils - gnused - ] - } - - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestTag="$(git ${suffixes} ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:ThomasDickey/xterm-snapshots.git 'xterm-*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^xterm-||g')" - - if [ ! "$oldVersion" = "$latestTag" ]; then - update-source-version ${pname} "$latestTag" --version-key=version --print-changes - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix" - nixfmt "$default_nix" - else - echo "${pname} is already up-to-date" - fi - ''; + ignoredVersions = "[a-z]$"; + }; }; meta = { diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 274eb3a0070f6..3c0cf0ecec040 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -6,7 +6,7 @@ , jinja2 , lib , packaging -, poetry +, poetry-core , pytest-freezegun , pytest-mock , pytest-regressions @@ -34,7 +34,7 @@ buildPythonApplication rec { format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ termcolor diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 564bcdc5897bc..a60aa27a8439c 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fnc"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; - sha256 = "05cg8id4d1ia8y60y3x23167bl1rn2fdpkf1jfj3aklhlihvkbxd"; + sha256 = "126aklsjfqmrj0f9p1g6sdlqhwnbfhyn0lq2c9pidfnhppa7sz95"; }; buildInputs = [ libiconv ncurses zlib ]; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 0bd1e2a51217f..1bdd028d8101b 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-hB8qpVXsAVJvtrdTnbPYcL9K4gL2nkZLo6vunjOP/7o="; + sha256 = "sha256-rPtLvO6raBY6BfrP0erBaXD86W1JL8g4XC4VbkR4Pww="; }; - cargoSha256 = "sha256-19ZGWM8vPbIEYaCxrAZ2HWgSqbeLu3hEb8eLL4a7fAI="; + cargoSha256 = "sha256-raT8a8K05ZpiGuZdM1hNikGxqY6w0g8G1DohfybXD9s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 29f52ce9fa4b3..9d726795c6200 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fast-export"; - version = "220921"; + version = "221024"; src = fetchFromGitHub { owner = "frej"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8tAh17Cp1L0kyV5+HoFnh9mINCBNCNBv1gqsMd6U3FQ="; + sha256 = "sha256-re8iXM8s+TD35UGKalq2kVn8fx68fsnUC7Yo+/DQ9SM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-aggregator/default.nix b/pkgs/applications/version-management/git-and-tools/git-aggregator/default.nix new file mode 100644 index 0000000000000..9b2465366f672 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-aggregator/default.nix @@ -0,0 +1,43 @@ +{ lib, git, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "git-aggregator"; + version = "2.1.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; + }; + + nativeBuildInputs = with python3Packages; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3Packages; [ + argcomplete + colorama + git + kaptan + requests + ]; + + checkInputs = [ + git + ]; + + preCheck = '' + export HOME="$(mktemp -d)" + git config --global user.name John + git config --global user.email john@localhost + git config --global init.defaultBranch master + git config --global pull.rebase false + ''; + + meta = with lib; { + description = "Manage the aggregation of git branches from different remotes to build a consolidated one"; + homepage = "https://github.com/acsone/git-aggregator"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ lourkeur ]; + mainProgram = "gitaggregate"; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index cc916baec94d5..e05bed928889d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -1,22 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, rclone, makeWrapper }: +{ lib, stdenvNoCC, fetchFromGitHub, rclone, makeWrapper }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "git-annex-remote-rclone"; - version = "0.6"; - rev = "v${version}"; + version = "0.7"; src = fetchFromGitHub { - inherit rev; owner = "DanielDent"; repo = "git-annex-remote-rclone"; - sha256 = "0j0hlxji8d974fq7zd4xc02n0jpi31ylhxc7z4zp8iiwad5mkpxp"; + rev = "v${version}"; + sha256 = "sha256-H2C4zjM+kbC9qPl1F+bSnepuqANjZd1sz6XxOTkVVkU="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/bin - cp git-annex-remote-rclone $out/bin + install -Dm755 -t $out/bin git-annex-remote-rclone wrapProgram "$out/bin/git-annex-remote-rclone" \ --prefix PATH ":" "${lib.makeBinPath [ rclone ]}" ''; @@ -24,7 +22,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/DanielDent/git-annex-remote-rclone"; description = "Use rclone supported cloud storage providers with git-annex"; - license = licenses.gpl3; + license = licenses.gpl3Only; + platforms = platforms.all; maintainers = [ maintainers.montag451 ]; }; } diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-and-tools/git-backup/default.nix index 8c45fdef3f7d7..8c45fdef3f7d7 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-backup/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix index a48fd5f20c372..42a22f4866239 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { for pythonBin in git-cinnabar git-remote-hg; do makeWrapper $out/libexec/$pythonBin $out/bin/$pythonBin \ --prefix PATH : ${lib.getBin python3}/bin \ - --prefix GIT_CINNABAR_EXPERIMENTS , python3 \ --set PYTHONPATH ${mercurial}/${python3.sitePackages} done diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index 8e765824b2230..efc12299f941d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-6OxYIr2ElyB4QHiPV/KAELmKC+qFGpgerhlDPjLvsio="; + sha256 = "sha256-f7nM4airKOTXiYEMksTCm18BN036NQLLwNcKIlhuHWs="; }; - cargoSha256 = "sha256-+C7MXmn3FrhD9UVdRmRZbH/rzleATBT0bdlQUSOae5Y="; + cargoSha256 = "sha256-wjqQAVQ1SCjD24aCwZorUhnfOKM+j9TkB84tLxeaNgo="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix index 43de62876858d..af641d241b849 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.0.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - sha256 = "sha256-Hyo2UWGlxxeSz3E73DeA0VoOnBJ1VedvpshnATJGbFo="; + sha256 = "sha256-vh2XFzvGEMutlaHKNhpuYdlnNl49zoNPkLYNUA1lWwc="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index fdfd722e8fb04..07d36cba891b1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "refs/tags/v${version}"; - hash = "sha256-w3SbuquHuWTYg1N3kcix4S5vrsmclVSrHf6uv8CYU6w="; + hash = "sha256-++cpzspN7REp9dOcsostcaJPnFHUW624hlgngQWjQCs="; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-and-tools/git-crecord/default.nix index 1ad75e75b7bfd..1ad75e75b7bfd 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crecord/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix index 0e5ba28eebaac..27998f1c9c15b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-credential-keepassxc"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-zVE3RQlh0SEV4iavz40YhR+MP31oLCvG54H8gqXwL/k="; + hash = "sha256-ZpysJ+xs3IenqAdoswG0OkzxzuNPSKkqlutGxn4VRw8="; }; - cargoHash = "sha256-H75SGbT//02I+umttnPM5BwtFkDVNxEYLf84oULEuEk="; + cargoHash = "sha256-IPsMlVfgwoFEQlXmW4gnt16WNF5W6akobUVct/iF42E="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index 19e3a58baf408..e24003c858911 100644 --- a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "7.2.0"; + version = "7.2.2"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-pdP+DDJOSqr/fUQPtb84l/8J4EA81nlk/U8h24X8n+I="; + sha256 = "sha256-Q83s0kkrArRndxQa+V+eZw+iaJje7VR+aPScB33l1W0="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/version-management/git-and-tools/git-fire/default.nix b/pkgs/applications/version-management/git-and-tools/git-fire/default.nix new file mode 100644 index 0000000000000..bc7e9f4840b71 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fire/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "git-fire"; + version = "unstable-2017-08-27"; + + src = fetchFromGitHub { + owner = "qw3rtman"; + repo = "git-fire"; + rev = "d72b68ed356f726c77c60294f9220275f16c9931"; + sha256 = "1hdwkhyjjx31y0lpjkhbb4f5y9f7g70fnd4c2246cmk2rbsvj5b2"; + }; + + installPhase = '' + install -D -m755 $src/git-fire $out/bin/git-fire + ''; + + meta = with lib; { + description = '' + Push ALL changes in a git repository + ''; + longDescription = '' + In the event of an emergency (fire, etc.), automatically commit all changes/files in a repository, pushing to all known remotes all commits and stashes. + ''; + homepage = "https://github.com/qw3rtman/git-fire"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ swflint ]; + mainProgram = "git-fire"; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-ftp/default.nix b/pkgs/applications/version-management/git-and-tools/git-ftp/default.nix new file mode 100644 index 0000000000000..57b5e3c463724 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-ftp/default.nix @@ -0,0 +1,99 @@ +{ lib +, resholve +, fetchFromGitHub +, fetchpatch +, bash +, coreutils +, git +, gnugrep +, gawk +, curl +, hostname +, gnused +, findutils +, lftp +, pandoc +, man +}: + +resholve.mkDerivation rec { + pname = "git-ftp"; + version = "1.6.0"; + src = fetchFromGitHub { + owner = "git-ftp"; + repo = "git-ftp"; + rev = version; + sha256 = "1hxkqf7jbrx24q18yxpnd3dxzh4xk6asymwkylp1x7zg6mcci87d"; + }; + + dontBuild = true; + + # fix bug/typo; PRed upstream @ + # https://github.com/git-ftp/git-ftp/pull/628 + patches = [ + (fetchpatch { + name = "fix-function-invocation-typo.patch"; + url = "https://github.com/git-ftp/git-ftp/commit/cddf7cbba80e710758f6aac0ec0d77552ea8cd75.patch"; + sha256 = "sha256-2B0QaMJi78Bg3bA1jp41aiyql1/LCryoaDs7+xmS1HY="; + }) + ]; + + installPhase = '' + make install-all prefix=$out + ''; + + nativeBuildInputs = [ pandoc man ]; + + solutions = { + git-ftp = { + scripts = [ "bin/git-ftp" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + git + gnugrep + gawk + curl + hostname + gnused + findutils + lftp + ]; + fake = { + # don't resolve impure system macOS security + # caution: will still be fragile if PATH is bad + # TODO: fixable once we figure out how to handle + # this entire class of problem... + "external" = [ "security" ]; + }; + keep = { + # looks like run-time user/env/git-config controlled + "$GIT_PAGER" = true; + "$hook" = true; # presumably git hooks given context + }; + execer = [ + # TODO: rm when binlore/resholve handle git; manually + # checked and see no obvious subexec for now + "cannot:${git}/bin/git" + /* + Mild uncertainty here. There *are* commandlikes in + the arguments (especially wait & cd), but I think they are + fine as-is, because I'm reading them as: + 1. ftp commands + 2. running on the remote anyways + + See https://github.com/git-ftp/git-ftp/blob/057f7d8e9f00ffc5a8c6ceaa4be30af2939df41a/git-ftp#L1214-L1221 + */ + "cannot:${lftp}/bin/lftp" + ]; + }; + }; + + meta = with lib; { + description = "Git powered FTP client written as shell script"; + homepage = "https://git-ftp.github.io/"; + license = licenses.gpl3; + maintainers = with maintainers; [ tweber ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 5bdab4b081ee8..fd93c337eac0e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "git-gone"; rev = "v${version}"; - sha256 = "sha256-aKBNi797aMPawxD+BLpk0sazXz2g0XTzmDpR/mk07no="; + sha256 = "sha256-pHtFLJGZYlxvQxqG/LWoWeQDxa8i3ws0olAtuoyHXTM="; }; - cargoSha256 = "sha256-vO1ePqDIy5HEBauO3OkMCovrgtIVB9biJExw/q89ivE="; + cargoSha256 = "sha256-BfUR/9WBgyUlKZ80qtqX6+AK7hRBCCsEG/IWjbcDU3c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-hound/default.nix b/pkgs/applications/version-management/git-and-tools/git-hound/default.nix new file mode 100644 index 0000000000000..463d550cbcabb --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-hound/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "git-hound"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "tillson"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; + }; + + vendorSha256 = null; #vendorSha256 = ""; + + meta = with lib; { + description = "Reconnaissance tool for GitHub code search"; + longDescription = '' + GitHound pinpoints exposed API keys and other sensitive information + across all of GitHub using pattern matching, commit history searching, + and a unique result scoring system. + ''; + homepage = "https://github.com/tillson/git-hound"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + }; +} diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-and-tools/git-lfs/default.nix index 45a5234accb1d..bbb7d29422aa7 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-lfs/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub, ronn, installShellFiles, git, testers, git-lfs }: +{ lib, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles, git, testers, git-lfs }: buildGoModule rec { pname = "git-lfs"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; rev = "v${version}"; - sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI="; + hash = "sha256-r1z97sgqo1IyR0oW5b3bMGTUHGE8U+hrWgQ0Su9FRrw="; }; - vendorSha256 = null; + vendorHash = "sha256-did6qAUawmQ/juLzJWIXGzmErj9tBKgM7HROTezX+tw="; - nativeBuildInputs = [ ronn installShellFiles ]; + nativeBuildInputs = [ asciidoctor installShellFiles ]; ldflags = [ "-s" diff --git a/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix b/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix new file mode 100644 index 0000000000000..c17654174382a --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, git +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "git-privacy"; + version = "2.1.0"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "EMPRI-DEVOPS"; + repo = pname; + rev = "v${version}"; + sha256 = "0hfy43fip1l81672xfwqrz1jryzkjy7h9f2lyikxgibibil0p444"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + git-filter-repo + GitPython + pynacl + setuptools + ]; + + checkInputs = with python3.pkgs; [ + git + pytestCheckHook + ]; + + disabledTests = [ + # Tests want to interact with a git repo + "TestGitPrivacy" + ]; + + pythonImportsCheck = [ + "gitprivacy" + ]; + + meta = with lib; { + description = "Tool to redact Git author and committer dates"; + homepage = "https://github.com/EMPRI-DEVOPS/git-privacy"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-quick-stats/default.nix b/pkgs/applications/version-management/git-and-tools/git-quick-stats/default.nix new file mode 100644 index 0000000000000..336c24819baf0 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-quick-stats/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv +, fetchFromGitHub +, makeWrapper +, coreutils +, gawk +, git +, gnugrep +, ncurses +, util-linux +}: + +stdenv.mkDerivation rec { + pname = "git-quick-stats"; + version = "2.4.0"; + + src = fetchFromGitHub { + repo = "git-quick-stats"; + owner = "arzzen"; + rev = version; + sha256 = "sha256-QmHb5MWZpbZjc93XgdPFabgzT7S522ZN27p6tdL46Y0="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installFlags = [ + "PREFIX=${builtins.placeholder "out"}" + ]; + + postInstall = + let + path = lib.makeBinPath [ + coreutils + gawk + git + gnugrep + ncurses + util-linux + ]; + in + '' + wrapProgram $out/bin/git-quick-stats --suffix PATH : ${path} + ''; + + meta = with lib; { + homepage = "https://github.com/arzzen/git-quick-stats"; + description = "A simple and efficient way to access various statistics in git repository"; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix b/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix new file mode 100644 index 0000000000000..d78972aa07bdf --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonApplication, fetchPypi +, colorama, GitPython }: + +buildPythonApplication rec { + pname = "gitup"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pa612rcc94nc461zs9sag9p46sycc214622b06gdn35rmwp0y2g"; + }; + + propagatedBuildInputs = [ colorama GitPython ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Easily update multiple Git repositories at once"; + homepage = "https://github.com/earwig/git-repo-updater"; + license = licenses.mit; + maintainers = [ maintainers.bdesham ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-repo/default.nix index e47ea6b12dbef..e47ea6b12dbef 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-repo/default.nix diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-and-tools/git-repo/import-ssl-module.patch index efc3d2b1f8a5e..efc3d2b1f8a5e 100644 --- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch +++ b/pkgs/applications/version-management/git-and-tools/git-repo/import-ssl-module.patch diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-and-tools/git-review/default.nix index 2650f330c0a99..2650f330c0a99 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-review/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-series/default.nix b/pkgs/applications/version-management/git-and-tools/git-series/default.nix new file mode 100644 index 0000000000000..31d1c635512c4 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-series/default.nix @@ -0,0 +1,40 @@ +{ lib, rustPlatform, fetchFromGitHub +, pkg-config, openssl, zlib, curl, libgit2, libssh2 +}: + +rustPlatform.buildRustPackage rec { + pname = "git-series"; + version = "unstable-2019-10-15"; + + src = fetchFromGitHub { + owner = "git-series"; + repo = "git-series"; + rev = "c570a015e15214be46a7fd06ba08526622738e20"; + sha256 = "1i0m2b7ma6xvkg95k57gaj1wpc1rfvka6h8jr5hglxmqqbz6cb6w"; + }; + + cargoSha256 = "1hmx14z3098c98achgii0jkcm4474iw762rmib77amcsxj73zzdh"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl zlib curl libgit2 libssh2 ]; + + LIBGIT2_SYS_USE_PKG_CONFIG = true; + LIBSSH2_SYS_USE_PKG_CONFIG = true; + + postInstall = '' + install -D "$src/git-series.1" "$out/man/man1/git-series.1" + ''; + + meta = with lib; { + description = "A tool to help with formatting git patches for review on mailing lists"; + longDescription = '' + git series tracks changes to a patch series over time. git + series also tracks a cover letter for the patch series, + formats the series for email, and prepares pull requests. + ''; + homepage = "https://github.com/git-series/git-series"; + + license = licenses.mit; + maintainers = with maintainers; [ edef vmandela ]; + }; +} diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-and-tools/git-sizer/default.nix index ed7239b80cb33..ed7239b80cb33 100644 --- a/pkgs/applications/version-management/git-sizer/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sizer/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-team/default.nix b/pkgs/applications/version-management/git-and-tools/git-team/default.nix index 6ec4589f570ec..4857384148d8f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-team/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-team/default.nix @@ -1,49 +1,39 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch +, go-mockery , installShellFiles }: buildGoModule rec { pname = "git-team"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "hekmekk"; repo = "git-team"; rev = "v${version}"; - hash = "sha256-pHKfehPyy01uVN6kjjPGtdkltw7FJ+HmIlwGs4iRhVo="; + hash = "sha256-LZR30zqwit/xydQbpGm1LXd/tno/sTCaftgjVkVS6ZY="; }; - patches = [ - (fetchpatch { - name = "1-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/d8632d9938379293521f9b3f2a93df680dd13a31.patch"; - hash = "sha256-hlmjPf3qp8WPNSH+GgkqATDiKIRzo+t81Npkptw8vgI="; - }) - (fetchpatch { - name = "2-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/f6acc96c2ffe76c527f2f2897b368cbb631d738c.patch"; - hash = "sha256-Pe+UAK9N1NpXhFGYv9l1iZ1/fCCqnT8OSgKdt/vUqO4="; - }) - (fetchpatch { - name = "3-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/2f38137298e4749a8dfe37e085015360949e73ad.patch"; - hash = "sha256-+6C8jp/qwYVmbL+SpV9FJIVyBRvX4tXBcoHMB//nNTk="; - }) - ]; + vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A="; - vendorSha256 = "sha256-GdwksPmYEGTq/FkG/rvn3o0zMKU1cSkpgZ+GrfVgLWM="; + nativeBuildInputs = [ + go-mockery + installShellFiles + ]; - nativeBuildInputs = [ installShellFiles ]; + preBuild = '' + mockery --dir=src/ --all --keeptree + ''; postInstall = '' - go run main.go --generate-man-page > ${pname}.1 - installManPage ${pname}.1 + go run main.go --generate-man-page > git-team.1 + installManPage git-team.1 - # Currently only bash completions are provided - installShellCompletion --cmd git-team --bash <($out/bin/git-team completion bash) + installShellCompletion --cmd git-team \ + --bash <($out/bin/git-team completion bash) \ + --zsh <($out/bin/git-team completion zsh) ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-town/default.nix b/pkgs/applications/version-management/git-and-tools/git-town/default.nix new file mode 100644 index 0000000000000..abca61358d99b --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-town/default.nix @@ -0,0 +1,77 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }: + +buildGoModule rec { + pname = "git-town"; + version = "7.8.0"; + + src = fetchFromGitHub { + owner = "git-town"; + repo = "git-town"; + rev = "v${version}"; + sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI="; + }; + + patches = [ + # Fix "go vet" when building using Go 1.18. + (fetchpatch { + name = "fix-go-vet-in-go-1.18.patch"; + url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch"; + sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc="; + }) + ]; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + buildInputs = [ git ]; + + ldflags = + let + modulePath = "github.com/git-town/git-town/v${lib.versions.major version}"; in + [ + "-s" + "-w" + "-X ${modulePath}/src/cmd.version=v${version}" + "-X ${modulePath}/src/cmd.buildDate=nix" + ]; + + checkInputs = [ git ]; + preCheck = + let + skippedTests = [ + "TestGodog" + "TestRunner_CreateChildFeatureBranch" + "TestShellRunner_RunStringWith_Dir" + "TestMockingShell_MockCommand" + "TestShellRunner_RunStringWith_Input" + ]; + in + '' + HOME=$(mktemp -d) + # Disable tests requiring local operations + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; + + postInstall = '' + installShellCompletion --cmd git-town \ + --bash <($out/bin/git-town completion bash) \ + --fish <($out/bin/git-town completion fish) \ + --zsh <($out/bin/git-town completion zsh) + + wrapProgram $out/bin/git-town --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + passthru.tests.version = testers.testVersion { + package = git-town; + command = "git-town version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Generic, high-level git support for git-flow workflows"; + homepage = "https://www.git-town.com/"; + license = licenses.mit; + maintainers = with maintainers; [ allonsy blaggacao ]; + }; +} diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-and-tools/git-up/default.nix index 0a366827e40d5..0a366827e40d5 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-up/default.nix diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/git-and-tools/gitless/default.nix index 31ab40d79478f..31ab40d79478f 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitless/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gitlint/default.nix b/pkgs/applications/version-management/git-and-tools/gitlint/default.nix new file mode 100644 index 0000000000000..626739864c713 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitlint/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, gitMinimal +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gitlint"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "jorisroovers"; + repo = "gitlint"; + rev = "v${version}"; + sha256 = "sha256-MmXzrooN+C9MUaAz4+IEGkGJWHbgvPMSLHgssM0wyN8="; + }; + + # Upstream splitted the project into gitlint and gitlint-core to + # simplify the dependency handling + sourceRoot = "source/gitlint-core"; + + propagatedBuildInputs = with python3.pkgs; [ + arrow + click + sh + ]; + + checkInputs = with python3.pkgs; [ + gitMinimal + pytestCheckHook + ]; + + postPatch = '' + # We don't need gitlint-core + substituteInPlace setup.py \ + --replace "'gitlint-core[trusted-deps]==' + version," "" + ''; + + pythonImportsCheck = [ + "gitlint" + ]; + + meta = with lib; { + description = "Linting for your git commit messages"; + homepage = "https://jorisroovers.com/gitlint/"; + license = licenses.mit; + maintainers = with maintainers; [ ethancedwards8 fab ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitls/default.nix b/pkgs/applications/version-management/git-and-tools/gitls/default.nix new file mode 100644 index 0000000000000..4cda10b380575 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitls/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, gitls +, fetchFromGitHub +, testers +}: + +buildGoModule rec { + pname = "gitls"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "hahwul"; + repo = pname; + rev = "v${version}"; + hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0="; + }; + + vendorSha256 = null; + + passthru.tests.version = testers.testVersion { + package = gitls; + command = "gitls -version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Tools to enumerate git repository URL"; + homepage = "https://github.com/hahwul/gitls"; + changelog = "https://github.com/hahwul/gitls/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/git-and-tools/gitoxide/default.nix index 2f207e8ee4746..d2a51c94727a2 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitoxide/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-VB7v51YW4aA5WHVD5ZWFzv9hQskjQeqMzm+pQ9glODg="; + sha256 = "sha256-GGXujTn5Xb63vKIycj5o9+PCsMN1Kp3RCSg1wiM31qA="; }; - cargoSha256 = "sha256-uII6o/cJktpUFxROuu11dNSXx0p6phVVqszmbYK9Rd0="; + cargoSha256 = "sha256-MAZhrd9CtFOIAaUUbXplBo+eo6Zaws2LIRkPoX4HztE="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin diff --git a/pkgs/applications/version-management/git-and-tools/gitsign/default.nix b/pkgs/applications/version-management/git-and-tools/gitsign/default.nix new file mode 100644 index 0000000000000..11a8394a63c49 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitsign/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub, stdenv, makeWrapper, gitMinimal }: + +buildGoModule rec { + pname = "gitsign"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lSE4BLwtxicngvnDCcMa6F6c3+Okn9NKAOnT2FGi7kU="; + }; + vendorSha256 = "sha256-WrVunAxOXXGSbs9OyKydeg4N/s871mt2O3t2e5DxXQo="; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ "-s" "-w" "-buildid=" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ]; + + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ gitMinimal ]} + done + ''; + + meta = { + homepage = "https://github.com/sigstore/gitsign"; + changelog = "https://github.com/sigstore/gitsign/releases/tag/v${version}"; + description = "Keyless Git signing using Sigstore"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lesuisse ]; + }; +} diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/git-and-tools/gitstats/default.nix index 6cfcb0077427f..6cfcb0077427f 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstats/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 3b383647c2c9d..a161fb2c6b1b6 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZLGA0LHdGPqIoNG2k4nunVWYlOnwRT8nqTSwUWGkfCU="; + sha256 = "sha256-K6xWTPu2a5NKYAYBt/sCWQOmuw9TCoKPA4ZxkoLWmeY="; }; - cargoSha256 = "sha256-ArJerq3gLzPm66RWDCvkpPFyh7ZyaoqLO/3zSjFTL04="; + cargoSha256 = "sha256-MZrx72poA6uOIulWIQkfOr9gy5qr5f61UtLITfES/rk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 70d82410997ce..6bfc8df1313c2 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -1,19 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: +{ lib, buildGoModule, fetchFromGitLab, installShellFiles, stdenv }: buildGoModule rec { pname = "glab"; - version = "1.22.0"; + version = "1.23.0"; - src = fetchFromGitHub { - owner = "profclems"; - repo = pname; + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "cli"; rev = "v${version}"; - sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE="; + sha256 = "sha256-NHBLaUEWurWnwbLiEsi3/pHqxKcgjjx+oRAGZXxni/Q="; }; - vendorSha256 = "sha256-hGpJXCs5lZ6QQHr6LW1fCT+CVtOaUpYXJPchDPDdbaM="; + vendorSha256 = "sha256-NuK63ibb1t+HnSR/gCFS7HWVtfGLazVx2M+qxRNCR1I="; ldflags = [ + "-s" + "-w" "-X main.version=${version}" ]; @@ -34,9 +36,9 @@ buildGoModule rec { ''; meta = with lib; { - description = "An open-source GitLab command line tool"; + description = "GitLab CLI tool bringing GitLab to your command line"; license = licenses.mit; - homepage = "https://glab.readthedocs.io/"; + homepage = "https://gitlab.com/gitlab-org/cli"; maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/git-and-tools/josh/default.nix index acf2b24c0794e..acf2b24c0794e 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/josh/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index def387980d63f..e73d4de6dc41c 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-ZMqqiPSNNJw9t3p5h/GUHa9cvl9LcJ4u0HMf1ag8qCc="; + sha256 = "sha256-tns/JUOYlgG+oiFACnXlCwHBF4enctV4GPlpEZCM/nM="; }; - vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; + vendorSha256 = "sha256-sBcgt2YsV9RQhSjPN6N54tRk7nNvcOVhPEsEP+0Dtco="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 693b7adf46b85..fe0bed84b5051 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.4.4", - "repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=", - "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8", + "version": "15.6.1", + "repo_hash": "sha256-cdwfljmJvApU2q0pmWSmcMnHkQH4hfN7+cld5oP880g=", + "yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.4.4-ee", + "rev": "v15.6.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.4.4", - "GITLAB_PAGES_VERSION": "1.62.0", - "GITLAB_SHELL_VERSION": "14.10.0", - "GITLAB_WORKHORSE_VERSION": "15.4.4" + "GITALY_SERVER_VERSION": "15.6.1", + "GITLAB_PAGES_VERSION": "1.63.0", + "GITLAB_SHELL_VERSION": "14.13.0", + "GITLAB_WORKHORSE_VERSION": "15.6.1" }, "vendored_gems": [ "bundler-checksum", @@ -17,9 +17,9 @@ "omniauth-azure-oauth2", "omniauth-cas3", "omniauth-gitlab", - "omniauth-google-oauth2", "omniauth_crowd", "omniauth-salesforce", + "attr_encrypted", "mail-smtp_pool", "microsoft_graph_mailer", "ipynbdiff", diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 88f2a5f4cd0e1..2ed65c59901b0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -108,7 +108,7 @@ let bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production + bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production @@ -137,9 +137,6 @@ stdenv.mkDerivation { patches = [ # Change hardcoded paths to the NixOS equivalent ./remove-hardcoded-locations.patch - - # Bump pg to 1.4.3 (see https://github.com/NixOS/nixpkgs/pull/187946) - ./update-pg.patch ]; postPatch = '' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 7fa9b5b307bb7..5c9feca5cebcb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -4,22 +4,27 @@ gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.20.0', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.1.6.1' -gem 'rdoc', '~> 6.0' -gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools gem 'sentry-raven', '~> 3.0', require: false -gem 'faraday', '~> 1.0' gem 'rbtrace', require: false +# The Gitaly Gem contains the Protobuf and gRPC definitions required by the +# Ruby sidecar. +gem 'gitaly', '~> 15.5.0' + # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.24' +gem 'gitlab-labkit', '~> 0.28' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.15' -gem 'google-protobuf', '~> 3.21.0' +gem 'google-protobuf', '~> 3.21.9' + +# Rails is currently blocked on the upgrade to the new major version for Redis, +# so we don't upgrade either until the issue is resolved. This is an indirect +# dependency and can thus be removed when the version constraint is gone. +gem 'redis', '~> 4.8.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false @@ -28,8 +33,6 @@ group :development, :test do gem 'timecop', require: false gem 'factory_bot', require: false gem 'pry', '~> 0.12.2', require: false - - gem 'grpc-tools', '~> 1.42.0' end # Gems required in omnibus-gitlab pipeline diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 616dabbe088a5..85f0f5c03d14d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -46,33 +46,21 @@ GEM faraday (1.0.1) multipart-post (>= 1.2, < 3) ffi (1.15.5) - gemojione (3.3.0) - json + gitaly (15.5.0) + grpc (~> 1.0) github-linguist (7.20.0) charlock_holmes (~> 0.7.7) escape_utils (~> 1.2.0) mini_mime (~> 1.0) rugged (~> 1.0) - github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.10.gitlab.2) - gemojione (~> 3.2) - github-markup (~> 1.6) - gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - nokogiri (>= 1.6.1, < 2.0) - rouge (~> 3.1) - sanitize (~> 6.0) - stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) - mime-types (>= 1.15) - rugged (~> 1.0) - gitlab-labkit (0.24.0) + gitlab-labkit (0.28.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) - redis (> 3.0.0, < 5.0.0) + redis (> 3.0.0, < 6.0.0) gitlab-license_finder (6.14.2.1) bundler rubyzip (>= 1, < 3) @@ -81,35 +69,30 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.7.1) - google-protobuf (3.21.5) + google-protobuf (3.21.9) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) grpc (1.42.0) google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) - grpc-tools (1.42.0) i18n (1.12.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) opentracing (~> 0.3) thrift - json (2.5.1) licensee (9.15.2) dotenv (~> 2.0) octokit (~> 4.20) reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.18.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.2) - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.16.3) @@ -126,7 +109,7 @@ GEM parallel (1.19.2) parser (3.0.3.2) ast (~> 2.4.1) - pg_query (2.1.3) + pg_query (2.2.0) google-protobuf (>= 3.19.2) proc_to_ast (0.1.0) coderay @@ -151,13 +134,11 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rdoc (6.3.2) redis (4.8.0) regexp_parser (1.8.1) reverse_markdown (1.4.0) nokogiri rexml (3.2.5) - rouge (3.30.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -191,18 +172,14 @@ GEM ruby-progressbar (1.10.1) rubyzip (2.3.2) rugged (1.2.0) - sanitize (6.0.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) sentry-raven (3.0.4) faraday (>= 1.0) - stringex (2.8.5) thor (1.1.0) thread_safe (0.3.6) - thrift (0.16.0) + thrift (0.17.0) timecop (0.9.1) tomlrb (2.0.1) tzinfo (2.0.5) @@ -227,20 +204,17 @@ PLATFORMS DEPENDENCIES activesupport (~> 6.1.6.1) factory_bot - faraday (~> 1.0) + gitaly (~> 15.5.0) github-linguist (~> 7.20.0) - gitlab-gollum-lib (~> 4.2.7.10.gitlab.2) - gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.24) + gitlab-labkit (~> 0.28) gitlab-license_finder gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.21.0) + google-protobuf (~> 3.21.9) grpc (~> 1.42.0) - grpc-tools (~> 1.42.0) licensee (~> 9.15) pry (~> 0.12.2) rbtrace - rdoc (~> 6.0) + redis (~> 4.8.0) rspec rspec-parameterized rubocop (~> 0.69) @@ -249,4 +223,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.3.15 + 2.3.24 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 44a8218e1fbc8..14e9344b1854a 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkg-config # libgit2 + dependencies -, libgit2_1_3_0, openssl, zlib, pcre, http-parser }: +, libgit2, openssl, zlib, pcre, http-parser }: let rubyEnv = bundlerEnv rec { @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.4.4"; + version = "15.6.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,17 +22,17 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-b8ChQYaj+7snlrLP4P9FIUSIq/SNMh9hFlFajOPcBEU="; + sha256 = "sha256-mzX+6kMXqdrxqMaUwN2tG5kJgKSRv0/tNN8ibHqBbzU="; }; - vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM="; + vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; doCheck = false; }; @@ -59,7 +59,7 @@ buildGoModule ({ postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,proto} $ruby + cp -rv $src/ruby/{bin,lib} $ruby ''; outputs = [ "out" "ruby" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9051ad74bf1d7..a36e88e086689 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -215,14 +215,16 @@ }; version = "1.15.5"; }; - gemojione = { - dependencies = ["json"]; + gitaly = { + dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; + sha256 = "0hpgljz05rhik15z081ghxw9pw83vz78p12wjdgxj3qz1a4x8pfq"; type = "gem"; }; - version = "3.3.0"; + version = "15.5.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"]; @@ -235,46 +237,16 @@ }; version = "7.20.0"; }; - github-markup = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; - type = "gem"; - }; - version = "1.7.0"; - }; - gitlab-gollum-lib = { - dependencies = ["gemojione" "github-markup" "gitlab-gollum-rugged_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vs6frgnhhfnyicsjck39xibmn7xc6ji7wvznvfmr53f4smqjk40"; - type = "gem"; - }; - version = "4.2.7.10.gitlab.2"; - }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gvgqfn05swsazfxdwmlqcq8v2pjyy7dmyl3bd8b8jrrxbpmpxxg"; - type = "gem"; - }; - version = "0.4.4.4.gitlab.1"; - }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg"; + sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7"; type = "gem"; }; - version = "0.24.0"; + version = "0.28.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -302,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9"; + sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras"; type = "gem"; }; - version = "3.21.5"; + version = "3.21.9"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -329,16 +301,6 @@ }; version = "1.42.0"; }; - grpc-tools = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xipvw8zcm1c3pna6fgmy83x0yvffii8d7wafwcxmszxa647brw1"; - type = "gem"; - }; - version = "1.42.0"; - }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default" "development" "test"]; @@ -369,16 +331,6 @@ }; version = "1.1.0"; }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; - type = "gem"; - }; - version = "2.5.1"; - }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; groups = ["default"]; @@ -396,10 +348,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -418,27 +370,6 @@ }; version = "0.9.2"; }; - mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; - type = "gem"; - }; - version = "3.3.1"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; - type = "gem"; - }; - version = "3.2020.1104"; - }; mini_mime = { groups = ["default"]; platforms = []; @@ -558,10 +489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; + sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4"; type = "gem"; }; - version = "2.1.3"; + version = "2.2.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -671,16 +602,6 @@ }; version = "0.4.14"; }; - rdoc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y"; - type = "gem"; - }; - version = "6.3.2"; - }; redis = { groups = ["default"]; platforms = []; @@ -722,16 +643,6 @@ }; version = "3.2.5"; }; - rouge = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; - type = "gem"; - }; - version = "3.30.0"; - }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; groups = ["development" "test"]; @@ -849,17 +760,6 @@ }; version = "1.2.0"; }; - sanitize = { - dependencies = ["crass" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; - type = "gem"; - }; - version = "6.0.0"; - }; sawyer = { dependencies = ["addressable" "faraday"]; groups = ["default"]; @@ -882,16 +782,6 @@ }; version = "3.0.4"; }; - stringex = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys"; - type = "gem"; - }; - version = "2.8.5"; - }; thor = { groups = ["default"]; platforms = []; @@ -915,10 +805,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh"; + sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80"; type = "gem"; }; - version = "0.16.0"; + version = "0.17.0"; }; timecop = { source = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 2694be2f65b35..535d4faa13a90 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.10.0"; + version = "14.13.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-7uy7F4wK/4xz0PK9ZadaMjy3c+xUK9+YKaaEm5iFqUs="; + sha256 = "sha256-KN1twfuamRsG5/jan4Frhd4LXOU9Bp5Htex+TsTc+Is="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-urS0FED636APQe5uNvhDvWsnZtHCW60VtRE1B7IzGZQ="; + vendorSha256 = "sha256-CAadjiZCopjGNxQTJbvs56THtAve92ewiFLjGTY2/9E="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 2042b6c2bcefa..be226c94f43b0 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.4.4"; + version = "15.6.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-dN3DfkAJkqkmGyahsBDsPQBog52RGECV+SESSR6W3fg="; + vendorSha256 = "sha256-VqJqyRRFmDugq0VG7gPBxllikVNv5et93jJHleSTS7M="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 0426bd840201c..cf08454a64961 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,30 +2,48 @@ source 'https://rubygems.org' +if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental + $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) + require 'bundler-checksum' + Bundler::Checksum.patch! +end + gem 'bundler-checksum', '~> 0.1.0', path: 'bundler-checksum', require: false +# NOTE: When incrementing the major or minor version here, also increment activerecord_version +# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve +# https://gitlab.com/gitlab-org/gitlab/-/issues/375713 gem 'rails', '~> 6.1.6.1' gem 'bootsnap', '~> 1.13.0', require: false +# Pin openssl to match the version bundled with our supported Rubies. +# See https://stdgems.org/openssl/#gem-version. +gem 'openssl', '2.2.1' +# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3. +# Since the latest version caused problems with GitLab, we pin this to an older +# version for now. +# See https://gitlab.com/gitlab-org/gitlab/-/issues/376417 +gem 'ipaddr', '1.2.2' + # Responders respond_to and respond_with gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 2.71.0' +gem 'view_component', '~> 2.74.1' # Default values for AR models gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.4.0' +gem 'pg', '~> 1.4.3' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.1' gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.10.0' +gem 'marginalia', '~> 1.11.1' # Authorization gem 'declarative_policy', '~> 1.1.0' @@ -38,18 +56,17 @@ gem 'doorkeeper', '~> 5.5.0.rc2' gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' -gem 'omniauth-rails_csrf_protection' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-azure-activedirectory-v2', '~> 1.0' +gem 'omniauth-azure-activedirectory-v2', '~> 2.0' gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'omniauth-azure-oauth2' # See gem README.md gem 'omniauth-cas3', '~> 1.1.4', path: 'omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' -gem 'omniauth-alicloud', '~> 1.0.1' +gem 'omniauth-alicloud', '~> 2.0.0' gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '2.0.0' +gem 'omniauth-github', '2.0.1' gem 'omniauth-gitlab', '~> 4.0.0', path: 'omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md -gem 'omniauth-google-oauth2', '~> 1.0.1', path: 'omniauth-google-oauth2' # See gem README.md +gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 2.0.0' gem 'omniauth-shibboleth', '~> 1.3.0' @@ -59,7 +76,7 @@ gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect' gem 'omniauth-salesforce', '~> 1.0.5', path: 'omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.21.2' +gem 'rack-oauth2', '~> 1.21.3' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only @@ -69,12 +86,12 @@ gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 1.1.0' +gem 'invisible_captcha', '~> 2.0.0' # Two-factor authentication gem 'devise-two-factor', '~> 4.0.2' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.1.0' +gem 'attr_encrypted', '~> 3.2.4', path: 'attr_encrypted' gem 'u2f', '~> 0.2.1' # GitLab Pages @@ -84,7 +101,7 @@ gem 'rubyzip', '~> 2.3.2', require: 'zip' gem 'acme-client', '~> 2.0' # Browser detection -gem 'browser', '~> 4.2' +gem 'browser', '~> 5.3.1' # OS detection for usage ping gem 'ohai', '~> 16.10' @@ -101,7 +118,9 @@ gem 'net-ldap', '~> 0.16.3' # API gem 'grape', '~> 1.5.2' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.1.0', require: 'rack/cors' +gem 'rack-cors', '~> 1.1.1', require: 'rack/cors' +gem 'grape-swagger', '~>1.5.0', group: [:development, :test] +gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] # GraphQL API gem 'graphql', '~> 1.13.12' @@ -110,12 +129,10 @@ gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) -gem 'hashie' -# Disable strong_params so that Mash does not respond to :permitted? -gem 'hashie-forbidden_attributes' +gem 'hashie', '~> 5.0.0' # Pagination -gem 'kaminari', '~> 1.0' +gem 'kaminari', '~> 1.2.2' # HAML gem 'hamlit', '~> 2.15.0' @@ -125,16 +142,16 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.14' +gem 'fog-aws', '~> 3.15' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.15', require: 'fog/google' -gem 'fog-local', '~> 0.6' +gem 'fog-google', '~> 1.19', require: 'fog/google' +gem 'fog-local', '~> 0.8' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -149,18 +166,17 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.131.0' +gem 'aws-sdk-core', '~> 3.167.0' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.114.0' +gem 'aws-sdk-s3', '~> 1.117.1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # Markdown and HTML processing -gem 'html-pipeline', '~> 2.13.2' -gem 'deckar01-task_list', '2.3.1' -gem 'gitlab-markup', '~> 1.8.0' -gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.4' +gem 'html-pipeline', '~> 2.14.3' +gem 'deckar01-task_list', '2.3.2' +gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup' +gem 'commonmarker', '~> 0.23.6' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -170,12 +186,11 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.17' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.16' -gem 'asciidoctor-kroki', '~> 0.5.0', require: false +gem 'asciidoctor-kroki', '~> 0.7.0', require: false gem 'rouge', '~> 3.30.0' gem 'truncato', '~> 0.7.12' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.13.8' -gem 'escape_utils', '~> 1.1' +gem 'nokogiri', '~> 1.13.9' # Calendar rendering gem 'icalendar' @@ -187,7 +202,7 @@ gem 'diff_match_patch', '~> 0.1.0' # Application server gem 'rack', '~> 2.2.4' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' +gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.6.5', require: false @@ -202,16 +217,16 @@ gem 'state_machines-activerecord', '~> 0.8.0' gem 'acts-as-taggable-on', '~> 9.0' # Background jobs -gem 'sidekiq', '~> 6.4.0' -gem 'sidekiq-cron', '~> 1.4.0' -gem 'redis-namespace', '~> 1.8.1' -gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' +gem 'sidekiq', '~> 6.5.7' +gem 'sidekiq-cron', '~> 1.8.0' +gem 'redis-namespace', '~> 1.9.0' +gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'fugit', '~> 1.2.1' # HTTP requests -gem 'httparty', '~> 0.16.4' +gem 'httparty', '~> 0.20.0' # Colored output to console gem 'rainbow', '~> 3.0' @@ -223,20 +238,20 @@ gem 'ruby-progressbar', '~> 1.10' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.4.0' +gem 're2', '~> 1.6.0' # Misc gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.7' +gem 'js_regex', '~> 3.8' # User agent parsing gem 'device_detector' # Redis -gem 'redis', '~> 4.7.0' +gem 'redis', '~> 4.8.0' gem 'connection_pool', '~> 2.0' # Redis session store @@ -262,7 +277,7 @@ gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' gem 'asana', '~> 0.10.13' # FogBugz integration -gem 'ruby-fogbugz', '~> 0.2.1' +gem 'ruby-fogbugz', '~> 0.3.0' # Kubernetes integration gem 'kubeclient', '~> 4.9.3' @@ -272,7 +287,7 @@ gem 'sanitize', '~> 6.0' gem 'babosa', '~> 1.0.4' # Sanitizes SVG input -gem 'loofah', '~> 2.18.0' +gem 'loofah', '~> 2.19.0' # Working with license # Detects the open source license the repository includes @@ -292,7 +307,7 @@ gem 'fast_blank' gem 'gitlab-chronic', '~> 0.10.5' gem 'gitlab_chronic_duration', '~> 0.10.6.2' -gem 'rack-proxy', '~> 0.7.2' +gem 'rack-proxy', '~> 0.7.4' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -301,13 +316,13 @@ gem 'terser', '1.0.2' gem 'addressable', '~> 2.8' gem 'tanuki_emoji', '~> 0.6' gem 'gon', '~> 6.4.0' -gem 'request_store', '~> 1.5' +gem 'request_store', '~> 1.5.1' gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.2.1' # Protect against bruteforcing -gem 'rack-attack', '~> 6.6.0' +gem 'rack-attack', '~> 6.6.1' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -317,12 +332,12 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1.0' +gem 'pg_query', '~> 2.2' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.24.0' +gem 'gitlab-labkit', '~> 0.28.0' gem 'thrift', '>= 0.16.0' # I18n @@ -347,12 +362,12 @@ gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.1.1', require: false + gem 'lefthook', '~> 1.2.0', require: false gem 'rubocop' - gem 'solargraph', '~> 0.46.0', require: false + gem 'solargraph', '~> 0.47.2', require: false gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 1.0' + gem 'lookbook', '~> 1.2', '>= 1.2.1' # Better errors handler gem 'better_errors', '~> 2.9.1' @@ -382,7 +397,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 8.0.0', require: false + gem 'gitlab-styles', '~> 9.0.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -406,11 +421,11 @@ group :development, :test do gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' - gem 'pact', '~> 1.12' + gem 'pact', '~> 1.63' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.5.2', require: false + gem 'gitlab-dangerfiles', '~> 3.6.2', require: false end group :development, :test, :coverage do @@ -460,10 +475,9 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 1.3.0' gem 'stackprof', '~> 0.2.21', require: false gem 'rbtrace', '~> 0.4', require: false -gem 'memory_profiler', '~> 0.9', require: false +gem 'memory_profiler', '~> 1.0', require: false gem 'activerecord-explain-analyze', '~> 0.1', require: false # OAuth @@ -486,16 +500,16 @@ gem 'ssh_data', '~> 1.3' gem 'spamcheck', '~> 1.0.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 15.4.0-rc2' +gem 'gitaly', '~> 15.5.2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.21' +gem 'google-protobuf', '~> 3.21', '>= 3.21.9' -gem 'toml-rb', '~> 2.0' +gem 'toml-rb', '~> 2.2.0' # Feature toggles gem 'flipper', '~> 0.25.0' @@ -519,8 +533,6 @@ gem 'retriable', '~> 3.1.2' # LRU cache gem 'lru_redux' -gem 'erubi', '~> 1.9.0' - # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` # See https://gitlab.com/gitlab-org/gitlab/issues/197386 @@ -539,6 +551,7 @@ gem 'valid_email', '~> 0.1' gem 'json', '~> 2.5.1' gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' +gem 'oj-introspect', '~> 0.7' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' @@ -556,3 +569,15 @@ gem 'ed25519', '~> 1.3.0' # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature gem 'error_tracking_open_api', path: 'error_tracking_open_api' + +# Vulnerability advisories +gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' + +# Work with RPM packages +gem 'arr-pm', '~> 0.0.12' + +# Apple plist parsing +gem 'CFPropertyList' + +# For phone verification +gem 'telesignenterprise', '~> 2.2' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index f1b1f615a0942..2174cec05f8a3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1,4 +1,10 @@ PATH + remote: attr_encrypted + specs: + attr_encrypted (3.2.4) + encryptor (~> 3.0.0) + +PATH remote: bundler-checksum specs: bundler-checksum (0.1.0) @@ -9,6 +15,7 @@ PATH specs: devise-pbkdf2-encryptable (0.0.0) devise (~> 4.0) + devise-two-factor (~> 4.0) PATH remote: error_tracking_open_api @@ -58,16 +65,7 @@ PATH specs: omniauth-gitlab (4.0.0) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) - -PATH - remote: omniauth-google-oauth2 - specs: - omniauth-google-oauth2 (1.0.1) - jwt (>= 2.0) - oauth2 (~> 2.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (~> 1.8) PATH remote: omniauth-salesforce @@ -87,6 +85,8 @@ PATH GEM remote: https://rubygems.org/ specs: + CFPropertyList (3.0.5) + rexml RedCloth (4.3.2) acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) @@ -155,14 +155,15 @@ GEM zeitwerk (~> 2.3) acts-as-taggable-on (9.0.0) activerecord (>= 6.0, < 7.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) akismet (3.0.0) android_key_attestation (0.3.0) apollo_upload_server (2.1.0) actionpack (>= 4.2) graphql (>= 1.8) + arr-pm (0.0.12) asana (0.10.13) faraday (~> 1.0) faraday_middleware (~> 1.0) @@ -171,38 +172,36 @@ GEM asciidoctor (2.0.17) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.5.0) + asciidoctor-kroki (0.7.0) asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) ast (2.4.2) atlassian-jwt (0.2.0) jwt (~> 2.1.0) - attr_encrypted (3.1.0) - encryptor (~> 3.0.0) attr_required (1.0.1) autoprefixer-rails (10.2.5.1) execjs (> 0) awesome_print (1.9.2) awrence (1.1.1) aws-eventstream (1.2.0) - aws-partitions (1.600.0) + aws-partitions (1.658.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.1) + aws-sdk-core (3.167.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.59.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.117.1) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) @@ -220,22 +219,22 @@ GEM benchmark (0.2.0) benchmark-ips (2.3.0) benchmark-malloc (0.2.0) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) + benchmark-memory (0.2.0) + memory_profiler (~> 1) benchmark-perf (0.6.0) benchmark-trend (0.4.0) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindata (2.4.10) + bindata (2.4.11) binding_ninja (0.2.3) bootsnap (1.13.0) msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) - browser (4.2.0) + browser (5.3.1) builder (3.2.4) bullet (7.0.2) activesupport (>= 3.0.0) @@ -282,9 +281,9 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.23.4) + commonmarker (0.23.6) concurrent-ruby (1.1.10) - connection_pool (2.2.5) + connection_pool (2.3.0) contracts (0.11.0) cork (0.3.0) colored2 (~> 3.1) @@ -301,8 +300,9 @@ GEM creole (0.5.0) crystalball (0.7.0) git - css_parser (1.11.0) + css_parser (1.12.0) addressable + cvss-suite (3.0.1) danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) @@ -321,7 +321,7 @@ GEM gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) dead_end (3.1.1) - deckar01-task_list (2.3.1) + deckar01-task_list (2.3.2) html-pipeline declarative (0.0.20) declarative-option (0.1.0) @@ -330,7 +330,7 @@ GEM activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (2.1.1) + derailed_benchmarks (2.1.2) benchmark-ips (~> 2) dead_end get_process_mem (~> 0) @@ -412,7 +412,7 @@ GEM launchy (~> 2.1) mail (~> 2.7) encryptor (3.0.0) - erubi (1.9.0) + erubi (1.11.0) escape_utils (1.2.1) et-orbi (1.2.7) tzinfo @@ -420,6 +420,8 @@ GEM ffi (>= 1.15.0) excon (0.90.0) execjs (2.8.1) + expgen (0.1.1) + parslet expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) @@ -446,7 +448,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.4.0) + faraday-http-cache (2.4.1) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -490,7 +492,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.14.0) + fog-aws (3.15.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -499,16 +501,22 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.15.0) - fog-core (<= 2.1.0) + fog-google (1.19.0) + fog-core (< 2.3) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-api-client (>= 0.44.2, < 0.51) + google-apis-compute_v1 (~> 0.14) + google-apis-dns_v1 (~> 0.12) + google-apis-iamcredentials_v1 (~> 0.6) + google-apis-monitoring_v3 (~> 0.12) + google-apis-pubsub_v1 (~> 0.7) + google-apis-sqladmin_v1beta4 (~> 0.13) + google-apis-storage_v1 (~> 0.6) google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-local (0.6.0) + fog-local (0.8.0) fog-core (>= 1.27, < 3.0) fog-openstack (1.0.8) fog-core (~> 2.1) @@ -531,6 +539,7 @@ GEM ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) gemoji (3.0.1) + gems (1.2.0) get_process_mem (0.2.7) ffi (~> 1.0) gettext (3.3.6) @@ -545,36 +554,35 @@ GEM rails (>= 3.2.0) git (1.11.0) rchardet (~> 1.8) - gitaly (15.4.0.pre.rc2) + gitaly (15.5.2) grpc (~> 1.0) - github-markup (1.7.0) gitlab (4.16.1) httparty (~> 0.14, >= 0.14.0) terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.5.2) + gitlab-dangerfiles (3.6.2) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.3.0) + gitlab-fog-azure-rm (1.4.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.24.0) + gitlab-labkit (0.28.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) - redis (> 3.0.0, < 5.0.0) + redis (> 3.0.0, < 6.0.0) gitlab-license (2.2.1) gitlab-mail_room (0.0.9) gitlab-markup (1.8.1) @@ -583,15 +591,16 @@ GEM addressable (~> 2.7) omniauth (>= 1.9, < 3) openid_connect (~> 1.2) - gitlab-sidekiq-fetcher (0.8.0) + gitlab-sidekiq-fetcher (0.9.0) + json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (8.0.0) - rubocop (~> 0.91, >= 0.91.1) + gitlab-styles (9.0.0) + rubocop (~> 1.36.0) rubocop-gitlab-security (~> 0.1.1) - rubocop-graphql (~> 0.10) - rubocop-performance (~> 1.9.2) - rubocop-rails (~> 2.9) - rubocop-rspec (~> 1.44) + rubocop-graphql (~> 0.14) + rubocop-performance (~> 1.14) + rubocop-rails (~> 2.15) + rubocop-rspec (~> 2.12) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -606,27 +615,52 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - google-api-client (0.50.0) + google-api-client (0.53.0) + google-apis-core (~> 0.1) + google-apis-generator (~> 0.1) + google-apis-compute_v1 (0.53.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-core (0.9.1) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) + retriable (>= 2.0, < 4.a) rexml - signet (~> 0.12) + webrick + google-apis-discovery_v1 (0.12.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-dns_v1 (0.28.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-generator (0.11.0) + activesupport (>= 5.0) + gems (~> 1.2) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-discovery_v1 (~> 0.5) + thor (>= 0.20, < 2.a) + google-apis-iamcredentials_v1 (0.15.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-monitoring_v3 (0.37.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-pubsub_v1 (0.30.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-sqladmin_v1beta4 (0.38.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.20.0) + google-apis-core (>= 0.9.1, < 2.a) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-protobuf (3.21.5) + google-protobuf (3.21.9) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) - googleauth (0.14.0) - faraday (>= 0.17.3, < 2.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) + signet (>= 0.16, < 2.a) gpgme (2.0.20) mini_portile2 (~> 2.3) grape (1.5.2) @@ -644,6 +678,11 @@ GEM grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) + grape-swagger (1.5.0) + grape (~> 1.3) + grape-swagger-entity (0.5.1) + grape-entity (>= 0.6.0) + grape-swagger (>= 1.2.0) grape_logging (1.8.4) grape rack @@ -702,14 +741,12 @@ GEM hana (1.3.7) hangouts-chat (0.0.5) hashdiff (1.0.1) - hashie (4.1.0) - hashie-forbidden_attributes (0.1.1) - hashie (>= 3.0) - health_check (3.0.0) + hashie (5.0.0) + health_check (3.1.0) railties (>= 5.0) heapy (0.2.0) thor - html-pipeline (2.13.2) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) @@ -727,18 +764,21 @@ GEM http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - httparty (0.16.4) + httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) i18n_data (0.8.0) - icalendar (2.4.1) + icalendar (2.8.0) + ice_cube (~> 0.16) + ice_cube (0.16.4) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - invisible_captcha (1.1.0) - rails (>= 4.2) + invisible_captcha (2.0.0) + rails (>= 5.0) + ipaddr (1.2.2) ipaddress (0.8.3) jaeger-client (1.1.0) opentracing (~> 0.3) @@ -750,15 +790,16 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.6.1) - js_regex (3.7.0) + js_regex (3.8.0) character_set (~> 1.4) - regexp_parser (~> 2.1) + regexp_parser (~> 2.5) regexp_property_values (~> 1.0) json (2.5.1) - json-jwt (1.13.0) + json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap bindata + httpclient json_schemer (0.2.18) ecma-re-validator (~> 0.3) hana (~> 1.3) @@ -767,18 +808,18 @@ GEM jsonpath (1.1.2) multi_json jwt (2.1.0) - kaminari (1.2.1) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) kas-grpc (0.0.2) grpc (~> 1.0) knapsack (1.21.1) @@ -794,7 +835,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.1.1) + lefthook (1.2.0) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -826,30 +867,32 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.18.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lookbook (1.0.3) + lookbook (1.2.1) actioncable + activemodel css_parser htmlbeautifier (~> 1.3) htmlentities (~> 4.3.4) listen (~> 3.0) railties (>= 5.0) redcarpet (~> 3.5) - rouge (~> 3.26) + rouge (>= 3.26, < 5.0) view_component (~> 2.0) yard (~> 0.9.25) + zeitwerk (~> 2.5) lru_redux (1.1.0) lumberjack (1.2.7) mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) - marginalia (1.10.0) - actionpack (>= 2.3) - activerecord (>= 2.3) + marginalia (1.11.1) + actionpack (>= 5.2) + activerecord (>= 5.2) memoist (0.16.2) - memory_profiler (0.9.14) + memory_profiler (1.0.1) method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) @@ -895,7 +938,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -903,13 +946,13 @@ GEM shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.6) - oauth2 (2.0.3) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - rash_alt (>= 0.4, < 1) - version_gem (~> 1.0) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -926,13 +969,15 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - oj (3.13.21) + oj (3.13.23) + oj-introspect (0.7.1) + oj (>= 3.13.23) omniauth (2.1.0) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-alicloud (1.0.1) - omniauth-oauth2 (~> 1.7.1) + omniauth-alicloud (2.0.0) + omniauth-oauth2 (~> 1.8) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) @@ -941,26 +986,29 @@ GEM omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-activedirectory-v2 (1.0.0) - omniauth-oauth2 (~> 1.7) + omniauth-azure-activedirectory-v2 (2.0.0) + omniauth-oauth2 (~> 1.8) omniauth-dingtalk-oauth2 (1.0.1) omniauth-oauth2 (~> 1.7) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (2.0.0) + omniauth-github (2.0.1) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + omniauth-google-oauth2 (1.1.1) + jwt (>= 2.0) + oauth2 (~> 2.0.6) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (~> 1.8.0) omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.7.3) + omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) - omniauth (>= 1.9, < 3) - omniauth-oauth2-generic (0.2.2) - omniauth-oauth2 (~> 1.0) - omniauth-rails_csrf_protection (1.0.1) - actionpack (>= 4.2) omniauth (~> 2.0) + omniauth-oauth2-generic (0.2.8) + omniauth-oauth2 (~> 1.0) + rake omniauth-saml (2.0.0) omniauth (~> 2.0) ruby-saml (~> 1.9) @@ -980,7 +1028,8 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openssl (2.2.0) + openssl (2.2.1) + ipaddr openssl-signature_algorithm (0.4.0) opentracing (0.5.0) optimist (3.0.1) @@ -988,29 +1037,29 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - pact (1.59.0) + pact (1.63.0) pact-mock_service (~> 3.0, >= 3.3.1) - pact-support (~> 1.15) - rack-test (>= 0.6.3, < 2.0.0) + pact-support (~> 1.16, >= 1.16.9) + rack-test (>= 0.6.3, < 3.0.0) rspec (~> 3.0) term-ansicolor (~> 1.0) thor (>= 0.20, < 2.0) webrick (~> 1.3) - pact-mock_service (3.6.2) + pact-mock_service (3.10.0) filelock (~> 1.1) find_a_port (~> 1.0.1) json - pact-support (~> 1.12, >= 1.12.0) + pact-support (~> 1.16, >= 1.16.4) rack (~> 2.0) rspec (>= 2.14) term-ansicolor (~> 1.0) thor (>= 0.19, < 2.0) webrick (~> 1.3) - pact-support (1.15.1) - awesome_print (~> 1.1) - randexp (~> 0.1.7) - rspec (>= 2.14) - term-ansicolor (~> 1.0) + pact-support (1.18.1) + awesome_print (~> 1.9) + diff-lcs (~> 1.4) + expgen (~> 0.1) + rainbow (~> 3.1.1) parallel (1.22.1) parser (3.1.2.1) ast (~> 2.4.1) @@ -1020,7 +1069,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.4.3) - pg_query (2.1.4) + pg_query (2.2.0) google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) @@ -1050,7 +1099,7 @@ GEM pry (~> 0.13.0) tty-markdown tty-prompt - public_suffix (4.0.7) + public_suffix (5.0.0) puma (5.6.5) nio4r (~> 2.0) puma_worker_killer (0.3.1) @@ -1066,7 +1115,7 @@ GEM rack (>= 1.0, < 3) rack-cors (1.1.1) rack (>= 2.0.0) - rack-oauth2 (1.21.2) + rack-oauth2 (1.21.3) activesupport attr_required httpclient @@ -1074,11 +1123,11 @@ GEM rack (>= 2.1.0) rack-protection (2.2.2) rack - rack-proxy (0.7.2) + rack-proxy (0.7.4) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rack-timeout (0.6.0) + rack-test (2.0.2) + rack (>= 1.3) + rack-timeout (0.6.3) rails (6.1.6.1) actioncable (= 6.1.6.1) actionmailbox (= 6.1.6.1) @@ -1114,9 +1163,6 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) - randexp (0.1.7) - rash_alt (0.4.12) - hashie (>= 3.4) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1127,24 +1173,24 @@ GEM rbtree (0.4.4) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.4.0) + re2 (1.6.0) recaptcha (4.13.1) json recursive-open-struct (1.1.3) redcarpet (3.5.1) - redis (4.7.1) + redis (4.8.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) - redis-namespace (1.8.1) - redis (>= 3.0.4) + redis-namespace (1.9.0) + redis (>= 4) redis-rack (2.1.4) rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-store (1.9.1) redis (>= 4, < 5) - regexp_parser (2.5.0) + regexp_parser (2.6.0) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) @@ -1180,7 +1226,7 @@ GEM benchmark-perf (~> 0.6) benchmark-trend (~> 0.4) rspec (>= 3.0) - rspec-core (3.10.1) + rspec-core (3.10.2) rspec-support (~> 3.10.0) rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) @@ -1204,44 +1250,44 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-support (3.10.2) - rspec_junit_formatter (0.4.1) + rspec-support (3.10.3) + rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.6) activerecord pg rails sqlite3 - rubocop (0.93.1) + rubocop (1.36.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) - rexml - rubocop-ast (>= 0.6.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.20.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) + unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.21.0) parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) rubocop-graphql (0.14.6) rubocop (>= 0.87, < 2) - rubocop-performance (1.9.2) - rubocop (>= 0.90.0, < 2.0) + rubocop-performance (1.14.3) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.9.1) + rubocop-rails (2.15.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - rubocop-rspec (1.44.1) - rubocop (~> 0.87) - rubocop-ast (>= 0.7.1) - ruby-fogbugz (0.2.1) + rubocop (>= 1.7.0, < 2.0) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) + ruby-fogbugz (0.3.0) crack (~> 0.4) + multipart-post (~> 2.0) ruby-magic (0.5.4) mini_portile2 (~> 2.6) - ruby-prof (1.3.1) ruby-progressbar (1.11.0) ruby-saml (1.13.0) nokogiri (>= 1.10.5) @@ -1303,11 +1349,11 @@ GEM shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.4.2) - connection_pool (>= 2.2.2) + sidekiq (6.5.7) + connection_pool (>= 2.2.5) rack (~> 2.0) - redis (>= 4.2.0) - sidekiq-cron (1.4.0) + redis (>= 4.5.0, < 5) + sidekiq-cron (1.8.0) fugit (~> 1) sidekiq (>= 4.2.1) sigdump (0.2.4) @@ -1328,9 +1374,12 @@ GEM simplecov_json_formatter (0.1.4) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) + snaky_hash (2.0.0) + hashie + version_gem (~> 1.1) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - solargraph (0.46.0) + solargraph (0.47.2) backport (~> 1.2) benchmark bundler (>= 1.17.2) @@ -1386,6 +1435,10 @@ GEM ffi (~> 1.1) sysexits (1.2.0) tanuki_emoji (0.6.0) + telesign (2.2.4) + net-http-persistent (>= 3.0.0, < 5.0) + telesignenterprise (2.2.2) + telesign (~> 2.2.3) temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) @@ -1399,13 +1452,13 @@ GEM text (1.3.1) thor (1.2.1) thrift (0.16.0) - tilt (2.0.10) + tilt (2.0.11) timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) - tins (1.31.0) + tins (1.31.1) sync - toml-rb (2.0.1) + toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) tpm-key_attestation (0.9.0) @@ -1472,9 +1525,9 @@ GEM validates_hostname (1.0.11) activerecord (>= 3.0) activesupport (>= 3.0) - version_gem (1.0.0) + version_gem (1.1.0) version_sorter (2.2.4) - view_component (2.71.0) + view_component (2.74.1) activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1522,6 +1575,7 @@ PLATFORMS ruby DEPENDENCIES + CFPropertyList RedCloth (~> 4.3.2) acme-client (~> 2.0) activerecord-explain-analyze (~> 0.1) @@ -1529,18 +1583,19 @@ DEPENDENCIES addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.1.0) + arr-pm (~> 0.0.12) asana (~> 0.10.13) asciidoctor (~> 2.0.17) asciidoctor-include-ext (~> 0.4.0) - asciidoctor-kroki (~> 0.5.0) + asciidoctor-kroki (~> 0.7.0) asciidoctor-plantuml (~> 0.0.16) atlassian-jwt (~> 0.2.0) - attr_encrypted (~> 3.1.0) + attr_encrypted (~> 3.2.4)! autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.131.0) - aws-sdk-s3 (~> 1.114.0) + aws-sdk-core (~> 3.167.0) + aws-sdk-s3 (~> 1.117.1) babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1550,7 +1605,7 @@ DEPENDENCIES better_errors (~> 2.9.1) bootsnap (~> 1.13.0) bootstrap_form (~> 4.2.0) - browser (~> 4.2) + browser (~> 5.3.1) bullet (~> 7.0.2) bundler-audit (~> 0.7.0.1) bundler-checksum (~> 0.1.0)! @@ -1558,14 +1613,15 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.23.4) + commonmarker (~> 0.23.6) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) creole (~> 0.5.0) crystalball (~> 0.7.0) + cvss-suite (~> 3.0.1) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.3.1) + deckar01-task_list (= 2.3.2) declarative_policy (~> 1.1.0) default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) @@ -1586,8 +1642,6 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) error_tracking_open_api! - erubi (~> 1.9.0) - escape_utils (~> 1.1) factory_bot_rails (~> 6.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) @@ -1598,10 +1652,10 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.25.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.14) + fog-aws (~> 3.15) fog-core (= 2.1.0) - fog-google (~> 1.15) - fog-local (~> 0.6) + fog-google (~> 1.19) + fog-local (~> 0.8) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) fugit (~> 1.2.1) @@ -1609,29 +1663,30 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 15.4.0.pre.rc2) - github-markup (~> 1.7.0) + gitaly (~> 15.5.2) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.5.2) + gitlab-dangerfiles (~> 3.6.2) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.3.0) - gitlab-labkit (~> 0.24.0) + gitlab-fog-azure-rm (~> 1.4.0) + gitlab-labkit (~> 0.28.0) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.10.0) - gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 8.0.0) + gitlab-sidekiq-fetcher (= 0.9.0) + gitlab-styles (~> 9.0.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.21) + google-protobuf (~> 3.21, >= 3.21.9) gpgme (~> 2.0.19) grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) + grape-swagger (~> 1.5.0) + grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) graphiql-rails (~> 1.8) graphlient (~> 0.5.0) @@ -1644,77 +1699,78 @@ DEPENDENCIES haml_lint (~> 0.40.0) hamlit (~> 2.15.0) hangouts-chat (~> 0.0.5) - hashie - hashie-forbidden_attributes + hashie (~> 5.0.0) health_check (~> 3.0) - html-pipeline (~> 2.13.2) + html-pipeline (~> 2.14.3) html2text - httparty (~> 0.16.4) + httparty (~> 0.20.0) icalendar - invisible_captcha (~> 1.1.0) + invisible_captcha (~> 2.0.0) + ipaddr (= 1.2.2) ipaddress (~> 0.8.3) ipynbdiff! jira-ruby (~> 2.1.4) - js_regex (~> 3.7) + js_regex (~> 3.8) json (~> 2.5.1) json_schemer (~> 0.2.18) jwt (~> 2.1.0) - kaminari (~> 1.0) + kaminari (~> 1.2.2) kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.3) - lefthook (~> 1.1.1) + lefthook (~> 1.2.0) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) lockbox (~> 0.6.2) lograge (~> 0.5) - loofah (~> 2.18.0) - lookbook (~> 1.0) + loofah (~> 2.19.0) + lookbook (~> 1.2, >= 1.2.1) lru_redux mail (= 2.7.1) mail-smtp_pool (~> 0.1.0)! - marginalia (~> 1.10.0) - memory_profiler (~> 0.9) + marginalia (~> 1.11.1) + memory_profiler (~> 1.0) microsoft_graph_mailer (~> 0.1.0)! mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - nokogiri (~> 1.13.8) + nokogiri (~> 1.13.9) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) oj (~> 3.13.21) + oj-introspect (~> 0.7) omniauth (~> 2.1.0) - omniauth-alicloud (~> 1.0.1) + omniauth-alicloud (~> 2.0.0) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) - omniauth-azure-activedirectory-v2 (~> 1.0) + omniauth-azure-activedirectory-v2 (~> 2.0) omniauth-azure-oauth2 (~> 0.0.9)! omniauth-cas3 (~> 1.1.4)! omniauth-dingtalk-oauth2 (~> 1.0) omniauth-facebook (~> 4.0.0) - omniauth-github (= 2.0.0) + omniauth-github (= 2.0.1) omniauth-gitlab (~> 4.0.0)! - omniauth-google-oauth2 (~> 1.0.1)! + omniauth-google-oauth2 (~> 1.1) omniauth-oauth2-generic (~> 0.2.2) - omniauth-rails_csrf_protection omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.0.0) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! + openssl (= 2.2.1) org-ruby (~> 0.9.12) - pact (~> 1.12) + pact (~> 1.63) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.4.0) - pg_query (~> 2.1.0) + pg (~> 1.4.3) + pg_query (~> 2.2) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.16) @@ -1724,23 +1780,23 @@ DEPENDENCIES puma (~> 5.6.5) puma_worker_killer (~> 0.3.1) rack (~> 2.2.4) - rack-attack (~> 6.6.0) - rack-cors (~> 1.1.0) - rack-oauth2 (~> 1.21.2) - rack-proxy (~> 0.7.2) - rack-timeout (~> 0.6.0) + rack-attack (~> 6.6.1) + rack-cors (~> 1.1.1) + rack-oauth2 (~> 1.21.3) + rack-proxy (~> 0.7.4) + rack-timeout (~> 0.6.3) rails (~> 6.1.6.1) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.4.0) + re2 (~> 1.6.0) recaptcha (~> 4.11) - redis (~> 4.7.0) + redis (~> 4.8.0) redis-actionpack (~> 5.3.0) - redis-namespace (~> 1.8.1) - request_store (~> 1.5) + redis-namespace (~> 1.9.0) + request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) @@ -1753,9 +1809,8 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.6) rubocop - ruby-fogbugz (~> 0.2.1) + ruby-fogbugz (~> 0.3.0) ruby-magic (~> 0.5) - ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) @@ -1772,8 +1827,8 @@ DEPENDENCIES sentry-sidekiq (~> 5.1.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 5.1.0) - sidekiq (~> 6.4.0) - sidekiq-cron (~> 1.4.0) + sidekiq (~> 6.5.7) + sidekiq-cron (~> 1.8.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) simplecov (~> 0.21) @@ -1781,7 +1836,7 @@ DEPENDENCIES simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) - solargraph (~> 0.46.0) + solargraph (~> 0.47.2) spamcheck (~> 1.0.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) @@ -1792,13 +1847,14 @@ DEPENDENCIES state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.6) + telesignenterprise (~> 2.2) terser (= 1.0.2) test-prof (~> 1.0.7) test_file_finder (~> 0.1.3) thrift (>= 0.16.0) timecop (~> 0.9.1) timfel-krb5-auth (~> 0.8) - toml-rb (~> 2.0) + toml-rb (~> 2.2.0) truncato (~> 0.7.12) typhoeus (~> 1.4.0) u2f (~> 0.2.1) @@ -1808,7 +1864,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) - view_component (~> 2.71.0) + view_component (~> 2.74.1) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 2.3) @@ -1818,4 +1874,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.3.15 + 2.3.25 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 6e34481ef6de3..54d4cfb85aab5 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -159,10 +159,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; aes_key_wrap = { groups = ["default"]; @@ -205,6 +205,16 @@ }; version = "2.1.0"; }; + arr-pm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fddw0vwdrr7v3a0lfqbmnd664j48a9psrjd3wh3k4i3flplizzx"; + type = "gem"; + }; + version = "0.0.12"; + }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; groups = ["default"]; @@ -243,10 +253,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04jzsicaynwyy4l3w69x1qqww4av57army5xiapvv2b6g5s8nb32"; + sha256 = "08diy3wpmmaw9kabpr2wm908bgv71jj9l7z9fs6fj45fkkjf92jj"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; @@ -280,17 +290,6 @@ }; version = "0.2.0"; }; - attr_encrypted = { - dependencies = ["encryptor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; - type = "gem"; - }; - version = "3.1.0"; - }; attr_required = { groups = ["default"]; platforms = []; @@ -347,10 +346,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx73zazv4jsh51b08jgf7pzn62wmfqlwwg2z8w4rcqbvn326n93"; + sha256 = "1z5k0zi8lnlwmxp27aqic6l9rmc15g6y62awpb3nhkkwr0gy58mv"; type = "gem"; }; - version = "1.600.0"; + version = "1.658.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -369,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yiz3aaik62rxhxipwznb2bv8ywha13vdxg9nk6anq9bd0nn0728"; + sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk"; type = "gem"; }; - version = "3.131.1"; + version = "3.167.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -380,10 +379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz"; + sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c"; type = "gem"; }; - version = "1.57.0"; + version = "1.59.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -391,10 +390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; + sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn"; type = "gem"; }; - version = "1.114.0"; + version = "1.117.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -402,10 +401,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; azure-storage-blob = { dependencies = ["azure-storage-common" "nokogiri"]; @@ -511,14 +510,14 @@ }; benchmark-memory = { dependencies = ["memory_profiler"]; - groups = ["default"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa"; + sha256 = "0p5bwqc828yai7h71b7ny77hgd7dll00dy34izp3b5dh6dj467na"; type = "gem"; }; - version = "0.1.2"; + version = "0.2.0"; }; benchmark-perf = { groups = ["default" "test"]; @@ -556,10 +555,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; + sha256 = "0shg48ilaxn8ps8arvyb8pr6pqigdmccirks185c306dzychr3n3"; type = "gem"; }; - version = "2.4.10"; + version = "2.4.11"; }; binding_ninja = { groups = ["default" "development" "test"]; @@ -598,10 +597,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw"; + sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; type = "gem"; }; - version = "4.2.0"; + version = "5.3.1"; }; builder = { groups = ["default" "development" "test"]; @@ -692,6 +691,17 @@ }; version = "0.5.9.6"; }; + CFPropertyList = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7"; + type = "gem"; + }; + version = "3.0.5"; + }; character_set = { dependencies = ["sorted_set"]; groups = ["default"]; @@ -814,10 +824,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kn7x7smqsk0x2iq17dbbaay0qimmgza8wbdlrs66dvn0l2wpncm"; + sha256 = "0f3v6ffikj694h925zvfzgx995q6l1ixnqpph3qpnjdsyjpsmbn8"; type = "gem"; }; - version = "0.23.4"; + version = "0.23.6"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -834,10 +844,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.0"; }; contracts = { groups = ["default"]; @@ -926,14 +936,24 @@ }; css_parser = { dependencies = ["addressable"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + type = "gem"; + }; + version = "1.12.0"; + }; + cvss-suite = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; + sha256 = "1yfkibv7c7aazh8p3v9mksa2rdkqacq1x3621pyl4ah3jjg9xjmm"; type = "gem"; }; - version = "1.11.0"; + version = "3.0.1"; }; danger = { dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"]; @@ -983,10 +1003,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18bwkvxjr7khxj95xrg1vj7va522vbm2li9wsiiw01cg5b10hni0"; + sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; type = "gem"; }; - version = "2.3.1"; + version = "2.3.2"; }; declarative = { groups = ["default"]; @@ -1046,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cxaqvfhm8xpv3hvpwn7y4g5315zzf5gsdffdkm1bisjviwvmc15"; + sha256 = "0kx1i7qsb5gvc24kxwq4bpcvsknm4c04mq7mz27m7dgfdhhcdbga"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; device_detector = { groups = ["default"]; @@ -1073,7 +1093,7 @@ version = "4.8.1"; }; devise-two-factor = { - dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; + dependencies = ["activesupport" "devise" "railties" "rotp"]; groups = ["default"]; platforms = []; source = { @@ -1373,10 +1393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.9.0"; + version = "1.11.0"; }; escape_utils = { groups = ["default" "development" "test"]; @@ -1430,6 +1450,17 @@ }; version = "2.8.1"; }; + expgen = { + dependencies = ["parslet"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fd2sdh3lc3x0qds30czli8k5qr45bkb7ssx0kb038hhn9jhysjf"; + type = "gem"; + }; + version = "0.1.1"; + }; expression_parser = { groups = ["default"]; platforms = []; @@ -1531,10 +1562,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "143cpzdrnyqyfv1jasr0qjqgm57dhv46nsf5f2s06ndxccfr13rq"; + sha256 = "1qsycf92z2797m9v6calp4yhz565vdsfazi7rj0rxy3jxvlv4lgv"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; faraday-httpclient = { groups = ["danger" "default" "development" "test"]; @@ -1782,10 +1813,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gsb26a1jp0k7hclry0dai2a9m77a9h6ybc17x0i98z2ivzjsi07"; + sha256 = "130y73isnky4kgqwr1jhci3b51ld4i9r5a7132q6aq8cx8qjjx89"; type = "gem"; }; - version = "3.14.0"; + version = "3.15.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1799,15 +1830,15 @@ version = "2.1.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; + dependencies = ["fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mky1gqgg8vijr2avyspc9l4asjzkr5xc31x4c4ff7jzf00g11g"; + sha256 = "127l22c7lhg166sylfhxys41p0i3nlkxkpzzgw8q9zip10irm41w"; type = "gem"; }; - version = "1.15.0"; + version = "1.19.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1826,10 +1857,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; + sha256 = "0yggsxd7c58p5i8zgvfw9rkqlg75l6hkbwnpgawd2sacwl4jsfr6"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; @@ -1916,6 +1947,16 @@ }; version = "3.0.1"; }; + gems = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w26k4db8yj6x1gpxvh1rma4p36hz61xkk7kjf0z61nrajyp8g9l"; + type = "gem"; + }; + version = "1.2.0"; + }; get_process_mem = { dependencies = ["ffi"]; groups = ["default" "puma" "test"]; @@ -1977,20 +2018,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzqyglw7akval4rxjyqygs2abdrziy6ry0cy135lq1hlwl4axj8"; + sha256 = "10bq1l9445b9ff921kyayrn5w1b0f7qm1sjia3wmnl54jq2vxfk2"; type = "gem"; }; - version = "15.4.0.pre.rc2"; - }; - github-markup = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; - type = "gem"; - }; - version = "1.7.0"; + version = "15.5.2"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2020,10 +2051,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zhs9mz9gi6hgarm0px55kn6wxfah1xkcdrk217yv1vp1aqmqps"; + sha256 = "1if6makvlxxmjsyaga660smrw4ij9a0b6xh7mmifih5mpcr5an48"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.2"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2042,10 +2073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d8plrl69q5mcsgz8ywhw7k9q0g31y3gm6h90gw9apsisqbm7vrg"; + sha256 = "0zpbw2i1igv6ywqikip64w2xa5sqb9vg98qli0hab2h25g1n6hdg"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2053,10 +2084,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg"; + sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7"; type = "gem"; }; - version = "0.24.0"; + version = "0.28.0"; }; gitlab-license = { groups = ["default"]; @@ -2110,15 +2141,15 @@ version = "0.10.0"; }; gitlab-sidekiq-fetcher = { - dependencies = ["sidekiq"]; + dependencies = ["json" "sidekiq"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qkkwd2sj9l6nmvipd1308ni01m2n8ixqwl6syl493cm5am4qmlw"; + sha256 = "15rqw4rx7fwall9ajbgkrv3skh70c0dlwfffvzkch84z0pn1l12l"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; @@ -2126,10 +2157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nk6gdgjs920kfzyj35im2m3rp79vhmamg8f8f3y74vh7dadhxzz"; + sha256 = "1b9vvgdgzsaiq1kp3f38xm9bmigy8ky4v8lv63i5nyl0iymxy3pg"; type = "gem"; }; - version = "8.0.0"; + version = "9.0.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2176,15 +2207,125 @@ version = "6.4.0"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; + dependencies = ["google-apis-core" "google-apis-generator"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zypv7qz37ql5fqnlmk39krbazzshjzsw44syg7p0ap03zr6w021"; + type = "gem"; + }; + version = "0.53.0"; + }; + google-apis-compute_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jsz21m0mkjhn6yik2rshgg8i17sdwm8rmq0pfhfs6pwkv7kg5b2"; + type = "gem"; + }; + version = "0.53.0"; + }; + google-apis-core = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ynbapd26wppcqa81kw6kb8a39mzp0fql1rwmk3lgr95ybmxr1s"; + sha256 = "0d5h7sm8asxg252dnkk91sq51ynk1m06i15an6s04ihsi5ja64n0"; type = "gem"; }; - version = "0.50.0"; + version = "0.9.1"; + }; + google-apis-discovery_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05as93y4c613dg70xpyzs18a18vqm0bkl2slv3myb1382bzcqnif"; + type = "gem"; + }; + version = "0.12.0"; + }; + google-apis-dns_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k7k1nanm4wqyx19m5x9xzzm3nvf89gg5vr1dq4nfyvkl8g668zm"; + type = "gem"; + }; + version = "0.28.0"; + }; + google-apis-generator = { + dependencies = ["activesupport" "gems" "google-apis-core" "google-apis-discovery_v1" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y8j6bxgl1sxq2n3hslvld09xv6bcympk30if681xci1s6zgwmj6"; + type = "gem"; + }; + version = "0.11.0"; + }; + google-apis-iamcredentials_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06smnmn2s460xl9x9rh07a3fkqdrjjy6azmx8iywggqgv2k5d8p9"; + type = "gem"; + }; + version = "0.15.0"; + }; + google-apis-monitoring_v3 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0skk42y2y81jlj0qfk790wqz3sdaxrykrc4mp1ysr0zsinp654id"; + type = "gem"; + }; + version = "0.37.0"; + }; + google-apis-pubsub_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gg1br0pj16iag3xax942g101zk4rk48isdpz5abyhc070amk45q"; + type = "gem"; + }; + version = "0.30.0"; + }; + google-apis-sqladmin_v1beta4 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r8npqk6hsvj31dcfn8y0449gds2v75jkk209r7vyj2mrk6pj0nh"; + type = "gem"; + }; + version = "0.38.0"; + }; + google-apis-storage_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l6qhspmpgafj7wgwad6j7fxv1kxvim7sxvfyzb6d6chzh3ww6la"; + type = "gem"; + }; + version = "0.20.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2202,10 +2343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9"; + sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras"; type = "gem"; }; - version = "3.21.5"; + version = "3.21.9"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2224,10 +2365,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; + sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai"; type = "gem"; }; - version = "0.14.0"; + version = "1.3.0"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -2273,6 +2414,28 @@ }; version = "1.7.1"; }; + grape-swagger = { + dependencies = ["grape"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zy84lxrnnslray9rmfgb7ri295wda3cxx3xryz4lr5hd8r5p24w"; + type = "gem"; + }; + version = "1.5.0"; + }; + grape-swagger-entity = { + dependencies = ["grape-entity" "grape-swagger"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08smc3c2li1xa2nmgjkn742sp1xj9qzppy28v68cz5mc00nkf7pm"; + type = "gem"; + }; + version = "0.5.1"; + }; grape_logging = { dependencies = ["grape" "rack"]; groups = ["default"]; @@ -2466,25 +2629,14 @@ version = "1.0.1"; }; hashie = { - groups = ["default" "kerberos"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; - type = "gem"; - }; - version = "4.1.0"; - }; - hashie-forbidden_attributes = { - dependencies = ["hashie"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis"; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; type = "gem"; }; - version = "0.1.1"; + version = "5.0.0"; }; health_check = { dependencies = ["railties"]; @@ -2492,10 +2644,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wrbfsfsprfmykc0qbkkgxpf8vlx4a8sp77acqrjsh395f6qcqv"; + sha256 = "0mrv2323hx4lbcr6xii6ry89b3zvly5jsaacwbblxibx4c46a50h"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; heapy = { dependencies = ["thor"]; @@ -2514,10 +2666,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; + sha256 = "180kjksi0sdlqb0aq0bhal96ifwqm25hzb3w709ij55j51qls7ca"; type = "gem"; }; - version = "2.13.2"; + version = "2.14.3"; }; html2text = { dependencies = ["nokogiri"]; @@ -2605,14 +2757,14 @@ }; httparty = { dependencies = ["mime-types" "multi_xml"]; - groups = ["default"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32"; + sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9"; type = "gem"; }; - version = "0.16.4"; + version = "0.20.0"; }; httpclient = { groups = ["default"]; @@ -2646,14 +2798,25 @@ version = "0.8.0"; }; icalendar = { + dependencies = ["ice_cube"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd"; + sha256 = "11zfs0l8y2a6gpf0krm91d0ap2mnf04qky89dyzxwaspqxqgj174"; type = "gem"; }; - version = "2.4.1"; + version = "2.8.0"; + }; + ice_cube = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dri4mcya1fwzrr9nzic8hj1jr28a2szjag63f9k7p2bw9fpw4fs"; + type = "gem"; + }; + version = "0.16.4"; }; imagen = { dependencies = ["parser"]; @@ -2672,10 +2835,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lmlx3g4z894vwsgbpxhpmkn63n74mynklbwy07l7ccak552jw1n"; + sha256 = "0hn06njrwbxhxs2myr04fq3spqn38b8wm3irvkll91qv3p5yv0d3"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.0"; + }; + ipaddr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ycz5z25dykxy4sqdifgw6xszpgiy4hc0nv7sd89hm3x6vk6x497"; + type = "gem"; + }; + version = "1.2.2"; }; ipaddress = { groups = ["default"]; @@ -2735,10 +2908,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xarq1fqjaz6v139zzy4nwjg8c253fkvifn345gilva1qilaqgxi"; + sha256 = "1da4ccsq5bycg28iv0smmrra80jad3a8ya10lps5lv8fbbfvqd3r"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; json = { groups = ["default"]; @@ -2751,15 +2924,15 @@ version = "2.5.1"; }; json-jwt = { - dependencies = ["activesupport" "aes_key_wrap" "bindata"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr"; + sha256 = "04315mf4p9qa97grdfqv922paghzdfrbb982ap0p99rqwla4znv6"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.3"; }; json_schemer = { dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; @@ -2799,10 +2972,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vxkqciny5v4jgmjxl8qrgbmig2cij2iskqbwh4bfcmpxf467ch3"; + sha256 = "0gia8irryvfhcr6bsr64kpisbgdbqjsqfgrk12a11incmpwny1y4"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-actionview = { dependencies = ["actionview" "kaminari-core"]; @@ -2810,10 +2983,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w0p1hyv6lgf6h036cmn2kbkdv4x7g0g9q9kc5gzkpz7amlxr8ri"; + sha256 = "02f9ghl3a9b5q7l079d3yzmqjwkr4jigi7sldbps992rigygcc0k"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-activerecord = { dependencies = ["activerecord" "kaminari-core"]; @@ -2821,20 +2994,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02n5xxv6ilh39q2m6vcz7qrdai7ghk3s178dw6f0b3lavwyq49w3"; + sha256 = "0c148z97s1cqivzbwrak149z7kl1rdmj7dxk6rpkasimmdxsdlqd"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h04cr4y1jfn81gxy439vmczifghc2cvsyw47aa32is5bbxg1wlz"; + sha256 = "1zw3pg6kj39y7jxakbx7if59pl28lhk98fx71ks5lr3hfgn6zliv"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kas-grpc = { dependencies = ["grpc"]; @@ -2907,10 +3080,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nyhh3h96c118xcyfmn2595fhavi9r0g2v7rckqzc56walncszgs"; + sha256 = "1avkih414xnaznjlwp64cw4jhzvb7yd4szmnb88yvi7aj4n8r7hq"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; letter_opener = { dependencies = ["launchy"]; @@ -3014,21 +3187,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; lookbook = { - dependencies = ["actioncable" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard"]; + dependencies = ["actioncable" "activemodel" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mmw3jklhhrvvmp2fswld7pipdgw3s5l3fg3dgv353jq6w516gn5"; + sha256 = "1mv5q4gpgzklwrgp7s7mhi0gb7x739qhyrni2n96i2vr4nv48a3l"; type = "gem"; }; - version = "1.0.3"; + version = "1.2.1"; }; lru_redux = { groups = ["default"]; @@ -3077,10 +3250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1003hf828anbd3pxwzs9ir9sclh64mgj971n4a7ilgj9xs8r0a38"; + sha256 = "1kw9l9gw9dqmbpjxs3ndifia2204n8n92pjr4xp78hiynqm22qyb"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; memoist = { groups = ["default"]; @@ -3093,14 +3266,14 @@ version = "0.16.2"; }; memory_profiler = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04ivhv1bilwqm33jv28gar2vwzsichb5nipaq395d3axabv8qmfy"; + sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; type = "gem"; }; - version = "0.9.14"; + version = "1.0.1"; }; method_source = { groups = ["default" "development" "metrics" "test"]; @@ -3431,10 +3604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3468,15 +3641,15 @@ version = "0.5.6"; }; oauth2 = { - dependencies = ["faraday" "jwt" "multi_xml" "rack" "rash_alt" "version_gem"]; + dependencies = ["faraday" "jwt" "multi_xml" "rack" "snaky_hash" "version_gem"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06y4wnsc1flbgv8vhh650x7f2k0k8238zcrmncil4swkb9kdhhxk"; + sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -3505,10 +3678,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihfnl0maszdq821h6mivr8xickjab6ccyncnm5rn2vgrj6imwxf"; + sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; type = "gem"; }; - version = "3.13.21"; + version = "3.13.23"; + }; + oj-introspect = { + dependencies = ["oj"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2hw0cxs8z6g3bkrsrxmlixcmalnlmj9rzcd8sxaqjs95w4wn7a"; + type = "gem"; + }; + version = "0.7.1"; }; omniauth = { dependencies = ["hashie" "rack" "rack-protection"]; @@ -3527,10 +3711,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk9vlqm7warm83l5vy44z7q4rg4mismqmb4bmgapllqiw5yr09g"; + sha256 = "1qsx4ri5rbr68djyqd5523rcyxhzi5v05f66wz0iflyda6fkdkwf"; type = "gem"; }; - version = "1.0.1"; + version = "2.0.0"; }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -3571,10 +3755,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pv9pxff3g4cva76zzsx8fibb08c9av51lxksh73mbl9rrxdgkgd"; + sha256 = "0wnhibz903ssnq9scl65a47d41zcczb3wjvc44y3w8ydabfwx164"; type = "gem"; }; - version = "1.0.0"; + version = "2.0.0"; }; omniauth-dingtalk-oauth2 = { dependencies = ["omniauth-oauth2"]; @@ -3604,54 +3788,54 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jc66zp4bhwy7c6s817ws0nkimski3crrhwd7xyy55ss29v6b8hw"; + sha256 = "1m6a7kg3lxz2nm96prln2ja8r4wlm37m5vsy9199vnynqq5fgy4g"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.1"; }; - omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; + omniauth-google-oauth2 = { + dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; + sha256 = "0fahkghfa2iczmwss9bz5l4rh7siwzjnjp3akh7pdbsfx0kg35j4"; type = "gem"; }; - version = "1.2.0"; + version = "1.1.1"; }; - omniauth-oauth2 = { - dependencies = ["oauth2" "omniauth"]; + omniauth-oauth = { + dependencies = ["oauth" "omniauth"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ia73zcbmhf02krlkq2rxmksx93jp777ax5x58fzkq3jzacqyniz"; + sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; type = "gem"; }; - version = "1.7.3"; + version = "1.2.0"; }; - omniauth-oauth2-generic = { - dependencies = ["omniauth-oauth2"]; + omniauth-oauth2 = { + dependencies = ["oauth2" "omniauth"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273"; + sha256 = "0y4y122xm8zgrxn5nnzwg6w39dnjss8pcq2ppbpx9qn7kiayky5j"; type = "gem"; }; - version = "0.2.2"; + version = "1.8.0"; }; - omniauth-rails_csrf_protection = { - dependencies = ["actionpack" "omniauth"]; + omniauth-oauth2-generic = { + dependencies = ["omniauth-oauth2" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; + sha256 = "04vnmszmm1jmwvg6cwdy9jxliwa8yawp4w4690pvyplx04wqavnf"; type = "gem"; }; - version = "1.0.1"; + version = "0.2.8"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -3708,14 +3892,15 @@ version = "1.3.0"; }; openssl = { + dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w"; + sha256 = "0wkx3b598mxmr3idfbgas0cnrds54bfivnn1ip0d7z7kcr5vzbzn"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; openssl-signature_algorithm = { groups = ["default"]; @@ -3784,10 +3969,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ngwc4zrp6jxpb8s0y07xxic492a1n0akjxd7x4hks2fbsiwwwk2"; + sha256 = "0ldi3j95dh3c29w4bliykfdd08r95d4zvbdblk385w9b4knr2afc"; type = "gem"; }; - version = "1.59.0"; + version = "1.63.0"; }; pact-mock_service = { dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; @@ -3795,21 +3980,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0izmf5h0n1mcrfk6qlz61rhzdjs6h0bkqrx6ndp8nhmfhja254fc"; + sha256 = "09syv4y0g0pvjshxj8i0yg7mrvszgp503is1b78k86bgv6wc73l9"; type = "gem"; }; - version = "3.6.2"; + version = "3.10.0"; }; pact-support = { - dependencies = ["awesome_print" "randexp" "rspec" "term-ansicolor"]; + dependencies = ["awesome_print" "diff-lcs" "expgen" "rainbow"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07qxvxy48im9vlswqspsh2k6fy6rsmi3409863ww8y7yx5pmjr63"; + sha256 = "0xh4idg0m1mr0pkywj5f79nlr4g6n4waism86gj34h8wicf9c9aa"; type = "gem"; }; - version = "1.15.1"; + version = "1.18.1"; }; parallel = { groups = ["development" "test"]; @@ -3880,10 +4065,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fyhhb5f2y5mqk5vg5ykicxp58wwhc7invfp27x8d7fgi0zkdwa8"; + sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4"; type = "gem"; }; - version = "2.1.4"; + version = "2.2.0"; }; plist = { groups = ["default"]; @@ -4012,10 +4197,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; puma = { dependencies = ["nio4r"]; @@ -4118,10 +4303,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wiz38c155g236sgrw0qnn33ysjmqhwq3hc1hqfw2fi4mmy1bz06"; + sha256 = "1fknwsxz4429w1hndl6y30cmm2n34wmmaaj2hhp6jrm8ssfsfwjf"; type = "gem"; }; - version = "1.21.2"; + version = "1.21.3"; }; rack-protection = { dependencies = ["rack"]; @@ -4140,10 +4325,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dpl6vi9yiv6k8gnr3zrsq7kd1dwbn8vkn70sw7dp975sgb4ziw9"; + sha256 = "1m6j2xk3s3ps3r9vqgwq3flyij9jgkyzanmgiifid8yqhcskgfx8"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.4"; }; rack-test = { dependencies = ["rack"]; @@ -4151,20 +4336,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rack-timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ahj3qz3xhfrwvqb4nf6cfzvliigg0idfsp5jyr8qwk676d2f30"; + sha256 = "1cqa9lh2rdqqvhfxbrdys7mj2x4vxhqmf57iww2x8961mhp8jm0p"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.3"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -4252,27 +4437,6 @@ }; version = "13.0.6"; }; - randexp = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j742j7g107jgkvpsfq2b10d5xhsni5s8vxrp518d3karw7529ih"; - type = "gem"; - }; - version = "0.1.7"; - }; - rash_alt = { - dependencies = ["hashie"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01qn9qrbi79mr4nyf1fqv3fjbh9ipx6r42vwfxmwrkpxp3ansjhx"; - type = "gem"; - }; - version = "0.4.12"; - }; rb-fsevent = { groups = ["default" "development" "test"]; platforms = []; @@ -4340,10 +4504,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; + sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; recaptcha = { dependencies = ["json"]; @@ -4391,10 +4555,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; + sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; type = "gem"; }; - version = "4.7.1"; + version = "4.8.0"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -4413,10 +4577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k65fr7f8ciq7d9nwc5ziw1d32zsxilgmqdlj3359rz5jgb0f5y8"; + sha256 = "04l61lpb3s2xkwj36l7b543lhciv19z514kxnmnbh5fg70grc8q9"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -4445,10 +4609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; + sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; regexp_property_values = { groups = ["default"]; @@ -4615,10 +4779,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; + sha256 = "06wmcjsslx9vmw0bair46551ya8mb76csjyb59fxsmnkkp75jmh0"; type = "gem"; }; - version = "3.10.1"; + version = "3.10.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4680,10 +4844,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; + sha256 = "0pjckrh8q6sqxy38xw7f4ziylq1983k84xh927s6352pps68zj35"; type = "gem"; }; - version = "3.10.2"; + version = "3.10.3"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -4691,10 +4855,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p"; + sha256 = "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"; type = "gem"; }; - version = "0.4.1"; + version = "0.6.0"; }; rspec_profiling = { dependencies = ["activerecord" "pg" "rails" "sqlite3"]; @@ -4708,15 +4872,15 @@ version = "0.0.6"; }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["default" "development" "test"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phrig25dykgi42z6mf1abllh3ws6sv7awa82hzvvvbjx2xlzd3k"; + sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; type = "gem"; }; - version = "0.93.1"; + version = "1.36.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4757,10 +4921,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01aahh54r9mwhdj7v2s6kmkdm1k1n1z27dlknlbgm281ny1aswrk"; + sha256 = "0l87hrzjch2mdpwi0wf9b5nci7fmz5pfzqn5v44zi3rq80zawigf"; type = "gem"; }; - version = "1.9.2"; + version = "1.14.3"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4768,32 +4932,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d"; + sha256 = "0g342zj7b01z3l8k9hsvx0x2qyp74a59qz6j3a26pwzalr3ap48q"; type = "gem"; }; - version = "2.9.1"; + version = "2.15.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-ast"]; + dependencies = ["rubocop"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0albi9zn8zrz1bb105xkcn5xdv6q7i7r34h9m4jsj5ygsvkkh8kv"; + sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; type = "gem"; }; - version = "1.44.1"; + version = "2.12.1"; }; ruby-fogbugz = { - dependencies = ["crack"]; + dependencies = ["crack" "multipart-post"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm"; + sha256 = "0mznsnhsgh1yg57j5gighr9vjricnix1l7ngf654k3v4fkjcs12y"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.0"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -4806,16 +4970,6 @@ }; version = "0.5.4"; }; - ruby-prof = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g1j37fy53ly6351asfcnik033gwkp4kjma7lji1yklmj86d4dg7"; - type = "gem"; - }; - version = "1.3.1"; - }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; @@ -5149,10 +5303,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b06kw7frd8hrb7373pvfd39qap00ykkvipgymgwxfjzrgz0ag0d"; + sha256 = "0p2mj2jj5b9wqmpvkngx87lfr2qgwhqvwx38bmhl5aa29pc6z5kx"; type = "gem"; }; - version = "6.4.2"; + version = "6.5.7"; }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; @@ -5160,10 +5314,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9psfprq1x03b51mnpidfzilnm8b6spzkgap3pb8yga4pg2lq91"; + sha256 = "1jmh5vc2gdy0a161hgq0vlbwaviqj51pqzmgda4p2nyffg575nj7"; type = "gem"; }; - version = "1.4.0"; + version = "1.8.0"; }; sigdump = { groups = ["development" "test"]; @@ -5268,6 +5422,17 @@ }; version = "2.3.4"; }; + snaky_hash = { + dependencies = ["hashie" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pl70rh92wsn15q4lwzikzi7j5a00vm77bqjg07k4sgzx0wjx2zy"; + type = "gem"; + }; + version = "2.0.0"; + }; snowplow-tracker = { dependencies = ["contracts"]; groups = ["default"]; @@ -5285,10 +5450,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r8lr7gldwp57xqik4kims6w72q9ww34bral0j5z20a56s6gva8x"; + sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7"; type = "gem"; }; - version = "0.46.0"; + version = "0.47.2"; }; sorted_set = { dependencies = ["rbtree" "set"]; @@ -5510,6 +5675,28 @@ }; version = "0.6.0"; }; + telesign = { + dependencies = ["net-http-persistent"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hjcaiy58zg7vpy5vsaaz6ss8w6nlkkvz1p758gdmd5wlxpfkinw"; + type = "gem"; + }; + version = "2.2.4"; + }; + telesignenterprise = { + dependencies = ["telesign"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cziz60q1pav635fln5xiag7vqvf992sk9xi1l5gxhm8ccra0izi"; + type = "gem"; + }; + version = "2.2.2"; + }; temple = { groups = ["default" "development" "test"]; platforms = []; @@ -5609,10 +5796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.11"; }; timecop = { groups = ["development" "test"]; @@ -5650,10 +5837,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153q7j2nj7y43iscbfcihmwlcydx6sbd65azs27kain0gncymd90"; + sha256 = "1kxykx7ywc0i3y4dwakz4b46dql4zc7h8b5w1hqhsqswq93s7i2i"; type = "gem"; }; - version = "1.31.0"; + version = "1.31.1"; }; toml-rb = { dependencies = ["citrus"]; @@ -5661,10 +5848,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5j95w28vj85bzw98g1dyd4gm7xpli2fdvwwrgwlay7gb3wc5jh"; + sha256 = "19nr4wr5accc6l2y3avn7b02lqmk9035zxq42234k7fcqd5cbqm1"; type = "gem"; }; - version = "2.0.1"; + version = "2.2.0"; }; tomlrb = { groups = ["default"]; @@ -5957,10 +6144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bwgbw56z2mhh2j044lgahrsiddibxx0r62r0cxvp0k4sjj9774j"; + sha256 = "104s7p4zp5yvf0bvbwd9mqmnkgz2z89h4hbvxi8pzd8d08c9a03b"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; version_sorter = { groups = ["default"]; @@ -5978,10 +6165,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0av6ngrfb1pyxwvy2lsp7m5lljk2vc9j7aabzw1zp70dh13hd261"; + sha256 = "1h4jhcp4h98lj5f7bn54313na25p9mhal0fw8d8a8m8lq6llgg8b"; type = "gem"; }; - version = "2.71.0"; + version = "2.74.1"; }; vmstat = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/update-pg.patch b/pkgs/applications/version-management/gitlab/update-pg.patch deleted file mode 100644 index be8cd639df596..0000000000000 --- a/pkgs/applications/version-management/gitlab/update-pg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Gemfile.lock b/Gemfile.lock -index 9074b48c56b..57a1c924897 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -1019,7 +1019,7 @@ GEM - tty-color (~> 0.5) - peek (1.1.0) - railties (>= 4.0.0) -- pg (1.4.1) -+ pg (1.4.3) - pg_query (2.1.4) - google-protobuf (>= 3.19.2) - plist (3.6.0) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 65c152a347e5f..0f322a5d375e7 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -23,9 +23,9 @@ VENDORED_GEMS = [ "omniauth-azure-oauth2", "omniauth-cas3", "omniauth-gitlab", - "omniauth-google-oauth2", "omniauth_crowd", "omniauth-salesforce", + "attr_encrypted", "mail-smtp_pool", "microsoft_graph_mailer", "ipynbdiff", @@ -159,11 +159,6 @@ def update_rubyenv(): gemfile = repo.get_file('Gemfile', rev) gemfile_lock = repo.get_file('Gemfile.lock', rev) - if "pg (1.4.1)" in gemfile_lock: - gemfile_lock = gemfile_lock.replace("pg (1.4.1)", "pg (1.4.3)") - else: - logger.info("Looks like pg was updated! Please remove update-pg.patch, as this will cause a build failure") - with open(rubyenv_dir / 'Gemfile', 'w') as f: f.write(re.sub(f'.*({"|".join(VENDORED_GEMS)}).*', "", gemfile)) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index b3af90c2a38e2..2bd780548114f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg="; + sha256 = "sha256-bDmrhzKUjYnPEgh1HdfYXUBCqoIVOXdFG56xM2dYUHI="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE="; + sha256 = "sha256-UZ/ZSZkAedrm3iUkaQu6zvfX4bhrYDlwR9L9ytf38ZY="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -157,9 +157,9 @@ let # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 test-patchbomb-tls.t - # Test broken with recent versions of git due to default policy change - # https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302 - test-convert-git.t + # Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3. + # https://bz.mercurial-scm.org/show_bug.cgi?id=6760 + test-https.t EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/applications/version-management/rcshist/default.nix index a9c7bbefc1318..f7cdceaa1b4ca 100644 --- a/pkgs/applications/version-management/rcshist/default.nix +++ b/pkgs/applications/version-management/rcshist/default.nix @@ -1,12 +1,17 @@ { lib , stdenv , fetchurl +, musl-fts }: stdenv.mkDerivation { pname = "rcshist"; version = "1.04"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "LIBS=-lfts"; + + buildInputs = lib.optional stdenv.hostPlatform.isMusl musl-fts; + src = fetchurl { url = "https://web.archive.org/web/20220508220019/https://invisible-island.net/datafiles/release/rcshist.tar.gz"; sha256 = "01ab3xwgm934lxr8bm758am3vxwx4hxx7cc9prbgqj5nh30vdg1n"; diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock new file mode 100644 index 0000000000000..0065449e7d075 --- /dev/null +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -0,0 +1,7768 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "abomonation" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e72913c99b1f927aa7bd59a41518fdd9995f63ffc8760f211609e0241c4fb2" + +[[package]] +name = "abomonation_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e50e2a046af56a864c62d97b7153fda72c596e646be1b0c7963736821f6e1efa" +dependencies = [ + "proc-macro2", + "quote", + "synstructure", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom 0.2.8", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "anyhow" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" + +[[package]] +name = "arc-swap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" + +[[package]] +name = "assert-json-diff" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4259cbe96513d2f1073027a259fc2ca917feb3026a5a8d984e3628e490255cc0" +dependencies = [ + "extend", + "serde", + "serde_json", +] + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "brotli", + "bytes 0.5.6", + "bzip2", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite 0.2.9", + "tokio 0.2.25", + "tokio 0.3.7", + "tokio 1.22.0", + "zstd", + "zstd-safe", +] + +[[package]] +name = "async-io" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" +dependencies = [ + "async-lock", + "autocfg", + "concurrent-queue", + "futures-lite", + "libc", + "log", + "parking", + "polling", + "slab", + "socket2", + "waker-fn", + "winapi 0.3.9", +] + +[[package]] +name = "async-lock" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +dependencies = [ + "event-listener", + "futures-lite", +] + +[[package]] +name = "async-runtime" +version = "0.1.0" +dependencies = [ + "futures 0.3.25", + "num_cpus", + "once_cell", + "tokio 1.22.0", +] + +[[package]] +name = "async-trait" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomicfile" +version = "0.1.0" +dependencies = [ + "tempfile", + "tracing", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "auth" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "configmodel", + "configparser", + "indexmap", + "once_cell", + "pem", + "simple_asn1", + "thiserror", + "tracing", + "url 2.3.1", + "util", +] + +[[package]] +name = "auto_impl" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cbf586c80ada5e5ccdecae80d3ef0854f224e2dd74435f8d87e6831b8d0a38" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backingstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "configparser", + "eagerepo", + "edenapi", + "env_logger 0.7.1", + "identity", + "libc", + "log", + "manifest", + "manifest-tree", + "minibytes", + "parking_lot 0.11.2", + "revisionstore", + "tracing", + "tracing-collector", + "tracing-subscriber", + "types", +] + +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindag" +version = "0.1.0" +dependencies = [ + "dag", + "drawdag", + "nonblocking", + "tempfile", + "vlqencoding", +] + +[[package]] +name = "bindings" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "paste", + "pyauth", + "pyblackbox", + "pybytes", + "pycats", + "pycheckout", + "pyclientinfo", + "pycliparser", + "pyconfigparser", + "pydag", + "pydiffhelpers", + "pydirs", + "pydoctor", + "pydrawdag", + "pyeagerepo", + "pyedenapi", + "pyerror", + "pyexchange", + "pyfail", + "pyfs", + "pygitstore", + "pyhgmetrics", + "pyhgtime", + "pyidentity", + "pyindexedlog", + "pyio", + "pylock", + "pylz4", + "pymanifest", + "pymetalog", + "pymutationstore", + "pynodemap", + "pypathhistory", + "pypathmatcher", + "pypprint", + "pyprocess", + "pyprogress", + "pyrefencode", + "pyregex", + "pyrenderdag", + "pyrepo", + "pyrevisionstore", + "pyrevlogindex", + "pysptui", + "pystatus", + "pythreading", + "pytracing", + "pytreestate", + "pyvlq", + "pyworker", + "pyworkingcopy", + "pyzstd", + "pyzstore", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blackbox" +version = "0.1.0" +dependencies = [ + "anyhow", + "byteorder", + "indexedlog", + "lazy_static", + "libc", + "minibench", + "parking_lot 0.11.2", + "serde", + "serde_alt", + "serde_cbor", + "serde_derive", + "serde_json", + "tempfile", +] + +[[package]] +name = "blake2" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +dependencies = [ + "crypto-mac", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bufsize" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c81e4b4a053ed8b2123b6ed751a334bb30df2eb3da76d0e8bb97e9e69bbd9d51" +dependencies = [ + "bytes 1.2.1", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +dependencies = [ + "byteorder", + "iovec", +] + +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +dependencies = [ + "serde", +] + +[[package]] +name = "bzip2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cache-padded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cast" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cats" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "indexmap", + "serde", + "serde_json", + "thiserror", + "tracing", + "util", +] + +[[package]] +name = "cc" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "checkout" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "configmodel", + "fail", + "futures 0.3.25", + "io", + "manifest", + "manifest-tree", + "minibytes", + "parking_lot 0.11.2", + "pathmatcher", + "progress-model", + "quickcheck", + "repo", + "repolock", + "serde_json", + "status", + "storemodel", + "tempfile", + "thiserror", + "tokio 1.22.0", + "tracing", + "treestate", + "types", + "util", + "vfs", + "walkdir", + "workingcopy", +] + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "serde", + "time 0.1.44", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim 0.8.0", + "term_size", + "textwrap 0.11.0", + "unicode-width", + "vec_map", +] + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "regex", + "strsim 0.10.0", + "termcolor", + "terminal_size 0.2.2", + "textwrap 0.16.0", + "unicase", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck 0.4.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clidispatch" +version = "0.1.0" +dependencies = [ + "anyhow", + "blackbox", + "cliparser", + "configmodel", + "configparser", + "hgplain", + "identity", + "indexedlog", + "io", + "network-doctor", + "repo", + "termlogger", + "thiserror", + "thrift-types", + "tracing", + "types", + "util", + "workingcopy", +] + +[[package]] +name = "clientinfo" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "hostname 0.1.0", + "serde", + "serde_json", +] + +[[package]] +name = "cliparser" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "shlex", + "thiserror", +] + +[[package]] +name = "clone" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "checkout", + "configmodel", + "manifest-tree", + "repo", + "tempfile", + "termlogger", + "thiserror", + "tracing", + "treestate", + "types", + "util", + "vfs", +] + +[[package]] +name = "cloned" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" + +[[package]] +name = "codegen_includer_proc_macro" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "quote", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colored" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +dependencies = [ + "atty", + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "comfy-table" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e95a3e867422fd8d04049041f5671f94d53c32a9dcd82e2be268714942f3f3" +dependencies = [ + "crossterm", + "strum", + "strum_macros", + "unicode-width", +] + +[[package]] +name = "commitcloudsubscriber" +version = "0.1.0" +dependencies = [ + "anyhow", + "filetime", + "hostcaps", + "identity", + "lazy_static", + "log", + "mime", + "regex", + "reqwest", + "rust-ini", + "serde", + "serde_json", + "tempfile", + "thiserror", +] + +[[package]] +name = "conch-parser" +version = "0.1.1" +dependencies = [ + "serde", + "void", +] + +[[package]] +name = "conch_parser" +version = "0.1.0" +dependencies = [ + "conch-parser", + "cpython", +] + +[[package]] +name = "concurrent-queue" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +dependencies = [ + "cache-padded", +] + +[[package]] +name = "config" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "const-cstr", + "fbthrift", + "futures 0.3.25", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "config_thrift" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "const-cstr", + "fbthrift", + "futures 0.3.25", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "configmodel" +version = "0.1.0" +dependencies = [ + "anyhow", + "auto_impl", + "minibytes", + "thiserror", + "util", +] + +[[package]] +name = "configparser" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "dirs 2.0.2", + "filetime", + "hgplain", + "hgtime", + "hostcaps", + "hostname 0.3.1", + "http-client", + "identity", + "indexmap", + "lazy_static", + "minibench", + "minibytes", + "once_cell", + "parking_lot 0.11.2", + "pest-hgrc", + "regex", + "serde", + "serde_json", + "serde_urlencoded 0.5.5", + "sha2 0.10.6", + "tempdir", + "tempfile", + "tracing", + "types", + "url 2.3.1", + "util", + "version", + "zstd", +] + +[[package]] +name = "console" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "terminal_size 0.1.17", + "winapi 0.3.9", +] + +[[package]] +name = "const-cstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "cpython" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3052106c29da7390237bc2310c1928335733b286287754ea85e6093d2495280e" +dependencies = [ + "libc", + "num-traits", + "paste", + "python3-sys", + "serde", +] + +[[package]] +name = "cpython_async" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cpython", + "cpython_ext", + "futures 0.3.25", + "itertools 0.10.5", + "tokio 1.22.0", +] + +[[package]] +name = "cpython_ext" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "io", + "libc", + "once_cell", + "parking_lot 0.11.2", + "python3-sys", + "serde", + "serde_bytes", + "serde_cbor", + "thiserror", + "types", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "criterion" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1" +dependencies = [ + "atty", + "cast 0.2.7", + "clap 2.34.0", + "criterion-plot", + "csv", + "itertools 0.8.2", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +dependencies = [ + "cast 0.3.0", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-channel 0.4.4", + "crossbeam-deque 0.7.4", + "crossbeam-epoch 0.8.2", + "crossbeam-queue 0.2.3", + "crossbeam-utils 0.7.2", +] + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel 0.5.6", + "crossbeam-deque 0.8.2", + "crossbeam-epoch 0.9.11", + "crossbeam-queue 0.3.6", + "crossbeam-utils 0.8.12", +] + +[[package]] +name = "crossbeam-channel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +dependencies = [ + "crossbeam-utils 0.6.6", +] + +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.12", +] + +[[package]] +name = "crossbeam-deque" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" +dependencies = [ + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.11", + "crossbeam-utils 0.8.12", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "lazy_static", + "maybe-uninit", + "memoffset 0.5.6", + "scopeguard", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.12", + "memoffset 0.6.5", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.12", +] + +[[package]] +name = "crossbeam-utils" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +dependencies = [ + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossterm" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio 0.7.14", + "parking_lot 0.11.2", + "signal-hook 0.3.14", + "signal-hook-mio", + "winapi 0.3.9", +] + +[[package]] +name = "crossterm_winapi" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "lab", + "phf 0.11.1", +] + +[[package]] +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "csv-core", + "itoa 0.4.8", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "curl" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi 0.3.9", +] + +[[package]] +name = "curl-sys" +version = "0.4.59+curl-7.86.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" +dependencies = [ + "cc", + "libc", + "libnghttp2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi 0.3.9", +] + +[[package]] +name = "cxx" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dag" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "bitflags", + "byteorder", + "dag-types", + "dev-logger", + "drawdag", + "fail", + "fs2", + "futures 0.3.25", + "indexedlog", + "indexmap", + "itertools 0.10.5", + "mincode", + "minibytes", + "nonblocking", + "once_cell", + "quickcheck", + "rand 0.8.5", + "serde", + "tempfile", + "thiserror", + "tokio 1.22.0", + "tracing", + "unicode-width", + "vlqencoding", +] + +[[package]] +name = "dag-benches" +version = "0.1.0" +dependencies = [ + "bindag", + "dag", + "mincode", + "minibench", + "nonblocking", + "tempfile", +] + +[[package]] +name = "dag-types" +version = "0.1.0" +dependencies = [ + "abomonation", + "abomonation_derive", + "minibytes", + "quickcheck", + "quickcheck_arbitrary_derive", + "serde", +] + +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.12.3", + "lock_api", + "once_cell", + "parking_lot_core 0.9.4", + "rayon", + "serde", +] + +[[package]] +name = "data-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" + +[[package]] +name = "debugtop" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "runlog", +] + +[[package]] +name = "deltae" +version = "0.3.0" +source = "git+https://github.com/markbt/deltae?rev=1c6e9c7c9184751bd17795d78896d522e77a2ce4#1c6e9c7c9184751bd17795d78896d522e77a2ce4" + +[[package]] +name = "dev-logger" +version = "0.1.0" +dependencies = [ + "ctor", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +dependencies = [ + "cfg-if 0.1.10", + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dlv-list" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" +dependencies = [ + "rand 0.8.5", +] + +[[package]] +name = "drawdag" +version = "0.1.0" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "eagerepo" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "dag", + "edenapi_trait", + "fail", + "futures 0.3.25", + "http", + "identity", + "manifest-tree", + "metalog", + "minibytes", + "nonblocking", + "parking_lot 0.11.2", + "storemodel", + "tempfile", + "thiserror", + "tokio 1.22.0", + "tracing", + "zstore", +] + +[[package]] +name = "eden_apfs_mount_helper" +version = "0.1.0" +dependencies = [ + "anyhow", + "libc", + "once_cell", + "plist", + "pretty_assertions", + "serde", + "serde_json", + "sha2 0.10.6", + "structopt", +] + +[[package]] +name = "edenapi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "auth", + "bytes 1.2.1", + "chrono", + "configmodel", + "edenapi_trait", + "edenapi_types", + "futures 0.3.25", + "hg-http", + "http-client", + "itertools 0.10.5", + "lazy_static", + "metrics", + "minibytes", + "once_cell", + "parking_lot 0.11.2", + "pprint", + "progress-model", + "rand 0.8.5", + "repo_name", + "serde", + "serde_cbor", + "serde_json", + "tokio 1.22.0", + "tracing", + "types", + "url 2.3.1", + "version", +] + +[[package]] +name = "edenapi_ext" +version = "0.1.0" +dependencies = [ + "anyhow", + "blake2", + "cloned", + "crossbeam 0.8.2", + "edenapi", + "edenapi_types", + "futures 0.3.25", + "itertools 0.10.5", + "minibytes", + "tokio 1.22.0", + "types", + "vfs", +] + +[[package]] +name = "edenapi_trait" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "configmodel", + "edenapi_types", + "futures 0.3.25", + "http", + "http-client", + "minibytes", + "serde_cbor", + "thiserror", + "types", + "url 2.3.1", +] + +[[package]] +name = "edenapi_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes 1.2.1", + "dag-types", + "insta_ext", + "paste", + "quickcheck", + "quickcheck_arbitrary_derive", + "quickcheck_macros", + "revisionstore_types", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "thiserror", + "type_macros", + "types", +] + +[[package]] +name = "edenfs_client" +version = "0.1.0" +dependencies = [ + "anyhow", + "byteorder", + "chrono", + "fbthrift_socket", + "identity", + "io", + "serde", + "sha2 0.10.6", + "status", + "thiserror", + "thrift-types", + "tokio 1.22.0", + "tokio-uds-compat", + "toml", + "types", + "util", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding" +version = "0.1.0" +dependencies = [ + "local-encoding", + "types", + "winapi 0.3.9", +] + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "enum-as-inner" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "enum_dispatch" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime 1.3.0", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exchange" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "dag", + "edenapi", + "hgcommits", + "metalog", + "refencode", + "tracing", + "types", +] + +[[package]] +name = "extend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fail" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6" +dependencies = [ + "lazy_static", + "log", + "rand 0.7.3", +] + +[[package]] +name = "faster-hex" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8" + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "fb303_core" +version = "0.0.0" +source = "git+https://github.com/facebook/fb303.git?branch=main#42f3e6ac3bf02d4038f5ca5e7d97942d538fdd06" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "const-cstr", + "fbthrift", + "futures 0.3.25", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "fbinit" +version = "0.1.2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "fbinit_macros", + "quickcheck", +] + +[[package]] +name = "fbinit_macros" +version = "0.1.2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fbthrift" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#d5780da13719eaca77b1aec44d8d16b233c79b5e" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.11.0", + "bufsize", + "bytes 1.2.1", + "futures 0.3.25", + "ghost", + "num-derive", + "num-traits", + "ordered-float 1.1.1", + "panic-message", + "serde_json", + "thiserror", +] + +[[package]] +name = "fbthrift_framed" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "byteorder", + "bytes 1.2.1", + "tokio-util 0.6.10", +] + +[[package]] +name = "fbthrift_socket" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "anyhow", + "bytes 1.2.1", + "fbthrift", + "fbthrift_framed", + "fbthrift_util", + "futures 0.3.25", + "tokio 1.22.0", + "tokio-tower", + "tokio-util 0.6.10", + "tower-service", +] + +[[package]] +name = "fbthrift_util" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "tokio 1.22.0", +] + +[[package]] +name = "filedescriptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" +dependencies = [ + "libc", + "thiserror", + "winapi 0.3.9", +] + +[[package]] +name = "filetime" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys 0.42.0", +] + +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "futures 0.1.31", + "libc", + "miniz_oxide", + "tokio-io", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding 2.2.0", +] + +[[package]] +name = "formatter" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "serde", + "serde_json", + "termstyle", + "thiserror", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + +[[package]] +name = "fsinfo" +version = "0.1.0" +dependencies = [ + "anyhow", + "identity", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "fsprobe" +version = "0.1.0" +dependencies = [ + "anyhow", + "structopt", +] + +[[package]] +name = "fsyncglob" +version = "0.1.0" +dependencies = [ + "glob", + "tempfile", + "tracing", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-batch" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f5c372b0c5d1023cce2a0ff7667b589ba88dae751b5f65c400b5d0803b30cbf" +dependencies = [ + "futures 0.3.25", + "futures-timer", + "pin-utils", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite 0.2.9", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-timer" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite 0.2.9", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "ghost" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "git2" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url 2.3.1", +] + +[[package]] +name = "gitdag" +version = "0.1.0" +dependencies = [ + "anyhow", + "dag", + "git2", + "nonblocking", + "parking_lot 0.11.2", + "tracing", +] + +[[package]] +name = "gitstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "futures 0.3.25", + "git2", + "minibytes", + "storemodel", + "types", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "globset" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes 1.2.1", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.22.0", + "tokio-util 0.7.4", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash 0.4.7", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hg-http" +version = "0.1.0" +dependencies = [ + "async-runtime", + "auth", + "clientinfo", + "configmodel", + "hg-metrics", + "http-client", + "once_cell", + "progress-model", +] + +[[package]] +name = "hg-metrics" +version = "0.1.0" +dependencies = [ + "once_cell", + "parking_lot 0.11.2", +] + +[[package]] +name = "hgcommands" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "bindings", + "blackbox", + "checkout", + "chrono", + "clidispatch", + "cliparser", + "clone", + "comfy-table", + "configmodel", + "configparser", + "cpython", + "cpython_ext", + "dag", + "debugtop", + "eagerepo", + "edenapi", + "edenfs_client", + "exchange", + "fail", + "flate2", + "formatter", + "fsyncglob", + "hg-http", + "hgplain", + "hgtime", + "hostname 0.3.1", + "identity", + "indexedlog", + "libc", + "metrics-render", + "migration", + "mincode", + "minibytes", + "network-doctor", + "once_cell", + "parking_lot 0.11.2", + "pathmatcher", + "procinfo", + "progress-model", + "progress-render", + "pyconfigparser", + "python3-sys", + "pytracing", + "rand 0.8.5", + "repo", + "revisionstore", + "revsets", + "runlog", + "serde", + "serde_json", + "status", + "termstyle", + "tracing", + "tracing-collector", + "tracing-reload", + "tracing-sampler", + "tracing-subscriber", + "treestate", + "types", + "url 2.3.1", + "util", + "version", + "workingcopy", + "zstd", +] + +[[package]] +name = "hgcommits" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "dag", + "edenapi", + "futures 0.3.25", + "gitdag", + "metalog", + "minibytes", + "parking_lot 0.11.2", + "refencode", + "revlogindex", + "serde", + "storemodel", + "streams", + "thiserror", + "tracing", + "types", + "zstore", +] + +[[package]] +name = "hgmain" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "configparser", + "dirs 2.0.2", + "encoding", + "hgcommands", + "identity", + "libc", + "pyblackbox", + "winapi 0.3.9", +] + +[[package]] +name = "hgplain" +version = "0.1.0" +dependencies = [ + "identity", +] + +[[package]] +name = "hgtime" +version = "0.1.0" +dependencies = [ + "chrono", + "humantime 2.1.0", +] + +[[package]] +name = "hostcaps" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "hostname" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "anyhow", + "hostname 0.3.1", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi 0.3.9", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes 1.2.1", + "fnv", + "itoa 1.0.4", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.2.1", + "http", + "pin-project-lite 0.2.9", +] + +[[package]] +name = "http-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "assert_matches", + "async-compression", + "atty", + "crossbeam 0.8.2", + "curl", + "curl-sys", + "env_logger 0.7.1", + "futures 0.3.25", + "http", + "lru-cache", + "maplit", + "mockito", + "once_cell", + "openssl", + "parking_lot 0.11.2", + "paste", + "pin-project 0.4.30", + "regex", + "serde", + "serde_cbor", + "serde_json", + "structopt", + "thiserror", + "tokio 1.22.0", + "tokio-util 0.6.10", + "tracing", + "url 2.3.1", + "zstd", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +dependencies = [ + "bytes 1.2.1", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.4", + "pin-project-lite 0.2.9", + "socket2", + "tokio 1.22.0", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" +dependencies = [ + "http", + "hyper", + "rustls", + "tokio 1.22.0", + "tokio-rustls", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.2.1", + "hyper", + "native-tls", + "tokio 1.22.0", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "identity" +version = "0.1.0" +dependencies = [ + "anyhow", + "dirs 2.0.2", + "once_cell", + "parking_lot 0.11.2", + "tempfile", + "tracing", +] + +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +dependencies = [ + "crossbeam-utils 0.8.12", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "indexedlog" +version = "0.1.0" +dependencies = [ + "atomicfile", + "byteorder", + "dev-logger", + "fs2", + "hex", + "libc", + "memmap", + "minibench", + "minibytes", + "once_cell", + "quickcheck", + "rand 0.8.5", + "rand_chacha 0.3.1", + "tempfile", + "tracing", + "twox-hash", + "vlqencoding", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "rayon", + "serde", +] + +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "insta" +version = "1.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1e75aa1530e7385af7b2685478dece08dafb9db3b4225c753286decea83bef" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", + "yaml-rust", +] + +[[package]] +name = "insta_ext" +version = "0.1.0" +dependencies = [ + "insta", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "io" +version = "0.1.0" +dependencies = [ + "atty", + "configmodel", + "hgplain", + "once_cell", + "parking_lot 0.11.2", + "pipe", + "streampager", + "terminal_size 0.1.17", + "termwiz", +] + +[[package]] +name = "io-lifetimes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipconfig" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +dependencies = [ + "socket2", + "widestring", + "winapi 0.3.9", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "jobserver" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lab" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lazystr" +version = "0.1.0" + +[[package]] +name = "lfs_protocol" +version = "0.1.0" +dependencies = [ + "anyhow", + "faster-hex", + "http", + "mime", + "once_cell", + "quickcheck", + "serde", +] + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libgit2-sys" +version = "0.13.4+1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libnghttp2-sys" +version = "0.1.7+1.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libssh2-sys" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + +[[package]] +name = "local-encoding" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1ceb20f39ff7ae42f3ff9795f3986b1daad821caaa1e1732a0944103a5a1a66" +dependencies = [ + "kernel32-sys", + "skeptic", + "winapi 0.2.8", +] + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", + "value-bag", +] + +[[package]] +name = "lru" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +dependencies = [ + "hashbrown 0.12.3", +] + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "lz4-pyframe" +version = "0.1.0" +dependencies = [ + "byteorder", + "libc", + "lz4-sys", + "quickcheck", + "thiserror", +] + +[[package]] +name = "lz4-sys" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "manifest" +version = "0.1.0" +dependencies = [ + "anyhow", + "pathmatcher", + "quickcheck", + "quickcheck_arbitrary_derive", + "types", +] + +[[package]] +name = "manifest-tree" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "futures 0.3.25", + "futures-batch", + "manifest", + "minibench", + "minibytes", + "once_cell", + "parking_lot 0.11.2", + "pathmatcher", + "progress-model", + "quickcheck", + "rand 0.8.5", + "rand_chacha 0.3.1", + "sha-1", + "storemodel", + "thiserror", + "tracing", + "types", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "memmap2" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +dependencies = [ + "libc", +] + +[[package]] +name = "memmem" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" + +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metalog" +version = "0.1.0" +dependencies = [ + "anyhow", + "hex", + "indexedlog", + "lazy_static", + "mincode", + "minibytes", + "parking_lot 0.11.2", + "quickcheck", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "serde", + "serde_json", + "tempfile", + "tracing", + "types", + "zstore", +] + +[[package]] +name = "metrics" +version = "0.1.0" +dependencies = [ + "futures 0.3.25", + "once_cell", +] + +[[package]] +name = "metrics-render" +version = "0.1.0" +dependencies = [ + "async-runtime", + "metrics", + "once_cell", + "progress-model", + "tracing", +] + +[[package]] +name = "migration" +version = "0.1.0" +dependencies = [ + "configmodel", + "thiserror", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "mincode" +version = "0.1.0" +dependencies = [ + "byteorder", + "quickcheck", + "serde", + "vlqencoding", +] + +[[package]] +name = "minibench" +version = "0.1.0" + +[[package]] +name = "minibytes" +version = "0.1.0" +dependencies = [ + "bytes 1.2.1", + "memmap", + "quickcheck", + "serde", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow 0.2.2", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +dependencies = [ + "libc", + "log", + "miow 0.3.7", + "ntapi", + "winapi 0.3.9", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.42.0", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio 0.6.23", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "mkscratch" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap 3.2.23", + "dirs 2.0.2", + "identity", + "libc", + "serde", + "toml", +] + +[[package]] +name = "mockito" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3ae325bcceb48a24302ac57e1055f9173f5fd53be535603ea0ed41dea92db5" +dependencies = [ + "assert-json-diff", + "colored", + "difference", + "httparse", + "lazy_static", + "log", + "rand 0.7.3", + "regex", + "serde_json", + "serde_urlencoded 0.6.1", +] + +[[package]] +name = "mpatch" +version = "0.1.0" +dependencies = [ + "libc", + "mpatch-sys", +] + +[[package]] +name = "mpatch-sys" +version = "0.1.0" +dependencies = [ + "cc", +] + +[[package]] +name = "mutationstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags", + "dag", + "drawdag", + "futures 0.3.25", + "indexedlog", + "rand 0.8.5", + "rand_chacha 0.3.1", + "renderdag", + "tempdir", + "types", + "vlqencoding", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "net2" +version = "0.2.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "network-doctor" +version = "0.1.0" +dependencies = [ + "auth", + "configmodel", + "curl", + "hg-http", + "http", + "http-client", + "tempfile", + "thiserror", + "tracing", + "url 2.3.1", +] + +[[package]] +name = "nix" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nodemap" +version = "0.1.0" +dependencies = [ + "anyhow", + "indexedlog", + "quickcheck", + "tempfile", + "thiserror", + "types", +] + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nonblocking" +version = "0.1.0" +dependencies = [ + "futures 0.3.25", +] + +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio 0.6.23", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-float" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "ordered-float" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d84eb1409416d254e4a9c8fa56cc24701755025b458f0fcd8e59e1f5f40c23bf" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-multimap" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" +dependencies = [ + "dlv-list", + "hashbrown 0.9.1", +] + +[[package]] +name = "os_str_bytes" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "panic-message" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384e52fd8fbd4cbe3c317e8216260c21a0f9134de108cea8a4dd4e7e152c472d" + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.4", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.42.0", +] + +[[package]] +name = "paste" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" + +[[package]] +name = "pathhistory" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "dag", + "dev-logger", + "manifest", + "manifest-tree", + "storemodel", + "tokio 1.22.0", + "tracing", + "types", +] + +[[package]] +name = "pathmatcher" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags", + "globset", + "ignore", + "parking_lot 0.11.2", + "regex-automata", + "regex-syntax", + "tempfile", + "thiserror", + "types", + "util", +] + +[[package]] +name = "pem" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +dependencies = [ + "base64 0.13.1", + "once_cell", + "regex", +] + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pest" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest-hgrc" +version = "0.1.0" +dependencies = [ + "pest", +] + +[[package]] +name = "pest_derive" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe" +dependencies = [ + "once_cell", + "pest", + "sha1 0.10.5", +] + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_macros", + "phf_shared 0.11.1", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +dependencies = [ + "phf_shared 0.11.1", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +dependencies = [ + "phf_generator 0.11.1", + "phf_shared 0.11.1", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +dependencies = [ + "pin-project-internal 0.4.30", +] + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal 1.0.12", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pipe" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f763a706963c2af5e4e7f5b29a93a42809568b857d73ab8c0c4ecf8edf7f8f" +dependencies = [ + "crossbeam-channel 0.3.9", +] + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "plist" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b59eb8d91dfa89208ec74a920e3b55f840476cf46568026c18dbaa2999e0d48" +dependencies = [ + "base64 0.10.1", + "chrono", + "indexmap", + "line-wrap", + "serde", + "xml-rs", +] + +[[package]] +name = "plotters" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb" +dependencies = [ + "js-sys", + "num-traits", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "polling" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "libc", + "log", + "wepoll-ffi", + "winapi 0.3.9", +] + +[[package]] +name = "pprint" +version = "0.1.0" +dependencies = [ + "serde", + "serde_cbor", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +dependencies = [ + "ctor", + "diff", + "output_vt100", + "yansi", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "procinfo" +version = "0.1.0" +dependencies = [ + "cc", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "progress-model" +version = "0.1.0" +dependencies = [ + "arc-swap", + "once_cell", + "parking_lot 0.11.2", + "paste", + "tokio 1.22.0", + "tracing", +] + +[[package]] +name = "progress-render" +version = "0.1.0" +dependencies = [ + "progress-model", + "termwiz", + "unicode-width", +] + +[[package]] +name = "pulldown-cmark" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07" +dependencies = [ + "getopts", +] + +[[package]] +name = "pyauth" +version = "0.1.0" +dependencies = [ + "anyhow", + "auth", + "cpython", + "cpython_ext", + "pyconfigparser", + "url 2.3.1", +] + +[[package]] +name = "pyblackbox" +version = "0.1.0" +dependencies = [ + "blackbox", + "cpython", + "cpython_ext", +] + +[[package]] +name = "pybytes" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "minibytes", + "python3-sys", +] + +[[package]] +name = "pycats" +version = "0.1.0" +dependencies = [ + "anyhow", + "cats", + "cpython", + "cpython_ext", + "pyconfigparser", + "url 2.3.1", +] + +[[package]] +name = "pycheckout" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "checkout", + "cpython", + "cpython_ext", + "manifest-tree", + "pathmatcher", + "progress-model", + "pyconfigparser", + "pymanifest", + "pypathmatcher", + "pystatus", + "pytreestate", + "storemodel", + "treestate", + "types", + "vfs", +] + +[[package]] +name = "pyclientinfo" +version = "0.1.0" +dependencies = [ + "clientinfo", + "cpython", + "cpython_ext", + "pyconfigparser", +] + +[[package]] +name = "pycliparser" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "configmodel", + "cpython", + "cpython_ext", + "pyconfigparser", +] + +[[package]] +name = "pyconfigparser" +version = "0.1.0" +dependencies = [ + "anyhow", + "configparser", + "cpython", + "cpython_ext", + "util", + "version", +] + +[[package]] +name = "pydag" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cpython", + "cpython_ext", + "dag", + "futures 0.3.25", + "hgcommits", + "minibytes", + "parking_lot 0.11.2", + "pyedenapi", + "pymetalog", + "renderdag", + "storemodel", +] + +[[package]] +name = "pydiffhelpers" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", +] + +[[package]] +name = "pydirs" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "encoding", +] + +[[package]] +name = "pydoctor" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "network-doctor", + "pyconfigparser", +] + +[[package]] +name = "pydrawdag" +version = "0.1.0" +dependencies = [ + "cpython", + "drawdag", +] + +[[package]] +name = "pyeagerepo" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cpython", + "cpython_ext", + "dag", + "eagerepo", + "edenapi_types", + "pydag", + "pyedenapi", + "storemodel", +] + +[[package]] +name = "pyedenapi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "blake2", + "cpython", + "cpython_async", + "cpython_ext", + "dag-types", + "edenapi", + "edenapi_ext", + "edenapi_types", + "futures 0.3.25", + "minibytes", + "progress-model", + "pyconfigparser", + "pyprogress", + "pyrevisionstore", + "revisionstore", + "types", +] + +[[package]] +name = "pyerror" +version = "0.1.0" +dependencies = [ + "auth", + "cpython", + "cpython_ext", + "dag", + "edenapi", + "hgcommits", + "http-client", + "indexedlog", + "metalog", + "repo", + "repolock", + "revisionstore", + "revlogindex", + "treestate", + "types", +] + +[[package]] +name = "pyexchange" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "exchange", + "pydag", + "pyedenapi", + "pymetalog", +] + +[[package]] +name = "pyfail" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "fail", +] + +[[package]] +name = "pyfs" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "fsinfo", +] + +[[package]] +name = "pygitstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "gitstore", + "storemodel", +] + +[[package]] +name = "pyhgmetrics" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "hg-metrics", +] + +[[package]] +name = "pyhgtime" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "hgtime", +] + +[[package]] +name = "pyidentity" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "identity", +] + +[[package]] +name = "pyindexedlog" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "indexedlog", + "pybytes", +] + +[[package]] +name = "pyio" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cpython", + "cpython_ext", + "pyconfigparser", + "termstyle", +] + +[[package]] +name = "pylock" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "repolock", +] + +[[package]] +name = "pylz4" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "lz4-pyframe", +] + +[[package]] +name = "pymanifest" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "manifest", + "manifest-tree", + "parking_lot 0.11.2", + "pathmatcher", + "pypathmatcher", + "types", +] + +[[package]] +name = "pymetalog" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "metalog", + "parking_lot 0.11.2", +] + +[[package]] +name = "pymutationstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "byteorder", + "cpython", + "cpython_ext", + "mutationstore", + "pydag", + "thiserror", + "types", + "vlqencoding", +] + +[[package]] +name = "pynodemap" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "nodemap", + "types", +] + +[[package]] +name = "pypathhistory" +version = "0.1.0" +dependencies = [ + "async-runtime", + "cpython", + "cpython_ext", + "dag", + "pathhistory", + "storemodel", + "types", +] + +[[package]] +name = "pypathmatcher" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "pathmatcher", + "types", +] + +[[package]] +name = "pypprint" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "pprint", +] + +[[package]] +name = "pyprocess" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "spawn-ext", +] + +[[package]] +name = "pyprogress" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "progress-model", + "progress-render", +] + +[[package]] +name = "pyrefencode" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "refencode", +] + +[[package]] +name = "pyregex" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "regex", +] + +[[package]] +name = "pyrenderdag" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "minibytes", + "parking_lot 0.11.2", + "renderdag", +] + +[[package]] +name = "pyrepo" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "parking_lot 0.11.2", + "pyconfigparser", + "pydag", + "pyedenapi", + "pymetalog", + "pyworkingcopy", + "repo", + "util", + "workingcopy", +] + +[[package]] +name = "pyrevisionstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "configmodel", + "configparser", + "cpython", + "cpython_ext", + "futures 0.3.25", + "io", + "minibytes", + "parking_lot 0.11.2", + "pyconfigparser", + "revisionstore", + "storemodel", + "types", +] + +[[package]] +name = "pyrevlogindex" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "dag", + "pybytes", + "pydag", + "revlogindex", +] + +[[package]] +name = "pysptui" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cpython", + "cpython_ext", + "pipe", + "streampager", +] + +[[package]] +name = "pystatus" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "status", + "types", +] + +[[package]] +name = "python3-sys" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f8b50d72fb3015735aa403eebf19bbd72c093bfeeae24ee798be5f2f1aab52" +dependencies = [ + "libc", + "regex", +] + +[[package]] +name = "pythreading" +version = "0.1.0" +dependencies = [ + "cpython", +] + +[[package]] +name = "pytracing" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "lazy_static", + "mincode", + "parking_lot 0.11.2", + "python3-sys", + "serde_json", + "tracing", + "tracing-collector", + "tracing-reload", + "tracing-runtime-callsite", +] + +[[package]] +name = "pytreestate" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "parking_lot 0.11.2", + "pathmatcher", + "pypathmatcher", + "treestate", + "types", + "vfs", +] + +[[package]] +name = "pyvlq" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "vlqencoding", +] + +[[package]] +name = "pyworker" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "crossbeam 0.7.3", + "memmap", + "minibytes", + "pyrevisionstore", + "quickcheck", + "revisionstore", + "tempfile", + "tracing", + "types", + "vfs", +] + +[[package]] +name = "pyworkingcopy" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "io", + "parking_lot 0.11.2", + "pathmatcher", + "pyconfigparser", + "pymanifest", + "pypathmatcher", + "pystatus", + "pytreestate", + "storemodel", + "workingcopy", +] + +[[package]] +name = "pyzstd" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "zstd", + "zstd-safe", + "zstdelta", +] + +[[package]] +name = "pyzstore" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "zstore", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger 0.8.4", + "log", + "rand 0.8.5", +] + +[[package]] +name = "quickcheck_arbitrary_derive" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "proc-macro2", + "quickcheck", + "quote", + "syn", +] + +[[package]] +name = "quickcheck_macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radixbuf" +version = "0.1.0" +dependencies = [ + "minibench", + "quickcheck", + "rand 0.8.5", + "thiserror", + "vlqencoding", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi 0.3.9", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.8", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rayon" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +dependencies = [ + "crossbeam-deque 0.8.2", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +dependencies = [ + "crossbeam-channel 0.5.6", + "crossbeam-deque 0.8.2", + "crossbeam-utils 0.8.12", + "num_cpus", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.8", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "refencode" +version = "0.1.0" +dependencies = [ + "types", +] + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "renderdag" +version = "0.1.0" +dependencies = [ + "dag", +] + +[[package]] +name = "repo" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "configmodel", + "configparser", + "edenapi", + "fail", + "hgcommits", + "identity", + "manifest-tree", + "metalog", + "parking_lot 0.11.2", + "refencode", + "repolock", + "revisionstore", + "revsets", + "storemodel", + "tempfile", + "thiserror", + "tracing", + "treestate", + "types", + "util", + "vfs", + "workingcopy", +] + +[[package]] +name = "repo_name" +version = "0.1.0" +dependencies = [ + "anyhow", + "percent-encoding 2.2.0", +] + +[[package]] +name = "repolock" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "fs2", + "parking_lot 0.11.2", + "tempfile", + "thiserror", + "tracing", + "util", +] + +[[package]] +name = "reqwest" +version = "0.11.11" +source = "git+https://github.com/vmagro/reqwest?rev=f9490c06756a9d35ab874c44657db790a87af80b#f9490c06756a9d35ab874c44657db790a87af80b" +dependencies = [ + "base64 0.13.1", + "bytes 1.2.1", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "mime_guess", + "native-tls", + "percent-encoding 2.2.0", + "pin-project-lite 0.2.9", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded 0.7.1", + "tokio 1.22.0", + "tokio-native-tls", + "tokio-rustls", + "tokio-util 0.7.4", + "tower-service", + "trust-dns-resolver", + "url 2.3.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname 0.3.1", + "quick-error", +] + +[[package]] +name = "revisionstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "auth", + "bincode", + "blake2", + "byteorder", + "configmodel", + "crossbeam 0.8.2", + "edenapi", + "edenapi_types", + "fbinit", + "futures 0.3.25", + "hex", + "hg-http", + "hg-metrics", + "hgtime", + "http", + "http-client", + "indexedlog", + "lazy_static", + "lfs_protocol", + "lz4-pyframe", + "manifest-tree", + "maplit", + "memmap", + "mincode", + "minibytes", + "mockito", + "mpatch", + "once_cell", + "parking_lot 0.11.2", + "progress-model", + "quickcheck", + "quickcheck_arbitrary_derive", + "rand 0.8.5", + "rand_chacha 0.3.1", + "regex", + "revisionstore_types", + "serde", + "serde_derive", + "serde_json", + "sha-1", + "sha2 0.10.6", + "storemodel", + "tempfile", + "thiserror", + "tokio 1.22.0", + "tokio-stream", + "tracing", + "types", + "url 2.3.1", + "util", + "version", + "vlqencoding", +] + +[[package]] +name = "revisionstore_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "byteorder", + "quickcheck", + "quickcheck_arbitrary_derive", + "serde", + "serde_derive", +] + +[[package]] +name = "revlogindex" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "bit-vec", + "byteorder", + "dag", + "indexedlog", + "lz4-pyframe", + "minibytes", + "nonblocking", + "parking_lot 0.11.2", + "radixbuf", + "tempfile", + "thiserror", + "util", +] + +[[package]] +name = "revsets" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "dag", + "metalog", + "refencode", + "thiserror", + "treestate", + "types", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "runlog" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "configmodel", + "fs2", + "hg-http", + "libc", + "parking_lot 0.11.2", + "progress-model", + "rand 0.8.5", + "repo", + "serde", + "serde_json", + "tempfile", + "util", +] + +[[package]] +name = "rust-ini" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" +dependencies = [ + "cfg-if 1.0.0", + "ordered-multimap", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.14", +] + +[[package]] +name = "rustix" +version = "0.35.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.42.0", +] + +[[package]] +name = "rustls" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys 0.36.1", +] + +[[package]] +name = "scm_daemon" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap 2.34.0", + "commitcloudsubscriber", + "env_logger 0.7.1", + "libc", + "log", + "serde", + "thiserror", + "toml", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_alt" +version = "0.1.0" + +[[package]] +name = "serde_bser" +version = "0.3.1" +source = "git+https://github.com/facebook/watchman.git?branch=main#3e3b21c09d74f90b7342c26bbfa420c4e6b2da41" +dependencies = [ + "anyhow", + "byteorder", + "bytes 1.2.1", + "serde", + "thiserror", +] + +[[package]] +name = "serde_bytes" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +dependencies = [ + "itoa 1.0.4", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" +dependencies = [ + "dtoa", + "itoa 0.4.8", + "serde", + "url 1.7.2", +] + +[[package]] +name = "serde_urlencoded" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +dependencies = [ + "dtoa", + "itoa 0.4.8", + "serde", + "url 2.3.1", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.4", + "ryu", + "serde", +] + +[[package]] +name = "sha-1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" +dependencies = [ + "dirs 4.0.0", +] + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "signal-hook" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio 0.7.14", + "signal-hook 0.3.14", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "similar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" + +[[package]] +name = "simple_asn1" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" +dependencies = [ + "chrono", + "num-bigint", + "num-traits", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "skeptic" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ebf8a06f5f8bae61ae5bbc7af7aac4ef6907ae975130faba1199e5fe82256a" +dependencies = [ + "pulldown-cmark", + "tempdir", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "sorted_vector_map" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "itertools 0.10.5", + "quickcheck", +] + +[[package]] +name = "sparse" +version = "0.1.0" +dependencies = [ + "anyhow", + "futures 0.3.25", + "globset", + "once_cell", + "pathmatcher", + "regex", + "thiserror", + "tokio 1.22.0", + "tracing", + "types", +] + +[[package]] +name = "spawn-ext" +version = "0.1.0" +dependencies = [ + "libc", + "tempfile", + "winapi 0.3.9", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "staticconfig" +version = "0.1.0" +dependencies = [ + "configmodel", + "phf 0.11.1", + "staticconfig_macros", +] + +[[package]] +name = "staticconfig_macros" +version = "0.1.0" +dependencies = [ + "indexmap", + "pest-hgrc", +] + +[[package]] +name = "status" +version = "0.1.0" +dependencies = [ + "types", +] + +[[package]] +name = "storemodel" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "auto_impl", + "futures 0.3.25", + "minibytes", + "types", +] + +[[package]] +name = "streampager" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d43e4988f446d8d15c370527d38cdd35b470139775edeeca4c03921486c9b65a" +dependencies = [ + "anyhow", + "bit-set", + "clap 2.34.0", + "dirs 3.0.2", + "enum_dispatch", + "indexmap", + "lazy_static", + "lru", + "memmap2", + "notify", + "pest", + "pest_derive", + "regex", + "scopeguard", + "serde", + "smallvec", + "tempfile", + "terminfo", + "termwiz", + "thiserror", + "toml", + "unicode-segmentation", + "unicode-width", + "vec_map", +] + +[[package]] +name = "streams" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "futures 0.3.25", + "pin-project 0.4.30", + "tokio 1.22.0", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap 2.34.0", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck 0.3.3", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "strum" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" + +[[package]] +name = "strum_macros" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "sval" +version = "1.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" + +[[package]] +name = "syn" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +dependencies = [ + "rand 0.4.6", + "remove_dir_all", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] +name = "term_size" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "terminal_size" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" +dependencies = [ + "rustix", + "windows-sys 0.42.0", +] + +[[package]] +name = "terminfo" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" +dependencies = [ + "dirs 2.0.2", + "fnv", + "nom", + "phf 0.8.0", + "phf_codegen", +] + +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + +[[package]] +name = "termlogger" +version = "0.1.0" +dependencies = [ + "identity", + "io", + "lazystr", + "tracing", +] + +[[package]] +name = "termstyle" +version = "0.1.0" +dependencies = [ + "configmodel", + "hgplain", + "io", + "termwiz", + "tracing", +] + +[[package]] +name = "termwiz" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25e302bfaa2555ca7fb55eee19051ad43e510153b19cb880d6da5acb65a72ab9" +dependencies = [ + "anyhow", + "base64 0.13.1", + "bitflags", + "cassowary", + "cfg-if 1.0.0", + "filedescriptor", + "finl_unicode", + "fixedbitset", + "fnv", + "hex", + "lazy_static", + "libc", + "log", + "memmem", + "nix", + "num-derive", + "num-traits", + "ordered-float 3.4.0", + "pest", + "pest_derive", + "phf 0.10.1", + "regex", + "semver 0.11.0", + "sha2 0.9.9", + "signal-hook 0.1.17", + "siphasher", + "terminfo", + "termios", + "thiserror", + "ucd-trie", + "unicode-segmentation", + "vtparse", + "wezterm-bidi", + "wezterm-color-types", + "wezterm-dynamic", + "winapi 0.3.9", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "term_size", + "unicode-width", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +dependencies = [ + "terminal_size 0.2.2", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "thrift" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "config_thrift", + "const-cstr", + "fb303_core", + "fbthrift", + "futures 0.3.25", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "sorted_vector_map", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "thrift-types" +version = "0.1.0" +dependencies = [ + "anyhow", + "config", + "config_thrift", + "fb303_core", + "fbthrift", + "futures 0.3.25", + "thiserror", + "thrift", +] + +[[package]] +name = "thrift_compiler" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "anyhow", + "clap 2.34.0", + "which", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa 1.0.4", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "pin-project-lite 0.1.12", +] + +[[package]] +name = "tokio" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46409491c9375a693ce7032101970a54f8a2010efb77e13f70788f0d84489e39" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.9", +] + +[[package]] +name = "tokio" +version = "1.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +dependencies = [ + "autocfg", + "bytes 1.2.1", + "libc", + "memchr", + "mio 0.8.5", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite 0.2.9", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "winapi 0.3.9", +] + +[[package]] +name = "tokio-io" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +dependencies = [ + "bytes 0.4.12", + "futures 0.1.31", + "log", +] + +[[package]] +name = "tokio-macros" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio 1.22.0", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio 1.22.0", + "webpki", +] + +[[package]] +name = "tokio-stream" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.9", + "tokio 1.22.0", + "tokio-util 0.7.4", +] + +[[package]] +name = "tokio-tower" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4322b6e2ebfd3be4082c16df4341505ef333683158b55f22afaf3f61565d728" +dependencies = [ + "crossbeam 0.8.2", + "futures-core", + "futures-sink", + "futures-util", + "pin-project 1.0.12", + "tokio 1.22.0", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "tokio-uds-compat" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +dependencies = [ + "async-io", + "futures 0.3.25", + "tokio 1.22.0", + "tracing", + "uds_windows", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes 1.2.1", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite 0.2.9", + "slab", + "tokio 1.22.0", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes 1.2.1", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.9", + "tokio 1.22.0", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.9", + "tokio 1.22.0", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite 0.2.9", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-analyzer" +version = "0.1.0" +dependencies = [ + "serde_json", + "tracing-collector", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-collector" +version = "0.1.0" +dependencies = [ + "indexmap", + "libc", + "parking_lot 0.11.2", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", + "winapi 0.3.9", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project 1.0.12", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-reload" +version = "0.1.0" +dependencies = [ + "anyhow", + "once_cell", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-runtime-callsite" +version = "0.1.0" +dependencies = [ + "once_cell", + "parking_lot 0.11.2", + "regex", + "tracing", +] + +[[package]] +name = "tracing-sampler" +version = "0.1.0" +dependencies = [ + "configmodel", + "once_cell", + "parking_lot 0.11.2", + "serde", + "serde_json", + "tempfile", + "tracing", + "tracing-serde", + "tracing-subscriber", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "parking_lot 0.12.1", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "time 0.3.17", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "treestate" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags", + "byteorder", + "identity", + "itertools 0.10.5", + "pretty_assertions", + "quickcheck", + "rand 0.8.5", + "rand_chacha 0.3.1", + "repolock", + "sha2 0.10.6", + "tempdir", + "thiserror", + "tracing", + "twox-hash", + "types", + "util", + "uuid", + "vlqencoding", +] + +[[package]] +name = "trust-dns-proto" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "log", + "rand 0.8.5", + "smallvec", + "thiserror", + "tinyvec", + "tokio 1.22.0", + "url 2.3.1", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +dependencies = [ + "cfg-if 1.0.0", + "futures-util", + "ipconfig", + "lazy_static", + "log", + "lru-cache", + "parking_lot 0.12.1", + "resolv-conf", + "smallvec", + "thiserror", + "tokio 1.22.0", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if 1.0.0", + "rand 0.8.5", + "static_assertions", +] + +[[package]] +name = "type_macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "types" +version = "0.1.0" +dependencies = [ + "anyhow", + "byteorder", + "criterion", + "faster-hex", + "hex", + "lazy_static", + "quickcheck", + "quickcheck_arbitrary_derive", + "rand 0.8.5", + "ref-cast", + "serde", + "serde_bytes", + "serde_cbor", + "serde_derive", + "serde_json", + "sha-1", + "thiserror", + "util", + "vlqencoding", +] + +[[package]] +name = "ucd-trie" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi 0.3.9", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unionconfig" +version = "0.1.0" +dependencies = [ + "configmodel", + "indexmap", + "staticconfig", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ + "idna 0.1.5", + "matches", + "percent-encoding 1.0.1", +] + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna 0.3.0", + "percent-encoding 2.2.0", +] + +[[package]] +name = "utf8parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" + +[[package]] +name = "util" +version = "0.1.0" +dependencies = [ + "anyhow", + "atomicfile", + "dirs 2.0.2", + "fs2", + "hostname 0.3.1", + "lazystr", + "libc", + "memmap", + "once_cell", + "rand 0.8.5", + "shellexpand", + "tempdir", + "tempfile", + "thiserror", + "winapi 0.3.9", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom 0.2.8", + "serde", + "sha1 0.6.1", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +dependencies = [ + "ctor", + "sval", + "version_check", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version" +version = "0.1.0" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vfs" +version = "0.1.0" +dependencies = [ + "anyhow", + "crossbeam 0.8.2", + "dashmap", + "fsinfo", + "libc", + "minibytes", + "tempfile", + "tokio 1.22.0", + "types", + "util", +] + +[[package]] +name = "vlqencoding" +version = "0.1.0" +dependencies = [ + "quickcheck", +] + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "vtparse" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9b2acfb050df409c972a37d3b8e08cdea3bddb0c09db9d53137e504cfabed0" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "watchman_client" +version = "0.8.0" +source = "git+https://github.com/facebook/watchman.git?branch=main#3e3b21c09d74f90b7342c26bbfa420c4e6b2da41" +dependencies = [ + "anyhow", + "bytes 1.2.1", + "futures 0.3.25", + "maplit", + "serde", + "serde_bser", + "thiserror", + "tokio 1.22.0", + "tokio-util 0.6.10", + "winapi 0.3.9", +] + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +dependencies = [ + "webpki", +] + +[[package]] +name = "wepoll-ffi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] + +[[package]] +name = "wezterm-bidi" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1560382cf39b0fa92473eae4d5b3772f88c63202cbf5a72c35db72ba99e66c36" +dependencies = [ + "log", + "wezterm-dynamic", +] + +[[package]] +name = "wezterm-color-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6e7a483dd2785ba72705c51e8b1be18300302db2a78368dac9bc8773857777" +dependencies = [ + "csscolorparser", + "deltae", + "lazy_static", + "wezterm-dynamic", +] + +[[package]] +name = "wezterm-dynamic" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" +dependencies = [ + "log", + "ordered-float 3.4.0", + "strsim 0.10.0", + "thiserror", + "wezterm-dynamic-derive", +] + +[[package]] +name = "wezterm-dynamic-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9f5ef318442d07b3d071f9f43ea40b80992f87faee14bb4d017b6991c307f0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "which" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "widestring" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "workingcopy" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "configmodel", + "configparser", + "crossbeam 0.8.2", + "edenfs_client", + "futures 0.3.25", + "identity", + "io", + "manifest", + "manifest-tree", + "parking_lot 0.11.2", + "pathmatcher", + "repolock", + "serde", + "serde_json", + "sparse", + "status", + "storemodel", + "tempdir", + "tempfile", + "thiserror", + "thrift-types", + "tokio 1.22.0", + "tracing", + "treestate", + "types", + "util", + "vfs", + "watchman_client", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "xdiff" +version = "0.1.0" +dependencies = [ + "structopt", + "xdiff-sys", +] + +[[package]] +name = "xdiff-sys" +version = "0.1.0" +dependencies = [ + "cc", +] + +[[package]] +name = "xml-rs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.1+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "zstdelta" +version = "0.1.0" +dependencies = [ + "libc", + "quickcheck", + "rand 0.8.5", + "rand_chacha 0.3.1", + "zstd-sys", +] + +[[package]] +name = "zstore" +version = "0.1.0" +dependencies = [ + "indexedlog", + "lazy_static", + "lru-cache", + "mincode", + "minibytes", + "parking_lot 0.11.2", + "quickcheck", + "serde", + "sha-1", + "tempfile", + "tracing", + "types", + "zstdelta", +] diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix new file mode 100644 index 0000000000000..4598c86fb75b6 --- /dev/null +++ b/pkgs/applications/version-management/sapling/default.nix @@ -0,0 +1,195 @@ +{ lib +, stdenv +, python38Packages +, fetchFromGitHub +, fetchurl +, sd +, curl +, pkg-config +, openssl +, rustPlatform +, fetchYarnDeps +, yarn +, nodejs +, fixup_yarn_lock +, glibcLocales +, libiconv +, CoreFoundation +, CoreServices +, Security +}: + +let + inherit (lib.importJSON ./deps.json) links version versionHash; + # Sapling sets a Cargo config containing lines like so: + # [target.aarch64-apple-darwin] + # rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"] + # + # The default cargo config that's set by the build hook will set + # unstable.host-config and unstable.target-applies-to-host which seems to + # result in the link arguments above being ignored and thus link failures. + # All it is there to do anyway is just to do stuff with musl and cross + # compilation, which doesn't work on macOS anyway so we can just stub it + # on macOS. + # + # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295 + myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: { + cargoConfig = if stdenv.isDarwin then "" else old.cargoConfig; + }); + + src = fetchFromGitHub { + owner = "facebook"; + repo = "sapling"; + rev = version; + hash = "sha256-IzbUaFrsSMojhsbpnRj1XLkhO9V2zYdmmZls4mtZquw="; + }; + + addonsSrc = "${src}/addons"; + + # Fetches the Yarn modules in Nix to to be used as an offline cache + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${addonsSrc}/yarn.lock"; + sha256 = "sha256-B61T0ReZPRfrRjBC3iHLVkVYiifhzOXlaG1YL6rgmj4="; + }; + + # Builds the NodeJS server that runs with `sl web` + isl = stdenv.mkDerivation { + pname = "sapling-isl"; + src = addonsSrc; + inherit version; + + nativeBuildInputs = [ + fixup_yarn_lock + nodejs + yarn + ]; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + patchShebangs node_modules + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cd isl + node release.js $out + + runHook postInstall + ''; + }; + + # Builds the main `sl` binary and its Python extensions + # + # FIXME(lf-): when next updating this package, delete the python 3.8 override + # here, since the fix for https://github.com/facebook/sapling/issues/279 that + # required it will be in the next release. + sapling = python38Packages.buildPythonPackage { + pname = "sapling-main"; + inherit src version; + + sourceRoot = "source/eden/scm"; + + # Upstream does not commit Cargo.lock + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "cloned-0.1.0" = "sha256-c3CPWVjOk+VKBLD6WuaYZvBoKi5PwgXmiwxKoCk0bsI="; + "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; + "fb303_core-0.0.0" = "sha256-yoKKSBwqufFayLef2rRpX5oV1j8fL/kRkXBXIC++d7Q="; + "fbthrift-0.0.1+unstable" = "sha256-jtsDE5U/OavDUXRAE1N8/nujSPrWltImsFLzHaxfeM0="; + "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; + "serde_bser-0.3.1" = "sha256-KCAC+rbczroZn/oKYTVpAPJl40yMrszt/PGol+JStDU="; + }; + }; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + # Since the derivation builder doesn't have network access to remain pure, + # fetch the artifacts manually and link them. Then replace the hardcoded URLs + # with filesystem paths for the curl calls. + postUnpack = '' + mkdir $sourceRoot/hack_pydeps + ${lib.concatStrings (map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links)} + sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/sl \ + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" + ''; + + nativeBuildInputs = [ + curl + pkg-config + ] ++ (with rustPlatform; [ + myCargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + curl + openssl + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + CoreFoundation + CoreServices + Security + ]; + + doCheck = false; + + HGNAME = "sl"; + SAPLING_OSS_BUILD = "true"; + SAPLING_VERSION = version; + SAPLING_VERSION_HASH = versionHash; + }; +in +stdenv.mkDerivation { + pname = "sapling"; + inherit version; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + + cp -r ${sapling}/* $out + + sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages + chmod +w $sitepackages + cp -r ${isl} $sitepackages/edenscm-isl + + runHook postInstall + ''; + + # just a simple check phase, until we have a running test suite. this should + # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760) + doCheck = true; + checkPhase = '' + echo -n "testing sapling version; should be \"${version}\"... " + ${sapling}/bin/sl version | grep -qw "${version}" + echo "OK!" + ''; + + meta = with lib; { + description = "A Scalable, User-Friendly Source Control System"; + homepage = "https://sapling-scm.com"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ pbar thoughtpolice ]; + platforms = platforms.unix; + mainProgram = "sl"; + }; +} diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json new file mode 100644 index 0000000000000..06751b51b15e3 --- /dev/null +++ b/pkgs/applications/version-management/sapling/deps.json @@ -0,0 +1,78 @@ +{ + "links": [ + { + "sha256": "0dgg5x4nvdpfiz552diy11xg72y14s38hjz9qxygafnfgybg6hab", + "url": "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl" + }, + { + "sha256": "0dq9f7irmml1nm9a2rx8dd6m2dqmzjj1x40mk0rg619wrdfsaj0b", + "url": "https://files.pythonhosted.org/packages/39/7b/88dbb785881c28a102619d46423cb853b46dbccc70d3ac362d99773a78ce/pexpect-4.8.0-py2.py3-none-any.whl" + }, + { + "sha256": "0r4xy2sqwyhwlwj81zvhzbnx7a7r4xdz9xyzzkjczlx7gk1cig1d", + "url": "https://files.pythonhosted.org/packages/23/6a/210816c943c9aeeb29e4e18a298f14bf0e118fe222a23e13bfcc2d41b0a4/ipython-7.16.1-py3-none-any.whl" + }, + { + "sha256": "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw", + "url": "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip" + }, + { + "sha256": "16sgpg57kxx5jh467d9qwc2hwshfvdbl0xkafdp3qspvbfp46qc0", + "url": "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl" + }, + { + "sha256": "1qn3bnyd7gdwkyk8nvlhiy3c6zbwjd49fjxj0gp8xxi9faiysiwz", + "url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl" + }, + { + "sha256": "0mfj5d1bgpy1clfgwrkmjqm2pv70pm01jp4iyyhphc96kyifdg7v", + "url": "https://files.pythonhosted.org/packages/4c/1c/ff6546b6c12603d8dd1070aa3c3d273ad4c07f5771689a7b69a550e8c951/backcall-0.2.0-py2.py3-none-any.whl" + }, + { + "sha256": "0yxz45fzjsq6zh5f9cjl0gf4vfg1l7rd79zyb3ih544layjg3ff8", + "url": "https://files.pythonhosted.org/packages/4e/78/56aa1b5f4d8ac548755ae767d84f0be54fdd9d404197a3d9e4659d272348/setuptools-57.0.0-py3-none-any.whl" + }, + { + "sha256": "1177pfa343r378020a85l3b16ak479qgyvh8k5719fgbkhm81d5y", + "url": "https://files.pythonhosted.org/packages/59/7c/e39aca596badaf1b78e8f547c807b04dae603a433d3e7a7e04d67f2ef3e5/wcwidth-0.2.5-py2.py3-none-any.whl" + }, + { + "sha256": "1r55ffffaq4q3dpvha7iipgxlqwvjg5cklf9izr42xj5rr226r26", + "url": "https://files.pythonhosted.org/packages/87/61/2dfea88583d5454e3a64f9308a686071d58d59a55db638268a6413e1eb6d/prompt_toolkit-2.0.10-py3-none-any.whl" + }, + { + "sha256": "08v36wa0kckc892bk4nypl6sszbysarm8jhslviz1agp2sf1jp3f", + "url": "https://files.pythonhosted.org/packages/6a/36/b1b9bfdf28690ae01d9ca0aa5b0d07cb4448ac65fb91dc7e2d094e3d992f/decorator-5.0.9-py3-none-any.whl" + }, + { + "sha256": "0mnzcb714ynl1qlv9dwnh50rv75mmj18ywaxbl8xzm3l9m0syjcn", + "url": "https://files.pythonhosted.org/packages/9a/41/220f49aaea88bc6fa6cba8d05ecf24676326156c23b991e80b3f2fc24c77/pickleshare-0.7.5-py2.py3-none-any.whl" + }, + { + "sha256": "13iv73575lilrm01ffhr8y8sxn8kxhvfqsgwckbr919725280vnn", + "url": "https://files.pythonhosted.org/packages/a6/c9/be11fce9810793676017f79ffab3c6cb18575844a6c7b8d4ed92f95de604/Pygments-2.9.0-py3-none-any.whl" + }, + { + "sha256": "0i7ycyjad9kq6lgq5ih7j8xsm639z24250s6d17pp781v6hwdd3h", + "url": "https://files.pythonhosted.org/packages/ca/ab/872a23e29cec3cf2594af7e857f18b687ad21039c1f9b922fac5b9b142d5/traitlets-4.3.3-py2.py3-none-any.whl" + }, + { + "sha256": "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa", + "url": "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" + }, + { + "sha256": "1f7sc4ydjj33gadcgfz8fcx02d1wm2frlqwzdik1krlr6wikgpbj", + "url": "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl" + }, + { + "sha256": "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm", + "url": "https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57/ipdb-0.13.9.tar.gz" + }, + { + "sha256": "04m31z011arz2b70rwwkhvzkb9d4yxcfbxpw27d6fa3n79a7sdxg", + "url": "https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b/Cython-0.29.26.tar.gz" + } + ], + "version": "0.1.20221118-210929-cfbb68aa", + "versionHash": "5535144625961033752" +} diff --git a/pkgs/applications/version-management/sapling/gen-deps.py b/pkgs/applications/version-management/sapling/gen-deps.py new file mode 100755 index 0000000000000..e3fe56f73221b --- /dev/null +++ b/pkgs/applications/version-management/sapling/gen-deps.py @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" +import json +import re +from hashlib import sha1 +from struct import unpack +from subprocess import run + +from requests import get + +# Fetch the latest stable release metadata from GitHub +latestTag = get("https://api.github.com/repos/facebook/sapling/releases/latest").json()[ + "tag_name" +] + + +def nixPrefetchUrl(url): + return run( + ["nix-prefetch-url", "--type", "sha256", url], + check=True, + text=True, + capture_output=True, + ).stdout.rstrip() + + +# Fetch the `setup.py` source and look for instances of assets being downloaded +# from files.pythonhosted.org. +setupPy = get( + f"https://github.com/facebook/sapling/raw/{latestTag}/eden/scm/setup.py" +).text +foundUrls = re.findall(r'(https://files\.pythonhosted\.org/packages/[^\s]+)"', setupPy) + +dataDeps = { + "links": [{"url": url, "sha256": nixPrefetchUrl(url)} for url in foundUrls], + "version": latestTag, + # Find latest's git tag which corresponds to the Sapling version. Also + # needed is a hash of the version, so calculate that here. Taken from + # Sapling source `$root/eden/scm/setup_with_version.py`. + "versionHash": str(unpack(">Q", sha1(latestTag.encode("ascii")).digest()[:8])[0]), +} + +open("deps.json", "w").write(json.dumps(dataDeps, indent=2, sort_keys=True) + "\n") diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index dab74a8ec5cb1..15d26406bb8d4 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , makeDesktopItem , jre @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "21.2.2"; + version = "22.1.1"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "10v6sg0lmjby3v8g3sk2rzzvdx5p69ia4zz2c0hbf30rk0p6gqn3"; + sha256 = "sha256-twN1Clnj17A2IUOOhvs8hs6PuvC81j9GqF0yKIk3IkQ="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 2189e54ce3ca5..7faca39e2fe4f 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -15,7 +15,6 @@ let srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; buildsrht = self.callPackage ./builds.nix { }; - dispatchsrht = self.callPackage ./dispatch.nix { }; gitsrht = self.callPackage ./git.nix { }; hgsrht = self.callPackage ./hg.nix { }; hubsrht = self.callPackage ./hub.nix { }; @@ -33,7 +32,8 @@ with python.pkgs; recurseIntoAttrs { inherit python; coresrht = toPythonApplication srht; buildsrht = toPythonApplication buildsrht; - dispatchsrht = toPythonApplication dispatchsrht; + # Added 2022-10-29 + dispatchsrht = throw "dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information."; gitsrht = toPythonApplication gitsrht; hgsrht = toPythonApplication hgsrht; hubsrht = toPythonApplication hubsrht; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix deleted file mode 100644 index 05ed0450e0002..0000000000000 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, fetchFromSourcehut -, buildPythonPackage -, srht -, pyyaml -, PyGithub -, python -}: - -buildPythonPackage rec { - pname = "dispatchsrht"; - version = "0.15.34"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "dispatch.sr.ht"; - rev = version; - sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8="; - }; - - propagatedBuildInputs = [ - srht - pyyaml - PyGithub - ]; - - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht - ''; - - pythonImportsCheck = [ "dispatchsrht" ]; - - meta = with lib; { - homepage = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; - description = "Task dispatcher and service integration tool for the sr.ht network"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ eadwu ]; - }; -} diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index e13ce09da4c71..239d767ed9b4c 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -67,7 +67,7 @@ else # because the reported $oldHash to be changed # may not actually be in $default_nix # but in the file of one of its dependencies. - services=( "srht" "scmsrht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "hubsrht" "listssrht" "mansrht" + services=( "srht" "scmsrht" "buildsrht" "gitsrht" "hgsrht" "hubsrht" "listssrht" "mansrht" "metasrht" "pagessrht" "pastesrht" "todosrht" ) fi diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index 49c542b459fbf..c21c29ff583a2 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "dmlive"; - version = "unstable-2022-08-22"; + version = "unstable-2022-11-19"; src = fetchFromGitHub { owner = "THMonster"; repo = pname; - rev = "fd4fa1859f05350658db598a50d29f59d22b55a1"; - hash = "sha256-NVabHLxPHi7hWoztthPmVC5VRKQKglpytuUQOY1Hzrw="; + rev = "711319043dca3c1fee44cd60841ef51605b42bce"; + hash = "sha256-weWl9voqTP/1ZBSLuMFzfWE5NskHNPJnFYy9n9IgcZk="; }; - cargoHash = "sha256-TziP7n9Xgi/wHaiF/NI6noMp1iR6vRuAXxvKJwQHbTw="; + cargoHash = "sha256-9bonyOCQfO5Eq8T2GVCri+INCe4RUOK28nw4cnmmAWs="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index 3d5f8d4957abf..c210743f6eaeb 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "2.9"; + version = "3.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-jjCyO6lyhqH4xeNp5uy/KqNr5Mvv+45pJGHFOXNi0rk="; + hash = "sha256-hCVItxvYTE0G5inI/A4w4FYfSfrACINBSaKXhA1mh4A="; }; patches = [ @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { src = ./libmpv-path.patch; libmpv = "${lib.getLib mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"; }) + + # Fix launching with mpv 0.35.0 (ubuntu 22.04 doesn't have libmpv.so.2) + # https://github.com/linuxmint/hypnotix/issues/254 + ./fix-deprecated-mpv-detach-destroy.patch ]; postPatch = '' diff --git a/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch b/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch new file mode 100644 index 0000000000000..06c971b51520d --- /dev/null +++ b/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch @@ -0,0 +1,22 @@ +diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py +index f42a3be..db94bf6 100644 +--- a/usr/lib/hypnotix/mpv.py ++++ b/usr/lib/hypnotix/mpv.py +@@ -528,7 +528,7 @@ _mpv_create = backend.mpv_create + _handle_func('mpv_create_client', [c_char_p], MpvHandle, notnull_errcheck) + _handle_func('mpv_client_name', [], c_char_p, errcheck=None) + _handle_func('mpv_initialize', [], c_int, ec_errcheck) +-_handle_func('mpv_detach_destroy', [], None, errcheck=None) ++_handle_func('mpv_destroy', [], None, errcheck=None) + _handle_func('mpv_terminate_destroy', [], None, errcheck=None) + _handle_func('mpv_load_config_file', [c_char_p], c_int, ec_errcheck) + _handle_func('mpv_get_time_us', [], c_ulonglong, errcheck=None) +@@ -881,7 +881,7 @@ class MPV(object): + self._message_handlers[target](*args) + + if eid == MpvEventID.SHUTDOWN: +- _mpv_detach_destroy(self._event_handle) ++ _mpv_destroy(self._event_handle) + return + + except Exception as e: diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 69248dc75301c..02c58925558e6 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,12 +1,15 @@ { lib , buildPythonApplication +, copyDesktopItems , fetchPypi , gobject-introspection , jellyfin-apiclient-python , jinja2 +, makeDesktopItem , mpv , pillow , pystray +, python , python-mpv-jsonipc , pywebview , tkinter @@ -23,6 +26,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ + copyDesktopItems wrapGAppsHook gobject-introspection ]; @@ -59,6 +63,15 @@ buildPythonApplication rec { --replace "notify_updates: bool = True" "notify_updates: bool = False" ''; + # Install all the icons for the desktop item + postInstall = '' + for s in 16 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/''${s}x''${s}/apps + ln -s $out/${python.sitePackages}/jellyfin_mpv_shim/integration/jellyfin-''${s}.png \ + $out/share/icons/hicolor/''${s}x''${s}/apps/${pname}.png + done + ''; + # needed for pystray to access appindicator using GI preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") @@ -69,6 +82,16 @@ buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "jellyfin_mpv_shim" ]; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Jellyfin MPV Shim"; + categories = [ "Video" "AudioVideo" "TV" "Player" ]; + }) + ]; + meta = with lib; { homepage = "https://github.com/jellyfin/jellyfin-mpv-shim"; description = "Allows casting of videos to MPV via the jellyfin mobile and web app"; diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix index 210429c777068..7becbd2252de0 100644 --- a/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "certifi"; namespace = "script.module.certifi"; - version = "2022.5.18+matrix.1"; + version = "2022.9.24"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "tk4Ven35sicLxrT7SO2yx5kQORjFP6niRuS9SMocJKY="; + sha256 = "kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix index e21613dce615c..44bda1278bbd3 100644 --- a/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/pkgs/applications/video/kodi/addons/idna/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "idna"; namespace = "script.module.idna"; - version = "3.3.0+matrix.1"; + version = "3.4.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "gXW1BvM3CLKshVPaemjmzEoZekU0QjuxJY9zGbGwK18="; + sha256 = "wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 1becee357bee8..90900f3060738 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "1.26.9+matrix.1"; + version = "1.26.13+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "w2HXepAHLE4NAWTXOQgY3ifr3mlI/QYF6KAKqpAmO/g="; + sha256 = "pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY="; }; passthru = { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 9fd289f6fae6d..9c370741cdebf 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.17.1"; + version = "1.17.2"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "sha256-B4SQiwf5/Icweg+VgQW34tN/XxDA7xoSgIVOfXwGsfM="; + sha256 = "sha256-gACMzJ7oZCk/INSeJaV7GnF9hy/6F9d0QDLp5jPiF4k="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "sha256-DVcrG5N9lydct11xoUKz1VVCiuvVOmQWGlAP2nrnZv4="; + sha256 = "sha256-qD+Kuz8j3vDch4PlNQYqdbffL3YSKRqKg6IfkLk/LaQ="; }; in mkDerivation { diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index eda58349bd861..06bed9211318f 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by pasqui23 @@ -16,6 +16,12 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Taken from FreeBSD; already merged upstream in the media submodule + # (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a) + ./lib_media_src_mpv_mpvwidget.patch + ]; + nativeBuildInputs = [ qmake qttools ]; buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; diff --git a/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch new file mode 100644 index 0000000000000..9beff68a0ec40 --- /dev/null +++ b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch @@ -0,0 +1,16 @@ +diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp +--- a/lib/media/src/mpv/mpvwidget.cpp ++++ b/lib/media/src/mpv/mpvwidget.cpp +@@ -30,7 +30,11 @@ + qDebug() << "initializeGL" << nativeParent; + if (nativeParent == nullptr) qFatal("No native parent"); + +- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) ++ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #else ++ mpv_opengl_init_params gl_init_params{get_proc_address, this}; ++ #endif + mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL}, + {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, + {MPV_RENDER_PARAM_INVALID, nullptr}, diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch index b8c025b3b3fc0..affd85d2b7320 100644 --- a/pkgs/applications/video/mlv-app/aarch64-flags.patch +++ b/pkgs/applications/video/mlv-app/aarch64-flags.patch @@ -7,7 +7,7 @@ index ebdc552..3e37573 100644 # Linux linux-g++*{ - QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -+ QMAKE_CFLAGS += -O3 -fopenmp -march=native -std=c99 ++ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 QMAKE_CXXFLAGS += -fopenmp LIBS += -lgomp } diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 2db4cf53d0044..b43ce6afdff8b 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3, nix-update-script }: # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` stdenvNoCC.mkDerivation { @@ -41,7 +41,10 @@ stdenvNoCC.mkDerivation { passthru = { scriptName = "sponsorblock.lua"; - updateScript = ./update-sponsorblock.sh; + updateScript = nix-update-script { + attrPath = "mpvScripts.sponsorblock"; + extraArgs = [ "--version=branch" ]; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh b/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh deleted file mode 100755 index b4888365a6f35..0000000000000 --- a/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts git jq nix nix-prefetch-git -git_url='https://github.com/po5/mpv_sponsorblock.git' -git_branch='master' -git_dir='/var/tmp/mpv_sponsorblock.git' -nix_file="$(dirname "${BASH_SOURCE[0]}")/sponsorblock.nix" -pkg='mpvScripts.sponsorblock' - -set -euo pipefail - -info() { - if [ -t 2 ]; then - set -- '\033[32m%s\033[39m\n' "$@" - else - set -- '%s\n' "$@" - fi - printf "$@" >&2 -} - -old_rev=$(nix-instantiate --eval --strict --json -A "$pkg.src.rev" | jq -r) -old_version=$(nix-instantiate --eval --strict --json -A "$pkg.version" | jq -r) -today=$(LANG=C date -u +'%Y-%m-%d') - -info "fetching $git_url..." -if [ ! -d "$git_dir" ]; then - git init --initial-branch="$git_branch" "$git_dir" - git -C "$git_dir" remote add origin "$git_url" -fi -git -C "$git_dir" fetch origin "$git_branch" - -# use latest commit before today, we should not call the version *today* -# because there might still be commits coming -# use the day of the latest commit we picked as version -new_rev=$(git -C "$git_dir" log -n 1 --format='format:%H' --before="${today}T00:00:00Z" "origin/$git_branch") -new_version="unstable-$(git -C "$git_dir" log -n 1 --format='format:%cs' "$new_rev")" -info "latest commit before $today: $new_rev" - -if [ "$new_rev" = "$old_rev" ]; then - info "$pkg is up-to-date." - exit -fi - -new_sha256=$(nix-prefetch-git --rev "$new_rev" "$git_dir" | jq -r .sha256) -update-source-version "$pkg" \ - "$new_version" \ - "$new_sha256" \ - --rev="$new_rev" -git add "$nix_file" -git commit --verbose --message "$pkg: $old_version -> $new_version" diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index cf307f0da34e0..0df8cf6a72494 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,32 +1,41 @@ -{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm -, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders, soundtouch, libzip +, withWebKit ? false }: mkDerivation rec { pname = "mythtv"; - version = "31.0"; + version = "32.0"; src = fetchFromGitHub { owner = "MythTV"; repo = "mythtv"; rev = "v${version}"; - sha256 = "092w5kvc1gjz6jd2lk2jhcazasz2h3xh0i5iq80k8x3znyp4i6v5"; + sha256 = "0i4fs3rbk1jggh62wflpa2l03na9i1ihpz2vsdic9vfahqqjxff1"; }; patches = [ - # Disables OS detection used while checking if enforce_wshadow should be disabled. - ./disable-os-detection.patch + # Disable sourcing /etc/os-release + ./dont-source-os-release.patch + + # Fix QMake variable substitution syntax - MythTV/mythtv#550 + (fetchpatch { + name = "fix-qmake-var-syntax.patch"; + url = "https://github.com/MythTV/mythtv/commit/a8da7f7e7ec069164adbef65a8104adc9bb52e36.patch"; + stripLen = 1; + hash = "sha256-JfRME00YNNjl6SKs1HBa0wBa/lR/Rt3zbQtWhsC36JM="; + }) ]; setSourceRoot = "sourceRoot=$(echo */mythtv)"; buildInputs = [ - freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL + freetype qtbase qtscript lame zlib libGLU libGL perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC - libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 - ]; + libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 soundtouch libzip + ] ++ lib.optional withWebKit qtwebkit; nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; configureFlags = diff --git a/pkgs/applications/video/mythtv/disable-os-detection.patch b/pkgs/applications/video/mythtv/disable-os-detection.patch deleted file mode 100644 index 09ce6f6ca4f81..0000000000000 --- a/pkgs/applications/video/mythtv/disable-os-detection.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/configure 2020-07-21 20:50:58.653989766 +0200 -+++ b/configure 2020-07-21 20:52:21.236610586 +0200 -@@ -6537,17 +6537,17 @@ - } - - enable enforce_wshadow --case $target_os in -- android) -- disable enforce_wshadow -- ;; -- linux) -- . /etc/os-release -- if test $ID = "centos"; then -- disable enforce_wshadow -- fi -- ;; --esac -+#case $target_os in -+# android) -+# disable enforce_wshadow -+# ;; -+# linux) -+# . /etc/os-release -+# if test $ID = "centos"; then -+# disable enforce_wshadow -+# fi -+# ;; -+#esac - - if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then - enable qtwebkit diff --git a/pkgs/applications/video/mythtv/dont-source-os-release.patch b/pkgs/applications/video/mythtv/dont-source-os-release.patch new file mode 100644 index 0000000000000..fb4dc686af6a0 --- /dev/null +++ b/pkgs/applications/video/mythtv/dont-source-os-release.patch @@ -0,0 +1,15 @@ +--- a/configure ++++ b/configure +@@ -5894,9 +5894,9 @@ else + die "ERROR: cannot find soundtouch 1.8.0 or later." + fi + +-if [ $target_os = "linux" ] ; then +- . /etc/os-release +-fi ++# if [ $target_os = "linux" ] ; then ++# . /etc/os-release ++# fi + + # libudfread + if enabled system_libudfread ; then diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index a1abc952fc738..3b97644bf2557 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "obs-vkcapture"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - hash = "sha256-FOyUgsHQlsjVGCct+ky189alVImoG+paqDKmGvnHoXo="; + hash = "sha256-Ya4p0eXOTID1qmxokgSXdmBOd3nqzcOHM+pLqJi8LGg="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index f854054b3b644..83ebf1db9b4e0 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -1,23 +1,23 @@ { lib , fetchFromGitLab -# native , wrapGAppsHook -# not native , xorg , gobject-introspection , gtk3 +, libappindicator-gtk3 +, slop , python3 }: python3.pkgs.buildPythonApplication rec { pname = "screenkey"; - version = "1.4"; + version = "1.5"; src = fetchFromGitLab { - owner = "screenkey"; - repo = "screenkey"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "1rfngmkh01g5192pi04r1fm7vsz6hg9k3qd313sn9rl9xkjgp11l"; + hash = "sha256-kWktKzRyWHGd1lmdKhPwrJoSzAIN2E5TKyg30uhM4Ug="; }; nativeBuildInputs = [ @@ -28,20 +28,24 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 + libappindicator-gtk3 ]; propagatedBuildInputs = with python3.pkgs; [ babel pycairo pygobject3 + dbus-python ]; # Prevent double wrapping because of wrapGAppsHook dontWrapGApps = true; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; + preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=( + --prefix PATH ":" "${lib.makeBinPath [ slop ]}" + "''${gappsWrapperArgs[@]}" + ) ''; # screenkey does not have any tests diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 38b0301bbc92b..706a41e0a505b 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { autoPatchelfHook cairo cups.lib - dbus.daemon.lib + dbus.lib expat gcc-unwrapped gdk-pixbuf diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 1603bdcbb940d..9455f6d1a1e41 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sub-batch"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "kl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N+3KyBlLG90C3D5ivgj6qedtKsUBoBHr89gmxyAIfVI="; + sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4="; }; - cargoSha256 = "sha256-rjhSosiLIgcSw6OHpFmGNHXGUdf2QsiIXFVgtO9qNY0="; + cargoSha256 = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 41c14d6e439aa..d67bd55f505de 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -83,11 +83,11 @@ let in stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.17.3"; + version = "3.0.18"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ="; + sha256 = "sha256-VwlEOcNl2KqLm0H6MIDMDu8r7+YCW7XO9yKszGJa7ew="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of @@ -190,13 +190,9 @@ stdenv.mkDerivation rec { BUILDCC = "${stdenv.cc}/bin/gcc"; patches = [ - # patches to build with recent live555 + # patch to build with recent live555 # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473 (fetchpatch { - url = "https://code.videolan.org/videolan/vlc/uploads/3c84ea58d7b94d7a8d354eaffe4b7d55/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch"; - sha256 = "171d3qjl9a4dm13sqig3ra8s2zcr76wfnqz4ba4asg139cyc1axd"; - }) - (fetchpatch { url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch"; sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda"; }) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 810fefa2863f8..60d05f6f23095 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-Ly6GBR7nF7J5Dwe1jrQxR4XYsao7KxBAxGn8fsJwmMs="; + sha256 = "sha256-SNNy/oI3ZcMeRLEMS2nSCS/rRaen5WsDfhdlHQCdtP4="; fetchSubmodules = true; }; @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; strictDeps = true; + NIX_LDFLAGS = "-lcriu"; + # we need this before autoreconfHook does its thing in order to initialize # config.h with the correct values postPatch = '' diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 412f554022764..47ab9f6951fce 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.12.2"; + version = "2.14.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-QyxWoq3hGFLm27tba5BL3xcnNCOAmY+rbGBtwREZPJA="; + sha256 = "sha256-6dTVDAFq5CwLvTzOczyaM+ZILKjKZzR2SAaRq2hqk7M="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorSha256 = "sha256-QlzneikTMBUpKJiyVrN+A6CctsVvdoTOOMDjJqIF3a8="; + vendorSha256 = "sha256-B6xqMsspWexTdYX+o2BJNlXuJFL7/rv8oexFUxOO8BI="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 83824b6cb943b..c8d3de79f1556 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,7 +1,5 @@ { lib, callPackage, fetchFromGitHub }: -with lib; - rec { dockerGen = { version, rev, sha256 @@ -13,11 +11,14 @@ rec { , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose - , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git - , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs - , nixosTests + , sqlite, iproute2, docker-buildx, docker-compose + , iptables, e2fsprogs, xz, util-linux, xfsprogs, git + , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests , clientOnly ? !stdenv.isLinux, symlinkJoin + , withSystemd ? stdenv.isLinux, systemd + , withBtrfs ? stdenv.isLinux, btrfs-progs + , withLvm ? stdenv.isLinux, lvm2 + , withSeccomp ? stdenv.isLinux, libseccomp }: let docker-runc = runc.overrideAttrs (oldAttrs: { @@ -46,7 +47,8 @@ rec { sha256 = containerdSha256; }; - buildInputs = oldAttrs.buildInputs ++ [ libseccomp ]; + buildInputs = oldAttrs.buildInputs + ++ lib.optional withSeccomp [ libseccomp ]; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -68,7 +70,7 @@ rec { NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); - moby = buildGoPackage (optionalAttrs stdenv.isLinux rec { + moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec { pname = "moby"; inherit version; @@ -77,11 +79,15 @@ rec { goPackagePath = "github.com/docker/docker"; nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; + buildInputs = [ sqlite ] + ++ lib.optional withLvm lvm2 + ++ lib.optional withBtrfs btrfs-progs + ++ lib.optional withSystemd systemd + ++ lib.optional withSeccomp libseccomp; - extraPath = optionals stdenv.isLinux (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); + extraPath = lib.optionals stdenv.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); - extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); patches = [ # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. @@ -132,15 +138,21 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath:$extraUserPath" ''; - DOCKER_BUILDTAGS = [ "journald" "seccomp" ]; + DOCKER_BUILDTAGS = lib.optional withSystemd "journald" + ++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs" + ++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper" + ++ lib.optional withSeccomp "seccomp"; }); - plugins = optionals buildxSupport [ docker-buildx ] - ++ optionals composeSupport [ docker-compose ]; + plugins = lib.optional buildxSupport docker-buildx + ++ lib.optional composeSupport docker-compose; pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in - buildGoPackage (optionalAttrs (!clientOnly) { - } // rec { + buildGoPackage (lib.optionalAttrs (!clientOnly) { + # allow overrides of docker components + # TODO: move packages out of the let...in into top-level to allow proper overrides + inherit docker-runc docker-containerd docker-proxy docker-tini moby; + } // rec { pname = "docker"; inherit version; @@ -156,14 +168,17 @@ rec { nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = optionals (!clientOnly) [ - sqlite lvm2 btrfs-progs systemd libseccomp - ] ++ plugins; + buildInputs = lib.optional (!clientOnly) sqlite + ++ lib.optional withLvm lvm2 + ++ lib.optional withBtrfs btrfs-progs + ++ lib.optional withSystemd systemd + ++ lib.optional withSeccomp libseccomp + ++ plugins; postPatch = '' patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString (plugins != []) '' + '' + lib.optionalString (plugins != []) '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ "${pluginsRef}/libexec/docker/cli-plugins" ''; @@ -194,7 +209,7 @@ rec { makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" - '' + optionalString (!clientOnly) '' + '' + lib.optionalString (!clientOnly) '' # symlink docker daemon to docker cli derivation ln -s ${moby}/bin/dockerd $out/bin/dockerd ln -s ${moby}/bin/dockerd-rootless $out/bin/dockerd-rootless @@ -222,17 +237,18 @@ rec { installManPage man/*/*.[1-9] ''; - passthru.tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; + passthru = { + # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) + inherit moby-src; + tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; + }; - meta = { + meta = with lib; { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ]; }; - - # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) - inherit moby-src; }); # Get revisions from diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 66932260886d1..7662c57d7a1ce 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,8 @@ { fetchurl, lib, stdenv }: let - version = "1.1.2"; + version = "1.1.3"; + # nixpkgs-update: no auto update suffix = { x86_64-linux = "x86_64"; @@ -22,8 +23,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-RkFlc+atTB9zHRAjQSqe4nJ9N7I9FE/RBeEcXoCk0T8="; - aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc="; + x86_64-linux = "sha256-3+CqVBOb2haknQIMzE9kl99pDWm9wZPUX92FlVov3No="; + aarch64-linux = "sha256-ii+x4YEZIZJuM+1Njvxe1dz6WOvAK1SWqfuodC7a4yo="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index 8ee3d478497ee..d96277604b5f6 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "krunvm"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rR762L8P+7ebE0u4MVCJoXc5mmqXlDFfSas+lFBMVFQ="; + hash = "sha256-IXofYsOmbrjq8Zq9+a6pvBYsvZFcKzN5IvCuHaxwazI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-3WiXm90XiQHpCbhlkigg/ZATQeDdUKTstN7hwcsKm4o="; + hash = "sha256-Y0FNi/+HuN5SqexHTKjcW6lEaeis7xZDYc2/FOAANIA="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 198a2a0b71a53..abb8770297e67 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-az4DllTkGP80Jf0NeaKrBI0zz56chPizJGu97cqXrJ4="; + sha256 = "sha256-c1AqqbeBKXfXUKgalbo5OXc0oVyQyntqwmpB0AFlwRs="; }; - cargoSha256 = "sha256-ghbJBhoU41yJ3qZBaKzEybNuCLdSqoL30+1h9d56b4A="; + cargoSha256 = "sha256-SybFjc1oyfJpen+KH2xj/u3i1S5SLiprwkUPp9IpMfc="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 66c6086aed03a..b060c6290493d 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.1.0"; + version = "12.1.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - hash = "sha256-PgrLu0Bm9Vom5WNl43312QFWKojdXDAGn3Nvj4hzPrQ="; + hash = "sha256-CffJg29qM9ex1RAq5t2dE/GX8ud9TylQbYiwBkh8nxE="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -137,6 +137,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vmware/open-vm-tools"; + changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${version}"; description = "Set of tools for VMWare guests to improve host-guest interaction"; longDescription = '' A set of services and modules that enable several features in VMware products for diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index eba18a76b1494..70219f9953874 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -11,23 +11,24 @@ , wrapGAppsHook4 , gtksourceview5 , libadwaita +, libpanel }: stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b44x+VyoiDafsPqfCTPm70zZJfNYQ31/UXsrXP6K29E="; + sha256 = "sha256-WLjXeTtg5DlZbENWYC6lHj6ccU1HGLN+v7xl5sXXvE0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-kgXt5enZ0VJr6hmEVcCREna4Y53q1jEFzUMsGtV2zvY="; + sha256 = "sha256-/Z0vp9Fn49+PhXwtt4Z0on4CghU1Hnu4gWcjzAWeCFk="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { gtk4 gtksourceview5 libadwaita + libpanel ]; meta = with lib; { diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 0863eae3bb048..6bcd15dc52ffa 100755 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -26,13 +26,29 @@ , makeWrapper , sqlite , enableInstaller ? false +, enableMacOSGuests ? false, fetchFromGitHub, gnutar, unzip }: let - vmware-unpack-env = buildFHSUserEnv rec { - name = "vmware-unpack-env"; - targetPkgs = pkgs: [ zlib ]; + # macOS - versions + fusionVersion = "13.0.0"; + fusionBuild = "20802013"; + unlockerVersion = "3.0.4"; + + # macOS - ISOs + darwinIsoSrc = fetchurl { + url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/x86/core/com.vmware.fusion.zip.tar"; + sha256 = "sha256-cSboek+nhkVj8rjdic6yzWQfjXiiLlch6gBWn73BzRU="; }; + + # macOS - Unlocker + unlockerSrc = fetchFromGitHub { + owner = "paolo-projects"; + repo = "unlocker"; + rev = "${unlockerVersion}"; + sha256 = "sha256-kpvrRiiygfjQni8z+ju9mPBVqy2gs08Wj4cHxE9eorQ="; + }; + gdbm3 = gdbm.overrideAttrs (old: rec { version = "1.8.3"; @@ -46,11 +62,16 @@ let cp .libs/libgdbm*.so* $out/lib/ ''; }); + + vmware-unpack-env = buildFHSUserEnv rec { + name = "vmware-unpack-env"; + targetPkgs = pkgs: [ zlib ]; + }; in stdenv.mkDerivation rec { pname = "vmware-workstation"; - version = "16.2.3"; - build = "19376536"; + version = "17.0.0"; + build = "20800274"; buildInputs = [ libxslt @@ -73,15 +94,35 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ] - ++ lib.optionals enableInstaller [ sqlite bzip2 ]; + ++ lib.optionals enableInstaller [ sqlite bzip2 ] + ++ lib.optionals enableMacOSGuests [ gnutar unzip ]; src = fetchurl { - url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle"; - sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM="; + url = "https://download3.vmware.com/software/WKST-1700-LX/VMware-Workstation-Full-${version}-${build}.x86_64.bundle"; + sha256 = "sha256-kBTocGb1tg5i+dvWmOaPfPUHxrWcX8/obeKqRGR+mRA="; }; unpackPhase = '' ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked" + + ${lib.optionalString enableMacOSGuests '' + mkdir -p fusion/ + tar -xvpf "${darwinIsoSrc}" -C fusion/ + unzip "fusion/com.vmware.fusion.zip" \ + "payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \ + "payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \ + -d fusion/ + ''} + ''; + + patchPhase = lib.optionalString enableMacOSGuests '' + cp -R "${unlockerSrc}" unlocker/ + + substituteInPlace unlocker/unlocker.py --replace \ + "/usr/lib/vmware/bin/" "$out/lib/vmware/bin" + + substituteInPlace unlocker/unlocker.py --replace \ + "/usr/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" "$out/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" ''; installPhase = '' @@ -226,6 +267,14 @@ stdenv.mkDerivation rec { unpacked/vmware-tools-solaris/solaris.iso \ $out/lib/vmware/isoimages/ + ${lib.optionalString enableMacOSGuests '' + echo "Installing VMWare Tools for MacOS" + cp -v \ + "fusion/payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \ + "fusion/payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \ + $out/lib/vmware/isoimages/ + ''} + ## VMware Player Application echo "Installing VMware Player Application" unpacked="unpacked/vmware-player-app" @@ -290,9 +339,9 @@ stdenv.mkDerivation rec { mkdir -p $out/include/ cp -r $unpacked/include/* $out/include/ - ## VMware VIX Workstation-16.0.0 Library - echo "Installing VMware VIX Workstation-16.0.0 Library" - unpacked="unpacked/vmware-vix-lib-Workstation1600" + ## VMware VIX Workstation-17.0.0 Library + echo "Installing VMware VIX Workstation-17.0.0 Library" + unpacked="unpacked/vmware-vix-lib-Workstation1700" cp -r $unpacked/lib/* $out/lib/vmware-vix/ ## VMware VProbes component for Linux @@ -327,6 +376,11 @@ stdenv.mkDerivation rec { sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib" done + ${lib.optionalString enableMacOSGuests '' + echo "Running VMWare Unlocker to enable macOS Guests" + python3 unlocker/unlocker.py + ''} + # SUID hack wrapProgram $out/lib/vmware/bin/vmware-vmx rm $out/lib/vmware/bin/vmware-vmx @@ -339,6 +393,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ deinferno ]; + maintainers = with maintainers; [ cawilliamson deinferno ]; }; } diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 6e2fd639ddefb..063798881912d 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.26"; + version = "1.0.27"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - hash = "sha256-1FJFE4z8UT5VYv0Ef9pqi5sYq8iIbrDPKaqcUFf9dwE="; + hash = "sha256-Lr5OC14N6KTZNU3Ei4O9taYGL+1NZd5JmejYBmmELUE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index c5733ffa68fb8..ca9565d915a29 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -90,7 +90,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ wozeparrot ]; inherit (wayland.meta) platforms; mainProgram = "Hyprland"; - # ofborg failure: g++ does not recognize '-std=c++23' - broken = stdenv.isAarch64; }; }) diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 8362097ddf9ed..f7c28ff35d225 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -59,7 +59,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ wozeparrot ]; inherit (wayland.meta) platforms; - # ofborg failure: g++ does not recognize '-std=c++23' - broken = stdenv.isAarch64; }; }) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index d71ff01362d25..f18ca995b14ba 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -11,6 +11,7 @@ , libgudev , callaudiod , pulseaudio +, evince , glib , gtk3 , gnome @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-I0BWwEKvOYQ1s2IpvV70GWxhARdX6AZ+B4ypnTlLlDw="; + sha256 = "sha256-q2AYm+zbL4/pRG1wn+MT6IYM8CZt15o48U9+piMPf74="; }; nativeBuildInputs = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + evince phoc libhandy libsecret @@ -101,7 +103,7 @@ stdenv.mkDerivation rec { runHook preCheck export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs runHook postCheck ''; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix new file mode 100644 index 0000000000000..6786576e6edc4 --- /dev/null +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, wrapGAppsHook +, desktop-file-utils +, feedbackd +, gtk4 +, libadwaita +, lm_sensors +, phoc +, phosh +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "phosh-mobile-settings"; + version = "0.21.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "guidog"; + repo = "phosh-mobile-settings"; + rev = "v${version}"; + sha256 = "sha256-60AXaKSF8bY+Z3TNlIIa7jZwQ2IkHqCbZ3uIlhkx6i0="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + desktop-file-utils + feedbackd + gtk4 + libadwaita + lm_sensors + phoc + phosh + wayland-protocols + ]; + + postInstall = '' + # this is optional, but without it phosh-mobile-settings won't know about lock screen plugins + ln -s '${phosh}/lib/phosh' "$out/lib/phosh" + + # .desktop files marked `OnlyShowIn=Phosh;` aren't displayed even in our phosh, so remove that. + # also make the Exec path absolute. + substituteInPlace "$out/share/applications/org.sigxcpu.MobileSettings.desktop" \ + --replace 'OnlyShowIn=Phosh;' "" \ + --replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings" + ''; + + meta = with lib; { + description = "A settings app for mobile specific things"; + homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ colinsane ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 86329782255d9..384b806ce2f74 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "10"; + version = "10.1"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "sha256-ACQBgAYtJ4OOQIismNYJB3z426GmlyUtXXbH06eRsgg="; + hash = "sha256-EYNLLAz7CkbVGv2XMT+73RR58HzxG+Gy7b5x1qahAgo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index b1f80d102d2a3..3231882a4fba2 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall zig build -Drelease-safe -Dcpu=baseline ${lib.optionalString xwaylandSupport "-Dxwayland"} -Dman-pages --prefix $out install + install contrib/river.desktop -Dt $out/share/wayland-sessions runHook postInstall ''; @@ -61,6 +62,8 @@ stdenv.mkDerivation rec { */ installFlags = [ "DESTDIR=$(out)" ]; + passthru.providedSessions = ["river"]; + meta = with lib; { homepage = "https://github.com/ifreund/river"; description = "A dynamic tiling wayland compositor"; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 970fdfe371fe8..30e43fa0c902a 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,24 +5,15 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; + hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE="; }; - patches = [ - # remove once when updating to 1.7 - # https://github.com/swaywm/swaylock/pull/235 - (fetchpatch { - url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff"; - sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ="; - }) - ]; - strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 177e185d82734..fb57c0a73c2a2 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -2,7 +2,7 @@ , meson, ninja, pkg-config, python3, wayland-scanner , cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput , libjpeg, seatd, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland -, wayland-protocols, xlibsWrapper +, wayland-protocols , pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null , libva ? null, libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput libjpeg seatd libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam - pango pipewire udev vaapi wayland wayland-protocols xlibsWrapper + pango pipewire udev vaapi wayland wayland-protocols ]; mesonFlags= [ |