diff options
Diffstat (limited to 'pkgs/applications')
996 files changed, 19658 insertions, 13187 deletions
diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index d8ef7d2b4fa55..df61d38961556 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.9"; + version = "0.10.4"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3"; + sha256 = "sha256-J9xrd/N4LrvGgi89Yj4ob4ZPUAEchrXJJQ+YVJ29Qhk="; }; buildInputs = [ diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index f9fedfcc28ffa..5b956e8f59611 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK client for MPD (Music player daemon)"; - homepage = "http://ario-player.sourceforge.net/"; + homepage = "https://ario-player.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.garrison ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index c3cba87e300c7..d6efada907632 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -9,8 +9,6 @@ #, aacSupport ? false, TODO: neroAacEnc }: -with lib; - stdenv.mkDerivation rec { version = "2.9.7"; pname = "asunder"; @@ -23,20 +21,20 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libcddb ]; runtimeDeps = - optional mp3Support lame ++ - optional oggSupport vorbis-tools ++ - optional flacSupport flac ++ - optional opusSupport opusTools ++ - optional wavpackSupport wavpack ++ - optional monkeysAudioSupport monkeysAudio ++ + lib.optional mp3Support lame ++ + lib.optional oggSupport vorbis-tools ++ + lib.optional flacSupport flac ++ + lib.optional opusSupport opusTools ++ + lib.optional wavpackSupport wavpack ++ + lib.optional monkeysAudioSupport monkeysAudio ++ [ cdparanoia ]; postInstall = '' wrapProgram "$out/bin/asunder" \ - --prefix PATH : "${makeBinPath runtimeDeps}" + --prefix PATH : "${lib.makeBinPath runtimeDeps}" ''; - meta = { + meta = with lib; { description = "A graphical Audio CD ripper and encoder for Linux"; homepage = "http://littlesvr.ca/asunder/index.php"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index d7215f93973f6..940e6c3c0c683 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -1,8 +1,26 @@ -{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype -, gdk-pixbuf, glib, gtk3, lib, xorg -, libglvnd, libjack2, ffmpeg -, libxkbcommon, xdg-utils, zlib, pipewire, pulseaudio -, wrapGAppsHook, makeWrapper }: +{ stdenv +, fetchurl +, alsa-lib +, cairo +, dpkg +, ffmpeg +, freetype +, gdk-pixbuf +, glib +, gtk3 +, lib +, libglvnd +, libjack2 +, libjpeg +, libxkbcommon +, makeWrapper +, pipewire +, pulseaudio +, wrapGAppsHook +, xdg-utils +, xorg +, zlib +}: stdenv.mkDerivation rec { pname = "bitwig-studio"; @@ -24,7 +42,27 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pipewire pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + alsa-lib + cairo + freetype + gdk-pixbuf + glib + gtk3 + libglvnd + libjack2 + # libjpeg8 is required for converting jpeg's to colour palettes + libjpeg + libxcb + libXcursor + libX11 + libXtst + libxkbcommon + pipewire + pulseaudio + stdenv.cc.cc.lib + xcbutil + xcbutilwm + zlib ]; installPhase = '' diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 82259d563ce90..70ef1ebdf6448 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -5,8 +5,6 @@ withGtk2 ? true, gtk2 ? null, withGtk3 ? true, gtk3 ? null }: -with lib; - assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; assert withQt -> wrapQtAppsHook != null; @@ -30,13 +28,13 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ rdflib pyliblo - ] ++ optional withFrontend pyqt5; + ] ++ lib.optional withFrontend pyqt5; buildInputs = [ file liblo alsa-lib fluidsynth jack2 libpulseaudio libsndfile - ] ++ optional withQt qtbase - ++ optional withGtk2 gtk2 - ++ optional withGtk3 gtk3; + ] ++ lib.optional withQt qtbase + ++ lib.optional withGtk2 gtk2 + ++ lib.optional withGtk3 gtk3; propagatedBuildInputs = pythonPath; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 50a276074cabc..bb0e885cd7465 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,35 +1,27 @@ -{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which -, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel +{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which, DarwinTools, xcbuild +, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel, MultitouchSupport }: stdenv.mkDerivation rec { - version = "1.4.1.0"; + version = "1.4.1.1"; pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "sha256-dL+ZrVFeMRPFW4MxUpNvrQKjzwBqVBBf8Rd3xHMZSSg="; + sha256 = "sha256-RFnubxUdpy3N4VJeCv4FMp1hCGNWsWjs/AvDpXApD2M="; }; - nativeBuildInputs = [ flex bison which ]; + nativeBuildInputs = [ flex bison which ] + ++ lib.optionals stdenv.isDarwin [ DarwinTools xcbuild ]; buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.isDarwin) alsa-lib - ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; + ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ]; patches = [ ./darwin-limits.patch ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot"; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport"; - - postPatch = '' - substituteInPlace src/core/makefile.x/makefile.osx \ - --replace "weak_framework" "framework" \ - --replace "MACOSX_DEPLOYMENT_TARGET=10.9" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" - ''; - makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; - buildFlags = [ (if stdenv.isDarwin then "osx" else "linux-alsa") ]; + buildFlags = [ (if stdenv.isDarwin then "mac" else "linux-alsa") ]; meta = with lib; { description = "Programming language for real-time sound synthesis and music creation"; @@ -37,7 +29,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index 7deb21bcef284..dfbe70194bbe1 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "cider"; - version = "1.5.7"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/ciderapp/cider-releases/releases/download/v${version}/Cider-${version}.AppImage"; - sha256 = "sha256-fWpt7YxqEDa1U4CwyVZwgbiwe0lrh64v0cJG9pbNMUU="; + sha256 = "sha256-fbeUl+vQpEdP17m3koblKv9z4CRpLNYtVQf7bs8ZP1M="; }; extraInstallCommands = diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/applications/audio/cmt/default.nix index 1062d897c6bde..bf7ed0ee37d4b 100644 --- a/pkgs/applications/audio/cmt/default.nix +++ b/pkgs/applications/audio/cmt/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cmt"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "http://www.ladspa.org/download/cmt_${version}.tgz"; - sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb"; + sha256 = "sha256-qC+GNt4fSto4ahmaAXqc13Wkm0nnFrEejdP3I8k99so="; }; buildInputs = [ ladspaH ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 66c172ff01d8d..61ff53aa1d75e 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -39,8 +39,6 @@ #, vtxSupport ? true, libayemu ? null }: -with lib; - assert samplerateSupport -> jackSupport; # vorbis and tremor are mutually exclusive @@ -113,16 +111,16 @@ stdenv.mkDerivation rec { patches = [ ./option-debugging.patch ]; - configurePhase = "./configure " + concatStringsSep " " ([ + configurePhase = "./configure " + lib.concatStringsSep " " ([ "prefix=$out" "CONFIG_WAV=y" - ] ++ concatMap (a: a.flags) opts); + ] ++ lib.concatMap (a: a.flags) opts); nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] - ++ flatten (concatMap (a: a.deps) opts); + ++ lib.flatten (lib.concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index d41ebed096064..f837ad6603e3e 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -16,8 +16,6 @@ , which }: -with lib; - stdenv.mkDerivation rec { pname = "crip"; version = "3.9"; @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perlPackages.perl perlPackages.CDDB_get ]; nativeBuildInputs = [ makeWrapper ]; - toolDeps = makeBinPath [ + toolDeps = lib.makeBinPath [ cdparanoia coreutils eject @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin/ - for script in ${escapeShellArgs scripts}; do + for script in ${lib.escapeShellArgs scripts}; do cp $script $out/bin/ substituteInPlace $out/bin/$script \ @@ -63,6 +61,6 @@ stdenv.mkDerivation rec { description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; license = lib.licenses.gpl1Only; platforms = lib.platforms.linux; - maintainers = [ maintainers.endgame ]; + maintainers = [ lib.maintainers.endgame ]; }; } diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index 53c1340ba2a20..ffb4821d767d1 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "csound-manual"; - version = "6.17.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "csound"; repo = "manual"; rev = version; - sha256 = "sha256-8X9Egn/MIwlNDEKUmEEz4Dnw6rGa37jRjYsVEt8ziW8="; + sha256 = "sha256-W8MghqUBr3V7LPgNwU6Ugw16wdK3G37zAPuasMlZ2+I="; }; prePatch = '' diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index 953a919d0c702..e48b45aec3e42 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,28 +1,23 @@ { lib, stdenv, csound, desktop-file-utils, fetchFromGitHub, python, python-qt, qmake, - qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }: + qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "csound-qt"; - version = "0.9.6-beta3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; - rev = version; - sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip"; + rev = "v${version}"; + hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28="; }; patches = [ - (fetchpatch { - name = "examplepath.patch"; - url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff"; - sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm"; - }) ./rtmidipath.patch ]; - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ]; + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns wrapQtAppsHook ]; buildInputs = [ csound desktop-file-utils rtmidi ]; @@ -35,13 +30,11 @@ stdenv.mkDerivation rec { "PYTHONQT_LIB_DIR=${python-qt}/lib" "LIBS+=-L${python-qt}/lib" "INCLUDEPATH+=${python-qt}/include/PythonQt" - "INCLUDEPATH+=${python}/include/python2.7" + "INCLUDEPATH+=${python}/include/python${python.pythonVersion}" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" ]; - dontWrapQtApps = true; - meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch index 4cbab8a128fcc..4e22295d43ffe 100644 --- a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch +++ b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch @@ -1,8 +1,8 @@ -diff --git a/src/src.pri b/src/src.pri -index e5e0c896..9a9fa513 100644 ---- a/src/src.pri -+++ b/src/src.pri -@@ -155,9 +155,9 @@ pythonqt { +diff --git a/src/src.pri b/src/src.pri +index e5e0c896..9a9fa513 100644 +--- a/src/src.pri ++++ b/src/src.pri +@@ -155,9 +155,9 @@ pythonqt { "src/pyqcsobject.cpp" } rtmidi { diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 13e258c61a906..d86d8c6c1adb1 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -40,7 +40,7 @@ assert gtk2Support || gtk3Support; let inherit (lib) optionals; - version = "1.9.3"; + version = "1.9.4"; in clangStdenv.mkDerivation { pname = "deadbeef"; inherit version; @@ -50,7 +50,7 @@ in clangStdenv.mkDerivation { repo = "deadbeef"; fetchSubmodules = true; rev = version; - sha256 = "sha256-Vt5JHrkNyxerqlShIBVbzZaunG0ZbHm5qf3fq9kMMXc="; + sha256 = "sha256-ow+Aw/lp+oe9GhbOWM7XcX/tJjfAAu7KOUY1us7+f84="; }; buildInputs = [ diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 71841a616a358..d6f468dbc563d 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.19"; + version = "0.9.20"; pname = "drumgizmo"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "18x28vhif0c97xz02k22xwqxxig6fi6j0356mlz2vf7vb25z69kl"; + sha256 = "sha256-AF8gQLiB29j963uI84TyNHIC0qwEWOCqmZIUWGq8V2o="; }; configureFlags = [ "--enable-lv2" ]; diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index aad765041e4b8..0db9da5d2161d 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.2.1"; + version = "0.3.1"; format = "other"; src = fetchFromGitHub { owner = "knuxify"; repo = pname; - rev = version; - sha256 = "sha256-TlY2F2y7ZZ9f+vkYYkES5zoIGcuTWP1+rOJI62wc4SU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-gN3V5ZHlhHp52Jg/i+hDLEDpSvP8yFngujyw5ZncQQg="; }; postPatch = '' diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index ba0715eb1dfb7..84c8333d18575 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 64 bits floating point internal audio processing. Nice GUI with powerful metering for every plugin. ''; - homepage = "http://eq10q.sourceforge.net/"; + homepage = "https://eq10q.sourceforge.net/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index e5579175bbb78..2c59068720d08 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compact open source software speech synthesizer"; - homepage = "http://espeak.sourceforge.net/"; + homepage = "https://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 2c86a036ceb2b..6c4da056c8488 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Phoneme editor for espeak"; - homepage = "http://espeak.sourceforge.net/"; + homepage = "https://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 46b1480be3820..c6000c86c6397 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ lib.optional podcastSupport python3.pkgs.feedparser ++ lib.optional wikipediaSupport webkitgtk; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest ]; diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 1ff08bd06b93d..81a2646ad74a5 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "famistudio"; - version = "4.0.4"; + version = "4.0.6"; src = fetchzip { url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; stripRoot = false; - sha256 = "sha256-qdSldObfwC5J1b4tpHT9S/xxJ2StBTsPA80QS7bs2vo="; + sha256 = "sha256-Se9EIQTjZQM5qqzlEB4hGVRHDFdu6GecNGpw9gYMbW4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index 7aef140da6518..be6e0fcca228a 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch, fdk_aac }: stdenv.mkDerivation rec { pname = "fdkaac"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo="; }; + patches = [ + # To be removed when 1.0.4 is released, see https://github.com/nu774/fdkaac/issues/54 + (fetchpatch { + name = "CVE-2022-37781.patch"; + url = "https://github.com/nu774/fdkaac/commit/ecddb7d63306e01d137d65bbbe7b78c1e779943c.patch"; + sha256 = "sha256-uZPf5tqBmF7VWp1fJcjp5pbYGRfzqgPZpBHpkdWYkV0="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ fdk_aac ]; diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix index 09c7b44d92dd2..5da071805cad6 100644 --- a/pkgs/applications/audio/flac123/default.nix +++ b/pkgs/applications/audio/flac123/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libogg popt ]; meta = with lib; { - homepage = "http://flac-tools.sourceforge.net/"; + homepage = "https://flac-tools.sourceforge.net/"; description = "A command-line program for playing FLAC audio files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 3a78e89717ab5..98b9faf8d24ac 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "9.2.0"; + version = "9.5.1"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-qnjWpsgCRAi09o9O7CBc0R9MN1EpXVmCoxB2npc9qpM="; + sha256 = "sha256-45aA2Ib69Gb1Mg/5907rp1nfRbNyQq12pm/aFwTdgeA="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 09abaa862f513..cbed4b36181eb 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; - cmakeFlags = [ "-Denable-framework=off" ]; + cmakeFlags = [ + "-Denable-framework=off" + # set CMAKE_INSTALL_NAME_DIR to correct value on darwin + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 7e376c89d36a6..7fcfeb32fd3a2 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -7,8 +7,6 @@ assert alsaSupport -> alsa-lib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -with lib; - mkDerivation rec { pname = "fmit"; version = "1.2.14"; @@ -22,9 +20,9 @@ mkDerivation rec { nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; buildInputs = [ fftw qtbase qtmultimedia ] - ++ optionals alsaSupport [ alsa-lib ] - ++ optionals jackSupport [ libjack2 ] - ++ optionals portaudioSupport [ portaudio ]; + ++ lib.optionals alsaSupport [ alsa-lib ] + ++ lib.optionals jackSupport [ libjack2 ] + ++ lib.optionals portaudioSupport [ portaudio ]; postPatch = '' substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}' @@ -32,13 +30,13 @@ mkDerivation rec { preConfigure = '' qmakeFlags="$qmakeFlags \ - CONFIG+=${optionalString alsaSupport "acs_alsa"} \ - CONFIG+=${optionalString jackSupport "acs_jack"} \ - CONFIG+=${optionalString portaudioSupport "acs_portaudio"} \ + CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \ + CONFIG+=${lib.optionalString jackSupport "acs_jack"} \ + CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIXSHORTCUT=$out" ''; - meta = { + meta = with lib; { description = "Free Musical Instrument Tuner"; longDescription = '' FMIT is a graphical utility for tuning musical instruments, with error diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index 31defdeb2f5e6..0f15775b38d54 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.6pre2"; + version = "0.6pre3"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-ydywnlZ6HEcTiBIB92yduCzPsOljvypP1KpCVjETzBc="; + sha256 = "sha256-bHVeTw69k6LLcrfkmGxvjlFfR/hWiCfm/P3utknid1o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 4bd9c6dcd8f8d..29d676598203e 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generates playlists such that each song sounds good following the previous song"; - homepage = "http://gjay.sourceforge.net/"; + homepage = "https://gjay.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 1cdea4629bbce..42b28eacc4f46 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Programmable auditory binaural-beat synthesizer"; - homepage = "http://gnaural.sourceforge.net/"; + homepage = "https://gnaural.sourceforge.net/"; maintainers = with maintainers; [ ehmry ]; license = with licenses; [ gpl2Only ]; }; diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 1fb848ae1eda5..b85aa4c0df762 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -8,12 +8,11 @@ , isStereo ? false }: -with lib; let - pname = "goattracker" + optionalString isStereo "-stereo"; + pname = "goattracker" + lib.optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { name = pname; - desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; + desktopName = "GoatTracker 2" + lib.optionalString isStereo " Stereo"; genericName = "Music Tracker"; exec = if isStereo then "gt2stereo" @@ -30,7 +29,7 @@ in stdenv.mkDerivation rec { else "2.76"; # normal src = fetchurl { - url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip"; + url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${lib.optionalString isStereo "_Stereo"}.zip"; sha256 = if isStereo then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal @@ -63,11 +62,11 @@ in stdenv.mkDerivation rec { meta = { description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices" - + optionalString isStereo " - Stereo version"; + + lib.optionalString isStereo " - Stereo version"; homepage = "https://cadaver.github.io/tools.html"; downloadPage = "https://sourceforge.net/projects/goattracker2/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix index 1f09d99c88893..f51daf7081c2c 100644 --- a/pkgs/applications/audio/goodvibes/default.nix +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-CE9f0GnXr7wSpp8jyW0ZxGKx16r6tOaObzQXKcy5nPY="; + hash = "sha256-w0nmTYcq2DBHSjQ23zWxT6optyH+lRAMRa210F7XEvE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 6db530a2c233a..a6164189c1dbd 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { gnome.adwaita-icon-theme ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ minimock pytest pytest-httpserver diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 5fe2ca2ce6450..1b20f306166f8 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.9.0-1"; + version = "3.9.4-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-+LWEjoke7f+6f4K4jO9nCG88Mdg9C49+v3FboM9/NkU="; + sha256 = "sha256-10gcVxMLhMXUblvJYLj0TTwGFl1YHI7HU3TfHXtJ+24="; }; postPatch = '' diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 798af97ab32f9..684f074b4e612 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { pipewire ]; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + meta = with lib; { description = "A GTK patchbay for pipewire"; homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index f6c88bc456e96..7b8ece0e7182f 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line editor for id3v2 tags"; - homepage = "http://id3v2.sourceforge.net/"; + homepage = "https://id3v2.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; unix; }; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 25ee53d3f435e..420c11562e2a0 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { be controlled using the ALSA sequencer. It's phat; it turns your computer into an effects box. ''; - homepage = "http://jack-rack.sourceforge.net/"; + homepage = "https://jack-rack.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.astsmtl ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index c3667ee57a5d5..24a72501db54e 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { management, no track suggestions, no media player. Just a fast, efficient workflow tool. ''; - homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; + homepage = "https://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index b4961384080eb..843738babbc50 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R4Xv+PmzKZQF1tFtSQTFjaisGug2EKM6mPVoGutNnok="; + sha256 = "sha256-D2hrdej2Q69AYjDn2Ey4vBSOmzBY3UzZMUdJSRjurdA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index cbe12a486efa1..7c762adf371f6 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { prefixKey = "PREFIX="; meta = { - homepage = "http://das.nasophon.de/klick/"; + homepage = "https://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 4d7d70aebd662..abeaa7dff4270 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { channels. Additionally, the program can drive MIDI instruments (with the gp32 and gp2x a custom MIDI interface is required). ''; - homepage = "http://www.littlegptracker.com/"; - downloadPage = "http://www.littlegptracker.com/download.php"; + homepage = "https://www.littlegptracker.com/"; + downloadPage = "https://www.littlegptracker.com/download.php"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index a50e5dcd66908..1837cb1074813 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -1,5 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, glfw, makeWrapper, - libXrandr, libXinerama, libXcursor, gtk3, ffmpeg-full, ...}: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libX11 +, glfw +, makeWrapper +, libXrandr +, libXinerama +, libXcursor +, gtk3 +, ffmpeg-full +, AppKit +, Carbon +, Cocoa +, CoreAudio +, CoreMIDI +, CoreServices +, Kernel +}: stdenv.mkDerivation rec { pname = "MIDIVisualizer"; @@ -15,16 +34,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper]; buildInputs = [ - libX11 glfw + ffmpeg-full + ] ++ lib.optionals stdenv.isLinux [ + libX11 libXrandr libXinerama libXcursor gtk3 - ffmpeg-full + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Carbon + Cocoa + CoreAudio + CoreMIDI + CoreServices + Kernel ]; - installPhase = '' + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications $out/bin + cp -r MIDIVisualizer.app $out/Applications/ + ln -s ../Applications/MIDIVisualizer.app/Contents/MacOS/MIDIVisualizer $out/bin/ + '' else '' mkdir -p $out/bin cp MIDIVisualizer $out/bin @@ -36,7 +68,7 @@ stdenv.mkDerivation rec { description = "A small MIDI visualizer tool, using OpenGL"; homepage = "https://github.com/kosua20/MIDIVisualizer"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ericdallo ]; }; } diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index 6a5626d98a699..0d07663d115a2 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "05c6zskj50g29f51lx8fvgzsi3f31z01zj6ssjjrgr7jfs7ak70p"; }; - checkInputs = (with dotnetPackages; [ NUnitConsole ]); + nativeCheckInputs = (with dotnetPackages; [ NUnitConsole ]); nativeBuildInputs = [ mono makeWrapper ]; buildPhase = '' diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index bf343e101c962..90a86b0dfec67 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { Cocoa ]; - checkInputs = [ + nativeCheckInputs = [ cppunit ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 05857ce0142be..053be90621d77 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -27,6 +27,8 @@ lib.makeScope newScope (self: with self; { mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + mopidy-notify = callPackage ./notify.nix { }; + mopidy-podcast = callPackage ./podcast.nix { }; mopidy-scrobbler = callPackage ./scrobbler.nix { }; @@ -35,6 +37,8 @@ lib.makeScope newScope (self: with self; { mopidy-soundcloud = callPackage ./soundcloud.nix { }; + mopidy-tidal = callPackage ./tidal.nix { }; + mopidy-tunein = callPackage ./tunein.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index 717d61a92ecff..c72fec06cdd7e 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { python3Packages.uritools ]; - checkInputs = [ + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index 65a228b8fd0a1..2352a65dcc958 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib +, fetchFromGitHub +, pythonPackages +, mopidy +}: pythonPackages.buildPythonApplication rec { pname = "mopidy-musicbox-webclient"; @@ -6,18 +10,22 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pimusicbox"; - repo = "mopidy-musicbox-webclient"; + repo = pname; rev = "v${version}"; sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9"; }; - propagatedBuildInputs = [ mopidy ]; + propagatedBuildInputs = [ + mopidy + ]; doCheck = false; meta = with lib; { - description = "Mopidy extension for playing music from SoundCloud"; - license = licenses.mit; - maintainers = [ maintainers.spwhitt ]; + description = "A Mopidy frontend extension and web client with additional features for Pi MusicBox"; + homepage = "https://github.com/pimusicbox/mopidy-musicbox-webclient"; + changelog = "https://github.com/pimusicbox/mopidy-musicbox-webclient/blob/v${version}/CHANGELOG.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ spwhitt ]; }; } diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix new file mode 100644 index 0000000000000..6df8e3e45ef9f --- /dev/null +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -0,0 +1,29 @@ +{ lib, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + pname = "Mopidy-Notify"; + version = "0.2.0"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "sha256-lzZupjlS0kbNvsn18serOoMfu0sRb0nRwpowvOPvt/g="; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.pydbus + ]; + + nativeBuildInputs = [ + pythonPackages.pytestCheckHook + ]; + + pythonImportsCheck = [ "mopidy_notify" ]; + + meta = with lib; { + homepage = "https://github.com/phijor/mopidy-notify"; + description = "Mopidy extension for showing desktop notifications on track change"; + license = licenses.asl20; + maintainers = with maintainers; [ lilyinstarlight ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/podcast.nix b/pkgs/applications/audio/mopidy/podcast.nix index 8a5c4ec2b3d63..7aacc2f7befe1 100644 --- a/pkgs/applications/audio/mopidy/podcast.nix +++ b/pkgs/applications/audio/mopidy/podcast.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { python3Packages.uritools ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/applications/audio/mopidy/subidy.nix b/pkgs/applications/audio/mopidy/subidy.nix index 98d69816b73f0..b84a14106fdca 100644 --- a/pkgs/applications/audio/mopidy/subidy.nix +++ b/pkgs/applications/audio/mopidy/subidy.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ mopidy pythonPackages.py-sonic ]; - checkInputs = with pythonPackages; [ pytestCheckHook ]; + nativeCheckInputs = with pythonPackages; [ pytestCheckHook ]; meta = with lib; { homepage = "https://www.mopidy.com/"; diff --git a/pkgs/applications/audio/mopidy/tidal.nix b/pkgs/applications/audio/mopidy/tidal.nix new file mode 100644 index 0000000000000..b470e0489e90d --- /dev/null +++ b/pkgs/applications/audio/mopidy/tidal.nix @@ -0,0 +1,35 @@ +{ lib +, python3Packages +, mopidy +}: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Tidal"; + version = "0.3.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + hash = "sha256-ekqhzKyU2WqTOeRR1ZSZA9yW3UXsLBsC2Bk6FZrQgmc="; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.tidalapi + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-mock + ]; + + pytestFlagsArray = [ "tests/" ]; + + meta = with lib; { + description = "Mopidy extension for playing music from Tidal"; + homepage = "https://github.com/tehkillerbee/mopidy-tidal"; + license = licenses.mit; + maintainers = [ maintainers.rodrgz ]; + }; +} + + diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index 5110d6ace93f6..99eec8187082b 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { mopidy ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ vcrpy pytestCheckHook ]; diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 96d686864fbc7..51b5aa037f06b 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -50,6 +50,7 @@ python3.pkgs.buildPythonApplication rec { desktop-file-utils gettext glib + gobject-introspection gtk4 meson ninja @@ -58,7 +59,6 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index ba2a757e090cb..a0e6a0527f7d8 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lossless mp3 normalizer with statistical analysis"; - homepage = "http://mp3gain.sourceforge.net/"; + homepage = "https://mp3gain.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ devhell ]; diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index 2435f0cecc62c..559f04f919f1b 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also other MPEG versions and layers. The tool is also aware of the most common types of tags (ID3v1, ID3v2, APEv2). ''; - homepage = "http://mp3val.sourceforge.net/index.shtml"; + homepage = "https://mp3val.sourceforge.net/index.shtml"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.devhell ]; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index e247ebeb2b1d1..9a693c0eaa39f 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://mpc123.sourceforge.net/"; + homepage = "https://mpc123.sourceforge.net/"; description = "A Musepack (.mpc) audio player"; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 08cfbada9313a..4a73ddf03c877 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line MP3 player"; - homepage = "http://mpg321.sourceforge.net/"; + homepage = "https://mpg321.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index 571cd16e2aa86..75cf863fc7699 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "A library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; license = with licenses; [ lgpl21Plus ]; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix index 92488ac587b6b..51501de4a89ea 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -63,7 +63,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "A synthesizer application built on Qt and libmt32emu"; longDescription = '' mt32emu-qt is a synthesiser application that facilitates both realtime diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index b9e87a3053030..517d1b200aaba 100644 --- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "Produces a WAVE file from a Standard MIDI file (SMF)"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index add56f99d9b38..88b5d3b74c150 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -5,17 +5,15 @@ let appName = "MuseScore ${builtins.head versionComponents}"; in -with lib; - stdenv.mkDerivation rec { pname = "musescore-darwin"; - version = concatStringsSep "." versionComponents; + version = lib.concatStringsSep "." versionComponents; # The disk image contains the .app and a symlink to /Applications. sourceRoot = "${appName}.app"; src = fetchurl { - url = "https://github.com/musescore/MuseScore/releases/download/v${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; + url = "https://github.com/musescore/MuseScore/releases/download/v${lib.concatStringsSep "." (lib.take 3 versionComponents)}/MuseScore-${version}.dmg"; sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; }; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 38e96c7f098e5..7dd7670d67f79 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,4 +1,6 @@ -{ cmake +{ lib +, stdenv +, cmake , pkg-config , boost , curl @@ -12,13 +14,11 @@ , libopenmpt , mpg123 , ncurses -, lib -, stdenv , taglib # Linux Dependencies , alsa-lib , pulseaudio -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # Darwin Dependencies , Cocoa diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 739d0c3c499ef..870691ae1c3f3 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -12,8 +12,6 @@ , pcreSupport ? false, pcre ? null }: -with lib; - assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { @@ -28,13 +26,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib ncurses libmpdclient boost ] - ++ optional pcreSupport pcre; + ++ lib.optional pcreSupport pcre; nativeBuildInputs = [ meson ninja pkg-config gettext ]; mesonFlags = [ "-Dlirc=disabled" "-Ddocumentation=disabled" - ] ++ optional (!pcreSupport) "-Dregex=disabled"; + ] ++ lib.optional (!pcreSupport) "-Dregex=disabled"; meta = with lib; { description = "Curses-based interface for MPD (music player daemon)"; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 2a56b6aa3ccf2..c15f6b9c14e16 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-xJzj387exWDvNias50fELvoAxgIoxDHVVRoAD4FJHUw="; + sha256 = "sha256-kqGYBaXmGeGuGJ5fcc4OQzHISU8fVuQNGwiD8nyPa/0="; }; - cargoSha256 = "sha256-6QOD8IhrnjyaOEYVYt2DA3dI6Wcu1tCXnIp+Ruc+EEo="; + cargoSha256 = "sha256-gVXH2pFtyMfYkCqda9NrqOgczvmxiWHe0zArJfnnrgE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 0fe6da9537dab..8a672948634aa 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -9,20 +9,20 @@ stdenv.mkDerivation { sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_0_1 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ]; buildInputs = [ boost ladspaH ]; patchPhase = '' # remove TERM: sed -i -e '4d' SConstruct - sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct + sed -i 's@Options@Variables@g' SConstruct + sed -i "s@-fomit-frame-pointer -ffast-math -mfpmath=sse@-I ${boost.dev}/include@g" SConstruct sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "LADSPA plugins based on filters of nova"; homepage = "http://klingt.org/~tim/nova-filters/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 73bee279803bd..f40fb1413264d 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.20"; + version = "3.11.21"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-ifzth9qd2YX9WeF6QeXSWkMqRyTGBxPyTm5tkanPiFQ="; + sha256 = "sha256-nItqx3g4W3s1phHe6F8EtOL4nwJQ0XnKB8Ujg71/Q3Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 83cf44853a5a5..357799a11226c 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]); + nativeCheckInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]); checkPhase = '' export LANG="en_US.UTF-8" diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index ac3df5c5f958a..65d58ffd57749 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,19 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, boost, libpulseaudio }: +{ lib +, stdenv +, fetchFromGitHub +, boost +, cxxopts +, libpulseaudio +, meson +, ninja +, pkg-config +}: stdenv.mkDerivation rec { pname = "pamixer"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "cdemoulins"; repo = "pamixer"; rev = version; - sha256 = "sha256-7VNhHAQ1CecQPlqb8SMKK0U1SsFZxDuS+QkPqJfMqrQ="; + hash = "sha256-LbRhsW2MiTYWSH6X9Pz9XdJdH9Na0QCO8CFmlzZmDjQ="; }; - buildInputs = [ boost libpulseaudio ]; + nativeBuildInputs = [ pkg-config meson ninja ]; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ boost cxxopts libpulseaudio ]; meta = with lib; { description = "Pulseaudio command line mixer"; diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index 1d701004622e8..5e781a9f51158 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { special effects by "spectral smoothing" the sounds. It can transform any sound/music to a texture. ''; - homepage = "http://hypermammut.sourceforge.net/paulstretch/"; + homepage = "https://hypermammut.sourceforge.net/paulstretch/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 5cd2a26878894..e3a2fa0333b1d 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.55"; + version = "1.56"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-NwkHb0FOg9wAgtcEtWqOpNGvBXjQIoc4pMmf/32Gxr0="; + sha256 = "sha256-NetzlQdhbyClnVQTrHoX9QpVtoj8a8FoDue+uxhgrlA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index e9b6e76368e93..3e0206a654bf0 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.3.6"; + version = "0.3.9"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-uN3SAmpurINV+7vw51fWdwnuW2yBxnedY6BXdwn/S2s="; + sha256 = "sha256-KGZ67FF3WlKwUzVV3qz1DR/7i1mXsfXVVyuNoIR9uP0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index aacc584c5b84a..f0dc71aa47757 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gstreamer ] ++ lib.optionals (withGstPlugins) [ + gst-libav gst-plugins-bad gst-plugins-good gst-plugins-ugly @@ -118,7 +119,7 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = [ + nativeCheckInputs = [ dbus gdk-pixbuf glibcLocales diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index c02ee512669ae..8cf6871a76b48 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; - checkInputs = with python3Packages; [ requests sox ]; + nativeCheckInputs = with python3Packages; [ requests sox ]; # Testing downloads media files for testing, which requires the # sandbox to be disabled. diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 178b637978353..1d638c01f2055 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = !stdenv.isAarch64; # single failure that I can't explain preFixup = '' diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 9bf73bacfb11c..542e47cd16b70 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.71"; + version = "6.73"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-AHi0US3U4PU/IrlCahJbm+tkmsz+nh0AFOk0lB2lI3M="; - aarch64-linux = "sha256-/yCV7wllQ024rux4u4Tp9TZK8JMN9Tk0DFJY3W2BGAk="; + x86_64-linux = "sha256-omQ2XdL4C78BQRuYKy90QlMko2XYHoVhd4X0C+Zyp8E="; + aarch64-linux = "sha256-XHohznrfFMHHgif4iFrpXb0FNddYiBb0gB7ZznlU834="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 1be3f53dce5f9..44dbff6077bcd 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,15 +1,13 @@ { lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsa-lib , mpg123, releasePath ? null }: -with lib; - # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the release version to some stable location. # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. let - urlVersion = replaceStrings [ "." ] [ "_" ]; + urlVersion = lib.replaceStrings [ "." ] [ "_" ]; in stdenv.mkDerivation rec { @@ -80,7 +78,7 @@ stdenv.mkDerivation rec { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 853613c9a5f59..fe9f4a835c84c 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libnotify ] ++ gst_plugins; - checkInputs = [ + nativeCheckInputs = [ check ]; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index dd0112d821620..0a82a4671db28 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rosegarden"; - version = "20.12"; + version = "22.12.1"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "sha256-iGaEr8WFipV4I00fhFGI2xMBFPf784IIxNXs2hUTHFs="; + sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY="; }; postPhase = '' diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/applications/audio/sc68/default.nix index 3f6bb032ec4f8..a779576d05d9c 100644 --- a/pkgs/applications/audio/sc68/default.nix +++ b/pkgs/applications/audio/sc68/default.nix @@ -13,21 +13,32 @@ stdenv.mkDerivation rec { pname = "sc68"; - version = "unstable-2021-08-23"; + version = "unstable-2022-11-24"; src = fetchsvn { url = "svn://svn.code.sf.net/p/sc68/code/"; - rev = "694"; - sha256 = "1yycnr4ndzfhbmki41c30zskwyizpb9wb8sf0gxcprllmbq6a421"; + rev = "695"; + sha256 = "sha256-RO3Yhjalu49BUM0fYOZtI2l6KbuUuw03whRxlKneabo="; }; preConfigure = "tools/svn-bootstrap.sh"; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config which autoconf automake libtool hexdump ]; + nativeBuildInputs = [ + autoconf + automake + hexdump + libtool + pkg-config + which + ]; - buildInputs = [ libao zlib curl ]; + buildInputs = [ + curl + libao + zlib + ]; meta = with lib; { description = "Atari ST and Amiga music player"; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index bcb254ad87cc4..86f5cf83ad40e 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "22.5"; + version = "23.0"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-a/nYq6Cfbx93jfA6I8it+U0U36dOAFSpRis32spPks4="; + sha256 = "sha256-WnQtXr1IcOpNJBrSvLf2rNu2XPs8JU01LWsQSzvvivA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 1f5bb36a51443..8d10b2f2a34bd 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { fmt ]; - checkInputs = [ + nativeCheckInputs = [ parallel ruby supercollider-with-sc3-plugins diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 63cb7398201bc..35fb524ab3015 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , which @@ -9,7 +10,7 @@ , libxml2 , libjack2 , libsndfile -, wxGTK30 +, wxGTK32 , libsigcxx , libsamplerate , rubberband @@ -21,15 +22,23 @@ stdenv.mkDerivation rec { pname = "sooperlooper"; - version = "1.7.4"; + version = "1.7.8"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1jng9bkb7iikad0dy1fkiq9wjjdhh1xi1p0cp2lvnz1dsc4yk6iw"; + rev = "v${version}"; + sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE="; }; + patches = [ + (fetchpatch { + name = "10-build_with_wx_32.patch"; + url = "https://sources.debian.org/data/main/s/sooperlooper/1.7.8~dfsg0-2/debian/patches/10-build_with_wx_32.patch"; + sha256 = "sha256-NF/w+zgRBNkSTqUJhfH9kQogXSYEF70pCN+loR0hjpg="; + }) + ]; + autoreconfPhase = '' patchShebangs ./autogen.sh ./autogen.sh @@ -47,7 +56,7 @@ stdenv.mkDerivation rec { libxml2 libjack2 libsndfile - wxGTK30 + wxGTK32 libsigcxx libsamplerate rubberband @@ -68,7 +77,7 @@ stdenv.mkDerivation rec { However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc) and the engine can be run standalone on a computer without a monitor. ''; - homepage = "http://essej.net/sooperlooper/"; # https is broken + homepage = "https://sonosaurus.com/sooperlooper/"; license = licenses.gpl2; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index c0966e9ab3fdc..208d50a2773c2 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { python3Packages.pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 74c53f96efdc1..0c1aa5fa0e2f2 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; - version = "unstable-2018-12-29"; + version = "0.8.4"; src = fetchFromGitHub { owner = "alexkay"; repo = "spek"; - rev = "f071c2956176ad53c7c8059e5c00e694ded31ded"; - sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5"; + rev = "v${version}"; + sha256 = "sha256-JLQx5LlnVe1TT1KVO3/QSVRqYL+pAMCxoDWrnkUNmRU="; }; - # needed for autoreconfHook - AUTOPOINT="intltoolize --automake --copy"; - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; - buildInputs = [ ffmpeg wxGTK30 gtk3 ]; + buildInputs = [ ffmpeg wxGTK32 gtk3 ]; meta = with lib; { description = "Analyse your audio files by showing their spectrogram"; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index bfeb8a7dab3a3..274b054955b75 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -9,16 +9,16 @@ rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; rev = "v${version}"; - sha256 = "1liql2wp7cx0x4ha1578wx3m4byd295m4ph268s05yw2wrnr3v6c"; + sha256 = "sha256-9zwHBDrdvE2R/cdrWgjsfHlm3wEZ9SB2VNcqezB/Op0="; }; - cargoSha256 = "1plvqd55d1gj0ydimv3154pwgj2sh1fqx2182nw8akzdfmzg1150"; + cargoSha256 = "sha256-fQm7imXpm5AcKdg0cU/Rf2mAeg2ebZKRisJZSnG0REI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 1ac1d6658f8d1..d6d776c860588 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; version = version; - homepage = "http://shibatch.sourceforge.net/"; + homepage = "https://shibatch.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 13dc80c1dc632..eeed1e1837cde 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.10"; + version = "1.0.14"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-N3jLw2UXLXLpTmFIHihzcMXrxJY0gmvwoawTQ0vRR+w="; + hash = "sha256-ThfycS5yNpp6+mE33qPqEWlhSB3OIF7d/t2XvI+rF2E="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 6fae14e2b1ade..a44a77237d1fe 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libogg libvorbis libmad ]; meta = with lib; { - homepage = "http://streamripper.sourceforge.net/"; + homepage = "https://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; }; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index a9329c34212df..cedad6ef17e77 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { mpv peewee pygobject3 - python-Levenshtein + levenshtein python-dateutil requests semver @@ -73,7 +73,7 @@ python3Packages.buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 46f75442157cd..47c6a32ad1f23 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.7.5"; + version = "3.7.7"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-/0zzzOEkzNr1aIpPFdflFaM/0HTs3TlIRxau3Yt+Hog="; + hash = "sha256-CjbV/Uwpe+x7LBDUDY+NRonUt549MrjGnlJ2olIrKQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index 56ff4c0e1911d..9b6f4efe16618 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { TAP Pitch Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling Limiter, TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP TubeWarmth, TAP Vibrato. ''; - homepage = "http://tap-plugins.sourceforge.net/ladspa.html"; + homepage = "https://tap-plugins.sourceforge.net/ladspa.html"; license = licenses.gpl3; maintainers = [ maintainers.fps ]; }; diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 08420191127de..c26ffd7e64af5 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.7.5"; + version = "0.7.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/wpaxXY0hT7XX44cW1f3JuowE5u46/aLMC2VXgty/jE="; + sha256 = "sha256-1RlG1/2+NuMO9zqFHQaEkEX1YrYYMjnaNprjdl1ZnHQ="; }; - cargoHash = "sha256-TznzZ1dcun57IQ8e2T2FOxSdyqxS6etnuvxOY8n1y14="; + cargoHash = "sha256-SYk2SiFbp40/6Z0aBoX4MPnPLHjEfsJKCW4cErm0D78="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index e3c4b45224897..e92b2f13187e4 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -56,7 +56,7 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ libsndfile ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ twisted ] ++ bins; diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index b61ea3fc4d4b0..ae96ea63cb0ba 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolf-shaper"; - version = "0.1.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "pdesaulniers"; repo = "wolf-shaper"; rev = "v${version}"; - sha256 = "1j9xmh1nkf45ay1c5dz2g165qvrwlanzcq6mvb3nfxar265drd9q"; + sha256 = "sha256-BREv0nQVysWdx/sVd0cdFji49xtLmHEL8b2jLtgjDfI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 5f99555d376c4..6c0d439a0d1b5 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extended module player"; - homepage = "http://xmp.sourceforge.net/"; + homepage = "https://xmp.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 87305027e4c41..e28d773d6e2a4 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { synths) with user interfaces, permitting them to be hosted in-process by audio applications. ''; - homepage = "http://dssi.sourceforge.net/download.html#Xsynth-DSSI"; + homepage = "https://dssi.sourceforge.net/download.html#Xsynth-DSSI"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 6a7d7a9dc770e..ed36ab263a055 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -2,11 +2,11 @@ let pname = "youtube-music"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/th-ch/youtube-music/releases/download/v${version}/YouTube-Music-${version}.AppImage"; - sha256 = "sha256-7U+zyLyXMVVMtRAT5yTEUqS3/qP5Kx/Yuu263VcsbAE="; + sha256 = "sha256-o/a+6EKPEcE9waXQK3hxtp7FPqokteoUAt0iOJk8bYw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index a07bfa60b0545..c676e6a774b53 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zam-plugins"; - version = "3.14"; + version = "4.1"; src = fetchFromGitHub { owner = "zamaudio"; repo = pname; rev = version; - sha256 = "sha256-zlANfFuEXQdXlSu4CuXNyChiuV7wkumaOJqgthl6Y9Q="; + sha256 = "sha256-NKa6lOP3fpAFMYwzZAMFgW0tBSM/F89oB/nDbEUeflw="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.zamaudio.com/?p=976"; + homepage = "https://www.zamaudio.com/?p=976"; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index fae337c079f00..2c8ecfd199e07 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; doCheck = true; - checkInputs = [ cxxtest ruby ]; + nativeCheckInputs = [ cxxtest ruby ]; # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index eaf3f90138172..8e86b35cf7cc1 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.11.1"; + version = "22.11.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "JYYiqJzLszaCJSl7fDb9Oz8tdIYAnqEbJoRg4zw3wbg="; + sha256 = "yZNERRoNZ1K7BRiAu7sqVQyhghsS/AeZSODMVSm46oY="; }; patches = [ diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index 410ff23a46241..36f554761f08c 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -1,8 +1,11 @@ -{ fetchFromGitHub, python3, lib }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.8.7"; + version = "0.8.8"; format = "pyproject"; @@ -10,18 +13,23 @@ python3.pkgs.buildPythonApplication rec { owner = "ep1cman"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VIA7/jWMuAWYle3tBDgKU5PJ9wkHChEjNns8lhYr1K8="; + hash = "sha256-Z8qK7LprMyXl5irx9Xrs/RgqvNcFVBqLBSljovr6oiE="; }; - preBuild = '' - sed -i 's_click = "8.0.1"_click = "^8"_' pyproject.toml - sed -i 's_pyunifiprotect = .*_pyunifiprotect = "*"_' pyproject.toml - sed -i 's_aiorun = .*_aiorun = "*"_' pyproject.toml - sed -i '/pylint/d' pyproject.toml - ''; + pythonRelaxDeps = [ + "aiorun" + "aiosqlite" + "click" + "pyunifiprotect" + ]; + + pythonRemoveDeps = [ + "pylint" + ]; nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -32,14 +40,15 @@ python3.pkgs.buildPythonApplication rec { pyunifiprotect ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; meta = with lib; { description = "Python tool to backup unifi event clips in realtime"; homepage = "https://github.com/ep1cman/unifi-protect-backup"; - maintainers = with maintainers; [ ajs124 ]; + changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + maintainers = with maintainers; [ ajs124 ]; }; } diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index ad55ef1ab8c8d..3fa8e1816f801 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { ) ''; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest-qt pytest-mock pytestCheckHook diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 68ddcca4a138d..7993887be65a5 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "22.7.6"; + version = "22.10.3"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nlOIUvFv05uITEw0K+qtgT4zqySJBjTAHu49N9wdqJM="; + sha256 = "sha256-chP5RFqEoZbpSuGHfG/bHlHTe/sZYV2gLvUSHU9A44w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index ca998248a6c58..d1e419425570a 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -23,7 +23,6 @@ , withWallet ? true }: -with lib; stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; version = "23.0.knots20220529"; @@ -35,29 +34,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -73,7 +72,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.bitcoind-knots; }; - meta = { + meta = with lib; { description = "A derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; maintainers = with maintainers; [ prusnak mmahut ]; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index d019c3f02d6d6..3fbf9615f7db1 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -3,10 +3,8 @@ , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: -with lib; - stdenv.mkDerivation rec { - pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited"; + pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-unlimited"; version = "1.10.0.0"; src = fetchFromGitLab { @@ -17,19 +15,19 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] - ++ optionals withGui [ wrapQtAppsHook qttools ]; + ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] - ++ optionals withGui [ qtbase qttools qrencode ] - ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; + ++ lib.optionals withGui [ qtbase qttools qrencode ] + ++ lib.optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" + ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system (Unlimited client)"; longDescription= '' Bitcoin is a free open source peer-to-peer electronic cash system that is diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 1c698927303ca..98483391973d0 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -23,7 +23,6 @@ , withWallet ? true }: -with lib; let desktop = fetchurl { # c2e5f3e is the last commit when the debian/bitcoin-qt.desktop file was changed @@ -45,16 +44,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; - postInstall = optionalString withGui '' + postInstall = lib.optionalString withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png @@ -63,17 +62,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -89,7 +88,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.bitcoind; }; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system"; longDescription = '' Bitcoin is a free open source peer-to-peer electronic cash system that is diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 4f8a08333a86b..f4c00d00858ea 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -5,7 +5,6 @@ , openssl }: -with lib; stdenv.mkDerivation rec { pname = "btcdeb"; version = "unstable-2022-04-03"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; - meta = { + meta = with lib; { description = "Bitcoin Script Debugger"; homepage = "https://github.com/bitcoin-core/btcdeb"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 17d6704644fc3..fb3912ab4db46 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.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-EZ8gfpTBmTB/lGtexZYbD9x1F7rFXIEaEhhwS6gOEV4="; + sha256 = "sha256-wjtiircPPQgWg1GGQsesEEeOF+h1+tc591YI0l/JlwQ="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 29bf9844b1786..6b67883226fe9 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,15 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.12"; sha256 = "1n7yv6q8fbk02d334a19zyicvlammjhfrg9rf18jyb3szj8g36k7"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.16"; sha256 = "050wh5gw3hgql8191z0yv7sj06wg5da6kvkbcg9hq3ildj0fdj67"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.19"; sha256 = "1jx9233apry0kb54df7k0p7vrsp3hp27f5d0j2802gry04sihrl7"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.14"; sha256 = "1k5m6jc585hnkkl019diz2gycfnsv2kx4g4cfs4awlpr42k8s3ph"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.18"; sha256 = "0zpqi8dpk91sqg7njxbs64m9598fmmalcc1w97v60xlhp9afjmdb"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.21"; sha256 = "0qq6ppr5vw4k8hjnz5xp29fc82z32vh6bc389dnr439gw7hmwkp9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.17"; sha256 = "1bb8q57lnqnp3wijw41vvbwgz8rgg4g9pw8qhd4iiqi1w94q1bkz"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.16"; sha256 = "1q109kmzj99axk35l68z3gi29ww1xd62zaxj1f39myvlcv9ncb41"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.18"; sha256 = "166v6mhmy47fgny55c4mzqb2x7anqyxnd0g409vfgyg5fq4gc15v"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.9"; sha256 = "0ya365w3i3sjv7wafm6wmasf9mpfsh0fcbhawsv5br7m7lpppwhh"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.12"; sha256 = "1gb61a5mdmyigy7ps2c8n4iig6i32rdsif9kwn35yxx25zbnmbk2"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.19"; sha256 = "046vvlxlg8div4a2v6pnxz4iwji93s688jgnvav3hl6c22b9lvs0"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.18"; sha256 = "04lp90rr61p7n39bfmia6jamgr0jjfns9987py64iazi236dl74g"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.20"; sha256 = "1kwyh71zzfij07r6nvcf7k2gdpjdhh90imwh6s255ws13m1fj3sn"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.11"; sha256 = "0zm0b45npacknir6b6a6v717kp3yz8hxv1qy2v65g2zp3ad2wij4"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.14"; sha256 = "1hhznv07bd1f3rn9d1rpg61ln68vqfjg7ypxif9lx4l3vfcj5j04"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) @@ -125,7 +125,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.10"; sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) @@ -158,7 +157,7 @@ (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.18"; sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.20"; sha256 = "0gl39v1mvnhdrqn8dmmslsyj4w4yc4l447zp62bfnwm5ppcwda9z"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.23"; sha256 = "10dy58gq644561svc67pm37rlb44mymbnlfz409dhclmfhmqmd5s"; }) (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; }) (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.2"; sha256 = "0a8zy9iasgmr7mqhjrbxa2shnygpp97pbg5qnk7ix50y01k9blyw"; }) diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh index 082911b42a3d0..9debe6780f231 100755 --- a/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -8,5 +8,4 @@ echo "Updating nbxplorer" ../nbxplorer/update.sh echo echo "Updating btcpayserver" -# Include Razor SDK packages in deps.nix -../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false' +../nbxplorer/util/update-common.sh btcpayserver deps.nix diff --git a/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/applications/blockchains/chia-dev-tools/default.nix new file mode 100644 index 0000000000000..d65eb37f3985f --- /dev/null +++ b/pkgs/applications/blockchains/chia-dev-tools/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, substituteAll +, python3Packages +, chia +, +}: +python3Packages.buildPythonApplication rec { + pname = "chia-dev-tools"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lE7FTSDqVS6AstcxZSMdQwgygMvcvh1fqYVTTSSNZpA="; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit chia; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + ''; + + nativeBuildInputs = [ + python3Packages.setuptools-scm + ]; + + # give a hint to setuptools-scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + + propagatedBuildInputs = with python3Packages; [ + (toPythonModule chia) + pytimeparse + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-asyncio + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + postCheck = "unset HOME"; + + disabledTests = [ + "test_spendbundles" + ]; + + meta = with lib; { + homepage = "https://www.chia.net/"; + description = "Utility for developing in the Chia ecosystem: Chialisp functions, object inspection, RPC client and more"; + license = with licenses; [ asl20 ]; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch b/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch new file mode 100644 index 0000000000000..9fb8fefe197af --- /dev/null +++ b/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/cdv/cmds/sim_utils.py b/cdv/cmds/sim_utils.py +index e59ba8f..20912ff 100644 +--- a/cdv/cmds/sim_utils.py ++++ b/cdv/cmds/sim_utils.py +@@ -67,7 +67,7 @@ async def start_async(root_path: Path, group: Any, restart: bool) -> None: + + from chia.cmds.start_funcs import async_start + +- sys.argv[0] = str(Path(sys.executable).parent / "chia") # this gives the correct path to the chia executable ++ sys.argv[0] = "@chia@/bin/chia" # this gives the correct path to the chia executable + if root_path.exists(): + config = load_config(root_path, "config.yaml") + await async_start(root_path, config, group, restart) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 33ce321cb4c6d..99fe1595def1c 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,21 +6,16 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg="; + hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8="; }; - patches = [ - # chia tries to put lock files in the python modules directory - ./dont_lock_in_store.patch - ]; - postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" @@ -59,6 +54,7 @@ let chia = python3Packages.buildPythonApplication rec { fasteners filelock keyrings-cryptfile + psutil pyyaml setproctitle setuptools # needs pkg_resources at runtime @@ -68,7 +64,7 @@ let chia = python3Packages.buildPythonApplication rec { zstd ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch b/pkgs/applications/blockchains/chia/dont_lock_in_store.patch deleted file mode 100644 index f923b11801a10..0000000000000 --- a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/chia/wallet/puzzles/load_clvm.py -+++ b/chia/wallet/puzzles/load_clvm.py -@@ -82,18 +82,6 @@ def load_serialized_clvm(clvm_filename, package_or_requirement=__name__) -> Seri - """ - hex_filename = f"{clvm_filename}.hex" - -- try: -- if pkg_resources.resource_exists(package_or_requirement, clvm_filename): -- # Establish whether the size is zero on entry -- full_path = pathlib.Path(pkg_resources.resource_filename(package_or_requirement, clvm_filename)) -- output = full_path.parent / hex_filename -- compile_clvm(full_path, output, search_paths=[full_path.parent]) -- -- except NotImplementedError: -- # pyinstaller doesn't support `pkg_resources.resource_exists` -- # so we just fall through to loading the hex clvm -- pass -- - clvm_hex = pkg_resources.resource_string(package_or_requirement, hex_filename).decode("utf8") - assert len(clvm_hex.strip()) != 0 - clvm_blob = bytes.fromhex(clvm_hex) diff --git a/pkgs/applications/blockchains/digibyte/default.nix b/pkgs/applications/blockchains/digibyte/default.nix index 90e84db3638e1..4e563d21fa22d 100644 --- a/pkgs/applications/blockchains/digibyte/default.nix +++ b/pkgs/applications/blockchains/digibyte/default.nix @@ -15,13 +15,11 @@ , wrapQtAppsHook ? null }: -with lib; - stdenv.mkDerivation rec { pname = "digibyte"; version = "7.17.3"; - name = pname + toString (optional (!withGui) "d") + "-" + version; + name = pname + toString (lib.optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "digibyte-core"; @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config hexdump - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ wrapQtAppsHook ]; @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { libevent db4 zeromq - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qtbase qttools protobuf @@ -54,12 +52,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - meta = { + meta = with lib; { description = "DigiByte (DGB) is a rapidly growing decentralized, global blockchain"; homepage = "https://digibyte.io/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/dogecoin/default.nix b/pkgs/applications/blockchains/dogecoin/default.nix index 6b6cfaa2398d4..421c2fe667e05 100644 --- a/pkgs/applications/blockchains/dogecoin/default.nix +++ b/pkgs/applications/blockchains/dogecoin/default.nix @@ -6,9 +6,8 @@ , withGui, withUpnp ? true, withUtils ? true, withWallet ? true , withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }: -with lib; stdenv.mkDerivation rec { - pname = "dogecoin" + optionalString (!withGui) "d"; + pname = "dogecoin" + lib.optionalString (!withGui) "d"; version = "1.14.6"; src = fetchFromGitHub { @@ -18,32 +17,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-PmbmmA2Mq07dwB3cI7A9c/ewtu0I+sWvQT39Yekm/sU="; }; - preConfigure = optionalString withGui '' - export LRELEASE=${getDev qttools}/bin/lrelease + preConfigure = lib.optionalString withGui '' + export LRELEASE=${lib.getDev qttools}/bin/lrelease ''; nativeBuildInputs = [ pkg-config autoreconfHook util-linux ] - ++ optionals withGui [ wrapQtAppsHook qttools ]; + ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl protobuf boost zlib libevent ] - ++ optionals withGui [ qtbase qrencode ] - ++ optionals withUpnp [ miniupnpc ] - ++ optionals withWallet [ db5 ] - ++ optionals withZmq [ zeromq ] - ++ optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals withGui [ qtbase qrencode ] + ++ lib.optionals withUpnp [ miniupnpc ] + ++ lib.optionals withWallet [ db5 ] + ++ lib.optionals withZmq [ zeromq ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configureFlags = [ "--with-incompatible-bdb" "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals (!withGui) [ "--with-gui=no" ] - ++ optionals (!withUpnp) [ "--without-miniupnpc" ] - ++ optionals (!withUtils) [ "--without-utils" ] - ++ optionals (!withWallet) [ "--disable-wallet" ] - ++ optionals (!withZmq) [ "--disable-zmq" ]; + ] ++ lib.optionals (!withGui) [ "--with-gui=no" ] + ++ lib.optionals (!withUpnp) [ "--without-miniupnpc" ] + ++ lib.optionals (!withUtils) [ "--without-utils" ] + ++ lib.optionals (!withWallet) [ "--disable-wallet" ] + ++ lib.optionals (!withZmq) [ "--disable-zmq" ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Wow, such coin, much shiba, very rich"; longDescription = '' Dogecoin is a decentralized, peer-to-peer digital currency that diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 0bc5c7baa4161..1ce458ffb11b3 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.10"; + version = "0.9.11"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE="; + hash = "sha256-iudHdsSjoPal+ORMB3lU7ejGYv69q/8HcxScZS8D/u8="; }; - cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ="; + cargoHash = "sha256-Ft1AluPfV6BIRGEddrrIGNRmaZIzUsA2DN2TcghCnSQ="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 1c02076c570dc..a39cbc341e894 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -22,7 +22,6 @@ , withWallet ? true }: -with lib; stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; version = "22.0.2"; @@ -36,24 +35,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -62,7 +61,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/179474 hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -70,11 +69,11 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Open Source implementation of advanced blockchain features extending the Bitcoin protocol"; longDescription= '' The Elements blockchain platform is a collection of feature experiments and extensions to the diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 3d14ec40f2383..e656843536429 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.3"; + version = "5.0.6"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-IDAss4qX39qPyOsPpVg5zU6zq/QV/RTnbHTGVl9UmOA="; + sha256 = "sha256-UiPwvZcdkeFOTMVcUT1Xr5ByrJC+yzodCfi8Br61hjU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index 5e1d0db82796b..e81dc1813e524 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -1,21 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: let - pinData = lib.importJSON ./pin.json; -in -buildGoModule rec { pname = "erigon"; - version = pinData.version; + version = "2.35.2"; +in +buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = pinData.sha256; + sha256 = "sha256-hGJ9SeUYACOuypTJmPnrv4f8ujjsUt3dZbwso+94g3M="; fetchSubmodules = true; }; - vendorSha256 = pinData.vendorSha256; + vendorSha256 = "sha256-lKzJLRCcyhQIV7y1XxqbvTINLlUwWFnflZgGQHYzBjY="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: @@ -29,7 +29,7 @@ buildGoModule rec { "cmd/rlpdump" ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/ledgerwatch/erigon/"; diff --git a/pkgs/applications/blockchains/erigon/pin.json b/pkgs/applications/blockchains/erigon/pin.json deleted file mode 100644 index e274f307007a0..0000000000000 --- a/pkgs/applications/blockchains/erigon/pin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "2.31.0", - "sha256": "sha256-+qVfujPKy/HAkMOJQdHI3G1pBoYG2Lhm5BKHrvf3lv0=", - "vendorSha256": "sha256-XTGbwMEuLBEXP/QAR8RLRPrbvz2ReCLg4tCogbqHiHg=" -} diff --git a/pkgs/applications/blockchains/erigon/update.sh b/pkgs/applications/blockchains/erigon/update.sh deleted file mode 100755 index c50a7a20f29ee..0000000000000 --- a/pkgs/applications/blockchains/erigon/update.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep - -# TODO set to `verbose` or `extdebug` once implemented in oil -shopt --set xtrace -# we need failures inside of command subs to get the correct vendorSha256 -shopt --unset inherit_errexit - -const directory = $(dirname $0 | xargs realpath) -const owner = "ledgerwatch" -const repo = "erigon" -const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \ - jq -r '.tag_name') -const latest_version = $(echo $latest_rev | sd 'v' '') -const current_version = $(jq -r '.version' $directory/pin.json) -if ("$latest_version" === "$current_version") { - echo "$repo is already up-to-date" - return 0 -} else { - const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev" --fetch-submodules) - const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')" - - jq ".version = \"$latest_version\" | \ - .\"sha256\" = \"$tarball_hash\" | \ - .\"vendorSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json - - const new_vendor_sha256 = $(nix-build -A erigon 2>&1 | \ - tail -n 2 | \ - head -n 1 | \ - sd '\s+got:\s+' '') - - jq ".vendorSha256 = \"$new_vendor_sha256\"" $directory/pin.json | sponge $directory/pin.json -} diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index f3884106a4d9d..1bc33588c42d5 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "22.8.12"; src = fetchzip { - url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; + url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; sha256 = "sha256-jNzHh4zYhFzpFZAC9rHmwjTdFkbpROSEN3qpL7geiOU="; }; diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index 36001a8d6dfba..bcc25cf2460ac 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; checkFlags = [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Groestlcoin's GUI. diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index a5e34bc904400..5b1d12634df5e 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "haven-cli"; - version = "3.0.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-ZQiSh1pB0njIAyJFPIsgoqNuhvMGRJ2NIZaUoB1fN3E="; + sha256 = "sha256-JbNk1TF0N3tRYGfZfSBFk+t/8GA4yjqP9G6S0ktdur8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index cd9ec2a80e774..d64376aae18d9 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, imagemagick, systemd }: +{ lib, fetchurl, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 8b54cc093159f..7a5607d01c5e5 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -14,11 +14,13 @@ , stdenv , testers , unzip +, nix-update-script +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "3.3.0"; + version = "3.4.0"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -28,10 +30,10 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - hash = "sha256-py64CWY3k5Z2mm9WduJ4Fh7lQ8b3sF6iIFsYYjndU5I="; + hash = "sha256-4auiM5+kj/HjZKu2YP7JEnwDNxHuL39XCfmV/dc5jLE="; }; - cargoHash = "sha256-0gWTniLkhuPpgdUkE6gpF9uHYT6BeWWgH6Mu7KpFx9w="; + cargoHash = "sha256-ihfGwdxL7Ttw86dhaVBp5meb0caXjzgbbP27Io8zv/c="; buildFeatures = [ "modern" "gnosis" ]; @@ -40,7 +42,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - CoreFoundation + CoreFoundation SystemConfiguration ]; depositContractSpec = fetchurl { @@ -85,14 +87,17 @@ rustPlatform.buildRustPackage rec { "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" ]; - checkInputs = [ + nativeCheckInputs = [ nodePackages.ganache ]; - passthru.tests.version = testers.testVersion { - package = lighthouse; - command = "lighthouse --version"; - version = "v${lighthouse.version}"; + passthru = { + tests.version = testers.testVersion { + package = lighthouse; + command = "lighthouse --version"; + version = "v${lighthouse.version}"; + }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index d150d7347493f..3eeeafe8d8153 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -9,10 +9,8 @@ , fmt }: -with lib; - mkDerivation rec { - pname = "litecoin" + optionalString (!withGui) "d"; + pname = "litecoin" + lib.optionalString (!withGui) "d"; version = "0.21.2.1"; src = fetchFromGitHub { @@ -25,11 +23,11 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq fmt miniupnpc glib protobuf util-linux libevent ] - ++ optionals stdenv.isDarwin [ AppKit ] - ++ optionals withGui [ qtbase qttools qrencode ]; + ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ + ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -40,7 +38,7 @@ mkDerivation rec { ./src/test/test_litecoin ''; - meta = { + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index 5d8e887209a40..e9d68b756212f 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compiler and inspector for the miniscript Bitcoin policy language"; longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; - homepage = "http://bitcoin.sipa.be/miniscript/"; + homepage = "https://bitcoin.sipa.be/miniscript/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ RaghavSood jb55 ]; diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index a42e474c258a5..e2f2d57fc8295 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "namecoin" + lib.optionalString (!withGui) "d"; - version = "23.0"; + version = "24.0"; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = "nc${version}"; - sha256 = "sha256-MfqJ7EcJvlQ01Mr1RQpXVNUlGIwNqFTxrVwGa+Hus+A="; + sha256 = "sha256-DSUYqNHgPsHVwx3G83pZdzsTjhX2X2mMqt+lAlIuGp0="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh index caab20c928f85..5db2723ef8e93 100755 --- a/pkgs/applications/blockchains/nbxplorer/update.sh +++ b/pkgs/applications/blockchains/nbxplorer/update.sh @@ -3,4 +3,4 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix '' +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh deleted file mode 100755 index 2a862c31c881e..0000000000000 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p dotnet-sdk_6 -set -euo pipefail - -# Writes deps for dotnet package in $pkgSrc to $depsFile. -# Expects $pkgSrc to contain a single .sln file. - -pkgSrc=$1 -depsFile=$(realpath "$2") -customFlags=$3 - -sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) -[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } - -tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX) -echo "Using tmp dir: $tmpdir" -cp -rT "$pkgSrc" "$tmpdir" -chmod -R +w "$tmpdir" - -pushd "$tmpdir" > /dev/null -mkdir home -echo "Running dotnet restore for $sln" -HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ - dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log - -echo "{ fetchNuGet }: [" > "$depsFile" -while read pkgSpec; do - { read pname; read version; } < <( - # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2 - sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkgSpec" - ) - sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg) - cat >> "$depsFile" <<EOF - (fetchNuGet { - pname = "$pname"; - version = "$version"; - sha256 = "$sha256"; - }) -EOF -done < <(find home/.nuget/packages -name '*.nuspec' | LC_ALL=C sort) -echo "]" >> "$depsFile" - -echo "Created $depsFile" - -popd > /dev/null -rm -r $tmpdir diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index ee52389448674..6346c2fa9f400 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -10,7 +10,6 @@ trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR pkgName=$1 depsFile=$2 -customFlags=$3 : ${getVersionFromTags:=} : ${refetch:=} @@ -75,5 +74,4 @@ fi echo # Create deps file -storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" -. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags" +$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile" diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index c55d04b03a28a..942f0a71cbf4a 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -14,8 +14,6 @@ , python3 }: -with lib; - stdenv.mkDerivation rec { pname = "particl-core"; version = "23.0.3.0"; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-bench" "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--enable-tests=no" ]; @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs test"; enableParallelBuilding = true; - meta = { + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription = '' diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 596130337c7ad..1f5636dd41c34 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.33"; + version = "0.9.36"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-vAFGLcsbGuoaNtxtEIHSeX00nsULJROCEhaMv5IEcp4="; + sha256 = "sha256-HzQFlnn+SPasI0g0DYDCRoFCMVyxlUmEQAobvzRnAW4="; # 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-SZUkgtI/4kA5iWzalmGo5KXRHXKgdeCo2SSCVF66p5E="; + cargoSha256 = "sha256-P31GW/1HiaZLF6e8Fq1YnH1ZLhiOhURm8st9a4KRlJU="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/solana/default.nix b/pkgs/applications/blockchains/solana/default.nix index a91d1f3905348..4886720218638 100644 --- a/pkgs/applications/blockchains/solana/default.nix +++ b/pkgs/applications/blockchains/solana/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; # all the following are needed for the checkphase - # checkInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ]; + # nativeCheckInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ]; # Needed to get openssl-sys to use pkg-config. # OPENSSL_NO_VENDOR = 1; # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index fbbd05be46ed6..8f3fd4b1c886c 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.4.0"; + version = "19.6.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pgwLCtlj2Ak34KfE+ffIxQ1Z4Epxm3f1Y2aqYOIlLUc="; + sha256 = "sha256-lDefmPZM8ow6t5CpNBxef+9BoT773p5UgeMhgF+em2w="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/sumokoin/default.nix b/pkgs/applications/blockchains/sumokoin/default.nix index 8a193d906ece1..0c3a3d239599e 100644 --- a/pkgs/applications/blockchains/sumokoin/default.nix +++ b/pkgs/applications/blockchains/sumokoin/default.nix @@ -1,33 +1,56 @@ -{ lib, stdenv, fetchFromGitHub, cmake, unbound, openssl, boost -, libunwind, lmdb, miniupnpc }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, boost +, openssl +, libsodium +, libunwind +, lmdb +, unbound +, zeromq +}: stdenv.mkDerivation rec { pname = "sumokoin"; - version = "0.2.0.0"; + version = "0.8.1.0"; src = fetchFromGitHub { owner = "sumoprojects"; repo = "sumokoin"; rev = "v${version}"; - sha256 = "0ndgcawhxh3qb3llrrilrwzhs36qpxv7f53rxgcansbff9b3za6n"; + hash = "sha256-CHZ6hh60U6mSR68CYDKMWTYyX1koF4gA7YrA1P5f0Dk="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ unbound openssl boost libunwind lmdb miniupnpc ]; - + # disable POST_BUILD postPatch = '' - substituteInPlace src/blockchain_db/lmdb/db_lmdb.cpp --replace mdb_size_t size_t + sed -i 's/if (UNIX)/if (0)/g' src/utilities/*_utilities/CMakeLists.txt ''; - cmakeFlags = [ - "-DLMDB_INCLUDE=${lmdb}/include" + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + openssl + libsodium + libunwind + lmdb + unbound + zeromq ]; + # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] + hardeningDisable = [ "format" ]; + meta = with lib; { description = "A fork of Monero and a truely fungible cryptocurrency"; homepage = "https://www.sumokoin.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/applications/blockchains/torq/default.nix new file mode 100644 index 0000000000000..85041accbc4bf --- /dev/null +++ b/pkgs/applications/blockchains/torq/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "torq"; + version = "0.16.15"; + + src = fetchFromGitHub { + owner = "lncapital"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ibrPq/EC61ssn4072gTNvJg9QO41+aTsU1Hhc6X6NPk="; + }; + + vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; + + subPackages = [ "cmd/torq" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/lncapital/torq/build.version=v${version}" + ]; + + meta = with lib; { + description = "Capital management tool for lightning network nodes"; + license = licenses.mit; + homepage = "https://github.com/lncapital/torq"; + maintainers = with maintainers; [ mmilata prusnak ]; + }; +} diff --git a/pkgs/applications/blockchains/vertcoin/default.nix b/pkgs/applications/blockchains/vertcoin/default.nix index 87d9a8b64b21a..90e4dd14a6856 100644 --- a/pkgs/applications/blockchains/vertcoin/default.nix +++ b/pkgs/applications/blockchains/vertcoin/default.nix @@ -16,13 +16,11 @@ , wrapQtAppsHook ? null }: -with lib; - stdenv.mkDerivation rec { pname = "vertcoin"; version = "0.18.0"; - name = pname + toString (optional (!withGui) "d") + "-" + version; + name = pname + toString (lib.optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = pname + "-project"; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config hexdump - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ wrapQtAppsHook ]; @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { db4 zeromq gmp - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qtbase qttools protobuf @@ -56,12 +54,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - meta = { + meta = with lib; { description = "A digital currency with mining decentralisation and ASIC resistance as a key focus"; homepage = "https://vertcoin.org/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index e4e97cae21a0d..79355f3979dca 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -1,34 +1,34 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildDotnetModule -, dotnetCorePackages -, autoPatchelfHook -, zlib -, openssl +{ + lib, + stdenv, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + autoPatchelfHook, + zlib, + openssl, }: - buildDotnetModule rec { pname = "wasabibackend"; - version = "1.1.13.1"; + version = "2.0.2.1"; src = fetchFromGitHub { owner = "zkSNACKs"; repo = "WalletWasabi"; - rev = "v${version}"; - sha256 = "sha256-Hwav7moG6XKAcR7L0Q7CtifP3zCNRfHIihlaFw+dzbk="; + rev = "refs/tags/v${version}"; + hash = "sha512-JuCl3SyejzwUd2n8Fy7EdxUuO4bIcGb8yMWZQOhZzsY4fvg9prFOnVZEquxahD0a41MLKHRNA1R2N3NMapcc0A=="; }; projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.aspnetcore_3_1; + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [autoPatchelfHook]; + buildInputs = [stdenv.cc.cc.lib zlib]; - runtimeDeps = [ openssl zlib ]; + runtimeDeps = [openssl zlib]; preConfigure = '' makeWrapperArgs+=( @@ -43,9 +43,9 @@ buildDotnetModule rec { meta = with lib; { description = "Backend for the Wasabi Wallet"; homepage = "https://wasabiwallet.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [binaryNativeCode]; license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [mmahut]; + platforms = ["x86_64-linux"]; }; } diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index d7026875d062f..eb55fd9f503e5 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -2,8 +2,8 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "3.1.1"; sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "3.1.1"; sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "15.3.409"; sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "15.3.409"; sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; }) (fetchNuGet { pname = "Microsoft.Build.Runtime"; version = "15.3.409"; sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; }) @@ -11,7 +11,7 @@ (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "15.3.409"; sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; }) (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 = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.0.0"; sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.0.0"; sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.0.0"; sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; }) @@ -24,22 +24,20 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.1"; sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.1.4"; sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts"; version = "2.0.2"; sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Web.CodeGeneration.Tools"; version = "2.0.2"; sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) - (fetchNuGet { pname = "NBitcoin"; version = "5.0.81"; sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; }) - (fetchNuGet { pname = "NBitcoin.Secp256k1"; version = "1.0.10"; sha256 = "14hngbhxk2xjr5kcbsb26l788xnd1lmxn7fhmm2kvx49kdb1malp"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.14"; sha256 = "18nxx13fz3i7kmigijnynvrbx2i5cb3v4m89nvnxl38vcw7w5jys"; }) + (fetchNuGet { pname = "NBitcoin.Secp256k1"; version = "3.0.1"; sha256 = "17wxn0dinmp5fbqdirflfkz75wykqvw9a7ydv2inx1sajxnsy1f3"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.1"; sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "4.0.0"; sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.0.11"; sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) @@ -61,10 +59,10 @@ (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "5.0.0"; sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "5.0.0"; sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.0.0"; sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "5.0.0"; sha256 = "0d7vjq489rz208j6k3rb7vq6mzxzff3mqg83yk2rqy25vklrsbjd"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) @@ -152,7 +150,6 @@ (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.1.1"; sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) @@ -161,7 +158,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.0.1"; sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 30edd74d031de..c4c8de947f1db 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.2"; + version = "2.0.2.1"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-0DFl+UFxQckRM2qXFqDpKaRQ5sIMUbNj7l3zKPKAOnQ="; + sha256 = "sha256-kvUwWRZZmalJQL65tRNdgTg7ZQHhmIbfmsfHbHBYz7w="; }; dontBuild = true; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 14e17c766dd99..9c68a094b8787 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -2,7 +2,6 @@ , readline, libsodium, rapidjson }: -with lib; stdenv.mkDerivation rec { pname = "wownero"; version = "0.8.0.1"; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { "-DMANUAL_SUBMODULES=ON" ]; - meta = { + meta = with lib; { description = '' A privacy-centric memecoin that was fairly launched on April 1, 2018 with no pre-mine, stealth-mine or ICO diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 7466ff31d5816..04340e75a7a87 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,5 +1,5 @@ { autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub -, hexdump, hostPlatform, lib, libevent, libsodium, makeWrapper, rust, rustPlatform +, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform , pkg-config, Security, stdenv, testers, utf8cpp, util-linux, zcash, zeromq }: @@ -82,6 +82,6 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { license = licenses.mit; # https://github.com/zcash/zcash/issues/4405 - broken = hostPlatform.isAarch64 && hostPlatform.isDarwin; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix index 932aa47fd7146..cea23577cc45f 100644 --- a/pkgs/applications/display-managers/greetd/wlgreet.nix +++ b/pkgs/applications/display-managers/greetd/wlgreet.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "wlgreet-unstable"; - version = "2022-01-25"; + pname = "wlgreet"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = "wlgreet"; - rev = "8517e578cb64a8fb3bd8f8a438cdbe46f208b87c"; - sha256 = "0la4xlikw61cxvbkil1d22dgvazi7rs17n5i2z02090fvnfxxzxh"; + repo = pname; + rev = version; + hash = "sha256-qfEzr8tAE1+PK7xs1NQ1q6d/GlFA7/kSWXbJDOCrEsw="; }; - cargoSha256 = "651d2bf01612534f1c4b0472c812095a86eb064d16879380c87f684c04fe0d8d"; + cargoHash = "sha256-1ugExUtrzqyd9dTlBHcc44UrtEfYrfUryuG79IkTv2Y="; meta = with lib; { description = "Raw wayland greeter for greetd, to be run under sway or similar"; diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index eedfaee00c59c..605b5bc286abf 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.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-XoGha0DyrtrGXW72Zvnk1FrvULPMYc0FvQj4JFSKxXo="; + sha256 = "sha256-k/E3bR63kesHQ/we+ctC0UEYE5YdZ6Lv5lYuXqCOvKA="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { substituteInPlace src/slick-greeter.vala \ --replace "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \ --replace "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \ + --replace "/usr/share/wayland-sessions/" "/run/current-system/sw/share/wayland-sessions/" \ --replace "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter" substituteInPlace src/session-list.vala \ diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 348f4706411fd..8365ac3b5a22f 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -30,8 +30,6 @@ , yelp-tools }: -with lib; - stdenv.mkDerivation rec { pname = "lightdm"; version = "1.32.0"; @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { libxklavier pam polkit - ] ++ optional withQt5 qtbase; + ] ++ lib.optional withQt5 qtbase; patches = [ # Adds option to disable writing dmrc files @@ -96,7 +94,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-tests" "--disable-dmrc" - ] ++ optional withQt5 "--enable-liblightdm-qt5"; + ] ++ lib.optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=${placeholder "out"}/etc" @@ -120,7 +118,7 @@ stdenv.mkDerivation rec { }; - meta = { + meta = with lib; { homepage = "https://github.com/canonical/lightdm"; description = "A cross-desktop display manager"; platforms = platforms.linux; diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 8472a91c596fe..6e817646d9e75 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; - homepage = "http://aewan.sourceforge.net/"; + homepage = "https://aewan.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index fc6ddd93567c4..674b27330802d 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -7,7 +7,7 @@ let pythonEnv = pythonPackages.python.withPackages(p: with p; [ - regex setuptools python-Levenshtein pyenchant + regex setuptools levenshtein pyenchant pygobject3 pycairo pypandoc chardet ]); diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index caa1d2ab79b9e..e435e834e7e5f 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "bonzomatic"; - version = "2022-02-05"; + version = "2022-08-20"; src = fetchFromGitHub { owner = "Gargaj"; repo = pname; rev = version; - sha256 = "sha256-y0zNluIDxms+Lpg7yBiEJNNyxx5TLaSiWBKXjqXiVJg="; + sha256 = "sha256-AaUMefxQd00O+MAH4OLoyQIXZCRQQbt2ucgt7pVvN24="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index ddef8467646b5..e4e41ec732b25 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Hex editor with vim style keybindings"; - homepage = "http://bvi.sourceforge.net/download.html"; + homepage = "https://bvi.sourceforge.net/download.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 7a1c0af2c6430..441b224ef0226 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -2,8 +2,6 @@ , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: -with lib; - stdenv.mkDerivation rec { name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; version = "20.03"; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; buildInputs = [ wxGTK31 gtk3 ] - ++ optionals contribPlugins [ hunspell gamin boost ]; + ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch @@ -56,16 +54,16 @@ stdenv.mkDerivation rec { }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; - configureFlags = [ "--enable-pch=no" ] ++ optionals contribPlugins [ - ("--with-contrib-plugins" + optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ + ("--with-contrib-plugins" + lib.optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") "--with-boost-libdir=${boost}/lib" ]; - postInstall = optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; - meta = { + meta = with lib; { maintainers = [ maintainers.linquize ]; platforms = platforms.all; description = "The open source, cross platform, free C, C++ and Fortran IDE"; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index d2a0080859da1..3c3102370d0e8 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -2,7 +2,7 @@ , zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: -{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }: +{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }: stdenv.mkDerivation rec { inherit name src; @@ -38,13 +38,14 @@ stdenv.mkDerivation rec { # settings in ~/.eclipse/org.eclipse.platform_<version> rather # than ~/.eclipse/org.eclipse.platform_<version>_<number>. productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct) + productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct) makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration" + --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. mkdir -p $out/share/applications @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = "http://www.eclipse.org/"; + homepage = "https://www.eclipse.org/"; inherit description; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 64204deaa4aaa..eadd27124281a 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -14,21 +14,19 @@ let platform_major = "4"; - platform_minor = "25"; + platform_minor = "26"; year = "2022"; - month = "09"; #release month - buildmonth = "08"; #sometimes differs from release month - timestamp = "${year}${buildmonth}311800"; + month = "12"; #release month + buildmonth = "11"; #sometimes differs from release month + timestamp = "${year}${buildmonth}231800"; gtk = gtk3; in rec { - # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3 - buildEclipseUnversioned = callPackage ./build-eclipse.nix { + buildEclipse = callPackage ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk makeWrapper; }; - buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; }); ### Eclipse CPP @@ -38,7 +36,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-1sUQ/jDOQMqnKLKY6oh28STvS5pbH89+2zs+H77euiJOsBgB+yEkEntnhI39O67qmOK/EkQ3y3NkQcumbax56A=="; + hash = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw=="; }; }; @@ -50,7 +48,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-Qb2BmfXtmVeTLIZZav91hayPkwSGYMAG3fod3BmyJdo1DPas6VC+MzBwklAjpC1wqLTzKCAKzVZtdtPYC9QCqw=="; + hash = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q=="; }; }; @@ -62,17 +60,16 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-RW+5H82AcH/U9XUzIlUCU5heN9qQAlMl3rmxsKnTYxVWdIjSN461Nf71F6jPhL/Q+VCAMesguOEF0AqyhnH0nw=="; + hash = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; }; }; ### Eclipse Scala SDK eclipse-scala-sdk = - buildEclipseUnversioned.override { jdk = jdk8; gtk = gtk2; } { + buildEclipse.override { jdk = jdk8; gtk = gtk2; } { name = "eclipse-scala-sdk-4.7.0"; description = "Eclipse IDE for Scala Developers"; - productVersion = "4.7"; src = fetchurl { url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz"; @@ -88,7 +85,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-1wjKNBl6A2XENRVZNtDelPSMAYtc4wRXdQ4CJX/1YcFUPEzbPsX7plO2uJXmDpZcjw3wkQNxqy4bmZF6YnXy/Q=="; + hash = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ=="; }; }; @@ -100,7 +97,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-UejE0pzgwBYpmNbdGEegMM5iEOMYP+VvebU17YQeJUzh/qYr0B6sfXwJ+cdTCavKCNGLMMDenJMYk9V/6DSZHw=="; + hash = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ=="; }; }; @@ -112,7 +109,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-9E0Zwv64qRwVdPouhmIYT6SkbTkd3zLnfkHduHy2VXvmqW7xaOfmplvxpr+V1RDpnfDfw4RouU+WQdhFqBqcWg=="; + hash = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ=="; }; }; @@ -124,7 +121,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-V7GmvqQVZnTkkhKmuGyMiZlFlRpFbXM7r6w9yS0FxBOHNHIzkX4pJ6sgn+ww1lvwsdPqBFYtbWUiuKo73eTKzg=="; + hash = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q=="; }; }; @@ -136,7 +133,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha256-8qQWwUiNemJLTAncZwO14fBfr7kTmmXPSeqBLfV8wTw="; + hash = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU="; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 8c9189466c83b..5ae155f39f9a9 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.7.0"; + version = "11.0.0"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; - hash = "sha256-/lQ3TLFQ1IgwYM540gxAFiEGOfHQIQQMf/pqCZ29ztQ="; + hash = "sha256-2rt9crMqNFevIHFIdOGWDq+j0ZJPVt1a9Z7P9HG58Ks="; }; meta = with lib; { diff --git a/pkgs/applications/editors/edlin/default.nix b/pkgs/applications/editors/edlin/default.nix new file mode 100644 index 0000000000000..9de4f8d4a8c78 --- /dev/null +++ b/pkgs/applications/editors/edlin/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "edlin"; + version = "2.21"; + + src = let + inherit (finalAttrs) version; + in fetchurl { + url = "mirror://sourceforge/freedos-edlin/freedos-edlin/${version}/edlin-${version}.tar.bz2"; + hash = "sha256-lQ/tw8dvEKV81k5GV05o49glOmfYcEeJBmgPUmL3S2I="; + }; + + postInstall = '' + mkdir -p $out/share/doc/edlin-${finalAttrs.version}/ + cp AUTHORS ChangeLog README TODO edlin.htm $out/share/doc/edlin-${finalAttrs.version}/ + ''; + + meta = with lib; { + homepage = "https://sourceforge.net/projects/freedos-edlin/"; + description = "FreeDOS line editor"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +}) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix index 82ea42aa2b83e..c2a6fca64fea8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix @@ -1,20 +1,13 @@ -{ lib, stdenv, fetchurl }: +{ lib, trivialBuild, fetchurl }: -stdenv.mkDerivation { - name = "control-lock"; +trivialBuild { + pname = "control-lock"; src = fetchurl { - url = "https://github.com/emacsmirror/emacswiki.org/blob/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el"; - sha256 = "1b5xcgq2r565pr1c14dwrmn1fl05p56infapa5pqvajv2kpfla7h"; + url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el"; + hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4="; }; - dontUnpack = true; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install $src $out/share/emacs/site-lisp/control-lock.el - ''; - meta = { description = "Like caps-lock, but for your control key. Give your pinky a rest!"; homepage = "https://www.emacswiki.org/emacs/control-lock.el"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix index ad12c606abb9d..178fb16751e23 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix @@ -1,19 +1,17 @@ -{ lib -, trivial-build +{ trivialBuild , fetchurl }: -trivial-build { - name = "perl-completion"; +trivialBuild { + pname = "perl-completion"; src = fetchurl { url = "http://emacswiki.org/emacs/download/perl-completion.el"; sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks"; }; - dontUnpack = true; - meta = { + broken = true; description = "Minor mode provides useful features for editing perl codes"; homepage = "http://emacswiki.org/emacs/PerlCompletion"; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix index 71f9981f461a9..f21e79c8f33d8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { (add-hook 'after-init-hook 'session-initialize) */ description = "Small session management for emacs"; - homepage = "http://emacs-session.sourceforge.net/"; + homepage = "https://emacs-session.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index d6ce650fb8ad1..feed7ba5b41e1 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -13,7 +13,7 @@ , alsa-lib, cairo, acl, gpm, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests , recurseIntoAttrs, emacsPackagesFor -, libgccjit, targetPlatform, makeWrapper # native-comp params +, libgccjit, makeWrapper # native-comp params , fetchFromSavannah, fetchFromBitbucket # macOS dependencies for NS and macPort @@ -44,7 +44,7 @@ else if withMotif then "motif" else if withAthena then "athena" else "lucid") -, withSystemd ? stdenv.isLinux, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: assert (libXft != null) -> libpng != null; # probably a bug diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index dc00e09b97437..b7cca4ff3ec9c 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "1.3.1"; + version = "1.3.5"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "sha256-OLipBhSrXf9lLpSYLwjjOv5AYJDt46MlnEW4YetXZjI="; + sha256 = "sha256-deQDLcymci8x9QvVOfNwroZPvifovxV6+jT9Grl3sxA="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index b4b5e74887c13..c2b3229d4523e 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free text editor for developers"; - homepage = "http://fte.sourceforge.net/"; + homepage = "https://fte.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index bacc629448bc1..337370a6ddb7a 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { webkitgtk_5_0 ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 2c959519f41fe..ff9a30074120e 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, gtk3, librsvg }: -with lib; - stdenv.mkDerivation rec { pname = "howl"; version = "0.6"; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = { + meta = with lib; { homepage = "https://howl.io/"; description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix index b35f9aa06ca43..50693018f0814 100644 --- a/pkgs/applications/editors/imhex/default.nix +++ b/pkgs/applications/editors/imhex/default.nix @@ -22,13 +22,13 @@ let # when bumping the version, check if imhex has gotten support for the capstone version in nixpkgs - version = "1.19.3"; + version = "1.26.2"; patterns_src = fetchFromGitHub { owner = "WerWolv"; repo = "ImHex-Patterns"; rev = "ImHex-v${version}"; - hash = "sha256-mukGPN2TugJZLLuZ5FTvZ4DxUsMGfVNhBFAPnBRC0qs="; + hash = "sha256-2+7bJzgwHfXcINM5oxwi3vEbUtq9gGJc/uxFOwT4RnM="; }; in @@ -41,7 +41,7 @@ gcc12Stdenv.mkDerivation rec { owner = "WerWolv"; repo = pname; rev = "v${version}"; - hash = "sha256-SFv5ulyjm5Yf+3Gpx+A74so2YClCJx1sx0LE5fh5eG4="; + hash = "sha256-H2bnRByCUAltngmVWgPW4vW8k5AWecOAzwtBKsjbpTw="; }; nativeBuildInputs = [ cmake llvm python3 perl pkg-config ]; @@ -72,10 +72,8 @@ gcc12Stdenv.mkDerivation rec { "-DUSE_SYSTEM_YARA=ON" ]; - # for reasons unknown, the built-in plugin isn't found unless made available under $out/bin postInstall = '' - ln -s $out/share/imhex/plugins $out/bin/ - + mkdir -p $out/share/imhex for d in ${patterns_src}/{constants,encodings,includes,magic,patterns}; do cp -r $d $out/share/imhex/ done diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 1208db4424173..913ef7570eeea 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -11,15 +11,13 @@ , vmopts ? null }: -with lib; - let platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" ]; inherit (stdenv.hostPlatform) system; - versions = builtins.fromJSON (readFile (./versions.json)); + versions = builtins.fromJSON (lib.readFile (./versions.json)); versionKey = if stdenv.isLinux then "linux" else system; products = versions.${versionKey} or (throw "Unsupported system: ${system}"); @@ -42,11 +40,11 @@ let maintainers = with maintainers; [ edwtjo mic92 ]; }; }).overrideAttrs (attrs: { - nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ lib.optionals (stdenv.isLinux) [ autoPatchelfHook patchelf ]; - buildInputs = (attrs.buildInputs or []) ++ optionals (stdenv.isLinux) [ + buildInputs = (attrs.buildInputs or []) ++ lib.optionals (stdenv.isLinux) [ python3 stdenv.cc.cc libdbusmenu @@ -54,7 +52,7 @@ let expat ]; dontAutoPatchelf = true; - postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ( cd $out/clion # bundled cmake does not find libc @@ -93,10 +91,10 @@ let }; }); - buildGateway = { pname, version, src, license, description, wmClass, ... }: + buildGateway = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit pname version src wmClass jdk; - product = "Gateway"; + inherit pname version src wmClass jdk product; + productShort = "Gateway"; meta = with lib; { homepage = "https://www.jetbrains.com/remote-development/gateway/"; inherit description license platforms; @@ -127,9 +125,9 @@ let }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv + patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv - chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv + chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv # fortify source breaks build since delve compiles with -O0 wrapProgram $out/bin/goland \ @@ -217,7 +215,7 @@ let ''; maintainers = with maintainers; [ ]; }; - }).overrideAttrs (finalAttrs: previousAttrs: optionalAttrs cythonSpeedup { + }).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs cythonSpeedup { buildInputs = with python3.pkgs; [ python3 setuptools ]; preInstall = '' echo "compiling cython debug speedups" @@ -287,12 +285,6 @@ let ''; maintainers = with maintainers; [ abaldeau ]; }; - }).overrideAttrs (attrs: { - postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) '' - # Webstorm tries to use bundled jre if available. - # Lets prevent this for the moment - rm -r jbr - ''; }); in @@ -328,6 +320,7 @@ in gateway = buildGateway rec { pname = "gateway"; + product = "JetBrains Gateway"; version = products.gateway.version; description = "Your single entry point to all remote development environments"; license = lib.licenses.unfree; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index dec117def52af..7443842e7bf9c 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -5,10 +5,8 @@ { pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: -with lib; - -let loName = toLower productShort; - hiName = toUpper productShort; +let loName = lib.toLower productShort; + hiName = lib.toUpper productShort; vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; @@ -29,7 +27,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { startupWMClass = wmClass; }; - vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); + vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts); nativeBuildInputs = [ makeWrapper patchelf unzip ]; @@ -46,6 +44,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec { truncate --size=$size $fname } + rm -rf jbr + interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then target_size=$(get_file_size bin/fsnotifier64) diff --git a/pkgs/applications/editors/jetbrains/update.py b/pkgs/applications/editors/jetbrains/update.py index fe57f75c72e13..1c22acf8e7477 100755 --- a/pkgs/applications/editors/jetbrains/update.py +++ b/pkgs/applications/editors/jetbrains/update.py @@ -64,7 +64,7 @@ def update_product(name, product): build = latest_build(channel) new_version = build["@version"] new_build_number = build["@fullNumber"] - if "EAP" not in channel["@name"]: + if all(x not in channel["@name"] for x in ["EAP", "Gateway"]): version_or_build_number = new_version else: version_or_build_number = new_build_number diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 3908bd1d9efd3..5d54b1150bcc1 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,56 +3,50 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.2.4", - "sha256": "d88794c698d7bf4d970ba102b85166d5f8c3cb08c4ed5b4cbc150bb505320fab", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.1", + "sha256": "cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.tar.gz", + "build_number": "223.8214.51" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.2.5", - "sha256": "55b28f3b79eda126fe778e2945804d50b1145503737f1b5e25ab6ae2d2a0e3ae", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.tar.gz", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.2", + "sha256": "e542111e490fbbc80d3aebcbbc343b29e17bf6766d7b708675618d8e49b6ee83", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.tar.gz", + "build_number": "223.8214.62" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2022.3 EAP", - "sha256": "4868baed9350065c1db760f07a09badd1473132af640cc19330e20c8a0940d7d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.tar.gz", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.1", + "sha256": "7bfe02c1b414c2fc095deab35fa40ed29a129bfa76efc3e31a2785f0f37fa778", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.tar.gz", + "build_number": "223.8214.51" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.2.4", - "sha256": "e39aaae39e6021e87cece7622c51860d23e2a5b5ac2683fb67d369ec7d609084", - "url": "https://download.jetbrains.com/go/goland-2022.2.4.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.1", + "sha256": "566eada40511cd06727d69047e8a6a1e75b06ebade93d1ea78262fc2715c8a38", + "url": "https://download.jetbrains.com/go/goland-2022.3.1.tar.gz", + "build_number": "223.8214.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "4ba5faafad48d58db5099fae080ae2238086d3d9803080082de8efe35d8bf4ed", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "4c3514642ce6c86e5343cc29b01c06ddc9c55f134bcb6650de5d7d36205799e8", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.tar.gz", + "build_number": "223.8214.52" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", - "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", - "version": "2022.2.3", - "sha256": "7454d7e0b8f4e3d8d805dde645d28b842101bd77aea8b29125880c592e6b8c85", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-no-jbr.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", + "version": "2022.3.1", + "sha256": "ce807ba3a776e14f85dbd38f2744fc97e54318561eddd1c265f0d2cacc2565da", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz", + "build_number": "223.8214.52" }, "mps": { "update-channel": "MPS RELEASE", @@ -60,118 +54,106 @@ "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", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "2376cd043bb941524df62db40f9125b1c693be11df80a41fd5b3dd9dcd3446e9", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.1", + "sha256": "222e8cf974f70a77c92f03b34c38645bfe72a2dd4da20d7154f40375db54709b", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.tar.gz", + "build_number": "223.8214.64", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "cb03d44599a03419c0c63fc917846fca28c9ea664ed2b2a1c36240dcffb2a387", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "b243103f27cfb763106a2f5667d8f201562154755ce9746e81e88c80acd7b316", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.tar.gz", + "build_number": "223.8214.51" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "c73750a2e27ed2410741a739071a920cca9844608a81f07735ed2e35a024cca1", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "8f845077cc0fa3582348ee3d76a69ff001391b3f3d63a9b279b8039fd6e07622", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.tar.gz", + "build_number": "223.8214.51" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "2fdff8616fd1574a0ef7baaed855aa39a1254ea164b74d1b4dda11241e58ab2d", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.1", + "sha256": "d785f02e355983c6762248860052a81f75b392e25b585ff5a913aeaa2a2a3010", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.tar.gz", + "build_number": "223.8214.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "a8c3412db30ab7bd8b8601b0a50c95dc48a412391f1c33df27c47cf5d2204257", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "4d2adb310b14fb38afcaa2da5c254c2fc0bede109e597eed6d3c36837497591f", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.tar.gz", + "build_number": "223.8214.60" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "1d7d464bbcb83d5af48359aeda6aa7d165038bfaa1f26fef1019761eb278fa22", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "d78bd6494cced51fe77d87c07040fa3a29e8af917317399036af161c56afd927", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.tar.gz", + "build_number": "223.8214.51" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.2.4", - "sha256": "b72fae2bee3bd10374d10a4efb86888d289931080d5321385ede30373d31a55a", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.1", + "sha256": "e6246c929e0d0b9340b66dd282572d67db7bf6031d5789f197be8817de54b186", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.dmg", + "build_number": "223.8214.51" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.2.5", - "sha256": "cdf0302b0ab65d3dfce4e48004ef45873c9912c844d2e3c82bfe19de2b11cfda", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.dmg", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.2", + "sha256": "3c91269f04bd6f6df0ae8f2042c029097f56c2ccbc45db95b4f66e87e9d4a320", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.dmg", + "build_number": "223.8214.62" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2022.3 EAP", - "sha256": "2db71a052501db41d5cfe142f1a6e3178fe02830f0da127d00fbf93a4629c61b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.dmg", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.1", + "sha256": "4b86b523b02f2df5150bc965bcef7e1a0bf7a7e6d2233a3a2603529a8577dd43", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.dmg", + "build_number": "223.8214.51" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.2.4", - "sha256": "456957075636f7f9ccffbd8d3bd37d2218547289a2cbce043bb9e32c436654f6", - "url": "https://download.jetbrains.com/go/goland-2022.2.4.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.1", + "sha256": "296d5da052b59a00b0930cf6eea07eb2e5ed4eb1417ee505b013c6d83ffda2e1", + "url": "https://download.jetbrains.com/go/goland-2022.3.1.dmg", + "build_number": "223.8214.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.2.3", - "sha256": "6ec3721d9961918a14630eaf068765eeba97e71baecd95ec67510dc25c8bd1b1", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "8ea8b1ceebde397950592708b55f277ca43856b4013f597ccbf385bb75a42c72", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.dmg", + "build_number": "223.8214.52" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.2.3", - "sha256": "df780c841398532e090adc2c6af35a7fbcdd29fddb37e5a68f33d61a9032d5a3", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "5278cf5ded9464b284fa568f2b453eb5b207a0c75e26354bfb66ef8e96be85e6", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.dmg", + "build_number": "223.8214.52" }, "mps": { "update-channel": "MPS RELEASE", @@ -179,118 +161,106 @@ "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", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.2.3", - "sha256": "8dbe5cd8e31c7f6bc6795db6946e2430c82f0aa2c13e7805c40733428b02241d", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.1", + "sha256": "a2ea7d0f1fd9810a46a3f3fea5f47475fe8b325514488f46ee4dace474388fa4", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.dmg", + "build_number": "223.8214.64", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.2.3", - "sha256": "01eec651f6e8d92e1bfe5688aeb179ad5eb92e77ef77d102793d4848f8efc0d4", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "adfb73d85ffb30c2abf715a6c6a0a2ed64a047a3016021a2cb61838457c66a81", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.dmg", + "build_number": "223.8214.51" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.2.3", - "sha256": "920326a35589fee80e70b84d23184daf1d3efc8ecf4ec8c273c2bf2ec764a5b7", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "2e3bff74a53df74ceee0ac182ffc2f22248317ced0a33f8c0014b1ed504d9650", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.dmg", + "build_number": "223.8214.51" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.2.3", - "sha256": "aa02c2c621d356486a0b698a45d773f5830ff4ef431940059f82e8d3c17a2335", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.1", + "sha256": "9d73b21e558db89ac24a406187cb96e506e320ca0154e8db6aeac7ff960c8944", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.dmg", + "build_number": "223.8214.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.2.3", - "sha256": "a04700159fcf3bfed74d196edc4c1150e5906dc4730d06ffd017b6bbb9bc853b", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "3b23165c3ea9ef3d87233a64005bee4fbf98c99df5d60410a1418e022ce032d6", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.dmg", + "build_number": "223.8214.60" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.2.3", - "sha256": "e6532a9a840c3508cdf26511200fbba34ec9a275154d717538019f72ebc5fc51", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "ea2fb464cf8ba0bf553115cd0f006cb4dab729cbde941de2fc86588024abe8b9", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.dmg", + "build_number": "223.8214.51" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.2.4", - "sha256": "2b95358770cd56b94b46e4bcb86080e2c97771c0f34ad50543de206bb3c81d47", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.1", + "sha256": "85ee94f4dac126ee2b87ab225f9be6fa828a0c17e067b896f541fd25599411ef", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1-aarch64.dmg", + "build_number": "223.8214.51" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.2.5", - "sha256": "8ff78e440e4753adc8dbd4ee408fde114f7d9c65ee780f012b917498b63993ee", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5-aarch64.dmg", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.2", + "sha256": "13c8503f190e82b00949b26312873976a10c64dcca036ecc6ce9547b69341658", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2-aarch64.dmg", + "build_number": "223.8214.62" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2022.3 EAP", - "sha256": "513d3a271c5ff20fdc5c22f6e28eb21cfbb283d01ade2d11f33bb7eb79317410", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21-aarch64.dmg", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.1", + "sha256": "555ca346ec41de06223d3a4b5e9247809e07c8339bff0d139b624634c812c8e5", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51-aarch64.dmg", + "build_number": "223.8214.51" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.2.4", - "sha256": "f1b1bb4f28a09b23a185fc2437792a3125b2c8856fa533c9bcb09b7eef16fe09", - "url": "https://download.jetbrains.com/go/goland-2022.2.4-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.1", + "sha256": "5873200406e91ca64df50470eb20f907c568f5d95b7488cb4c3b3d3eb8353df4", + "url": "https://download.jetbrains.com/go/goland-2022.3.1-aarch64.dmg", + "build_number": "223.8214.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "333c70caf452034ae332cdded4d24a71592049b4045725eb57826a0b997d1c7a", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "394478e3f2a2ea1788a5c2ef9c5a9db72531462b4db921483d24a08f7c260a43", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1-aarch64.dmg", + "build_number": "223.8214.52" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "9e5c32fffd17d651d8d875c2588a067902a9ebb9bf815d06aabfd75b9f4ee3cd", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "1e9454c2500e1ec0d490e19d175a30f4441ffd30200a5a1041ecbeff3c66c7e4", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1-aarch64.dmg", + "build_number": "223.8214.52" }, "mps": { "update-channel": "MPS RELEASE", @@ -298,62 +268,56 @@ "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", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "0dee8fe654cccdafa73b65da1a2ef844401a9438ecee726fe6f6af1f09d07c38", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.1", + "sha256": "7658bcf3433d8f6b983136cc3f3edae5c02053d6983a59c273448f246ea3bcef", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1-aarch64.dmg", + "build_number": "223.8214.64", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "6b87c85f6b5b3262904b34d0bbb6775d2654610685a8bca9977b147644b113ea", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "6574cfd20a586fcbdfbac2ea0fa903ea078c1702fd9e5145c33c7c8dc4506388", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1-aarch64.dmg", + "build_number": "223.8214.51" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "59d9553ab01de9460984f082c12fb0586aeb84eb00a4501bab358e516f1f6847", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "640e4088d976820808d4571c8060b473ab6cfde34699d5913ec3c528ca70faac", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1-aarch64.dmg", + "build_number": "223.8214.51" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "5dd892ed16dd1bc819a97ffb62cdfbb3b60c6019581ba18358afc5c0a39585f5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.1", + "sha256": "d25ba49504c22e8669b8e15033cb6e944e9948ecbb0394ba4bbd5804f1f6657f", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1-aarch64.dmg", + "build_number": "223.8214.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "cd7a967c2745aca566569a320eb276773638d05fcd25839db18a098803d2c5f4", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "d0ec036ed67146beb46059a6ec9aa07d8caa2225e141183fe1d47e27170ad71a", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1-aarch64.dmg", + "build_number": "223.8214.60" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "7ffd746e5e33f2d69f7b8c39920f67de149f183a0d372d20f3f6bc4febf2e355", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "f63d2708cccc57bd404b782137f11e5dabf012df0c18aabf900743c4f02daa97", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1-aarch64.dmg", + "build_number": "223.8214.51" } } } diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index b06c93c103401..01ab62c6de4fb 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -3,13 +3,11 @@ libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: -with lib; - stdenv.mkDerivation rec { pname = "juicipp"; version = "1.2.3"; - meta = { + meta = with lib; { homepage = "https://github.com/cppit/jucipp"; description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; license = licenses.mit; diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index c5265aa255c20..cb814ddbc95a3 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -20,7 +20,7 @@ in rec { launcher = runCommand "octave-kernel-launcher" { inherit octave; - python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]); + python = python3.withPackages (ps: [ ps.traitlets ps.jupyter-core ps.ipykernel ps.metakernel kernel ]); nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 3366efb697a88..77d75eb131ff6 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; version = "2022.10.31"; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { ln -s --relative "$autoload_target" autoload ''; - meta = { + meta = with lib; { homepage = "http://kakoune.org/"; description = "A vim inspired text editor"; license = licenses.publicDomain; diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix new file mode 100644 index 0000000000000..e047aaa270289 --- /dev/null +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk3, fetchFromGitHub +, autoreconfHook, wrapGAppsHook }: + +stdenv.mkDerivation rec { + version = "unstable-2022-02-14"; + pname = "l3afpad"; + + src = fetchFromGitHub { + owner = "stevenhoneyman"; + repo = pname; + rev = "16f22222116b78b7f6a6fd83289937cdaabed624"; + sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; + buildInputs = [ intltool gtk3 ]; + + meta = with lib; { + description = "Simple text editor forked from Leafpad using GTK+ 3.x"; + homepage = "https://github.com/stevenhoneyman/l3afpad"; + platforms = platforms.linux; + maintainers = with maintainers; [ ckie ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 175026440daaa..3e6346f57e41b 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "ldtk"; - version = "1.1.3"; + version = "1.2.5"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; - sha256 = "sha256-qw7+4k4IH2+9DX4ny8EBbSlyXBrk/y91W04+zWPGupk="; + sha256 = "sha256-kx4GOENYYbS09HxAiCCvqm/ztc32sdB39W8uv6D+R+A="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 0376e3af6bfb7..d0b38bcd35a89 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }: stdenv.mkDerivation rec { - version = "0.8.18.1"; + version = "0.8.19"; pname = "leafpad"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz"; - sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; + sha256 = "sha256-B9P3EvTb0KMyUf0d7hTiGv3J+SCQ/HaMEasKxVatvpc="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/applications/editors/lifeograph/default.nix index 895a9e11d5e86..099aec1558b26 100644 --- a/pkgs/applications/editors/lifeograph/default.nix +++ b/pkgs/applications/editors/lifeograph/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://lifeograph.sourceforge.net/wiki/Main_Page"; + homepage = "https://lifeograph.sourceforge.net/wiki/Main_Page"; description = "Lifeograph is an off-line and private journal and note taking application"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 11dd387523774..577ea527804c7 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - sha256 = "sha256-9nQFdii6SY14Cul7Ki0DUEsu75HWTCeEZtXaU6KGRiM="; + sha256 = "sha256-tZ9bCazs4ygNl5RKFNUtxboaMcG8a7mIz2FuiExX1d4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix new file mode 100644 index 0000000000000..cb94cef3a328f --- /dev/null +++ b/pkgs/applications/editors/molsketch/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, mkDerivation +, fetchurl +, cmake +, pkg-config +, hicolor-icon-theme +, openbabel +, desktop-file-utils +, qttranslations +}: + +mkDerivation rec { + pname = "molsketch"; + version = "0.7.3"; + + src = fetchurl { + url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz"; + hash = "sha256-82iNJRiXqESwidjifKBf0+ljcqbFD1WehsXI8VUgrwQ="; + }; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out" + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + hicolor-icon-theme + openbabel + desktop-file-utils + qttranslations + ]; + + meta = with lib; { + description = "2D molecule editor"; + homepage = "https://sourceforge.net/projects/molsketch/"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.fortuneteller2k ]; + }; +} diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index cfb1d17c91293..69c7f3eb7af34 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -4,8 +4,6 @@ assert enableNls -> (gettext != null); -with lib; - let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; @@ -23,7 +21,7 @@ in stdenv.mkDerivation rec { sha256 = "V7p1Hpt1GfD23e5QUgLjh8dd3kQMH3qhuTEMw4FAaDY="; }; - nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; + nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; buildInputs = [ ncurses ]; outputs = [ "out" "info" ]; @@ -71,7 +69,7 @@ in stdenv.mkDerivation rec { ''; }; - meta = { + meta = with lib; { homepage = "https://www.nano-editor.org/"; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 98859ec2ef3bc..23734f3f23cd6 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv +, fetchpatch , libuv, lua, ncurses, pkg-config , unibilium, gperf , libvterm-neovim @@ -19,18 +20,28 @@ let nvim-client luv coxpcall busted luafilesystem penlight inspect ] )); + codegenLua = + if lua.pkgs.isLuaJIT + then + let deterministicLuajit = + lua.override { + deterministicStringIds = true; + self = deterministicLuajit; + }; + in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ]) + else lua; pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-B2ZpwhdmdvPOnxVyJDfNzUT5rTVuBhJXyMwwzCl9Fac="; + sha256 = "sha256-eqiH/K8w0FZNHLBBMjiTSQjNQyONqcx3X+d85gPnFJg="; }; patches = [ @@ -38,6 +49,13 @@ in # necessary so that nix can handle `UpdateRemotePlugins` for the plugins # it installs. See https://github.com/neovim/neovim/issues/9413. ./system_rplugin_manifest.patch + # make the build reproducible, rebased version of + # https://github.com/neovim/neovim/pull/21586 + (fetchpatch { + name = "neovim-build-make-generated-source-files-reproducible.patch"; + url = "https://github.com/raboof/neovim/commit/485dd2af3efbfd174163583c46e0bb2a01ff04f1.patch"; + hash = "sha256-9aRVK4lDkL/W4RVjeKptrZFY7rYYBx6/RGR4bQSbCsM="; + }) ]; dontFixCmake = true; @@ -78,7 +96,7 @@ in ]; # extra programs test via `make functionaltest` - checkInputs = [ + nativeCheckInputs = [ fish nodejs pyEnv # for src/clint.py @@ -89,7 +107,7 @@ in substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; ''; # check that the above patching actually works - disallowedReferences = [ stdenv.cc ]; + disallowedReferences = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; cmakeFlags = [ # Don't use downloaded dependencies. At the end of the configurePhase one @@ -101,7 +119,12 @@ in ++ lib.optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString lua.pkgs.isLuaJIT '' + cmakeFlagsArray+=( + "-DLUAC_PRG=${codegenLua}/bin/luajit -b -s %s -" + "-DLUA_GEN_PRG=${codegenLua}/bin/luajit" + ) + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 6cfcec8f1f7b3..0f3c2359aab16 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -30,7 +30,7 @@ with python3.pkgs; buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ neovim pytestCheckHook ]; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 01a9cf98954b9..fac9b3c309900 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -5,8 +5,6 @@ , python3Packages , callPackage }: -with lib; - neovim: let @@ -32,7 +30,7 @@ let }@args: let - wrapperArgsStr = if isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; + wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; # If configure != {}, we can't generate the rplugin.vim file with e.g # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in @@ -43,7 +41,7 @@ let finalMakeWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] + ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; @@ -57,22 +55,22 @@ let substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'Name=Neovim' 'Name=Neovim wrapper' '' - + optionalString withPython3 '' + + lib.optionalString withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' - + optionalString (rubyEnv != null) '' + + lib.optionalString (rubyEnv != null) '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' - + optionalString withNodeJs '' + + lib.optionalString withNodeJs '' ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' - + optionalString vimAlias '' + + lib.optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' - + optionalString viAlias '' + + lib.optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi '' - + optionalString (manifestRc != null) (let + + lib.optionalString (manifestRc != null) (let manifestWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ]; in '' diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 2d6f5eb8f3ca3..ab9489cd381f5 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.6"; + version = "0.6"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-0ZmyEtyVpqQ05FOYdFbnFqfPJKNkrweflSl+irOzcuk="; + sha256 = "sha256-t+TfyhQjUp4xJQ4vihAwm691dpt8ctQwLYDRRAQI7OM="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/o/default.nix b/pkgs/applications/editors/o/default.nix index 5272ea3a5f1b2..18654f3901e6b 100644 --- a/pkgs/applications/editors/o/default.nix +++ b/pkgs/applications/editors/o/default.nix @@ -1,25 +1,29 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config -, tcsh -, withGui ? stdenv.isLinux, vte # vte is broken on darwin +, withGui ? true, vte }: buildGoModule rec { pname = "o"; - version = "2.57.0"; + version = "2.58.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "o"; rev = "v${version}"; - hash = "sha256-UKFquf5h1e7gRAZgtcTdEpoNv+TOC8BYb2ED26X274s="; + hash = "sha256-oYWlciTQ/4mm/gTSQEkD/xPeLfDjIAMksjj1DVodZW4="; }; - postPatch = '' - substituteInPlace ko/main.cpp --replace '/bin/csh' '${tcsh}/bin/tcsh' - ''; - vendorSha256 = null; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "-Wl,--as-needed" "" + + # Requires impure pbcopy and pbpaste + substituteInPlace v2/pbcopy_test.go \ + --replace TestPBcopy SkipTestPBcopy + ''; + nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; buildInputs = lib.optional withGui vte; @@ -31,7 +35,7 @@ buildGoModule rec { installManPage o.1 '' + lib.optionalString withGui '' make install-gui PREFIX=$out - wrapProgram $out/bin/ko --prefix PATH : $out/bin + wrapProgram $out/bin/og --prefix PATH : $out/bin ''; meta = with lib; { diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index e94fb02fcd992..446b73dc50c8d 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -10,18 +10,36 @@ , gtk3 , wrapGAppsHook , makeWrapper +, pinegrowVersion ? "7" }: +let + # major version upgrade requires a new license. So keep version 6 around. + versions = { + "6" = { + version = "6.8"; + src = fetchurl { + url = "https://download.pinegrow.com/PinegrowLinux64.${versions."6".version}.zip"; + hash = "sha256-gqRmu0VR8Aj57UwYYLKICd4FnYZMhM6pTTSGIY5MLMk="; + }; + }; + "7" = { + version = "7.05.2"; + src = fetchurl { + url = "https://github.com/Pinegrow/PinegrowReleases/releases/download/pg${builtins.substring 0 4 (versions."7".version)}/PinegrowLinux64.${versions."7".version}.zip"; + hash = "sha256-Cvy4JwnQHMp7K0mKtIH8lk1bZ9hwa8nvtmimBK0UAf8="; + }; + }; + }; +in + stdenv.mkDerivation rec { pname = "pinegrow"; # deactivate auto update, because an old 6.21 version is getting mixed up # see e.g. https://github.com/NixOS/nixpkgs/pull/184460 - version = "6.8"; # nixpkgs-update: no auto update + version = versions.${pinegrowVersion}.version; # nixpkgs-update: no auto update - src = fetchurl { - url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; - sha256 = "sha256-gqRmu0VR8Aj57UwYYLKICd4FnYZMhM6pTTSGIY5MLMk="; - }; + src = versions.${pinegrowVersion}.src; nativeBuildInputs = [ unzip diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index bcc959bc200a8..8f4bcfd672634 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = !isCross; - checkInputs = lib.optionals (!isCross) [ dejagnu ]; + nativeCheckInputs = lib.optionals (!isCross) [ dejagnu ]; postInstall = '' moveToOutput share/emacs "$out" diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index d8e57fdb508fa..50eacf97bf850 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -44,6 +44,7 @@ in buildFHSUserEnv rec { xorg.libXext xorg.libXrender libudev0-shim + libxcrypt ]; passthru = { inherit unwrapped; }; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index c323a10e9b291..3f560d17e5323 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.26"; + version = "2.29"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QKK0bHy6pe+elPhnQlYAwmFP93LwCGxqRtBy10vj4i4="; + sha256 = "sha256-gRmSxWAVF61svlZ0/IMTrWCmwin+uPONLBlcJOYcp2w="; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 70e69503749b9..71633c8c8e4a9 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -206,7 +206,7 @@ in homepage = "https://www.rstudio.com/"; license = licenses.agpl3Only; maintainers = with maintainers; [ ciil cfhammill ]; - mainProgram = "rstudio" + optionalString server "-server"; + mainProgram = "rstudio" + lib.optionalString server "-server"; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 409f99e37afa2..138c886e76394 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.10"; + version = "1.9.20"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-FWUrhTTV1TCoBhitopQc469I7SRy4UDKdRLifVKhCCg="; + sha256 = "sha256-rpJ+HBYmGuhxnZbJn59mc+IokBc5834X2uyriIGnsqA="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index d4e43b4f71de0..461e8dc504dc0 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,26 +1,14 @@ -{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils +{ callPackage, lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils , fetchurl, libsecret }: let - version = "3.23.69"; + srcjson = builtins.fromJSON (builtins.readFile ./src.json); + version = srcjson.version; pname = "standardnotes"; name = "${pname}-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - plat = { - i686-linux = "i386"; - x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system} or throwSystem; - - sha256 = { - i686-linux = "sha256-/A2LjV8ky20bcKgs0ijwldryi5VkyROwz49vWYXYQus="; - x86_64-linux = "sha256-fA9WH9qUtvAHF9hTFRtxQdpz2dpK0joD0zX9VYBo10g="; - }.${stdenv.hostPlatform.system} or throwSystem; - - src = fetchurl { - url = "https://github.com/standardnotes/app/releases/download/%40standardnotes%2Fdesktop%40${version}/standard-notes-${version}-linux-${plat}.AppImage"; - inherit sha256; - }; + src = fetchurl (srcjson.appimage.${stdenv.hostPlatform.system} or throwSystem); appimageContents = appimageTools.extract { inherit name src; @@ -47,6 +35,8 @@ in appimageTools.wrapType2 rec { ln -s ${appimageContents}/usr/share/icons share ''; + passthru.updateScript = callPackage ./update.nix {}; + meta = with lib; { description = "A simple and private notes app"; longDescription = '' @@ -55,8 +45,8 @@ in appimageTools.wrapType2 rec { ''; homepage = "https://standardnotes.org"; license = licenses.agpl3; - maintainers = with maintainers; [ mgregoire chuangzhu ]; + maintainers = with maintainers; [ mgregoire chuangzhu squalus ]; sourceProvenance = [ sourceTypes.binaryNativeCode ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = builtins.attrNames srcjson.appimage; }; } diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json new file mode 100644 index 0000000000000..d8fa27e34a08e --- /dev/null +++ b/pkgs/applications/editors/standardnotes/src.json @@ -0,0 +1,17 @@ +{ + "version": "3.129.0", + "appimage": { + "x86_64-linux": { + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-x86_64.AppImage", + "hash": "sha512-JLO2jX9Us6BjqmTZIkVyxy2pqFM/eFGpwi6vXicMOgDB0UsgEMTK+Ww+9g+vJ1KbFRFmlt187qkdSNcevQPt7w==" + }, + "aarch64-linux": { + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-arm64.AppImage", + "hash": "sha512-LGUSRqMrJ+hVHyi/bjI/NkWRVsmY0Kh/wRY9RNJXm0C3dKQSFV8ca4GeY9+VCuJEecR4LGnWp4agS5jPybPP6w==" + }, + "i686-linux": { + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-i386.AppImage", + "hash": "sha512-XbQ4hn3QJ61hDC12cK95zsUowbyXPYArHZoRDx5trQ30phtQxtz6nV+pL00m4S9kYeEhsAwk1wXlRq9Ylbz2IA==" + } + } +} diff --git a/pkgs/applications/editors/standardnotes/update.nix b/pkgs/applications/editors/standardnotes/update.nix new file mode 100644 index 0000000000000..5b8794e9a44ef --- /dev/null +++ b/pkgs/applications/editors/standardnotes/update.nix @@ -0,0 +1,55 @@ +{ writeScript +, lib, curl, runtimeShell, jq, coreutils, moreutils, nix, gnused }: + +writeScript "update-standardnotes" '' + #!${runtimeShell} + PATH=${lib.makeBinPath [ jq curl nix coreutils moreutils gnused ]} + + set -euo pipefail + set -x + + tmpDir=$(mktemp -d) + srcJson=pkgs/applications/editors/standardnotes/src.json + jsonPath="$tmpDir"/latest + + oldVersion=$(jq -r .version < "$srcJson") + + curl https://api.github.com/repos/standardnotes/app/releases/latest > "$jsonPath" + + tagName=$(jq -r .tag_name < "$jsonPath") + + if [[ ! "$tagName" =~ "desktop" ]]; then + echo "latest release '$tagName' not a desktop release" + exit 1 + fi + + newVersion=$(jq -r .tag_name < "$jsonPath" | sed s,@standardnotes/desktop@,,g) + + if [[ "$oldVersion" == "$newVersion" ]]; then + echo "version did not change" + exit 0 + fi + + function getDownloadUrl() { + jq -r ".assets[] | select(.name==\"standard-notes-$newVersion-$1.AppImage\") | .browser_download_url" < "$jsonPath" + } + + function setJsonKey() { + jq "$1 = \"$2\"" "$srcJson" | sponge "$srcJson" + } + + function updatePlatform() { + nixPlatform="$1" + upstreamPlatform="$2" + url=$(getDownloadUrl "$upstreamPlatform") + hash=$(nix-prefetch-url "$url" --type sha512) + sriHash=$(nix hash to-sri --type sha512 $hash) + setJsonKey .appimage[\""$nixPlatform"\"].url "$url" + setJsonKey .appimage[\""$nixPlatform"\"].hash "$sriHash" + } + + updatePlatform x86_64-linux linux-x86_64 + updatePlatform aarch64-linux linux-arm64 + updatePlatform i686-linux linux-i386 + setJsonKey .version "$newVersion" +'' diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index ebf6cc2c53e19..7a8cc75e540b3 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -3,6 +3,7 @@ { fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook , writeShellScript, common-updater-scripts, curl , openssl_1_1, bzip2, bash, unzip, zip +, sqlite }: let @@ -15,7 +16,19 @@ let versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; - libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl_1_1 gtk3 cairo pango curl ]; + neededLibraries = [ + xorg.libX11 + xorg.libXtst + glib + libglvnd + openssl_1_1 + gtk3 + cairo + pango + curl + ] ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [ + sqlite + ]; in let binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; @@ -52,7 +65,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -67,6 +80,7 @@ in let # No need to patch these libraries, it works well with our own rm libcrypto.so.1.1 libssl.so.1.1 + ${lib.optionalString (lib.versionAtLeast buildVersion "4145") "rm libsqlite3.so"} mkdir -p $out cp -r * $out/ diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index d5a37aee5a473..5a60ce185c12c 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } {}; sublime4-dev = common { - buildVersion = "4141"; + buildVersion = "4147"; dev = true; - x64sha256 = "eFo9v4hSrp1gV56adVyFB9sOApOXlKNvVBW0wbFYG4g="; - aarch64sha256 = "MmwSptvSH507+X9GT8GC4tzZFzEfT2pKc+/Qu5SbMkM="; + x64sha256 = "9zs+2cp+pid0y/v5tHJN4jp7sM1oGB5EgGzMASL3y4o="; + aarch64sha256 = "KyvHJPqBEfeQQJnuyWZA7vGhWkYFqMaTMx+uy+3cZ30="; } {}; } diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index d859b5c888400..73cd6139ba14d 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-VGP9JVw92rk1yXZDqTKcMzJt8t+T8YAg8zYxFaWxGr4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TxfpzKAsU/5ble4VzJ+4pokCiyJsdisjmNwWfxOMKzE="; }; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index f5b79ecdb01ef..8440d1fd6d9c2 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -11,7 +11,7 @@ , perl , luajit , darwin -, python37 +, python3 }: let @@ -41,7 +41,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config buildSymlinks ]; buildInputs = [ - gettext ncurses cscope luajit ruby tcl perl python37 + gettext ncurses cscope luajit ruby tcl perl python3 ]; patches = [ ./macvim.patch ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation { "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" - "--with-python3-command=${python37}/bin/python3" + "--with-python3-command=${python3}/bin/python3" "--with-ruby-command=${ruby}/bin/ruby" "--with-tclsh=${tcl}/bin/tclsh" "--with-tlib=ncurses" @@ -159,7 +159,7 @@ stdenv.mkDerivation { libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe - install_name_tool -add_rpath ${python37}/lib $exe + install_name_tool -add_rpath ${python3}/lib $exe install_name_tool -add_rpath $libperl $exe install_name_tool -add_rpath ${ruby}/lib $exe diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 2d5842b5eb411..98d7a8db2f4d0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2022-12-23"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "c1198dd914bfe7af1754c67beff441b0475e51ee"; - sha256 = "17nil4vnlvq6qmsgmbrn0ci48p2pfyv1wf2p31da2ld3hjp52wbm"; + rev = "dac83f630fc6aafd256b149a2c2ae0d4466ec85e"; + sha256 = "1ny56csbrk2kzfqr9a3m858j4vi4iwpmx8w71fr9k6ncychk9pip"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-11-29"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "1704623395dbd6b42d999d378f14887aa6a8e704"; - sha256 = "0bkvrhpbisrn5bvpy7aknzr0b8c4hppszv82iiqmag9y380gkxqp"; + rev = "4ba9154caafe707c95d438681da4eb4774380024"; + sha256 = "11c39hjpn9i3d74wqnqczcx9bysgaj3wjkb8y86b312kpi4r2agh"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-12-24"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "ceebc0d0e5f6fe48c7739331e05c3843c07ade37"; - sha256 = "04zwi4k8ldqy02xkqwpdbicpr5mpnz1l6p4ykwhjvzyjsjl782i9"; + rev = "8ec6e1b030d933cba9a207a78c2f24333641fb2c"; + sha256 = "1cqhg2mp2qjpi28yq7pj9qlyry9vlyjw30nvwm0sd02pkjal0m0j"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -353,12 +353,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-11-29"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "3ac0fe27ccc0bebbcdc419de7654e06a41b7c803"; - sha256 = "17s5gfscg6bvaks7d7dgsaf04y6rall4hcicvi02im9iwm49srdh"; + rev = "25e2819b0e6ad38f51c918ea09e159c8a09bbdc3"; + sha256 = "15s0ndfpji3zms2fbijm7ys40x5p8994cdir3a0ya1nksf3yb9jj"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-12-14"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "88efc6f6035e4c656e8791f3c3a8a4328a1634dc"; - sha256 = "0krd0rbx5j6wkscsjsf4hmj64cxrqgqwvdzf600cwznfjsnnhb8k"; + rev = "50379d35ddc38ee3651f568d080442d5e4cb4a3a"; + sha256 = "0s830zxirqbw880xv7ddza8m988i4ljrd4vgdk1yxaifid2zx8yg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-12-15"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "086e1904e51fc559673598afbc59842db7981501"; - sha256 = "05ihib3wxjgcvfzg8hldw005iirwglnfzhikf91g3x2yhznmp8g4"; + rev = "e2b6cd07b45f8457ea183d16e483fdac3581b04f"; + sha256 = "0hx85bkbqcp94d2i1p9jd3c5n91xg1fhmm86yf7xjpx4knynsdbh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -535,12 +535,12 @@ final: prev: ai-vim = buildVimPluginFrom2Nix { pname = "ai.vim"; - version = "2022-12-16"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "aduros"; repo = "ai.vim"; - rev = "b5098a1d70be968444b6f3d9441443af3e357035"; - sha256 = "1hx4zilzc0vf62hiwk3qgyn12mjs8fw0wq1fw9g1v3k9v512z4fb"; + rev = "bc77f9f7565928169fe35d64123736b7d918f30c"; + sha256 = "0bn4712rwyr0fwwb8fx1cpxpz7x6fppfh24l20xpgaphdg0j78ih"; }; meta.homepage = "https://github.com/aduros/ai.vim/"; }; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-12-25"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "522b5d0433ba8c29f2f154f62184e34c2e5f301f"; - sha256 = "1h9xwjxnlkjrmhz1ixpshf7qhpl09ny8ynfbdcfzhzdm9aq8yra6"; + rev = "69c1dc8b5f3d215d4a0538265b2d257c2ed7a8fa"; + sha256 = "00jr9s90i03zkl076pa0knc0k9dx1xcc98ajlrxw3dkq38kbshiy"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -595,12 +595,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-08-24"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "9892a40d4cf970a2916a984544b7f984fc12f55c"; - sha256 = "1dbhvbaiabc8f9p3vfch3pkail2zx234g048mywl005s90d339kz"; + rev = "a7445c340fb7a0529f3c413eb99d3f8d29f50ba2"; + sha256 = "1rj1c4jljz83w1509y39lagmr86xngivzsjzngrdivnw3swbc59y"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -691,12 +691,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-11-28"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "ea59f760c223100edcffc52ffe019f502a792039"; - sha256 = "1pkqfwkmj8yzq2nx61k35xzvx4pm8qf07337q2fdi9sna734m8dw"; + rev = "bd240b2a2ac5c975216744fda57abe5ff8f39957"; + sha256 = "0mwrn4kxqn96n1jyr3sk1y39g8smgpa9kcdip3928p5vzsa8lbir"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-12-14"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "b60f56ad0bd797eb2f643e4c856b60d898f1435c"; - sha256 = "1x99dwjlzcrl47ykizlg76rvx68633bqzdm1mjx219pd9h7vnsqi"; + rev = "76ce329f419d615f52335e2c18153674a4598276"; + sha256 = "0l4g18d86wibsl4jmnm4kmjrgnk1dfzr2x7xwhx0s2dqkm2g1rqc"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -821,26 +821,38 @@ final: prev: meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; + b64-nvim = buildVimPluginFrom2Nix { + pname = "b64.nvim"; + version = "2022-08-22"; + src = fetchFromGitHub { + owner = "taybart"; + repo = "b64.nvim"; + rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3"; + sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw"; + }; + meta.homepage = "https://github.com/taybart/b64.nvim/"; + }; + barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-12-16"; + version = "2023-01-03"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "de30eb4b095c7f1ae51fbcc0d01e8671e80f6b0b"; - sha256 = "0f2p62xxmisc2dxc4anfqxl700vjs0lp2vghc4xfpv07zw6dcb5j"; + rev = "c1b5d351ccd8f88fd2729b90ade2ef5d333463de"; + sha256 = "1cwkkg57mga200kyvd9j02xi82mbq95i5nj0lkpc7r2lxds70qbr"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-12-23"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "894bd7a132832bba4d09155567f9e8114d9cc8d4"; - sha256 = "1xabr17md3hwjs92rcaxqhm60hl3pfz0kzj3i966z6vqs9dfnzmb"; + rev = "ab0d20b2d48551340b52b3cbe8922462caa06950"; + sha256 = "10382d94lg6k7g8inwqs40ddywzm8pfg6j0m97kansag4q7c8p4j"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -857,6 +869,18 @@ final: prev: meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; + bat-vim = buildVimPluginFrom2Nix { + pname = "bat.vim"; + version = "2022-11-14"; + src = fetchFromGitHub { + owner = "jamespwilliams"; + repo = "bat.vim"; + rev = "cc038af97410bfc8da2e29f7eefa51f565346993"; + sha256 = "17f9vwy3qfyl553hddah5zbj8gwww772frlvw51zskf9phdg17la"; + }; + meta.homepage = "https://github.com/jamespwilliams/bat.vim/"; + }; + bats-vim = buildVimPluginFrom2Nix { pname = "bats.vim"; version = "2013-07-03"; @@ -883,12 +907,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2022-03-28"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "d5ee0cef56a7e41a86048c14f25e964876ac20c1"; - sha256 = "04hi2zmaz02fiyvjs94lqn7imp20fn2vpwww37sg7gim18b1mpl4"; + rev = "6fed33809cde3b416087fc540ad9eb17ec470193"; + sha256 = "1wqps75qkr7rqdvrsn6f8m02nkqap9g6cca1jqf53y9476jsbml7"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -917,6 +941,18 @@ final: prev: meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/"; }; + boole-nvim = buildVimPluginFrom2Nix { + pname = "boole.nvim"; + version = "2023-01-14"; + src = fetchFromGitHub { + owner = "nat-418"; + repo = "boole.nvim"; + rev = "f4f9996f91159e54b8f1893b20e2e599c91bc1bd"; + sha256 = "0kilw1g57nrwxp07qpycig4bswafwg751kaiqnlnn70xbb88xppg"; + }; + meta.homepage = "https://github.com/nat-418/boole.nvim/"; + }; + bracey-vim = buildVimPluginFrom2Nix { pname = "bracey.vim"; version = "2021-08-20"; @@ -955,12 +991,12 @@ final: prev: bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-09-20"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "e782dab0fe9523ac65d9fe4f726f2efe924e3f43"; - sha256 = "1zbaqs96rimwawcf6nhxi3l02gs1yzdr4qk5aqh2ka0g6mx8mldn"; + rev = "5a830d5d2d7417bf02339ec279c90e98dde822f8"; + sha256 = "1vcfz4ngk5jsh66l74na9r0z2d3y6annb518kv0lgv76z99g5vy8"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -1003,12 +1039,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2022-12-24"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "2d11943edaca4b9a8ce127c25a56bf36c578a76a"; - sha256 = "1hkg4bdallk2a8h5nl1j9bx2cp0fk5f0nhydc6ycg54syh1ss7fd"; + rev = "8d4ab7a8d9120a3538216056047d10df3947789b"; + sha256 = "0v6d2kiww9ky0m0b94c66kfvxwmv11rkpxqyfv62pigirs8x3a82"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1039,12 +1075,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4ea096a150fe2636782f6f68b97d3cff7ee28b4f"; - sha256 = "1jb4dd9bg7q2an963fnn2mclpj52bjqvfv6k642757zfasx20x6p"; + rev = "be0a8122fd77efb7b6a0d672bab10417e68fab8b"; + sha256 = "1w7km6b4r3pvnx5g5i4wndj9524klx3g4q9li8xv8z6lhdz27c15"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1111,12 +1147,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2022-11-11"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "9bd6073dd1230e667f97760b5a73f81547a19528"; - sha256 = "00jzl7aaas26181b0ldnk7nskmp0l491c8j2r5lld623bvv2hdsl"; + rev = "a5c3c8390dfb342d630bdc25941a4d8f433510be"; + sha256 = "0picfypj5by4zmq37h0dmszwk8vzj5dq04q2jy8lb9p5n36rkwya"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1339,12 +1375,12 @@ final: prev: cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2022-08-08"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "fae6cdb407ad6c63a0b1928670bad1a67a55b887"; - sha256 = "1iz6jkwk6fpn8vpqn8nvxrn35bbx6q2ssgycsrpny5293dkyiwgx"; + rev = "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261"; + sha256 = "0n00apdpm920hjddmyhzynqxzdqz1scmqays9p4c4b6dq06jblbr"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1447,12 +1483,12 @@ final: prev: cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; - version = "2021-10-11"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lua"; - rev = "d276254e7198ab7d00f117e88e223b4bd8c02d21"; - sha256 = "11mhpb2jdc7zq7yiwzkks844b7alrdd08h96r6y7p3cxjv1iy5gz"; + rev = "f3491638d123cfd2c8048aefaf66d246ff250ca6"; + sha256 = "0qydmgfgarf17hz10i6ffqvppmyrj3q1dm2awksk4l4y6z0cgg7w"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; @@ -1471,12 +1507,12 @@ final: prev: cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; - version = "2022-04-22"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "21f02b62deb409ce69928a23406076bd0043ddbc"; - sha256 = "0jil0i9g33i0h3ynng58qaam5k18sdlqdzrbyqgn4gjzchcxpfqv"; + rev = "43b69a235b2dc54db692049fe0d5cc60c6b58b4b"; + sha256 = "0h3xm2pclylvr923sw9g9jj6bh867n0f2c4a9ndg803wky0pxmh0"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; @@ -1567,12 +1603,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-12-25"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "e9603484cb1937fb84ace447a8d5cb467f9aab45"; - sha256 = "0s73ys2dz0scf62zjkxb8lgyzh3x6am7w5z4pb1xq0h9gk5ip2ll"; + rev = "ee1341c53e7b82f55c6e83287828f652c2ac35e1"; + sha256 = "0x61dhbx1wvbnf1pjz1an3zhmp25xy07wshw8dw5yf46qi623l09"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1711,12 +1747,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-11-30"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "13da36309878d1f3199877a33badeca0fdf7543e"; - sha256 = "12p7qbqvqm3pj2pbvm3vg1q84kd15n1qhw720gd1nfxm0ybfxgfc"; + rev = "e74d1173689dccde72fdccaabae19cbe93d2f1be"; + sha256 = "0pmx80b4s0nvdz5ps0jrlgrsir00q0s4ighjl7598gfh59ic8jhl"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1759,12 +1795,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-12-25"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "95b43f67147391cf2c69e550bd001b742781d226"; - sha256 = "0rmva45znh39r4rhakk1zmqk9hrgi2d2daw8v1rfv1jd054w3vx1"; + rev = "e86b15bbcabc2cc1f20a40e7c127a424e7ad3850"; + sha256 = "1qh30yg082a6s55psa1z844n3s5z8s31pan7iywaygwcnpxhlgx6"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1819,12 +1855,12 @@ final: prev: com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix { pname = "com.cloudedmountain.ide.neovim"; - version = "2022-05-19"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Domeee"; repo = "com.cloudedmountain.ide.neovim"; - rev = "d5d6c5151e8643abfabd22e9fe7e31467c679be2"; - sha256 = "1h2379ibzadv7549i13zjzavya7n7q8z532awvwqdr8incja5b4c"; + rev = "d479b806f06cd6714e321cf88e94aae858e8274e"; + sha256 = "0nwp8drcy1bxd493gmi3bz41yw0avpvbfwx9dq03x9kxsjc81rsz"; }; meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; }; @@ -1843,12 +1879,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-12-25"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "45dc21a71ad1450606f5e98261badb28db59d74c"; - sha256 = "05278b42qwm77svl3k2a17vsdlmfjknlwkx01x80na9sciav07mz"; + rev = "eab2c83a0207369900e92783f56990808082eac2"; + sha256 = "0kin87qixkbib55763bd38xrbcgw4nx2rdklg3lmjgkd9w05jjzd"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1915,12 +1951,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-11-07"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "ab94958b819916a40770f9088db3a33336545dce"; - sha256 = "1pf26fw667rj5fzjrx3zkpz247i7y78wvrrl3b04jz581s4x5rrk"; + rev = "c9ce6476e4b481c64d13939c6696043b8e21dd43"; + sha256 = "0mqb300w663xb4yfxkijbn8ixzgj8azgywmhg7qjskds7w8af15z"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -1999,12 +2035,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-11-26"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0be93ef60f075a247bb5de9e29d447dc8a888ff0"; - sha256 = "07nzyswzd8bidx9by7lf60dcz51f1klfz0wnc2gfx5vq7qy3jjpq"; + rev = "d2e69a13b32e8574decfe81ea275292234eba6ea"; + sha256 = "0b1f0dx5xknm83b0ydq8ndf4207a5nqzvsbjzh4rngwxpc5kf5nc"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2033,50 +2069,62 @@ final: prev: meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; + copilot-cmp = buildVimPluginFrom2Nix { + pname = "copilot-cmp"; + version = "2023-01-07"; + src = fetchFromGitHub { + owner = "zbirenbaum"; + repo = "copilot-cmp"; + rev = "b732a58ac8b7287b981cd9f0d9c0f61e5e9d5760"; + sha256 = "0l05mrkc5v04nmrnazlqsb8p5ibv6p8lzy4ywvfrask14ajlfmz3"; + }; + meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; + }; + copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2022-12-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "81eb5d1bc2eddad5ff0b4e3c1c4be5c09bdfaa63"; - sha256 = "1hyv1iccy4fjpmdq16rl8pplhnrnz71nxjsndyf955q029l06ics"; + rev = "6ca9b4b3eda9138406291493750a6890c927dbfa"; + sha256 = "00dfhj44hfqi66j1ayr7h424qc160l9d91wlbfb4hhbg2rcldp4l"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-12-19"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "324ec9eb69e20971b58340d0096c3caac7bc2089"; - sha256 = "1zmzca9brdm9css41m9yc6vqc9033c86whcs9ykz4v4f148kyxvg"; + rev = "8c8416488ef21483dd5d2922ea194c05e9a3baaf"; + sha256 = "08zs24jqwv6z5fih1701wxlpbb2bjp5zlj0incw7vyi87zk2i3va"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "9d90bbff10171fcd9c6c4598e2cc7de1e6101463"; - sha256 = "1pchn21aq8chrlk16qkwxc8q63bccysqk2lnz5gc5j3gnnlx3asm"; + rev = "0b78334e1edcd7eb3d2038621b388ff040f035fb"; + sha256 = "0ag9f1h03s0pfiqaxclcz73sra0lwkva23dyacg53svcmpi9bpic"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "48c0b049999549c18365fc4d7bb23ecbae58b47d"; - sha256 = "0y4rwr4vfacvmj5bnia3s4h51fk73cay4kmwaajp1r1gbsxxiynq"; + rev = "d48f1315617092a8c0db29c2fd2d81d5e244c555"; + sha256 = "1ddzfj9gg67jz5kx4i51iyyl3js1b3k7mzxxa8pp5fh1021pi1hy"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2095,12 +2143,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "6ca864153bab793b5d75c8af1b8e2195145dba80"; - sha256 = "1mqciqyd4fjdrssf07mi3wk4qgvf48khpzgqzbsbv6c0g1k4pmn4"; + rev = "25232d23926c28c34f462dd9a57847d90b1af969"; + sha256 = "1ycf3mfrs2a4c43mbdc3rs2kby1y2gxpp0kxilv8vp0c1idibyxr"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2131,12 +2179,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-12-17"; + version = "2023-01-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "a70328ae638e20548bcfc64eb9561101104b3008"; - sha256 = "0i5bpg4sxm61200mwi3flji5cciv8izbcp38i4bkjm82ad09byzf"; + rev = "707ed7d6f8927a5ec0c241aa793f694f1b05f731"; + sha256 = "1nd7n871vlp5hdgl5xap09kn596rx99i11ccn7nr4abl56q2dp2s"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2239,12 +2287,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-12-20"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "115b9f9cec10e31aff39c077bf5a4881bc840916"; - sha256 = "0xvwsk6sl2yikppmx962hvgziib3wyybp1z528zvrl7a4xrfwx9n"; + rev = "f7d623457d6621b25a1292b24e366fae40cb79ab"; + sha256 = "17vwcqajvxhbvifg562zxvzwln0llb3gzyih3k61yssdp5akcfl0"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2613,28 +2661,40 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2022-12-20"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "61afb28f61ba090a67a88186f7bc8a94212e509a"; - sha256 = "0zzmgyl0j9ajmmyiwbpyp5js0ssz8gnlll6kbyk421jybjy17l6n"; + rev = "dbcfd4510d31884d444ec33a4453d0f06ad4a5eb"; + sha256 = "1qcwchka11gaphb36njcwa7qdw4hbp0x36w7mhsdm8p4i5xw3161"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-12-21"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "3812e296d3977a24db62f7c18025755b40968d3a"; - sha256 = "0xqpbsv2pahdc4zxqwkv9r6n5vm3g0c60q3klg96k7cn737k8cyn"; + rev = "5bbcf162d03287296fe393f88da6065db3cf9fd0"; + sha256 = "0lmqvm2sdj5mpq8hd03wyvmxgm6y286f0b7kr820znh1swlky3z1"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; + dirbuf-nvim = buildVimPluginFrom2Nix { + pname = "dirbuf.nvim"; + version = "2022-08-28"; + src = fetchFromGitHub { + owner = "elihunter173"; + repo = "dirbuf.nvim"; + rev = "ac7ad3c8e61630d15af1f6266441984f54f54fd2"; + sha256 = "09sbkgidj2fl7aj7kwzg37s5nynslbli9p3vwsh1yqxlag4lv6nz"; + }; + meta.homepage = "https://github.com/elihunter173/dirbuf.nvim/"; + }; + direnv-vim = buildVimPluginFrom2Nix { pname = "direnv.vim"; version = "2022-04-09"; @@ -2649,24 +2709,24 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-12-06"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "a83452264666eeb966b7fd5f48ddf15b8ca05450"; - sha256 = "1v84dz04xbwwhh61fvpmfvydpvj5wkqskml908rgjzmk6y3hp8wq"; + rev = "407c75de0049a184d6eb09ad415d2ccbc22ba612"; + sha256 = "1f38pgfwfa114f768f77fdy733nbn12ch33q7gskji28mwmdp8yy"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-12-22"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "9195c478cf05c3369131a7a9c606cbbc5247b0c6"; - sha256 = "12288w7071d9s4sfv0bd7bzahrmwds9yabqzfpapassr8958w84j"; + rev = "a0b129d7dea51b317fa8064f13b29f68004839c4"; + sha256 = "0q7ly95hp123z9z8qh4sih5a53dnbxv0jxa80b1s7d6h1wpr2w5j"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2697,24 +2757,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-12-23"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "255b8a1e6c3c2a24afb625274dd61a08edcf2db6"; - sha256 = "0lp6fiyv4b289qn0835sznva59515vwih4xp0mbfnp6n5fv8c811"; + rev = "5064f59094c42911e2ce57e1b59acda546c3905b"; + sha256 = "1gssj61d8lma9kbadmdwgpa3i4343srlfnzjc3br527dhw7ihcqm"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2022-11-12"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "30ddc057f71287c3ac2beca876e7ae6d5abe26a0"; - sha256 = "1pscf8a3fd79gzqm91gb22pmd44ijahyim9f8vq94c99silyvrjh"; + rev = "ed23a49992a8adfc0a1db765cb5353adeb12f9ff"; + sha256 = "09bi47gv5xd7wf7i53kbp3d2n5xzbns408cg52faxixd001m0f71"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2722,12 +2782,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2022-11-19"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "2af880947129f1ab776b732a4eecb92528472ef5"; - sha256 = "1rv70658l6f047qyqyfb4fsgypzsf8bgl4h0wi1k29ac888qdkiw"; + rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf"; + sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -2783,12 +2843,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-12-23"; + version = "2023-01-03"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "34c9fbc6f9777c4b1e5a65e590f0fa614c1e747c"; - sha256 = "1vla0d4gxw5664hbzw3ykp44vkdwxxpcq42gg43v1786jslx24zx"; + rev = "62408f6cb189606bc4b16832ada29be3ae33515f"; + sha256 = "18h7mwr9lpsdsdi90vn4nc868g50li27xvylrs2srppfjr7kvl7w"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2867,12 +2927,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-12-11"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "41710c31fffa76d08b8cfcd53d5defa7c07a3fc6"; - sha256 = "0859is1vxk8qz3bav12ppqsdrwaf2lfwfc55wnjpwjhld951pky3"; + rev = "4841c8830f0354808952fd4f64869383413c194f"; + sha256 = "0jmv0wqx0234dz0xlqjf1rhn7y4hnd4vxxqfr0f166nz678fld05"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2915,12 +2975,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2022-11-10"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "17a189f0f1e2d4197e00cd56dbeaed8c268bac8c"; - sha256 = "1fwwmvl1zciffwjf6iskqa5qychknnc300y9ympg51hlxzmm0vpz"; + rev = "b6be2e074b8f62815a45e31eb0966b4dd5e57810"; + sha256 = "0jhb91wfkz3jr1hxhigb551gg4c0gv8hdj9avyd5kj5lqwmy1j4q"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -2988,12 +3048,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2022-11-17"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "b666a057108c7655882cbc64217222228aad68da"; - sha256 = "0m2zmpcnv3zbjq83v0qfbqa7wvmhdscrsyfs9kr0yq3rfb7bmpzz"; + rev = "ae0be3cef35c0cb41d6c7f814a19b3402d50fd7a"; + sha256 = "0ynidizghmbrapcm2wrn6cjmn28gvzkxc1ia9s8nmh63574prfrv"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3024,12 +3084,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-12-18"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "1a6a02350568d6830bcfa167c72f9b6e75e454ae"; - sha256 = "0n4ia1g0jr4a4d27mjadwddmg5bqj4bgiy6vych4kmpz5yknk5i8"; + rev = "046e4d3491baf664e0eef5231d28beb49333578b"; + sha256 = "1ywp6lfzdx4k1pj6fzxd703zcvwrfkbmcmggds267bjgadrfbbnc"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3096,12 +3156,12 @@ final: prev: fzf-checkout-vim = buildVimPluginFrom2Nix { pname = "fzf-checkout.vim"; - version = "2021-06-25"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "stsewd"; repo = "fzf-checkout.vim"; - rev = "4d5ecae74460de8fed4f743f6bd53c4c31d32797"; - sha256 = "0mia7p2z8l3lrid0v8ml4i8y190gh4ll9898yyg4gcghhxp83zpm"; + rev = "00d953bbe2fba8d816f61bfe675070d4505f7a4f"; + sha256 = "0c5k4l2glvs23z6f9pynsxjdc8ascbgngvrqncbnsp0djs8wgasj"; }; meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; @@ -3132,24 +3192,24 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-12-21"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "5abf66f63bf08121dd4e917488b59ccb693eee12"; - sha256 = "0nf3gqvzsk4cda5r0afa979cxfsjq9smy4dyjpw2dhyxrm32a5cc"; + rev = "292de730ebbd3834e87f864c8c4115dc1035db37"; + sha256 = "068rwvq5q264lpfxgg4gw259rsy4wp6n6bf4877azk19f1b4j0ys"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-12-24"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "fd7fab77b20fdf09180cabdd660d8c3b7fe7ca1a"; - sha256 = "1shljxj04vrifkrqk5mzldl5qwxf196h01bvxpa03kf20yl39wvd"; + rev = "bdf48c282ad2174c25c059b3cdb7956427b07a99"; + sha256 = "0xjbnvyp0qnfnvz0grhyfcmzn7m90v3d3pfqfvivis3x1vws883q"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3180,12 +3240,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-12-04"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "526aeb1acda9504a4293b2a221700f6441211a7d"; - sha256 = "0nzsn79m3xk338gikz0qk7lqriia0fjfxbw3k9aj5h3kqxw7qgmw"; + rev = "9e4f5360b69558799c6974ed72248b86d09c6549"; + sha256 = "1pv64p2g385h4awapg99m39r3qipkpwg4rkicvdsc0dsnamqmis3"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3228,12 +3288,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-11-05"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "d3afb1c57918720548effb42edec530232436378"; - sha256 = "1dwnkrp1h452129xsa1jszrw38as0czhiykf0fvqvfa5yhsq0aga"; + rev = "5ddf157139ecfc0d2161f00c2cce4874578dc355"; + sha256 = "0d4caahrnqgy06mvqvxhhcr2li2hvk44hwqvw9dkxh9g6hyfjj87"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3288,12 +3348,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-12-19"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "2ab3bdf0a40bab53033048c6be75bda86316b55d"; - sha256 = "13j5cmrd54cx9d8rirmys01xgmf90ylc3wb5dzmsdjc7hy0viha2"; + rev = "7b37bd5c2dd4d7abc86f2af096af79120608eeca"; + sha256 = "19kna3rjdzfx2ys07jwb413saj9dg25i9ym6r8037r7h65h42yz2"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3310,6 +3370,18 @@ final: prev: meta.homepage = "https://github.com/gregsexton/gitv/"; }; + glance-nvim = buildVimPluginFrom2Nix { + pname = "glance.nvim"; + version = "2023-01-10"; + src = fetchFromGitHub { + owner = "DNLHC"; + repo = "glance.nvim"; + rev = "611478d2b36beb3c416c92f77e7c116d7bd25ee6"; + sha256 = "0fhxg27yq2lfwfwgpg2zf28hrb6kfa6nffrm6bzajk192z1zbak0"; + }; + meta.homepage = "https://github.com/DNLHC/glance.nvim/"; + }; + gleam-vim = buildVimPluginFrom2Nix { pname = "gleam.vim"; version = "2020-06-24"; @@ -3324,24 +3396,24 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-11-30"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "20d1cd087f8728f21a048a3b6259f6177237b39e"; - sha256 = "0zklzx2k85zyxn866xbhd6rnifc885rn68bnv1x945z34pj4m3xc"; + rev = "c88184a0bbd3e32e0274ad8c3782aba718f1053c"; + sha256 = "0b1yqy0j7akgqal1zq8h3zgrk0asvyffxrad81s2wv4r0dcg8csr"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; godbolt-nvim = buildVimPluginFrom2Nix { pname = "godbolt.nvim"; - version = "2022-12-17"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "c7b3785afb3fcc28088acbddfba588d7552f664d"; - sha256 = "0r5yfjhfkkpqpghy7pid7wd5r75cqhxh14iamvh65lmi79hs0hn3"; + rev = "a55d794e9faebfc09896bff3e9efd1156527f300"; + sha256 = "0cfwm1acj3ahk7kcrjwz7fqm7dqr13bgzkzybpkm4gncfzz3srph"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -3372,12 +3444,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2022-12-19"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "de58c6538f6625de52e40442337fda00e77d17b3"; - sha256 = "0a44hsww02m6dc7sfqq81wks5hy7yd12rcz9jl576ris4r960vp3"; + rev = "54a5e18f6a42b39021b7aef62aae4dda8680d666"; + sha256 = "1bbrjmywbdggl4l7mzg7fahp86qwr0gi4nw2b8arpj2cr8r9hy9f"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -3444,24 +3516,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-12-21"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "f4b9fd3b4795fe138aea93dd098112442108d277"; - sha256 = "13nphydsbp8vldjfffxc6l5x818lb3ciamiidf77nij50pi6dyx3"; + rev = "30e9f4b0fa24c25980df1690a8c47c36e40b6673"; + sha256 = "0nzrjrkfvckhzmxpwmn5qr62zfhkidmccfwj7iaaa3f4mi2ya5mb"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-12-12"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "c64ec557672c9c8ecc71a438533525482021377f"; - sha256 = "0q8y068cl75c12c2l9viw58p7swcjgn2p42wlvm9c0ks4mz03bgm"; + rev = "e863942494d7c72a7c8d2c54cf651f28fc5a76ab"; + sha256 = "0xh1y64bn274f7rm597gqgqjrra5fafydqcm127ikdiqsa948psy"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3527,12 +3599,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "7d771612036ffded31a80e34daa048e060566f9d"; - sha256 = "1rz9csy28bljyy5aad73iblqqa8f8kwsb9gklqpcfhzi628pp2bj"; + rev = "6ac15db045393cb40c484b19f3903d89acf2b125"; + sha256 = "07rsq2wgdjqlav15jvaiwk4a33q6w07all7q6v7hzdpng8bmywgi"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3670,12 +3742,12 @@ final: prev: hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2022-11-20"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "7e2aa29f88d534371c6b0263d3abbfac7c2376ce"; - sha256 = "0gc8gxnfvhmmhynvlm7dyjps3hl2lv14z70ngwdzg5pkxk5s5qmg"; + rev = "d00274f05363c13f29ed1fa571026a066a634cce"; + sha256 = "1scf9pmwch081l2rvfm0np6cjd4kj3kzpzkjlbc7zjw4gbbrbr9s"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -3730,12 +3802,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-12-15"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "9f7eed8133d62457f7ad2ca250eb9b837a4adeb7"; - sha256 = "0kzghqbidarjabmn1i0vwkz3jfnwpfzj36ild15y77l673acwdcj"; + rev = "c90e273f7b8c50a02f956c24ce4804a47f18162e"; + sha256 = "1cd1l55lax3938ym0kpwz0gpzmfi8rxq8rgl3l8vhq9frlaqyn53"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -3898,12 +3970,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-12-24"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "e07338597639f08fc4ef0f1d55f401ce5da5ef9f"; - sha256 = "0qavd22pn2k42279cxpr5ayafw6f7cxlq32yixiik53zbx2zm9rd"; + rev = "be483a2dcb63e992b02c5a0faff5d555720246fc"; + sha256 = "0ir2n9prdi50lvxrc23ya6pzmdp6fw1rdlls41zh0qbah0681yc3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -3971,12 +4043,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-11-23"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "fb733c1043a462155b52cd97efd920f1dd72d33a"; - sha256 = "1spaavmjxfnm30ks0c46i95zck967xl00cnzyclf3l8k0mzmq6kk"; + rev = "4c8d48726621a7f3998c7ed35b2c2535abc22def"; + sha256 = "0fq022r5wyvhrrmr6calw7bcz31hf30smz412y0g8g3bxildql3i"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3995,24 +4067,24 @@ final: prev: kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2022-11-06"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "981d56735ecc13e3c52b2d0cae269f5b9dcfe8ff"; - sha256 = "1pnxfarr1znv5zvy4pnapalyqg0pvnrrw5yk7ygyavfzzch1kzf0"; + rev = "3a80117148c6798972bb69414423311ab151d368"; + sha256 = "0d98hijynmdys7pyh9alk30lsp6ihsbbgzhi8gzjbms16fvgk29p"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2022-06-27"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "1261f851e5fb2192b3a5e1691650597c71dfce2f"; - sha256 = "0ly58dcxgwyfv5wdbi5i4g187zv6gw3bzxck0402jwadvxnq7x6d"; + rev = "53fe045906df8eeb07cb77b078fc93acda6c90b8"; + sha256 = "1fpfbjrh7k0g9bwji3r5snpjfwg0as937xy7k6hdsvrifkd2fb0j"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -4067,12 +4139,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "6c5af82589f846a773ac2e8ed44f7479fb28a870"; - sha256 = "11256cyja2nc0lv2cdsl1s88l4s3vjx72f181hh1pzq2ml9z2b77"; + rev = "cab4682d22a0451bc36a648694235621b5dd808e"; + sha256 = "0kxvb6l9pxdrs9cxh1cqf9p4y8nbfn9rx3a7zgd21h4c6126bcvh"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4091,12 +4163,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-12-19"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "0f7326f7e55ddbb69c057051566f5212d902b7f3"; - sha256 = "08kyanj07vs0f125kbwj6s3plxmy90a2g03w9xyfis7ccigysyv7"; + rev = "f69875f98317c11fd48c4c4a8166a408244b7fe8"; + sha256 = "1xhmp3zbi65n6dv6vv2023zj83bxnfvzxzdi5s6rsm0ls8dq9084"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4127,24 +4199,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-12-17"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "a5c9504290832e6bdbbb6265fd1ff02fc6485d20"; - sha256 = "1iz0h1nbsgyfmfdagpsg16drwqvclwciihky9ynr5kwxcsc60f88"; + rev = "ff4c3663e5a0a0ecbb3fffbc8318825def35d2aa"; + sha256 = "1pxm1b3crqmvbmds5cjfnqirvqbjqzc6vc59i6jsr8i79vymf16z"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-12-22"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "f53ef425b1b6cb9dc907a054755138345fd2fd57"; - sha256 = "1jyakdsn285l7mqxvr80sd4p175s17xd44pslqmgippwqbdgj8ns"; + rev = "3008ed68c8f309ced07587684c8af53884791d35"; + sha256 = "113y46yf33ymb53wpqnc9glzv2m3lfsnxsmnxn3cpk016zy9fp3z"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4319,12 +4391,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-12-24"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "84af01547e51e15fc97e878330414385eeb825e8"; - sha256 = "1idk82wyzwr1qk4waj8hik5jcv2zgbyc7zbb2bxl2vj0pdij8knw"; + rev = "937e882c169d572a8a73dfcb71137a264c6369b2"; + sha256 = "00aw82ymjqh729mi38l3nx0fhpp6rciqyqv0ar4g0v1qlq4gyp4l"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4403,12 +4475,12 @@ final: prev: lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; - version = "2022-09-05"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "4e6da1984d23da88a947805866580c48fc3cc8d7"; - sha256 = "1mckrs0rfbrz86wrvachdklfcl0c55a8h7mp5jlk7nc9cbvn280m"; + rev = "750d59b643865b906996028147675e9af216ea95"; + sha256 = "1i5qn1npa9zil3xql7yavx3p7w9xa26fz2lxw9ks23mpgdplk9gs"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -4427,12 +4499,12 @@ final: prev: lsp-inlayhints-nvim = buildVimPluginFrom2Nix { pname = "lsp-inlayhints.nvim"; - version = "2022-12-05"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "lvimuser"; repo = "lsp-inlayhints.nvim"; - rev = "a28c51a6362e3faa17f67749436cb5c8b55dcc6d"; - sha256 = "1hvn8y1mqd853aa2dm7156g4fvwq21qmmkicsl50czq4mf9vgvd1"; + rev = "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c"; + sha256 = "0fx0swsagjdng9m9x73wkfqnk464qk63q9wi32rhywllbm7gsflf"; }; meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; @@ -4473,6 +4545,18 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; + lsp-zero-nvim = buildVimPluginFrom2Nix { + pname = "lsp-zero.nvim"; + version = "2023-01-19"; + src = fetchFromGitHub { + owner = "VonHeikemen"; + repo = "lsp-zero.nvim"; + rev = "0b312c34372ec2b0daec722d1b7fad77b84bef5b"; + sha256 = "095n5sq850b66cpbqfbqkz5xzd2klyv5ijknffrbdrx0gwjh561l"; + }; + meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; + }; + lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions.nvim"; version = "2022-07-07"; @@ -4498,12 +4582,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-12-24"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "1979f1118e2b38084e7c148f279eed6e9300a342"; - sha256 = "0di84pidxf0mx2gcna3lhisx3drc1i2wajcrrc2dv7n122fv17yy"; + rev = "b86f249cba85ec2f0f74c62b65898bade00b4413"; + sha256 = "0kbcws9dwsvjg6psfax4azd6j46n05jhkkdgsc1c4wjhyg74jas9"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4558,24 +4642,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-12-22"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "fffbcb829288c3ca366f17cdb8d46aefb5c1d6f3"; - sha256 = "08yz4p6y5pg8ak4dkpggsk89n6f6lv78rglh1q88zh5ymjbqs8mv"; + rev = "0050b308552e45f7128f399886c86afefc3eb988"; + sha256 = "12c6f3xcj38zbiya3m4glwr5pkh0fq51gmch994i2mg5xy1ni3yw"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-12-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "5570fd797eae0790affb54ea669a150cad76db5d"; - sha256 = "0052rkqyhniz6djz7gkblmdlndllwv9jhcl6kh973qq23pdb00n4"; + rev = "5955bdd7b20854aea74dc86c7ddf9989296d52d7"; + sha256 = "0yzhz6cyhsh7aypvi0cz20wapn1xcild6llif7yvqbmvl4ygrdl5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4595,12 +4679,12 @@ final: prev: lush-nvim = buildNeovimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-12-16"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "4cc81a12731fbefce1582a940b755691eb3eb6d1"; - sha256 = "0zwb9d8makr9k20cdf7fajhk3frbh4n4p1zajxig0f3ws867zjqx"; + rev = "b1e8eb1da3fee95ef31515a73c9eff9bf251088d"; + sha256 = "0q3prq4fm9rpczl7b1lgqnhs0z5jgvpdy0cp45jfpw4bvcy6vkpq"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4631,16 +4715,52 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2022-11-24"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "chentoast"; repo = "marks.nvim"; - rev = "a69253e4b471a2421f9411bc5bba127eef878dc0"; - sha256 = "1df3c2apc4gsgrysdya99294c5h5lxibr9xifnv26rgbcqqk7njh"; + rev = "c3b18b97912720a6586fb537c5c0dfc9e06a68f1"; + sha256 = "1qgzvqzlnnb6axlcnyzw8lmafx8absv7dprqxkbgk5fkrdlcd9mm"; }; meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + mason-lspconfig-nvim = buildVimPluginFrom2Nix { + pname = "mason-lspconfig.nvim"; + version = "2023-01-22"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason-lspconfig.nvim"; + rev = "d7ff61a828d59bc593ea3e2020508c114048d790"; + sha256 = "03rmdhp30kzvc98gaagxbm3cm0q1mqy28wjih6r7l14kp3qv8bv1"; + }; + meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; + }; + + mason-tool-installer-nvim = buildVimPluginFrom2Nix { + pname = "mason-tool-installer.nvim"; + version = "2022-10-29"; + src = fetchFromGitHub { + owner = "WhoIsSethDaniel"; + repo = "mason-tool-installer.nvim"; + rev = "27f61f75a71bb3c2504a17e02b571f79cae43676"; + sha256 = "0zhmffjqssfqjbx69j7ambzr4dz52r4sgl6xhmzf9qxr8xlkhvny"; + }; + meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; + }; + + mason-nvim = buildVimPluginFrom2Nix { + pname = "mason.nvim"; + version = "2023-01-22"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason.nvim"; + rev = "bb88357eff0d0c69ab8ecc5985952e0a9a72175a"; + sha256 = "0hfnwjv165w1d89xd7gs11q5j8a52zj43acxaash2qaxy5hl3zpz"; + }; + meta.homepage = "https://github.com/williamboman/mason.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit.zip"; version = "2010-10-18"; @@ -4655,24 +4775,24 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-12-21"; + version = "2023-01-13"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "0560abaac9369d1027169a50e5219c3e069d00f3"; - sha256 = "190cw0fzrswigq1vc43nmf28mzhbn82wg2xhiq5rymbdf1lvpm2m"; + rev = "c5f6a24d526a8ddcd651c5d1291de89a51f923fa"; + sha256 = "1lwrxaaa11q9fwmiagy4zgx0chc69fdapqq5kw2nqc7f4wrqc6mm"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; material-vim = buildVimPluginFrom2Nix { pname = "material.vim"; - version = "2022-12-22"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "bdccc06f963d722111fc8887b22473997750b2de"; - sha256 = "1j23wi0hh5h0pc0rk5dxvsc60k484h5haa2gfxzahjqd7kzil4y8"; + rev = "ec5a2cecee50ea2074e6f19bd1c98e7d868a52c7"; + sha256 = "08s8k9nwnmyqzlpvfz2pp1j8dhip1syhkilrrzbj723xknclxyzf"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -4689,14 +4809,26 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; + mediawiki-vim = buildVimPluginFrom2Nix { + pname = "mediawiki.vim"; + version = "2015-11-15"; + src = fetchFromGitHub { + owner = "chikamichi"; + repo = "mediawiki.vim"; + rev = "26e5737264354be41cb11d16d48132779795e168"; + sha256 = "1laiiww2lhn0v1039n0mx97fyyj7wdzwi0ybwl1ysdik03nxl32f"; + }; + meta.homepage = "https://github.com/chikamichi/mediawiki.vim/"; + }; + mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-12-25"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "37e48cc5467fc695730d975bf269b10cc90bd3a3"; - sha256 = "1zqajz99pp3nx60d95kgy3924af1daj81r81yzpj187a2s0vdy4c"; + rev = "1c11d5fdb71c1d766545e42b0dd99eda50f1e349"; + sha256 = "16g9yzwiibrjhl9ln911kw433li5av64p6nrhypj6pcf2n1dkrfc"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5015,24 +5147,24 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2022-11-24"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "7fb5b63881a25c3d5a8321f8dae21737a1b01634"; - sha256 = "1843wss72yisfbp1xrrl6ajvvf3kmfcg3jwjcmyqv9vrsbivvijq"; + rev = "6c581808ac3179ea0c640e43c77de48bbbec4fbc"; + sha256 = "0jad8phdvslv57mah0psp0xlvh116s2dwmh7v1g4kmk598j4ljm4"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2022-12-17"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "73a90f6a736b51168ed05d89ed8872f75b98471c"; - sha256 = "0dpss9ydw3z8dkmjjagn799347svlw8yyp72h77z30k7awlcwqpx"; + rev = "8238865e1d9c61f1a260c290653f2c419503e0a9"; + sha256 = "18rndx83magknmjyihl02vjnqjra2x6y5d9wzz5qkhhacl8jhhbb"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5051,12 +5183,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2022-12-24"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "dd35a9b9172ae0f87eb407111dec754cf321002a"; - sha256 = "0ly5bx508iar3qgc6gx79hca9s47wd13d9pyr9h0xryqyrgsm027"; + rev = "0d4a5197def6019f125444c3870aa5a8f251a2db"; + sha256 = "03shsrnagr37awsvr88pzm1yhdp680dbzzgknzxf5d9sw7c3jfsg"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5075,36 +5207,36 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-12-21"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "c5f0a814abf89b5b1e3cfed95322813939bdc0c5"; - sha256 = "0aji887c2rmn9286jdx5wf1nj4gpyr0n1aar7rwx77k4va5fm06a"; + rev = "34dd33cd283b3a89f70d32c8f55bb5ec4ce2de93"; + sha256 = "1skz0fj0v5s926mfg58nrdmivsadjzlhlymxfyz0zvkj3vkf7d50"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-12-06"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "902f674b9e8a703fad9dafdda9d8f7c88ecf689f"; - sha256 = "12zxmyhk06xiyr5sahqip9pf6f5zyvr46yb6a4ayzdk81k8wmdky"; + rev = "ec601d38a2e9309109f405ce038c5a6ce774f1a9"; + sha256 = "028xycbvjhs7mvnzlismjipibgqdhjm9s0asmjpg3g7y2qhkw3ix"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-12-14"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "0d6002c6af432343937283fb70791fc76fa7227c"; - sha256 = "1lkxz1dl2i5ip4cn5xik7zls7skskik055m35l1y0ms3icjszfd1"; + rev = "30265e7a1bdf59361b37e293cdcecc167851c602"; + sha256 = "0fk29ggvncc26zx8zxdbyhqydxmvw3k71nf7ipp7pcxgkgm4zj4s"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5159,24 +5291,24 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-12-23"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "2c18f831effb5f3f383b2049902be23ea0dd7a8e"; - sha256 = "10lwjrwxjmag2jbhpzfv9g6zpl7mlmv646gr062pragb2cphrm7n"; + rev = "4a9a5fe13cd454692fc4db0b27783cd005e6be56"; + sha256 = "15a8az9xlcc0h0pw7s8kmd4zm5nx7d0q0j4d192d62mkdqc685mh"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll.nvim"; - version = "2022-07-11"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "54c5c419f6ee2b35557b3a6a7d631724234ba97a"; - sha256 = "09xlpdkbi0rpyh18f80w77454krx65kw463rs12241f5m0bax7xb"; + rev = "d7601c26c8a183fa8994ed339e70c2d841253e93"; + sha256 = "0ns9r2x82r2jwzmbv5jwk01a43d5qymhia9llmi9c30l6wnxg76g"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -5219,36 +5351,36 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-12-15"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "de2f68fb13a05c361e0c096e167f7f79712f3a5c"; - sha256 = "1wxm69zpglm504jjcqg7v4bcqi1a81w0b4m0rvdv84yidi5nfm4c"; + rev = "6676edc3078b8936df989df639900dc9a70dfc8a"; + sha256 = "1rhh775mm7byxcazl63hwdz8yjlz4fghd7yxaysv49s3rbrka1z1"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2022-11-23"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "412f498d25592d57932baa938857ef542754191b"; - sha256 = "1ml10rfwm7icvvyc0zcfjnhfdnqashh94xv7yrjg4rrqfiph2zyd"; + rev = "0bf23c10e4e72c7f21a2bb4cb8d8a28ac93f6f5f"; + sha256 = "0gwwm402lgnnk4zcsydbfx9iw4sndmc1xg1yfsab04mna8560bg6"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-11-19"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "5af91fe1176e764f7706b11b43793f31635e9520"; - sha256 = "161s84kdw7xfh1sk6yalk4a0i3hpqza71lxas8v4rnrx00s2xwwn"; + rev = "ba749799e48a8c5065106989eb8bf9915b51081d"; + sha256 = "0xqdz4qb0sdb9g2hdgm5c2ry0m3ar78hyp0n93k92dwd1v575996"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5351,24 +5483,24 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2022-12-01"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "fdebcbfbefdf26f73cd31ec849df784075dbd21f"; - sha256 = "0zgr4zvhxl3myx9a8pypxbv3f6i7xygzdd4cfi80c4nm3j83j1hk"; + rev = "99694458062e4e1d138bd022b10432a05612a2db"; + sha256 = "1ih25dl3zzcp2245vrq3ypii76b3ri73ayv3w8qg7s73j1g1c6p5"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-12-14"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9c3756ae21743c9634923cea788c4cca0eafccf2"; - sha256 = "1acb6n6j1fc3dafyvjfl4q5181szxidlq2yx3kqvj508g8r1fh5f"; + rev = "97e66dfaaecdc81f1dd7da00f8d4a6033f3bf6b2"; + sha256 = "01q3qlazc6m39rn67qpz03prrs2x9wqf71xi5s4a82vp53ha1fjv"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5385,14 +5517,26 @@ final: prev: meta.homepage = "https://github.com/zah/nim.vim/"; }; + nix-develop-nvim = buildVimPluginFrom2Nix { + pname = "nix-develop.nvim"; + version = "2023-01-11"; + src = fetchFromGitHub { + owner = "figsoda"; + repo = "nix-develop.nvim"; + rev = "ce61f6d964232c86b522c292667841f42ebee618"; + sha256 = "0yfs2iws6d370scq4jgc7gq3n5r3a0lwqfs7awcliks524768c6j"; + }; + meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; + }; + nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2022-12-23"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "8f67460e1ae721b91a9439243af5e42d6f3930d6"; - sha256 = "1f8rpchb7gr2wzl1xy1ja74h052bc0cig05a8549l5f8kg3x0qip"; + rev = "26fb0c6c5653b0bda95f29eae638305bab351123"; + sha256 = "0w9yy5c4rxw0k8z975p6zn1792lmjld1gch1m1gji0nvyyasvsbi"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5423,12 +5567,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-12-21"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "585d24ec6e3fb4288414f864cfe2de7d025e8216"; - sha256 = "0z7d3nfr5vydk2pwjhl0zlw0ipnbqhbw02sbk6j7vrcw6l0aqd7f"; + rev = "16b60455867dec069bf41699d690fa01261b4bf6"; + sha256 = "1fsngf0lf45csr5w6691xkdnkjbmp82xr4q65fnc5p0931q1yl7x"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5447,12 +5591,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-12-23"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "418e2507dcff84a7cb993ae4f37697b98e0c92ca"; - sha256 = "0zjlxq8xa7and5952lxz0irklxsrmh7k4bn905ggcd62hbpd5q6v"; + rev = "9824b8511dcb7d89de628d7e9bab5fa65c9d59d1"; + sha256 = "0y6paf8kyj30kkkwi9w2hank27b6f68l0swnly3w6abxfariwnpz"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5483,24 +5627,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-12-25"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "20385a698e8a5dd98ee7e63f16b700a10b921098"; - sha256 = "0widn891dgw3isg9axrgqc94yxb8s1mr5vxr5qfnf9rm2qk1hx71"; + rev = "b99e6cb13dc51768abc1c4c8585045a0c0459ef1"; + sha256 = "0fgwi68ks7qalr2nn1pzf3jdzyx5scmziz2dhp3yyw7mc1nq3fi1"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-12-23"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "b26851b3e7ac1c0c85666f8a74e36aef2acb89c6"; - sha256 = "0djmqka2b9yikjr1pllb572lvws86769z9bzj7xj984x1v1xf7rz"; + rev = "33cfeb7a761f08e8535dca722d4b237cabadd371"; + sha256 = "1lna5833nvk8db5jv549147078m6mzgzqvc42gqby8ma54rn6dq3"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5543,48 +5687,48 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-12-24"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "03580d758231956d33c8dd91e2be195106a79fa4"; - sha256 = "1qc7i1q4mkxqqmmcn22aig3sagg8g3qn6iw7xy56lv8dxk8yml9d"; + rev = "31042a5823b55c4bfb30efcbba2fc1b5b53f90dc"; + sha256 = "1jiwwmm87d2i76jgimk40mydsg2jddpl7q9axy94g6411hkdq261"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-12-21"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "be09864ae8b60f6f96d42ed60752dcfa3b7d31b5"; - sha256 = "02hy4358jqdf8pwis4w7z8rg4qw039c5cjvjlgbw4fzb02rqpvf6"; + rev = "cf8252058c8fc486bc565a815083a2eb390f7621"; + sha256 = "1hcj0k8szin32b2ki6mkqwpckinyca8vpwvd3rmaf597qnk0bv5h"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-biscuits = buildVimPluginFrom2Nix { pname = "nvim-biscuits"; - version = "2022-11-06"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "code-biscuits"; repo = "nvim-biscuits"; - rev = "5cfee78603bd4795e0709b8947e7ffaa2007cb1d"; - sha256 = "0qmkki3bpnk9rv90vaxyr8qi5y1lrd65x7fvk3h8bcyqnz7hhk28"; + rev = "25a880605fa4533b7075c54a0fdb5f0a25bc4f84"; + sha256 = "12lij0yv3n596yp2jbrdh17awrgvsm8gfyrafgvdzj4jibn16c68"; }; meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-12-21"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "b418b0a241d36509196944a6f6bee886c775d54f"; - sha256 = "1cjafp91jk9rrkiibsd7rp863gs51xpyrpkkprfy9x45nx6ihrmw"; + rev = "d15b59d7429d45f0b057aa63a0266989adc95715"; + sha256 = "0fsb8ybymxppkbdg45f7vr5vys2nl7b45nw6dprarh8bwp2qnkcr"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5615,12 +5759,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-12-23"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "d09b0c396aaa078cdfe78316ec06940971136e85"; - sha256 = "1vf1j10mibc3jdz3d1skw9gy14vg5fnpzzlgvfcd7fgh3gm6lj7h"; + rev = "11a95792a5be0f5a40bab5fc5b670e5b1399a939"; + sha256 = "178r1v9p7mcwg8xgl3jr4ibjsh9wiq0y81mps0nhx8q2dgnx8cyz"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5639,12 +5783,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2022-09-11"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "noib3"; repo = "nvim-cokeline"; - rev = "501f93ec84af0d505d95d3827cad470b9c5e86dc"; - sha256 = "1vb6p497rwi6jmj08a3vpcxkc6c9qkblkv56gn1qgrdrx66gh0q5"; + rev = "dc72c4a8dcbcc4763e33899876512b15c2d2aa4e"; + sha256 = "0lqzzycim4g1x5715845mcp4rrabgpl37jk7mrhh2k4mciraxwmg"; }; meta.homepage = "https://github.com/noib3/nvim-cokeline/"; }; @@ -5723,24 +5867,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-12-21"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6f2ea9e33b48a51849ec93c6c38148a5372018e4"; - sha256 = "0bjzqwvxn57n3rpx3sjk4cqdx876cgrbw744d86pzd1lrzdjixqm"; + rev = "c64a6627bb01eb151da96b28091797beaac09536"; + sha256 = "1nf48ns1zfmpizmki9545w4m8ndmkh76aadlmjpzn7y4draq5asf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2022-12-24"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "8aa9e7ef317182b33fc3e04651041e8d367cc73a"; - sha256 = "0aifkj73vxr6s263g63bl269nbx6hvbk5sf0mq0m3y4z9ia8lf03"; + rev = "6f045a72a05a78e4071dd0880f08214a2bb1461b"; + sha256 = "153dxjwq93wg1079485hqpvq81mai1yzqjmc9qybda09zra5wlk9"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -5759,24 +5903,24 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-11-24"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "54365d2eb4cb9cfab0371306c6a76c913c5a67e3"; - sha256 = "03i5n19q7hylnd5cb0plq7qmf21v5nq9l750988c97sfas5hwmqn"; + rev = "b80227ea56a48177786904f6322abc8b2dc0bc36"; + sha256 = "11a9jn4m1db2zlkfvwym98h15l46idf14gaddczf1njxhms52nm1"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2022-08-05"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "2971ce3e89b1711cc26e27f73d3f854b559a77d4"; - sha256 = "0hq6cmbl681x18s6c093dmwm9r9mzrx8icix304m9nm28d3l6179"; + rev = "191345947a92a5188d791e9786a5b4f205dcaca3"; + sha256 = "05rhpr34qsjczcv5kjd8664629308k3nazd8ksgfrpkjbg0ifjq9"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -5843,36 +5987,36 @@ final: prev: nvim-highlight-colors = buildVimPluginFrom2Nix { pname = "nvim-highlight-colors"; - version = "2022-09-28"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "5d20935b99d976ffa0d8226a78a8b2e091f0f699"; - sha256 = "0mqczqcrz2iz0k52k5bglad6rbsr8dddm5mvb1gsihbqp0ijyj85"; + rev = "af051bfe2971fc888d21cdfc59f5444904353b43"; + sha256 = "0xi4546f7qcdmyq04l1rjzyvw7rj9dlhmhskwk1pzq90rnd8xa5w"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-12-17"; + version = "2023-01-03"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "a6e397d9f901d419ea9d6fb09019c918bc6e9f69"; - sha256 = "1sl53z2pm2niysax90a8fiqcqdzhncjb35ap9rwx5xxjbpgjv8i2"; + rev = "718f09fc3ee6381d881863a817e44935bf41b1ab"; + sha256 = "1i2s8a6bgvm65iynbhhbyii72sr0f4wsnpvpxxyh3fnr2vlf61wc"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-12-21"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "0e59a9d29c5811dfc1ffcb032e18064fa2008b4e"; - sha256 = "05gz02npc4bw25jh8cm3ljv4p2iy6p65y6nv335b8fhm682i647f"; + rev = "fc83bd515c21c7912a6b9f97088e0492e923dfe0"; + sha256 = "03wpjgr8ziw9dllngh06l7wkf39vd9z96ivbyhzvdq801v0lyyw7"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5891,12 +6035,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-12-22"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d"; - sha256 = "1fdyb3cxqyj9iws54nhm76wnfadwhwd3ld0m3vpjyl6p85ss7iqa"; + rev = "beb9101fb4a8a4f2655e691980b4c82a27d2e920"; + sha256 = "1j56xz39wfdxinmzi83qfb6gljnag8a590wvyjg9c8m7ssd0ixw6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5915,12 +6059,12 @@ final: prev: nvim-lastplace = buildVimPluginFrom2Nix { pname = "nvim-lastplace"; - version = "2022-07-05"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "ethanholz"; repo = "nvim-lastplace"; - rev = "ecced899435c6bcdd81becb5efc6d5751d0dc4c8"; - sha256 = "030gc8q7xrkmqcsrx4h1issm4zjxxvypwawzq56kzm8x3d9bvbm0"; + rev = "65c5d6e2501a3af9c2cd15c6548e67fa035bf640"; + sha256 = "0klhy38a0x6g45z0k56gc48d1r4kqfq87yq4g8gr7fhy9fclmlza"; }; meta.homepage = "https://github.com/ethanholz/nvim-lastplace/"; }; @@ -5951,12 +6095,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-12-15"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "d60514f14baf8eacef4166070783d26c28fe3699"; - sha256 = "0fxk2gwq1dpmjsk9vwb8vh54xv7wh21skw1c4wg8pz9fcar3790w"; + rev = "57a52fce9b4a045f0b371a4ca5cbb535b9db0bdd"; + sha256 = "0bliv6vzgqk6nz0wk334gkbsdmkzxv38rjs0pf7jdk5azvgczslh"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5975,12 +6119,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "212b99bc12a5416df8b2a610711ba399e2fc388a"; - sha256 = "1yyi3iq5aacgad32jsvhj6ap37sy9m5mnqlqi6rn9x9c91213y19"; + rev = "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17"; + sha256 = "0fhfqf4rag58q64wfrlfzyw87n3zv24gnwr9inn3i63b27r57w83"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6023,12 +6167,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-12-09"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "d1c01907256dae7c9d55ba1fcfb8cf6b4f583325"; - sha256 = "0w7sya5pyfj9ad4295200j32ibsg5w9qx6icnlfv2fac03r4ir65"; + rev = "c552c96b837ce8b1318cf3eccbda41a73760cb21"; + sha256 = "1fqi33clnjsyx0fkdajl9vyrpmbdry11dm38nmm5d83a4zyb4qax"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6059,12 +6203,12 @@ final: prev: nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-10-13"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "3e0b9a134838c7356d743f84a272c92410c47d8d"; - sha256 = "19xwirhaw8y9blll37xwk13cn74cw6cl1j76773nkxgx5m5cynpg"; + rev = "5b9286a40ea2020352280caeb713515badb03d99"; + sha256 = "182jzsgqvzhlpzadi6rpnh6j2fakvinbmwwzgfnn6jyxw2cglbv2"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -6083,12 +6227,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-12-06"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "b005821516f1f37801a73067afd1cef2dbc4dfe8"; - sha256 = "06y5akjhrnnsdkjxbcci7fxar8qj37qsl5i18xyx4lzzslxf7nvy"; + rev = "bdd647f61a05c9b8a57c83b78341a0690e9c29d7"; + sha256 = "0fnn4jarxmp43jyk4j13wpk9zd7r7pjjmgqbr8brzfd3f9xabx6c"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -6119,12 +6263,12 @@ final: prev: nvim-scrollbar = buildVimPluginFrom2Nix { pname = "nvim-scrollbar"; - version = "2022-12-07"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "f45aecbba9c402282dfc99721e0ad4c08710907c"; - sha256 = "0aga91mvkgm8l2nqk2ng8rcgn2a10f5z4xdk66p7afddc8xzk32p"; + rev = "6a2065fbcd032075a06d2ab54508b69842bc4496"; + sha256 = "0i6kg4lw7v9fggi7j13lyb7ncchk1w10qdkzdgxn2cani2clwx9s"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; @@ -6143,12 +6287,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-12-07"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "47def62945611212a242657cc414dac91ca0453a"; - sha256 = "112h9rrfknqb2z0ph0x4fv3pplwrkp1sn1x2saw3bb8r7fjiqzr4"; + rev = "97df9b3e7da6f9a7325cb5c32649dddc48bb1630"; + sha256 = "188gr37y77l74dlzsp8wgccglx5c67gpdb3fmrn34cbw7id7fj7d"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6167,24 +6311,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-12-20"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "68ea562b485b6593e325e7916c3bd6e833d433e7"; - sha256 = "1r32ad6q18y3w3adkdgscya6gw9iynab5pgqv9an3924vzpbvi8w"; + rev = "24275beae382e6bd0180b3064cf5729548641a02"; + sha256 = "0rw2g0a1sdd92ac22rgmvb4yk17ps2c760g03pbdwfca14d50fnh"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-12-25"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "6aafeeda19a98768d1c17ff6dde5548bc77a1a2d"; - sha256 = "0ci25qy82phrlm7lp9zaaiyvf17rk6yvczbiwf6b578r4c8jq87j"; + rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e"; + sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6215,36 +6359,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-12-23"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "9e4c39572f631bb60ee15cb9d46e1daa9927a45e"; - sha256 = "0fw8c8jzpw2vrfh1ac27jbs0kgh3f98pixbwxwak98iq6a03vv50"; + rev = "96506fee49542f3aedab76368d400a147fea344e"; + sha256 = "137gwzb6xq32mwkbzwqiw2i3bgjz07nd1xx7d6ys825a9akkddcn"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "a2d7e78b0714a0dc066416100b7398d3f0941c23"; - sha256 = "07mvh417zywnh5xhm2lkyhizs1gi2lwq0s6r0ad1cbxbjw6xfajd"; + rev = "7bef1d53302f1087a07f83a4321582d835f44d4f"; + sha256 = "1v560a216ink7km0gr32kgjxd84lcvpiwy991pvp3s0xqxmw5bx7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-12-18"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "d28654b012d4c56beafec630ef7143275dff76f8"; - sha256 = "1wv94ni2cfifvdc9a681pfv24cxzgcbpmrygl0vz594702yi3k67"; + rev = "cacee4828152dd3a83736169ae61bbcd29a3d213"; + sha256 = "0d9j5wz1fqk8ipf2x8vym0m3zpydslivwsnha8h1qz6yp6zyq5hc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6275,12 +6419,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-12-25"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "83a494a6f93675beff7bbd320c04c87433b1462f"; - sha256 = "0qhi73kmdr3rr9jvklrvl7a7p7fz4i21i5yg1v927f15aq1lglsi"; + rev = "2fb97bd6c53d78517d2022a0b84422c18ce5686e"; + sha256 = "0wwzmkkdw3n2agxsclaniblwfjaqwav7vyd5w0fjcqvqjim4jd9d"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6299,36 +6443,47 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2022-10-29"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "32d9627123321db65a4f158b72b757bcaef1a3f4"; - sha256 = "176dqn0kxdcsjfxh3nhlkiwh7nrj9792rzbmmrkgghjjw87zrd4p"; + rev = "a0f89563ba36b3bacd62cf967b46beb4c2c29e52"; + sha256 = "0z91g5yn4i24myiv1dw0w28nd5j5vkgfp2jrn8wfkrrkmdmj6yqw"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-11-04"; + version = "2023-01-09"; src = fetchFromGitHub { - owner = "p00f"; + owner = "mrjones2014"; repo = "nvim-ts-rainbow"; - rev = "064fd6c0a15fae7f876c2c6dd4524ca3fad96750"; - sha256 = "1b7z8xyiplb9rjkdqwijnypjqrssrz5lr1wnl5vk1pyb6dnxspzg"; + rev = "aa83e4967bf78f85ffd9a11e159900c7ea7e423b"; + sha256 = "09x3bq4j9398avmzix78gm1qam0m34r9ifz7rb6l5rcqw7lhvr5q"; }; - meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; + meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; + }; + + nvim-ts-rainbow2 = buildVimPluginFrom2Nix { + pname = "nvim-ts-rainbow2"; + version = "2023-01-19"; + src = fetchgit { + url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; + rev = "2e0e2167f173df2f075fd52add2a0d6c66a2344a"; + sha256 = "0z5w6y6ynv4q8rjcrfi2vklf9l9h5azda73ragqbfijkx9ggniyy"; + }; + meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-12-09"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "05e1072f63f6c194ac6e867b567e6b437d3d4622"; - sha256 = "1b53nrmzga6bkf6cdck3hdwjyrlslyrsa7jv55198jy153y8qq2z"; + rev = "13d06d74afad093d8312fe051633b55f24049c16"; + sha256 = "07qixz6l1dyy84l14mbx6jwrmpmwdgvj8crq9vxqh44w5gwjr3qs"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6407,16 +6562,29 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-12-13"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "cb9314d358dc9f1d50e553a3c8e237ce713cbc57"; - sha256 = "0m57d7v2n2v9sxsiynsbgr4q56fhiq1l5vld5670j1xp63v8x1gr"; + rev = "52b2c9702fb9e219cd4182ed29daee644ec535f6"; + sha256 = "0inw57p02ad644f7fjfwsvk0lap6kpwrriz43kpp2x7wypkj8jxi"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; + oil-nvim = buildVimPluginFrom2Nix { + pname = "oil.nvim"; + version = "2023-01-22"; + src = fetchFromGitHub { + owner = "stevearc"; + repo = "oil.nvim"; + rev = "6c6b7673af1314dd7c8254a95eb8d331f6b76ac6"; + sha256 = "0gwfl7hslgbr2fawx15wbd6p4j60jnd2l68v36rxrmxl9iqm1ra6"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/stevearc/oil.nvim/"; + }; + omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { pname = "omnisharp-extended-lsp.nvim"; version = "2022-10-29"; @@ -6443,12 +6611,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-11-28"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "89dde4963ad198c9b6144dee3d5e8bcbb7559ddc"; - sha256 = "0x21c2rr49yi5ad5k7d24sy75lgvjyx8irh1n069m5afcdhbb2jv"; + rev = "f0a70e0993acbb348c32a52a88058cc60c160992"; + sha256 = "0mscpy6949zvcwfdp18nn4bkzrp9r5iyw4h2v310p5mr8gd3fjpv"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6467,12 +6635,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-12-21"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "7a7641e27f922496b4bf8493acd9f2f8da7ff864"; - sha256 = "0b2cm9inkw3wps8snxb09v789gi37k04swb8nfm3swa487r0dgr3"; + rev = "2aeceb0f0700ba57c8248aa36b3a900e58f5820e"; + sha256 = "0nslv7dxsxfjh2xlkh5w10gpi29c65g3mf9m7zyrbj3s0m5pldgg"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6491,12 +6659,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2022-12-24"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "3fca21ce5a849b0a5f4c97a2e6db8e61669cc617"; - sha256 = "15vhgjpqg97ll57ysakyq794cncigik6024z6k22ky1m19ybhjhr"; + rev = "b05d57d04445836e6b9235e1937bf0a3ba42506b"; + sha256 = "1n92ajibyz9w1iyyndkjzk6vzk3vz0wam1h39990c7fl4jj74is1"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6537,6 +6705,18 @@ final: prev: meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; + oxocarbon-nvim = buildVimPluginFrom2Nix { + pname = "oxocarbon.nvim"; + version = "2023-01-10"; + src = fetchFromGitHub { + owner = "nyoom-engineering"; + repo = "oxocarbon.nvim"; + rev = "b58812cde84df6ec0c2f54e602d608d94a78ebef"; + sha256 = "0gk2j9dkdjdiagz49wxj0skm9w50fifl0xg2496rcdarvhh5lny7"; + }; + meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; + }; + package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; version = "2022-11-17"; @@ -6551,12 +6731,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-12-18"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "dac4088c70f4337c6c40d1a2751266a324765797"; - sha256 = "129axd8cfm5y4n520z63cfsn8pix882f4l4nzvwmf62fqnr292i0"; + rev = "1d0cf98a561f7fd654c970c49f917d74fafe1530"; + sha256 = "1nx3ip7pab0a2c4w3rwmpj8a1qizmpw06b11v6js3mbp4hb40230"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -6659,24 +6839,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2022-12-18"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "3421bbbfec25a7c54ee041ffb9cb226b69b2b995"; - sha256 = "1zc9wwpb0565fw0g1mmhv2dkdlf57qvh7r133gcij9mp7jh87pgx"; + rev = "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6"; + sha256 = "13h5w5f9ywigi33g38ij5k24kyyz2nafwhzs5zqn8mngnvh7h0km"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-10-01"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "4b7e52044bbb84242158d977a50c4cbcd85070c7"; - sha256 = "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl"; + rev = "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826"; + sha256 = "12hp9a2q80hg93ynfa97v03fmxqwv4d6f1yb92bi6ih3kbjyjsji"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6941,7 +7121,7 @@ final: prev: src = fetchFromGitHub { owner = "ryvnf"; repo = "readline.vim"; - rev = "b5eff41db2803b6f5a264cc71867e8498e7318d1"; + rev = "1213ebcf558b4ee2e9df2c761cc01cc076fc764f"; sha256 = "03sn2rpadd746ax5ynidi8msp90phzb3a82w523q8b07kn32dgdw"; }; meta.homepage = "https://github.com/ryvnf/readline.vim/"; @@ -6949,12 +7129,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-12-23"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "2c72385b627e46bb66f23b8a11da40b4bb127506"; - sha256 = "14rbd79nfqzyhqb2bs57q4z9id7kh0r6jjg6g5j6cwqd7fjnaiwf"; + rev = "ee63338cfb9151018afb243f5af5262c1686b280"; + sha256 = "03fgla400n5mqhpfa3lljzark76ah7n0mzzxfsn5c6m3hxfkvaim"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -6985,12 +7165,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2022-12-19"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "84e8208c17bbc9e3c092b860db85953ee2d60d17"; - sha256 = "0labx6k5padzc8j270v07gxx3v3vw8kf5xnh5dg6pywpx4lp728h"; + rev = "090e253c114b6d5448bac5869a28a6623c195e3a"; + sha256 = "0qdxm9rcbq78yh0s3cvsbpnjjfd772fhkdrzwg1gc7k8p4ppnm1q"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7069,12 +7249,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-11-06"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "99fd1238c6068d0637df30b6cee9a264334015e9"; - sha256 = "0y95kj77p4zjskn6j7bp04scrlgg5l8827zc3m6f18cgcy1qnngf"; + rev = "df584e84393ef255f5b8cbd709677d6a3a5bf42f"; + sha256 = "1h2p6xdv4bxphn98iwjzk9fh54lh1ff41smp2n0j84inqpl0mygv"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -7117,12 +7297,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2022-12-16"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "84e47a303a1aa97e2a81df03ef040d41c8192134"; - sha256 = "0jk0jq3kv0i3jr95k9izd2zziws7pimlhxj72aj2pf1mvc7pvb66"; + rev = "d522369aa50cf8c0116c952ddc55253c505e8bf7"; + sha256 = "1sbq1akv33sj3apqyw8sc7zpw36cyxk8m1inhmwdwgampzhl9sxc"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -7213,12 +7393,12 @@ final: prev: seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256.vim"; - version = "2022-12-10"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "9faf491b28c747707037b6b47c6a52af313b9c17"; - sha256 = "1n39rfb1747yrziv2cja1ahlmj4ja2w7ww4lyr2q1r3whb71jrw0"; + rev = "8f81a2f9f7ced9f8edea7f8a06caf5eaa9d9a217"; + sha256 = "0vjdmiapz4mx9c2hg39hs45k9zwj5zk8cl757dfwbj6y5fqkznv6"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -7237,12 +7417,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways.vim"; - version = "2022-02-12"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "ab20cc8a6a7cb95679f99bc4ec724544f9b94c62"; - sha256 = "01slcxzw485ik7mszj97x67576yw1l7i6imv3rfdn3cv7d216rj8"; + rev = "e683ed0fc57eda718c6b28dce0ff5190089d13d3"; + sha256 = "09d34043bn9n89f2gg5y9whiza0rh6rf63qspl0r9bgiygl534b1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -7320,14 +7500,26 @@ final: prev: meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; + solarized-nvim = buildVimPluginFrom2Nix { + pname = "solarized.nvim"; + version = "2022-12-02"; + src = fetchFromGitHub { + owner = "shaunsingh"; + repo = "solarized.nvim"; + rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; + sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + }; + meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; + }; + sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-12-23"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "a2a648b709bc52d64504ba4fddedc25690029d8d"; - sha256 = "1h5jbbi22aipsyqrjsl8b9g39i4i0zqrxbrg4i40hbi07l5bb800"; + rev = "e2e89497f178bec568a0a43cda651f0429ec8ec1"; + sha256 = "0dh5dsn8znhxsdr9plxa2mchlnfbgrvalc5pnz2wdsc2adz37521"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7491,12 +7683,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2022-12-08"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "ce2ba65370c3e6ca2e84e652c9adfccb8611458e"; - sha256 = "080xgvq8i01v2zz86nxwr1c2pi2mb5qjx6lymkygp0xjmv3p9b2v"; + rev = "e6a11a702483d26f767f937575d549ac73b2fea3"; + sha256 = "0f8674wisl5l7xwglk6zw956yd0s9ml20dwfvxmvslz0c1an8q0c"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -7563,12 +7755,12 @@ final: prev: suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; - version = "2022-10-19"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "2fc45dc4bcafb245b613ebd6847a244924735cc6"; - sha256 = "1k8cx22p2xb1bvnz5zcwrxd8qnhdcwlrs9xqhjry5y4jpb16hdzc"; + rev = "08abd39dfe1cee681b8ce3e7321da5fa03e045c1"; + sha256 = "0sivx4smg6d02dd16d9aa4v652vl90lpkbpz69kpi5llii6kb1xf"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -7635,12 +7827,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2021-09-29"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "900c5d3ee79b1771c5e07bf7290068ea35881756"; - sha256 = "0fqvwlf01v7bpsmb3ssqw1kbpvfrk7qvrwxsy4y1bnm60kvnqb7a"; + rev = "9aa594704eb63b81477bf7547342a5cc4012ef80"; + sha256 = "058nwj9rin11p9ifcl50i6ys5fv4v80kml4gnxqq89cd52sz07mh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -7708,12 +7900,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-12-05"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "35f1661297b4bf8b12324c8d29442b36a5ef64d2"; - sha256 = "1snrjrd0ri5d3kkdv81gvbsv6nccjxqh6zpwkzbz9nh7nhb7dmy2"; + rev = "9944f213fe47a7d2ff269cda334ba28c14a4df79"; + sha256 = "1s6636s0pah340fgi5lip9zpnbd08f06idcywis5w9jqqy234b37"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -7877,24 +8069,24 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-12-25"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "b8581d00afa02c6bb4c947348e3cee62db65b119"; - sha256 = "0bn1l3jkap292p399fyx848yyb34gb3am7ih0d6wxz93sjpgzsps"; + rev = "304508fb7bea78e3c0eeddd88c4837501e403ae8"; + sha256 = "0hyy1fwp06748qy7rs7gf27p7904xfrr53v1sbrmqhlxinlsyp0m"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-11-06"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "10771fdb7b4c4b59f2b5c1e8757b0379e1314659"; - sha256 = "0gdaa7bvxi5ppy3is3ac42fbcd7wgp91ircikm0j9sg9f39vjk1i"; + rev = "62cbd4e7f55fb6de2b8081087ce97026022ffcd2"; + sha256 = "1mmwag20ljszzy9x1vfgxly20pkiwciq7n7cv5d6d6d20xjr7v06"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -7974,12 +8166,12 @@ final: prev: telescope-manix = buildVimPluginFrom2Nix { pname = "telescope-manix"; - version = "2022-11-12"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "e1ac51513b1952e980edd5bad9ed98f155717b07"; - sha256 = "1bip4njr0sk8v20r5vq41ik5pxrh5d84l448fn3id2r16dqjh9aq"; + rev = "55f73d0743d8597ca9c7bfbebe286e0b5bbe6138"; + sha256 = "1jgl3qb92x4wnkvjwzpqbkcmw22hc4m7nmp1dpj8cy30z5yawg54"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -8082,12 +8274,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-12-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e960efa60e97df58e089b00270f09d60f27202c8"; - sha256 = "023g8dblp5bp4wa5955drfipwzjaarbxl5xa9pky1ax4pni3i1rw"; + rev = "dce1156ca103b8222e4abbfc63f9c6887abf5ec6"; + sha256 = "194jkn7a4xh5733n8n1n8n9mwibvadkxj6vw44xvwd01w0db6zhx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8128,6 +8320,18 @@ final: prev: meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; + term-edit-nvim = buildVimPluginFrom2Nix { + pname = "term-edit.nvim"; + version = "2023-01-21"; + src = fetchFromGitHub { + owner = "chomosuke"; + repo = "term-edit.nvim"; + rev = "eb9a18b77fa54d0416e315dc0f9793f480930419"; + sha256 = "0562rlcah3czb00m9fkc1dhhy0v9zgi5lx2hc3zjprccdhw9q41j"; + }; + meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; + }; + terminus = buildVimPluginFrom2Nix { pname = "terminus"; version = "2021-12-28"; @@ -8262,12 +8466,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-12-14"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "c1760010f46992165995aaa52ca967f473a2e8e6"; - sha256 = "0r7nx0bfw9cn8xjbwxi8gzds768lmcbwwfvivmy0hib82xprf674"; + rev = "077c59586d9d0726b0696dc5680eb863f4e04bc5"; + sha256 = "1gvglhdwaqrm3anaz7wyq3k1bjikjq7nqrdaszd9nnp3n4yarmhr"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8299,24 +8503,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-12-09"; + version = "2023-01-13"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "b02a1674bd0010d7982b056fd3df4f717ff8a57a"; - sha256 = "1ibkq0mv39n8pf43nxrridn4hdn95qk7pq0mv28qrb9p8dnxczfj"; + rev = "a54e6c471ce1cd8ef8357e34598a28a955297131"; + sha256 = "07q90impvavl0vv2c89ckqm2g6b7yk5n4z8n1864pz1j6442vhda"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-12-20"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "8b55a47165348dd1d811f9e1f867bb17bb35a360"; - sha256 = "0glhl3dm4ispxcy1x9g495by6xfdqmvlyhcywjx10kqmi192cwxs"; + rev = "4071f7fa984859c5de7a1fd27069b99c3a0d802a"; + sha256 = "0l4ibd0bi2msj2camxls039n6pw008ll50mf5r8888265hmqzkfw"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8347,12 +8551,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2022-12-25"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "8853418ad35abc35475131fa289bc8f3d704a1fa"; - sha256 = "08xbvrf0la34knv7jwrvnmnfv8a1mx09hs2h8lk6fymdijhdfa38"; + rev = "15a2262dfcd7848fbafa5afea8adec3941b83c12"; + sha256 = "1jv13wvg6jcca3cw5swirna0jq5m3mj0pq7q113cpy11hd74bzh7"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8383,12 +8587,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2022-11-16"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "897542f90050c3230856bc6e45de58b94c700bbf"; - sha256 = "09niz0xw32g0mxarxhf6v6whchqqllklbqm966j93wqkqbhl30ph"; + rev = "b2a0afac2c319a481f0f0318963a74d672ba5766"; + sha256 = "0wjhwzk4drm1phvndbkjjcax3q1gmh9akl5i7fwd8635w8dpc9fs"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8431,12 +8635,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight.nvim"; - version = "2022-09-05"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "1ffa6a4d89fb2fbb784c6674044bf54f1fca936f"; - sha256 = "1aw1my5a2xz35j4v7kgq78mgh3g6clkxwahcyzqj9355zryxha5g"; + rev = "8bb7fa7b918baab1ca81b977102ddb54afa63512"; + sha256 = "0bqd24cv0mb288qppah5hpmjlik37hbfifgbclfjkkb7irf1va8y"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -8503,12 +8707,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-12-21"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "9ebb11fff1548ae9406bba8a06d9caabf686ef9a"; - sha256 = "0yjqc4is8zaf2m04a2kh079jp2635nn8nbpkqak416hgigs1agfc"; + rev = "6a2f1ae05ba036ca1e9c505f4d58b9a188ef51bd"; + sha256 = "12rs0c7sx0j8k646ycvypc9vi9k9fx17pihd3fhvccwyjwk7iafi"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8575,12 +8779,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-10-21"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "0a547a2e4c80e78f2f1a002851802ab2a2bfa3c6"; - sha256 = "0kdxmammf2gdr6pa8acz6h9wbqbzb14g1glq3sl9hlhgxqxcclxy"; + rev = "a9488d0803020e8d99ed13b95fd9def82941c978"; + sha256 = "0c78cr5f16vliiblafhcmmcq1xqybfnd70576drh6n7sr2fhss88"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8659,12 +8863,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2021-03-20"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "3f0c8faadf0c5b68bcf40785c1c42e3731bfa522"; - sha256 = "1w9zim2v1av3f43z8q7zh0ia8dgjxjwnvmzd4j3y25vy25avn0lb"; + rev = "aa3428b734ddbd0105615832843f619774a6871e"; + sha256 = "0dnv1ixhzrgafd7kqpx8hp0r1snyqfxw80psnbxsr6qcwzawb2da"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -8911,12 +9115,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-12-23"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "9e2d021fc6088a2027315d7e7ae8bafa94f16a7d"; - sha256 = "0qfpq71hmhgjcy2l056jm4l9gz9hypv0c1kcm1ainwyhq0bkwr77"; + rev = "c7460aa8836bcb05cf32331cc751739ba9392ae7"; + sha256 = "1w2r5vwll0mfmviz7s9r6n00lr0b1fav7qmkj7zbvxh8hrf2z80b"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9055,12 +9259,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2022-09-10"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "63866f84095888d69af4e03d04ee6384fb93ef9b"; - sha256 = "0501jskp4yxva9h12awmkk50hj8l8yxkqrbm362hgji7gh5n3za8"; + rev = "d529e3e09a378695367969bf01735b9b997014ec"; + sha256 = "06p0246rw4cra2c9zr6bml9ylflyb4kcx4h5nfcriz0rsqgph0ha"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -9115,12 +9319,12 @@ final: prev: vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2021-04-29"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "2f970a0c826275f7d07fa145ba9a35c15b15232d"; - sha256 = "0fzacrlfr8fy5j1kps1mbkik0ln7lgd9c9jv74xd3mrz50hzqzby"; + rev = "25bcbc773554b5798d253a1a5fa5de158792f95e"; + sha256 = "1fa03kjhvii80lf6kv4zrp2gbpr0f75vgq7pr7qcf02pkl85pqqc"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -9307,12 +9511,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-12-23"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "15ba008e15a05f90dfec0b4a59124fccb3e8ffc1"; - sha256 = "167kmgd8793nhan0hpwyvi1z0jzfgrvhgdzbf8clzswxg7wvq773"; + rev = "5a6ff035e16c57874fbf68951b1206535733827d"; + sha256 = "1v0fxyqnbcf3x5vv5aq1z9q75m1qym6l1f9jn9iwdwg06mj581wj"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9571,12 +9775,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-12-13"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "70f86045e3a70ccdc9b448a9fe66a550290adca3"; - sha256 = "053cy6vmsvjrhjrgmnhg1s2cvxap3dyfniy9r8phd56isvlqd2i1"; + rev = "a09e40664e9cd30cd2b3f8866b796598302070f6"; + sha256 = "0fhbb5yq6ll58gc2wyai7h4c889lfdmvhwzidw1gw529jpgwvc67"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -9595,12 +9799,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-10-12"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "6a2b841d2f0b82386c637ce4e9954ae12c7eaee8"; - sha256 = "1s1kz89k8iklf8sbgy4p52h7y2x90141jwgzwhhhqlp7h9ar9mmw"; + rev = "f4ead480930a37dd2b0cf917a8c387ed36c2d86a"; + sha256 = "00nmcsna4z1p8i5k74jykzci16by2ga2lf904f1aya0yhwpwrjg2"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -9967,12 +10171,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2022-12-09"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "09729769c47a5afc1da0682116425e103e817e28"; - sha256 = "0ymab8zyznf2ylh8smngd3nq4dpzgrx6zh5i5b149vrm9jiymxqz"; + rev = "614622790b9dbe2d5a47b435b01accddf17be3e6"; + sha256 = "1v9xk5gapbl8s5lb5j3kc87a865hidj2cx164kvw80rjbwx4knnq"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -10027,24 +10231,24 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-11-03"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "280b34a0760801168a67f952542b6c49292aa5f3"; - sha256 = "19hb8bqkk6iqy8lm4gs6kiiw6igjjyvazw9fx6gnmf86pkajk3cw"; + rev = "06c73980682f61307e890fe652d1343be82e7ec7"; + sha256 = "0xwf9613h5lq8wsjh4y4k4pz80cpbnc8kddhsk77jfpnf305pi4c"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-09-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "c880254c0d56a9dba0bfe7bc3a5f99cd15273363"; - sha256 = "1zf2i2z2y2sdnl0yvbrhwg4j9vnz85v4ycplsqvas0kfvc2vcrka"; + rev = "baa0206f8d1685d1239d6c10f4b53869eb84c4a0"; + sha256 = "0hmdpn548bn46ygwm8w2wm609hiyn2nwj2kqc7nsi0ypa5pkbnnb"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -10099,12 +10303,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-12-02"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5b0b138483de17a8fd8dfcec0b491782c8fbf102"; - sha256 = "1nlr50kv90rafy85cr2k2n7pmr5mvmvqiza7qnk0rzlccdada6ry"; + rev = "2febbe1f00be04f16daa6464cb39214a8566ec4b"; + sha256 = "0njzhsn5xlwjcgr6nkm8pds4rby46dldl0b25dwj2bj6nyydaa23"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10243,12 +10447,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-12-18"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "8c4db1c61432511a3aa55971dabb2171cbcba7b1"; - sha256 = "1qzri85vzz706h5wq8n0h7xi610vfm1cykwgrkwannwarj9khnx6"; + rev = "9e64fc1ab60b2e97d39410482b64289dbbaf4eda"; + sha256 = "01vj5c89g6fblrybx2f95ji9blcdjyqrr120qwbq9kawbgja1giy"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10267,12 +10471,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2022-12-24"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "ee618bc2101040a4a702b4724a094ca2820562b4"; - sha256 = "1qj5jsdz3r9j6djhqdfjpd6qmpqbamngr8y4lvgkjpbjz2jvrgp1"; + rev = "996749a7d69a3709768fa8c4d259f79b5fd9bdb1"; + sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -10544,12 +10748,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-11-11"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "a6d0b28ea7d6b9d139374be1f94a16bd120fcda3"; - sha256 = "0wby253z3njala4syizy3m463gi8l45gcf7rj866r2jhnfxg9ba8"; + rev = "da80f3877896adcf77f59fb0bf74e9601615d372"; + sha256 = "129r4jrdffy18yklk18gbplgxf7dkngda8cgssf9xfawizyg739v"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10857,12 +11061,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-11-27"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "b7fda15b5a7080c7ee9728765fa6e5b4b1c5fca4"; - sha256 = "1cb2mld2jk7zbyiwa863vmkj6a52d7dzs57vmzw1s047nl04lnb8"; + rev = "653fb20b4c0eedabdc5486719b571813d5c8878c"; + sha256 = "1y6hzjx4qknwvilqxshqgl8q6wy7ycabmlzy2kgww7257cxsan1x"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -10977,12 +11181,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-12-21"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "2cb7ef587cd2c79dd98a7cd3ff301cc415296629"; - sha256 = "10krhi7cq6ijlpascsjjxwg4abfqg3kis4p8cm0lwaj7sgk5h5sv"; + rev = "3244bed52220bee01515eb6dbc7da29a66998fec"; + sha256 = "0rh5pz0m4nbhx8dw2nqvswyapyh9s8racwlqxgykaxlni89m1g23"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11086,16 +11290,28 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-12-04"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "db5120dd9887c988de7cd973ddb951e465d413e5"; - sha256 = "047l43z9ak7xrl4p8p8rw5wjakg95b6y2labfp16qq139g3bib0w"; + rev = "959e0e79ea240cdee29efbdd0d2e2e718931ccec"; + sha256 = "0fyh7894fwnf8hxp8y9016blzmw7qv99izhy62bg11rhdjcgz4n8"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; + vim-mediawiki-editor = buildVimPluginFrom2Nix { + pname = "vim-mediawiki-editor"; + version = "2022-10-29"; + src = fetchFromGitHub { + owner = "aquach"; + repo = "vim-mediawiki-editor"; + rev = "ba6a1139bdde0bdf2990f7110a42b304815f76b5"; + sha256 = "00d1vwf0say9vsrsvz710483ybbhwn5799k3qb4skna0vzjryayz"; + }; + meta.homepage = "https://github.com/aquach/vim-mediawiki-editor/"; + }; + vim-mergetool = buildVimPluginFrom2Nix { pname = "vim-mergetool"; version = "2019-06-22"; @@ -11326,12 +11542,12 @@ final: prev: vim-nixhash = buildVimPluginFrom2Nix { pname = "vim-nixhash"; - version = "2022-09-01"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "symphorien"; repo = "vim-nixhash"; - rev = "e03af8d0c1bae3c015ffdb45ce79556c0561e59d"; - sha256 = "1kdg84666gf1d3qiwwqmk7nwshspr2kpb8hjyh2m0nx0zmjji2ij"; + rev = "71676294bcb22c52d372bd8850b1bd3d7173bfac"; + sha256 = "14chq3c5dhkvllkmrrnpd8lbmlbm8ji1gqxn686bnh0d1w2r9hyk"; }; meta.homepage = "https://github.com/symphorien/vim-nixhash/"; }; @@ -11578,12 +11794,12 @@ final: prev: vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2022-07-23"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "2baeabb9584bb948618806f22bc4cef5685535fc"; - sha256 = "095hsn5vm0s8ky84l85cshn9hsa3cmyy27r9n9cdq28x373nabdr"; + rev = "4268535e1d33117a680a91160d845cd3833dfe28"; + sha256 = "0wd6fxv3l19rh7a6zfqi7ylcd1wjk8haiix7cq3zzyvq3zfidp0z"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -11674,12 +11890,12 @@ final: prev: vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2022-09-13"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "ddce935b16fbaaf02ac96f9f238deb04d4d33a31"; - sha256 = "14fpa2z4cpb7if1wf4xkn7zqydhf7iz531lv3y5kvx3hp0yh02qi"; + rev = "034e8445908e828351da6e428022d8487c57ce99"; + sha256 = "1xjvgzcr8l3f6wv82vla1nd5jxa32zdxgyw9fizf6xsm6m74n7jn"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -11782,12 +11998,12 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2022-09-11"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "558013b66ba8f30e75fd67a67374662fd6961eb8"; - sha256 = "1hdj0391ja2sz4qyk2c96xlnafxfyfcdbqdq2r8mpzqy3x7ii5zh"; + rev = "3a088946adb24a2fac7b47f3dea97a3b99f52ddd"; + sha256 = "11vklmj35gj7l4n84fpn503rhpmbg7inlmwlvs3adgc0bfpccflf"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -11818,12 +12034,12 @@ final: prev: vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2022-09-12"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "e7cc3b08f6f9e2dc1909f397aa3d5b0a7acb661c"; - sha256 = "1n4c6sgmpr2zb0m5f1nw866fg4s4hqbbsbkz46x2sndr96r6gk1l"; + rev = "502590f90a21f0de2b7664d6d0dcc90e5bb28a9c"; + sha256 = "0v335bgbf1a6ry8dvphfqwmlhlz8x94cj4x6z7ssz16hpasrlhx6"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -11926,12 +12142,12 @@ final: prev: vim-racket = buildVimPluginFrom2Nix { pname = "vim-racket"; - version = "2021-04-11"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "wlangstroth"; repo = "vim-racket"; - rev = "32ad23165c96d05da7f3b9931d2889b7e39dcb86"; - sha256 = "1yyqx471p11vj6gya4yzkiy07vfwzpx10bf6s7dh2h7zp2nz10br"; + rev = "2c7ec0f35a2ad1ca00305e5d67837bc1f1d4b6cc"; + sha256 = "02cliv5798l5lgf082g48g6cimsphvdvysalj3x86q3273rf9dgv"; }; meta.homepage = "https://github.com/wlangstroth/vim-racket/"; }; @@ -11950,12 +12166,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2022-09-27"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "a6d2bac95b446a5c23eff4638eca164b0d77454a"; - sha256 = "0mxc8jv8y7dfy8a14y3xbgs75fv8443nnpf27wk4bz8vdp6nbfha"; + rev = "959e94b76e6ebdf984acef61649ba7d0f62bd425"; + sha256 = "05v2gi42jv1rly8g7vhwfhjl01x3ld5xnrzgi7kadl5kppjnp5g8"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -11998,12 +12214,12 @@ final: prev: vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2021-07-28"; + version = "2023-01-13"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "0415be8b5989e56f6c9e382a04906b7f719cfb38"; - sha256 = "1v7akjwrk62q2bk03iqhvziw6s13wnh2lk0vppzvlksv6rj0cmpi"; + rev = "4f52ca556a0b9e257bf920658714470ea0320b7a"; + sha256 = "12rwb51xc0ncs0g1ha4sbbp473w9ijx00krns271al387q6dwhys"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -12118,12 +12334,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2022-12-03"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "1be4e4e5409caccddf5c2f1bbfa16519f4c93de0"; - sha256 = "1l2ax16r0bqxzdmgpz4rlx7zj0g4d8d696ibdzwmr0q6nbkpy4w5"; + rev = "16283468becaa6985839f96fea212f8634fbd7d2"; + sha256 = "0grp80kahfnjkns5mbkprigr2j2vh38ajy0r7rh7pp17s3awdy7i"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -12178,12 +12394,12 @@ final: prev: vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2022-09-26"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "8bc268c79d4053c2f5ccaadcf0b666dd16ed3a58"; - sha256 = "0nc3c66vrbd18sf0krxn6llfz1v832f7xqbkrfacl9jbhsfch5hk"; + rev = "a05e63ba72411977f5087c27c1564c9287bfab66"; + sha256 = "1z435v9y7nkffwr2b7rnmjla21nfb3wvdnf6s32vw4h6n5wgj3bl"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -12214,24 +12430,24 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-10-06"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "8332f123a63c739c870c96907d987cc3ff719d24"; - sha256 = "15aln4mb82d2k67brgh6xq8nx9rn9ymy3a2ciwwjnxawzjs2pbpg"; + rev = "1cc4557420f215d02c4d2645a748a816c220e99b"; + sha256 = "0l8mw3r6lb6q1p3afvf5psp6cg8vdi84b5j8whmdm83f4mynsn8a"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-10-29"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "55e8604bda53f11cbce5d2b976bacb157de70297"; - sha256 = "19r7hx4xkw3b8fc81gp1sqc4xk3w2i55mpcbsrjr1mjyjwydjb84"; + rev = "5308556987857eb0fc5f1a774496b29d8dd70f34"; + sha256 = "0c0bqc3cs4k6vzfrpamzay98rxqi7pjg3vgr8sxj0z7ljc5x1101"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -12310,12 +12526,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-12-08"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "8c917944354552c1263159a4a218ad924969be0c"; - sha256 = "1fsfmi6q4inbv5vdfclfjc3dga4wcvgw6dm32xqxq74raq5npgmc"; + rev = "1049d2425b6d270621b48e110de37d5467a2a621"; + sha256 = "083h0dzi60p9hv2g9daydalrrpzngbw0lgyapbn1xzh3idb0hqhx"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12538,12 +12754,12 @@ final: prev: vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2021-07-10"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "f0b17ac9f1bbdf3a29dba8b17ab429b1eed5d443"; - sha256 = "0j87i6kxafwl8a8szy2gzv7d0qhzwynd93iw8k0i42jnpqm8rp3a"; + rev = "d00503de9bed3a1da7206090cb148c6a1acce870"; + sha256 = "1vh8yv2cpyfnqmmjza8dm3b11mhz9x8lwln865hdjggzbj9vdbcg"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -12563,12 +12779,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-12-14"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "c6e5d249241342fd4592a67113cb539427d57e23"; - sha256 = "1053wq3rffcb8lihv3qn2a5pwq0jsk27pvb985l1kr0jp5sxw04s"; + rev = "ca2502545a8c563e15f556d0eb8a59e0f74d2864"; + sha256 = "1ijfdhnsr3dlp5bw3xarp2nxkavab59lnk563gvjcw74889alip9"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12707,12 +12923,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2022-12-08"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "41ea9d23b814014c8d8daf8b44fa0cd827a0e5f4"; - sha256 = "15581nighr1a82gkn0blkx75l6bz0vfq573nf626dw1qa652nipz"; + rev = "cdd66d6a37d991bba7997d593586fc51a5b37aa8"; + sha256 = "12jb59c9x3xbhfc9xps64dq3h9a5gsjfb60hv8kd8k2hl3jmnpc0"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -12743,12 +12959,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-12-22"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "b4aefd5a1e697ea68d50df2f7b222036a7251df8"; - sha256 = "147mv6zn5b8my8a8w7ddk1g1wzj0xsdssb265j19vs8ajijg7bcy"; + rev = "86f37afec5cefd75baaebf8900889dabb9789a2c"; + sha256 = "133vfipflvalyp373lmqza5p8dhh2qnnvlh5y2bsxh5abjk1jml1"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12959,12 +13175,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-11-28"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "8c7f33b43a56f89285de0da77ee6ec7e4af1f835"; - sha256 = "0mlhlgfr24xyzvg6qbxzbsyby3dmv973avw5qv5qablngi6kqi87"; + rev = "b487cccc0e920e4fdf84f72d2fc1c86ef8dc3bdc"; + sha256 = "13741pp29f2pqr44sslh9fl49aw7a19l3ff78k1qm4i97ms4r0xc"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -12983,12 +13199,12 @@ final: prev: vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2022-12-15"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "64e7a3cfd210e0ffe4b3d103b2662aec6b0e2407"; - sha256 = "1gbjh7r2n4w7lq3bvzziq01bmdi6cwa1s1hl25wbgpdj6kzrnda6"; + rev = "9b6def0924e716fb5314d52e062965b950b707f8"; + sha256 = "0j383bs1s2l8qxmym3zwby8nj8md8dsx7nk7xnspcrgah4g3j4mm"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -13055,12 +13271,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2022-12-21"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "01e62dfd3f067318b2d4eb341801149b9ba6b34d"; - sha256 = "0xnbsw16xgsz5w026hhr7vz20sp7kd4yybbdni7clsw3xm6hywkf"; + rev = "c75c8bfb0ce01d17bb41cf2c351f98ee3c019bb7"; + sha256 = "0zjbfhz2k414y61kksbh2za6b90ixrshgczppss377jcrxv2y0fi"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -13223,12 +13439,12 @@ final: prev: vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc.vim"; - version = "2022-10-15"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "f396529d7868b43d88978eb347bb203353991184"; - sha256 = "1jn9z0c98hmza5nyjbhyjfdljq9rf8ypjn3q0qq82xxs9xzg9y6w"; + rev = "bf06f3f9bb1b60542fccde1ed7499798d1154db6"; + sha256 = "1nd6wrwwgz499inl42gih99da0nbpgwak6mswavs3ra906d3nsy3"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -13259,12 +13475,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-11-14"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "56f469c787c16bf3e57ab27d2d2b3f97064e7686"; - sha256 = "0i6g0flnnby189c1vbkam214ax76kpw5w0w6m326lpakqv4zbvp8"; + rev = "475d75a32e368dbfc700b580b16b351face72129"; + sha256 = "10r0n4dz8r4jbv9j583r77pp25q4yb4zd5gbrb8svxr873fja33n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13272,12 +13488,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-12-18"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "265cb5b8e23e125713e3d331d2c89383ca72cc09"; - sha256 = "1yy6ps0896zcsr55p7z9k4vbh2n78bq5mps3r13kv3y7aj9m394i"; + rev = "c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd"; + sha256 = "0cdc8qs1jyzxphqs11nwib0xxv4lsaiqi7w580jhg7an7w484kn0"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13380,12 +13596,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-12-24"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "8682d3003595017cd8ffb4c860a07576647cc6f8"; - sha256 = "0x3dz9qkpqjccxqlqv4ncji9f2ggnzzpd901szg3jbsqxdals89p"; + rev = "e4fa445065a2bb0bbc3cca85346b67817f28e83e"; + sha256 = "1gj1qkq1zxn9by6zxwg46rplpks51wvv3pmdjh8qr0ldkxk9yavy"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13428,12 +13644,12 @@ final: prev: windows-nvim = buildVimPluginFrom2Nix { pname = "windows.nvim"; - version = "2022-11-17"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "windows.nvim"; - rev = "a37b5d021afbe9baf741bb40818bd14604dde424"; - sha256 = "0fyfjsf5ivl0w6ywj6wvahxv9xsixqjpg2hh3w36rikz7r9b5bz8"; + rev = "c7492552b23d0ab30325e90b56066ec51242adc8"; + sha256 = "0dcznmjsvh8hky76svvj523flxg10l351k0ps7zws0va87rdvz1m"; }; meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; }; @@ -13561,24 +13777,24 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2022-09-05"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "6f5702db4fd4a4c9a212f8de3b7b982f3d93b03c"; - sha256 = "04i8d7dlxmzgxiysy9jffxkpkw8h3qjkrv3l74z7pfksdmhlbbwz"; + rev = "4313a5828e4d48c5f2f135f29d46f769a59dcfdc"; + sha256 = "05wn6p90ymwg0y3941c6v7zpxhkd2zn4xqg2qvvl4wyyhn4rl4wp"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2022-10-22"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "0f7e9eb1ef309098e69e5e317508e9a7af299d94"; - sha256 = "03439c2z4p286mqncgii6gyg2pz7kk9mdfqbbfyg14ycwmfn949a"; + rev = "13ed6d0493a1d5140995c4456ced54d0aa984f6a"; + sha256 = "1k894mxc7v4fp5zr80wbfk18zd5shcfik0j7mv1cs8c950xmahjl"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -13597,24 +13813,24 @@ final: prev: zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2022-10-17"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "e36e00155a2f2c30efcbd43d7f8b518a5aef4b25"; - sha256 = "0vwlvmhwk8qsp1zxszgkzriwkzx939s46smq30mpl0vjqgm7vjr7"; + rev = "7fd86b7164442d3b5ec2c81b2694d040e716b5cf"; + sha256 = "12ichp7jmawgf1clwpd2w22a2amqlv578lnb89ppzf9hjz5kcxnb"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-10-19"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "c33e1e312fc0f9523d09d7ddb845ea5d52db41d0"; - sha256 = "17iwx87n8w2ksi9f8ravsa69ng7gzn0px0d5pd58n3lsdvhcsm59"; + rev = "c8caa9ab97334ca5af2d69900108bb4af20933c5"; + sha256 = "0mpzlxbf9dclgs4r9pffhc31hri09c78dk9lpij8fr089srgcp5i"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -13645,48 +13861,48 @@ final: prev: zoxide-vim = buildVimPluginFrom2Nix { pname = "zoxide.vim"; - version = "2022-06-29"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "7add42b0474b07c206c94d1693997e52d25c5fec"; - sha256 = "1csr4k4f9nybwa0h6fnd7wgr5cgqzqqqamr0xvrv4z1j4h24i5hr"; + rev = "f247421ca0c1934b8bb29abe06d334f0adc93d14"; + sha256 = "1h17aqjicfhp4qsrbwgw3vry8cvy8raxj9bq013n2vzq6h38392h"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-12-16"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "55f43a952856bc0029e6cef066297c6cfab3451d"; - sha256 = "1y9k2hzykw7m227kihaf2cygbkirwqrha3m40k2807a66nrcjyk3"; + rev = "6368edcd0b5e5cb5d9fb7cdee9d62cffe3e14f0e"; + sha256 = "1d1bb9js2i58qn2b8zjhqbawlrbjk3sn91cpkjaw43wldgm3samj"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-11-24"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "2f0affc13228f6eac363612a3cce3677fcd0b490"; - sha256 = "0702bpvmyrr5p0r3fd09szsflrvr6qnngvgdws00x4spsq03nl1p"; + rev = "cf186cffa9b3b896b03e94247ac4b56994a09e34"; + sha256 = "17di30zm743sj707z8hg95z2g7687nd1wsxyyn20xy5s3f8lnx0v"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "0deeed4aef43b249650cf4fc57722d5a4905703f"; - sha256 = "1b98v4jzinf2hwdfhijl4qh12gvg3pr86w3j27wazlhb86wqlmi5"; + rev = "ed78c1968dfd3b9aa2a3444fce0482c06ee65a17"; + sha256 = "1yhffffvb5ry4vcaiz68rnjv13r63v632962axkm0wgqbc5i62fc"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13729,12 +13945,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2022-12-13"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "b7b4777369b441341b2dcd45c738ea4167c11c9e"; - sha256 = "16gygs2dggjv2kfapm9r5qrdssnagqyqxw8m7dc8vk9iygyrgj5i"; + rev = "8516da6a9c40a1d9ab81ad56c90673be29f188f7"; + sha256 = "1l3l1w75j6bal7l4jf27rvy7w5vx1w62z5650y9xgx9wjnc1y955"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; @@ -13765,12 +13981,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-12-03"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "7610f245821e98232e7ee8dcbf3364725807187d"; - sha256 = "1050yycxlinnj0fcpwvb18b6i1ahkm3mwc56qmkspj1glhk64cs9"; + rev = "845a6ad5443e3559dde42910c4523a5835c9233b"; + sha256 = "189h3x01jz0hqcvrldfpicnl64f05v00hr93vyldj2isdrspm3pc"; }; 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 67af5e9de1aa8..2a1deff81a38d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,6 +1,6 @@ # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit }: +{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchgit, fetchhg, fetchsvn }: { ada = buildGrammar { @@ -38,12 +38,12 @@ }; astro = buildGrammar { language = "astro"; - version = "22697b0"; + version = "a1f66bf"; source = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "22697b0e2413464b7abaea9269c5e83a59e39a83"; - hash = "sha256-vp2VjkfBEYEUwUCjBlbVjPIB49QIikdFAITzzFLZX+U="; + rev = "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"; + hash = "sha256-Q+nOJQAAHqvyH8PVckh38q0TJ6b9jjb/pZHC/U2Hs5Q="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; @@ -115,23 +115,23 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "1bd772f"; + version = "a29bac0"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "1bd772f69b0db577122533514a239b184650adf2"; - hash = "sha256-ySgSavQflqFXHY25DjX16aP4KgK2HFdsQ6HeYaerxNI="; + rev = "a29bac0681802139710b4d3875540901504d15cb"; + hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; clojure = buildGrammar { language = "clojure"; - version = "8c23e0e"; + version = "262d6d6"; source = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "8c23e0ec078af461ccad43fffbbfc204aa6bc238"; - hash = "sha256-rbR5/f9Cznl4AFybmpKgEcjKBw4GrUVP67tf4UT6/ZE="; + rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416"; + hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; @@ -181,12 +181,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "5ead1e2"; + version = "2d2c4ae"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "5ead1e26c6ab71919db0f1880c46a278a93bc5ea"; - hash = "sha256-h6mJdmQzJlxYIcY+d5IiaFghraUgBGZwqFPKwB3E4pQ="; + rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1"; + hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -203,12 +203,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "7f1a79e"; + version = "0091006"; source = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "7f1a79e612160aa02be87f1a24469ae3655fe818"; - hash = "sha256-zBlv/KyUPNHRA8fKWaDgCeE1AX3EYTkwjo/RYHaKjK0="; + rev = "0091006d6498ee5647f080ef6c09e5b95e481078"; + hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -338,23 +338,23 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "91fc5ae"; + version = "a130858"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "91fc5ae1140d5c9d922312431f7d251a48d7b8ce"; - hash = "sha256-WAMCwKS+gOvBVC9h0qKHLgNedCRQwbJV+++SDqHhK5g="; + rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df"; + hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; - version = "a8b8b0e"; + version = "f0e2f78"; source = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "a8b8b0e16c4f5552f5e85af3dec976a5d16af8b9"; - hash = "sha256-6eiRiTTPdMBRsxVHIHYuw0sIfRDvP4pZIEyckoo304Q="; + rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb"; + hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -393,15 +393,26 @@ }; fortran = buildGrammar { language = "fortran"; - version = "f0f2f10"; + version = "edcb337"; source = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "f0f2f100952a353e64e26b0fa710b4c296d7af13"; - hash = "sha256-ylQLalRFqRu5N/lUxvwOds/UbLH2JJ7T/rOpo9H4MZ4="; + rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; + hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; + fsh = buildGrammar { + language = "fsh"; + version = "fa33477"; + source = fetchFromGitHub { + owner = "mgramigna"; + repo = "tree-sitter-fsh"; + rev = "fa3347712f7a59ed02ccf508284554689c6cde28"; + hash = "sha256-6TLG2edQeo+jRVAnO6mq3pC8RYNFi2UVVT3mQGZqk5U="; + }; + meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; + }; fusion = buildGrammar { language = "fusion"; version = "19db2f4"; @@ -448,12 +459,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "f838621"; + version = "190d288"; source = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "f838621d00831967a39ac8293cd3c23b0f49252e"; - hash = "sha256-9OulAtUDMP1jKYPOFBfctBVX2TWktkmwPtE3sCh1qD8="; + rev = "190d288a1746bddb4abe96b597fb7d17b76e5522"; + hash = "sha256-PPdwdUfJ+2TCxVdEvexxGSBMDZmI1GW7eSfc/X3Me7Y="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -482,12 +493,12 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "fee3427"; + version = "c0bfd26"; source = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "fee34278dc212869dcfc92fce3007ee79a752867"; - hash = "sha256-a3goK+QSkrdsKvimT8vpsJ1bt8FhLf1bws0aqjncv3A="; + rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89"; + hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; @@ -604,12 +615,12 @@ }; help = buildGrammar { language = "help"; - version = "61c7505"; + version = "9dee68e"; source = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "61c75058299f3d1cf565697e4073d7b2cc6a6d6c"; - hash = "sha256-MTossQzmBoHqXu933suYUUyDbmb20uO5oZlV31BYqIA="; + rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029"; + hash = "sha256-6XYEC+wKrCbPtcdjFH1O0EdX84M+NpPfTO2tXGFkwtk="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -626,12 +637,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "39c822b"; + version = "bd0d463"; source = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "39c822b795bd6533815d100b5e7d1ec7778a1c2a"; - hash = "sha256-WXlOl+aopL332rW2c2dYyf/xoYx9g7BfkdMUIFJbxzg="; + rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa"; + hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -657,17 +668,39 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; + htmldjango = buildGrammar { + language = "htmldjango"; + version = "b2dba02"; + source = fetchFromGitHub { + owner = "interdependence"; + repo = "tree-sitter-htmldjango"; + rev = "b2dba02eddab66be669022320273d0dfe1ff923d"; + hash = "sha256-FEsvr9i0Lys8CzDlm2lhdJEAQNnmqRSFjn4I+CcZYM8="; + }; + meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; + }; http = buildGrammar { language = "http"; - version = "30a9c17"; + version = "2c6c445"; source = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "30a9c1789d64429a830802cde5b1760ff1064312"; - hash = "sha256-XpKw6v6fnowdJmoIZGn3N1r9JXdJnNifgj+DPNFuoz0="; + rev = "2c6c44574031263326cb1e51658bbc0c084326e7"; + hash = "sha256-R81n6vb7JzZlnK17SkiwYeJeMs0xYTXx/qFdTvT8V5c="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; + ini = buildGrammar { + language = "ini"; + version = "1a0ce07"; + source = fetchFromGitHub { + owner = "justinmk"; + repo = "tree-sitter-ini"; + rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"; + hash = "sha256-pPtKokpTgjoNzPW4dRkOnyzBBJFeJj3+CW3LbHSKsmU="; + }; + meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; + }; java = buildGrammar { language = "java"; version = "09d650d"; @@ -758,12 +791,12 @@ }; julia = buildGrammar { language = "julia"; - version = "f254ff9"; + version = "0412178"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "f254ff9c52e994f629a60821662917d2c6c0e8eb"; - hash = "sha256-918mGh91hAl8hx4HoGOXr2BFoDtMz5yPkQRMDrkk1Mg="; + rev = "041217800bf423099015e1654c9a4fdd75310bb1"; + hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -791,12 +824,12 @@ }; latex = buildGrammar { language = "latex"; - version = "1ec3941"; + version = "6b7ea83"; source = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "1ec3941b971dccfa36cb1cd6221a2e4a1cd3e250"; - hash = "sha256-m/6GWV797gaJnWVU07RvHjfAeRzGT9GZH3M9HkcjUq0="; + rev = "6b7ea839307670e6bda011f888717d3a882ecc09"; + hash = "sha256-fmMm6HM9ZCnTyDxKmouoKFPYWkbrM//gHwVEFsICzUs="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; @@ -903,23 +936,23 @@ }; meson = buildGrammar { language = "meson"; - version = "6c5f7ef"; + version = "5f3138d"; source = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "6c5f7ef944f9c6ae8a0fc28b9071a4b493652238"; - hash = "sha256-r/H7v6a1blsendVBxx9Qy4f2i4V3LsxSwe+9/PRbfG8="; + rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f"; + hash = "sha256-P0S2JpRjAznDLaU97NMzLuuNyPqqy4RNqBa+PKvyl6s="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; nickel = buildGrammar { language = "nickel"; - version = "9d83db4"; + version = "092e901"; source = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "9d83db400b6c11260b9106f131f93ddda8131933"; - hash = "sha256-Jv7GMm6TpJE8+0pG045rFWkW/9rkv1Pn/6ko2a0bpmY="; + rev = "092e90142667482996880044d2c04837d3d1c266"; + hash = "sha256-y0Lx6HdkoC7rOzm8fOfLBUt6672qe7AHe1SI6YY/aHE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -947,35 +980,35 @@ }; norg = buildGrammar { language = "norg"; - version = "8ad2005"; + version = "6348056"; source = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "8ad20059c6f128861c4506fff866150ffee1d6f4"; - hash = "sha256-1cKH3k/nbZhZleINZ91M+glG1m2SlBJR/AP7mz/SAvI="; + rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712"; + hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; ocaml = buildGrammar { language = "ocaml"; - version = "de07323"; + version = "f1106bf"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "de07323343946c32759933cb3b7c78e821098cad"; - hash = "sha256-JhJSg6Ht3dy94hAP2yy0fg9U/IeYNGaHYoys/++yOwg="; + rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; + hash = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "de07323"; + version = "f1106bf"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "de07323343946c32759933cb3b7c78e821098cad"; - hash = "sha256-JhJSg6Ht3dy94hAP2yy0fg9U/IeYNGaHYoys/++yOwg="; + rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; + hash = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1027,12 +1060,12 @@ }; php = buildGrammar { language = "php"; - version = "47dd353"; + version = "973694f"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "47dd3532df8204a444dd6eb042135f1e7964f9cb"; - hash = "sha256-YU21aRugPfwlYuj+9xJAFD44Btopnln7QEoxANIlcLs="; + rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; + hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1060,12 +1093,12 @@ }; prisma = buildGrammar { language = "prisma"; - version = "17a5923"; + version = "eca2596"; source = fetchFromGitHub { owner = "victorhqc"; repo = "tree-sitter-prisma"; - rev = "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c"; - hash = "sha256-EdeKTmai/OM0WzCjcLmzHI41EqJWH/dOJJxvCE2sid8="; + rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5"; + hash = "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c="; }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; @@ -1082,12 +1115,12 @@ }; pug = buildGrammar { language = "pug"; - version = "63e2149"; + version = "26f6ac8"; source = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "63e214905970e75f065688b1e8aa90823c3aacdc"; - hash = "sha256-t/KRUV1DMlU/xu5BRe1VZm+dliXdtUVhFO+6psiHf+Q="; + rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; + hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; @@ -1115,12 +1148,12 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0b2b25b"; + version = "ab75be9"; source = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1"; - hash = "sha256-Hf8LfrN3YjN9hpGtTVmK3ZjJ/b/fsRCg9FG7hSSj/mk="; + rev = "ab75be9750e6f2f804638824d1790034286a830c"; + hash = "sha256-UP/+svGOSMlUOMmNMpXKtDDPY9ZIldjWF5sM+PMbE9M="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; @@ -1214,12 +1247,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "c919603"; + version = "7a1921b"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "c91960320d0f337bdd48308a8ad5500bd2616979"; - hash = "sha256-zUNs7s7SLGLU4h08FHLUA3YhbhRotMQVqk+zG9bmtjE="; + rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4"; + hash = "sha256-niL8gqKv1Nq1z8y4c49amqkDo+FoIP3XEJz+dV2UmWo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; @@ -1236,23 +1269,23 @@ }; scala = buildGrammar { language = "scala"; - version = "140c96c"; + version = "067ee61"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "140c96cf398693189d4e50f76d19ddfcd8a018f8"; - hash = "sha256-Sr4+avj0v1y8K6XXPAVwJDTa6+RmbKe/4dzd0k0y3cE="; + rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20"; + hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; scheme = buildGrammar { language = "scheme"; - version = "16bdcf0"; + version = "67b90a3"; source = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "16bdcf0495865e17ae5b995257458e31e8b7f450"; - hash = "sha256-+K+T5IgcEdTZK4s60AmkPg7L6Aw0mj36FMsWaRxUT0I="; + rev = "67b90a365bebf4406af4e5a546d6336de787e135"; + hash = "sha256-aHYOzOPK74Jd6MWFsap/k+dG+aJDTXQ05q7NoP5kfd8="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -1269,15 +1302,26 @@ }; slint = buildGrammar { language = "slint"; - version = "d422300"; + version = "0754752"; source = fetchFromGitHub { owner = "jrmoulton"; repo = "tree-sitter-slint"; - rev = "d422300f5d6ccce8f9a617dfed57aafb636fadb2"; - hash = "sha256-j6NBJaix0oOUKLAaeo+/1XdYatStqyaTyLKawq/nFvc="; + rev = "07547525cdf4627343dca5891f1743ae45e879bb"; + hash = "sha256-FB5uDzvJKBN3KH+g71kn2/SX8KIZdLv3OamX8f1NeVE="; }; meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint"; }; + smali = buildGrammar { + language = "smali"; + version = "d7f535e"; + source = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-smali"; + rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff"; + hash = "sha256-wSUHzQdpWtIXuqfFvqMNJPQjvdRZ29PBcwtMnyKwRR4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-smali"; + }; solidity = buildGrammar { language = "solidity"; version = "52ed088"; @@ -1302,12 +1346,12 @@ }; sql = buildGrammar { language = "sql"; - version = "8635357"; + version = "9d98029"; source = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "8635357363f8b01931ce6abbe0c937aa73e47bf8"; - hash = "sha256-p3R8uGIHyzYnRnKYWpeqMAcuk1xjKlPvB5vllPqUvrs="; + rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149"; + hash = "sha256-Iy5rqNZem1r++aI7vGITzBSFGjdDLGHFOgBWqIgKZX0="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1347,12 +1391,12 @@ }; swift = buildGrammar { language = "swift"; - version = "f94e1d6"; + version = "0fe0de5"; source = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "f94e1d6dd8f4df6c7c8aa07da625e498ebb27d09"; - hash = "sha256-DtcGcywpwCZoGNllZEetE+s1bwMNrRdooGdttAG3Ra0="; + rev = "0fe0de56b528cbf24a654c734ca181b48be3831d"; + hash = "sha256-tU6UTyTR5biS6qBG0z6NbjJQUtZItzzscAKftUAzLq0="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1371,8 +1415,10 @@ t32 = buildGrammar { language = "t32"; version = "f8106fc"; - source = fetchgit { - url = "https://codeberg.org/xasc/tree-sitter-t32"; + source = fetchFromGitea { + domain = "codeberg.org"; + owner = "xasc"; + repo = "tree-sitter-t32"; rev = "f8106fcf5a27f905b3d9d55d9cd3e910bea70c60"; hash = "sha256-hKddSekx67Yqm4+LqVaH8Sf1+73RlCnXE6th2FTHB34="; }; @@ -1390,6 +1436,29 @@ generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; }; + terraform = buildGrammar { + language = "terraform"; + version = "0ff887f"; + source = fetchFromGitHub { + owner = "MichaHoffmann"; + repo = "tree-sitter-hcl"; + rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; + hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA="; + }; + location = "dialects/terraform"; + meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; + }; + thrift = buildGrammar { + language = "thrift"; + version = "999a27d"; + source = fetchFromGitHub { + owner = "duskmoon314"; + repo = "tree-sitter-thrift"; + rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633"; + hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw="; + }; + meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; + }; tiger = buildGrammar { language = "tiger"; version = "a233ebe"; @@ -1403,12 +1472,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "27e6d23"; + version = "d3ef05e"; source = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "27e6d238a5708b0490f43351f6e0baeaab4c9c1f"; - hash = "sha256-4RwHJN1N2DupVIYqWk2sioiiTtEKBmuLT+t+THr71os="; + rev = "d3ef05eec4473094e2d691243aa243ce63de6406"; + hash = "sha256-k5O6VheS8RBrSNk/GBjP3Qun4wY8cbPXxEFU0tCKbuU="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -1482,12 +1551,12 @@ }; v = buildGrammar { language = "v"; - version = "f0aa56e"; + version = "0b03983"; source = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "f0aa56eec7689f08a389c90ad8d3e5e0d18b3cd7"; - hash = "sha256-d69SvXDWxeRk2hvou8MhXUpUrSBwYENqFDGpT/Y5UpM="; + rev = "0b039830a33e759f0c9ee978b47ad10b82d37349"; + hash = "sha256-sQxq/tWNN/aWD3ZmNhil45cnjzfy/2AXn2X/NhzvnKk="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1549,15 +1618,26 @@ }; wgsl = buildGrammar { language = "wgsl"; - version = "61d2604"; + version = "40259f3"; source = fetchFromGitHub { owner = "szebniok"; repo = "tree-sitter-wgsl"; - rev = "61d2604525d47238ecbce8aa38f10cb81ba68fd3"; - hash = "sha256-dSWQAJN9+EyqPbGZv9wTR8upsK56ZWu9jOpJkJtkabs="; + rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65"; + hash = "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA="; }; meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl"; }; + wgsl_bevy = buildGrammar { + language = "wgsl_bevy"; + version = "7cd38d6"; + source = fetchFromGitHub { + owner = "theHamsta"; + repo = "tree-sitter-wgsl-bevy"; + rev = "7cd38d6895060b023353e04f7af099ec64add5d1"; + hash = "sha256-QzfeFzGhWJGD+l+MeKyedRpdZsH+dGKE7UxRmh2uMH0="; + }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; + }; yaml = buildGrammar { language = "yaml"; version = "0e36bed"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix index ca8c4d801c2be..04d83d42c8733 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix @@ -11,7 +11,7 @@ let in mkShell { - packages = [ neovim nix-prefetch python3 ]; + packages = [ neovim nurl python3 ]; NVIM_TREESITTER = nvim-treesitter; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index a780633112674..6963a82d46b64 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -2,8 +2,8 @@ #!nix-shell update-shell.nix -i python import json -import re import subprocess +from concurrent.futures import ThreadPoolExecutor from os import environ from os.path import dirname, join @@ -22,8 +22,6 @@ configs = json.loads( ) ) -regex = re.compile("^https?://(github.com|gitlab.com)/(.+?)/(.+?)(.git)?$") - def generate_grammar(item): lang, lock = item @@ -40,47 +38,8 @@ def generate_grammar(item): version = "{rev[:7]}"; source = """ - m = regex.fullmatch(url) - cmd = ["nix-prefetch", "--rev", rev] - - match m and m.group(1, 2, 3): - case "github.com", owner, repo: - cmd += [ - "fetchFromGitHub", - "--owner", - owner, - "--repo", - repo, - ] - - generated += f"""fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}";""" - - case "gitlab.com", owner, repo: - cmd += [ - "fetchFromGitLab", - "--owner", - owner, - "--repo", - repo, - ] - - generated += f"""fetchFromGitLab {{ - owner = "{owner}"; - repo = "{repo}";""" - - case _: - cmd += ["fetchgit", "--url", url] - generated += f"""fetchgit {{ - url = "{url}";""" - - hash = subprocess.check_output(cmd, text=True).strip() - - generated += f""" - rev = "{rev}"; - hash = "{hash}"; - }};""" + generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True) + generated += ";" location = info.get("location") if location: @@ -101,12 +60,16 @@ def generate_grammar(item): generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit }: +{ buildGrammar, """ + +generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) + +generated_file += """ }: { """ -for generated in map(generate_grammar, lockfile.items()): +for generated in ThreadPoolExecutor().map(generate_grammar, lockfile.items()): generated_file += generated generated_file += "}\n" diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 140a3b317ce9a..d02431e8bfdfe 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -598,6 +598,14 @@ self: super: { ''; }); + mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim nvim-lspconfig ]; + }); + + mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim ]; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; @@ -669,6 +677,10 @@ self: super: { dontBuild = true; }); + vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs (old: { + passthru.python3Dependencies = [ python3.pkgs.mwclient ]; + }); + nvim-spectre = super.nvim-spectre.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); @@ -699,6 +711,13 @@ self: super: { inherit parinfer-rust; + playground = super.playground.overrideAttrs (old: { + dependencies = with self; [ + # we need the 'query' grammer to make + (nvim-treesitter.withPlugins (p: [ p.query ])) + ]; + }); + plenary-nvim = super.plenary-nvim.overrideAttrs (old: { postPatch = '' sed -Ei lua/plenary/curl.lua \ @@ -1033,7 +1052,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-MzacdTuCaBIAyWxH+Uza1KToGZgGPcwMCe5JtQ+68/M="; + cargoSha256 = "sha256-v9RXW5RSPMotRVR/9ljBJ9VNbrLnSkU3zlEU79Xem28="; }; in '' diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 7e5c7380597c7..20336c66ed6ec 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -137,11 +137,15 @@ def main(): subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")]) if editor.nixpkgs_repo: - msg = "vimPlugins.nvim-treesitter: update grammars" - print(f"committing to nixpkgs: {msg}") index = editor.nixpkgs_repo.index - index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) - index.commit(msg) + for diff in index.diff(None): + if diff.a_path == "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix": + msg = "vimPlugins.nvim-treesitter: update grammars" + print(f"committing to nixpkgs: {msg}") + index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) + index.commit(msg) + return + print("no updates to nvim-treesitter grammars") if __name__ == "__main__": diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 42db88668740e..1cd0de9f12495 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -67,14 +67,17 @@ https://github.com/rmagatti/auto-session/,, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/ayu-theme/ayu-vim/,, +https://github.com/taybart/b64.nvim/,HEAD, https://github.com/romgrk/barbar.nvim/,, https://github.com/utilyre/barbecue.nvim/,, https://github.com/chriskempson/base16-vim/,, +https://github.com/jamespwilliams/bat.vim/,HEAD, https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, https://github.com/max397574/better-escape.nvim/,, https://github.com/sblumentritt/bitbake.vim/,, https://github.com/blueballs-theme/blueballs-neovim/,, +https://github.com/nat-418/boole.nvim/,HEAD, https://github.com/turbio/bracey.vim/,, https://github.com/fruit-in/brainfuck-vim/,, https://github.com/famiu/bufdelete.nvim/,, @@ -170,6 +173,7 @@ https://github.com/rhysd/conflict-marker.vim/,, https://github.com/Olical/conjure/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, +https://github.com/zbirenbaum/copilot-cmp/,HEAD, https://github.com/zbirenbaum/copilot.lua/,HEAD, https://github.com/github/copilot.vim/,, https://github.com/ms-jpq/coq.artifacts/,HEAD, @@ -220,6 +224,7 @@ https://github.com/onsails/diaglist.nvim/,, https://github.com/nvim-lua/diagnostic-nvim/,, https://github.com/monaqa/dial.nvim/,HEAD, https://github.com/sindrets/diffview.nvim/,, +https://github.com/elihunter173/dirbuf.nvim/,HEAD, https://github.com/direnv/direnv.vim/,, https://github.com/doki-theme/doki-theme-vim/,, https://github.com/Mofiqul/dracula.nvim/,HEAD, @@ -276,6 +281,7 @@ https://github.com/vim-scripts/gitignore.vim/,, https://github.com/ruifm/gitlinker.nvim/,, https://github.com/lewis6991/gitsigns.nvim/,, https://github.com/gregsexton/gitv/,, +https://github.com/DNLHC/glance.nvim/,HEAD, https://github.com/gleam-lang/gleam.vim/,, https://github.com/ellisonleao/glow.nvim/,, https://github.com/p00f/godbolt.nvim/,HEAD, @@ -374,6 +380,7 @@ https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, https://github.com/Issafalcon/lsp-overloads.nvim/,main, https://github.com/ahmedkhalf/lsp-rooter.nvim/,, https://github.com/nvim-lua/lsp-status.nvim/,, +https://github.com/VonHeikemen/lsp-zero.nvim/,main, https://github.com/nvim-lua/lsp_extensions.nvim/,, https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, @@ -389,10 +396,14 @@ https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, +https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, +https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, +https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/vim-scripts/mayansmoke/,, +https://github.com/chikamichi/mediawiki.vim/,HEAD, https://github.com/echasnovski/mini.nvim/,, https://github.com/wfxr/minimap.vim/,, https://github.com/jose-elias-alvarez/minsnip.nvim/,, @@ -453,6 +464,7 @@ https://github.com/fiatjaf/neuron.vim/,, https://github.com/chr4/nginx.vim/,, https://github.com/EdenEast/nightfox.nvim/,, https://github.com/zah/nim.vim/,, +https://github.com/figsoda/nix-develop.nvim/,HEAD, https://github.com/tamago324/nlsp-settings.nvim/,main, https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, @@ -531,7 +543,8 @@ https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, -https://github.com/p00f/nvim-ts-rainbow/,, +https://github.com/mrjones2014/nvim-ts-rainbow/,, +https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD, https://github.com/kyazdani42/nvim-web-devicons/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/roxma/nvim-yarp/,, @@ -540,6 +553,7 @@ https://github.com/neovim/nvimdev.nvim/,, https://github.com/glepnir/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, +https://github.com/stevearc/oil.nvim/,HEAD, https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, https://github.com/Th3Whit3Wolf/one-nvim/,, https://github.com/navarasu/onedark.nvim/,, @@ -550,6 +564,7 @@ https://github.com/rmehri01/onenord.nvim/,main, https://github.com/tyru/open-browser-github.vim/,, https://github.com/tyru/open-browser.vim/,, https://github.com/nvim-orgmode/orgmode/,, +https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/vuki656/package-info.nvim/,, https://github.com/wbthomason/packer.nvim/,, https://github.com/drewtempelmeyer/palenight.vim/,, @@ -615,6 +630,7 @@ https://github.com/kovisoft/slimv/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, +https://github.com/shaunsingh/solarized.nvim/,HEAD, https://github.com/sainnhe/sonokai/,, https://github.com/chikatoike/sourcemap.vim/,, https://github.com/liuchengxu/space-vim/,, @@ -682,6 +698,7 @@ https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, +https://github.com/chomosuke/term-edit.nvim/,HEAD, https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, https://github.com/ternjs/tern_for_vim/,, @@ -932,6 +949,7 @@ https://github.com/preservim/vim-markdown/,, https://github.com/euclio/vim-markdown-composer/,, https://github.com/mzlogin/vim-markdown-toc/,, https://github.com/andymass/vim-matchup/,, +https://github.com/aquach/vim-mediawiki-editor/,HEAD, https://github.com/samoshkin/vim-mergetool/,, https://github.com/idanarye/vim-merginal/,, https://github.com/david-a-wheeler/vim-metamath/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7c43c0493c5f4..dc3131a4b1357 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -706,6 +706,22 @@ let }; }; + colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "llvm-syntax-highlighting"; + publisher = "colejcummins"; + version = "0.0.3"; + sha256 = "sha256-D5zLp3ruq0F9UFT9emgOBDLr1tya2Vw52VvCc40TtV0="; + }; + meta = with lib; { + description = "Lightweight syntax highlighting for LLVM IR"; + homepage = "https://github.com/colejcummins/llvm-syntax-highlighting"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=colejcummins.llvm-syntax-highlighting"; + maintainers = with lib.maintainers; [ inclyc ]; + license = licenses.mit; + }; + }; + coolbear.systemd-unit-file = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "coolbear"; @@ -762,8 +778,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.48.1"; - sha256 = "sha256-3TpZGvas+pfabHayaA6Yd9nOO2MbfXbCvCiTcbja9Vo="; + version = "0.49.0"; + sha256 = "sha256-Mh/OoRK410aXEr3sK2CYFDsXGSqFT+JOWi9jHOdK01Y="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -998,8 +1014,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.10.3"; - sha256 = "sha256-BTuTTElPYRtbzQvUC3iMYlj7NDkGSDa/IppOGBXjfUM="; + version = "9.10.4"; + sha256 = "sha256-khtyB0Qbm+iuM1GsAaF32YRv1VBTIy7daeCKdgwCIC8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1438,8 +1454,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.12.0"; - sha256 = "sha256-ZwdGcsvmEKDH5ZAkKiLEV/3ru74BittnxibMWbdkaco="; + version = "0.13.0"; + sha256 = "sha256-1uaLFTMvkcYrYAt9qDdISJneKxHo9qsris70iowGW2s="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1483,8 +1499,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.2.0"; - sha256 = "sha256-AAADJkMXsKvpEHBH8+TNM0x3CGEGVtf/b+tce297rkw="; + version = "9.4.4"; + sha256 = "sha256-EA3OABn80GciNecXwLcorWP7K3+jI+wgujpmvvFcNOA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1741,8 +1757,8 @@ let mktplcRef = { publisher = "maximedenes"; name = "vscoq"; - version = "0.3.6"; - sha256 = "sha256-b0gCaEzt5yAj53oLFZSXSD3bum9J1fYes/uf9+OlUek="; + version = "0.3.7"; + sha256 = "sha256-QT+fb23g+IXlNKNAbjADEpqrS6ll2W8Yd0YzwJAjhQQ="; }; meta = with lib; { description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant."; @@ -2229,8 +2245,8 @@ let mktplcRef = { name = "adwaita-theme"; publisher = "piousdeer"; - version = "1.0.8"; - sha256 = "XyzxiwKQGDUIXp6rnt1BmPzfpd1WrG8HnEqYEOJV6P8="; + version = "1.1.0"; + sha256 = "sha256-tKpKLUcc33YrgDS95PJu22ngxhwjqeVMC1Mhhy+IPGE="; }; meta = with lib; { description = "Theme for the GNOME desktop"; @@ -2559,8 +2575,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.12.0"; - sha256 = "sha256-Dhd0QVWdCCvdGKuu8OB4KrBS0XUHWLzRSyreAf7sGLU="; + version = "2.14.0"; + sha256 = "sha256-DvcQ0wNmWqmMen7jYVP0tCDz/wdzBb56An+OaD3d4xA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix index 8aa121cbe2032..f1ce06b7ca0fa 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix @@ -7,8 +7,6 @@ , desktop-file-utils, xprop, xsel }: -with lib; - let # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually libs = [ @@ -118,12 +116,12 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens # which will break when copying over the files. mv dotnet_modules/vsls-agent{,-wrapped} makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \ - --prefix LD_LIBRARY_PATH : "${makeLibraryPath libs}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" \ --set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \ --set DOTNET_ROOT ${dotnet-sdk_3} ''; - meta = { + meta = with lib; { description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; license = licenses.unfree; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index a9f66d8e9d484..6559bc370baff 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -90,7 +90,6 @@ let vscodeDefault = vscode; }; - vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscode; @@ -100,10 +99,41 @@ let inherit lib buildEnv writeShellScriptBin extensionsFromVscodeMarketplace jq; vscodeDefault = vscode; }; + + toExtensionJsonEntry = ext: rec { + identifier = { + id = ext.vscodeExtUniqueId; + uuid = ""; + }; + + version = ext.version; + + location = { + "$mid" = 1; + fsPath = ext.outPath + "/share/vscode/extensions/${ext.vscodeExtUniqueId}"; + path = location.fsPath; + scheme = "file"; + }; + + metadata = { + id = ""; + publisherId = ""; + publisherDisplayName = ext.vscodeExtPublisher; + targetPlatform = "undefined"; + isApplicationScoped = false; + updated = false; + isPreReleaseVersion = false; + installedTimestamp = 0; + preRelease = false; + }; + }; + + toExtensionJson = extensions: builtins.toJSON (map toExtensionJsonEntry extensions); in { inherit fetchVsixFromVscodeMarketplace buildVscodeExtension buildVscodeMarketplaceExtension extensionFromVscodeMarketplace extensionsFromVscodeMarketplace - vscodeWithConfiguration vscodeExts2nix vscodeEnv; + vscodeWithConfiguration vscodeExts2nix vscodeEnv + toExtensionJsonEntry toExtensionJson; } diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index c41fcb4f4e349..1b4f4508fbf0b 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper +, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland @@ -72,7 +72,8 @@ let ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar - (wrapGAppsHook.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) ]; dontBuild = true; @@ -162,6 +163,7 @@ let icu libunwind libuuid + lttng-ust openssl zlib diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 16f723020d8ac..1d684f3ee3f3b 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0xdj5v2n34d6p49ng13qr9d4yyyvqr96qv15la2fda9s7n1s659c"; - x86_64-darwin = "0jgrf534qy39nki0rfc8lrdbdb8ghzarckd3cx9fzq6bw1p2jy1f"; - aarch64-linux = "133577j6i709dq4ircnh2yklylcmy0kgs6lhly7mx8nrag8qi9c1"; - aarch64-darwin = "18346igq8b1d0kywy9alvzm0glb46aalznnhr5mql5rhaana92xw"; - armv7l-linux = "0l0wvgi981ryqbhyh5qalr8lasyf3pg4pzqs9f9hc75ppk4d6sny"; + x86_64-linux = "192csxsvxdnizdi2jnh0w243h54cb4r99y4p9mnck813bnlcplf5"; + x86_64-darwin = "0l5n7ba3gd7f73dag52ccd26076a37jvr5a3npyd0078nby0d5n4"; + aarch64-linux = "073czaap96ddchmsdx7wjqfm68pgimwrngmy2rfgj4b7a0iw3jg6"; + aarch64-darwin = "1nl3xpjw4ci0z0g7jx5z3v9j6l4vka5w1ijsf2qvrwa27pp8n6hk"; + armv7l-linux = "10vcmicrk19qi8l01hkvxlay8gqk5qlkx0kpax0blkk91cifqzg7"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.74.2"; + version = "1.74.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index a9e14f0bfccb0..08219714061d4 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0xbwx218dzf9nyjf531sb9ij0p8lz08yi09yz8dms07qcsfirac0"; - x86_64-darwin = "028i7cbh43ivz5amx015v0d87kh4jj54b3ndirxl57py2gxszy0x"; - aarch64-linux = "1rg67sfp3abpcxrl89db6x3a41la63xinl4kjin8v08w5iprrm0n"; - aarch64-darwin = "0zm057rvabd29ay88l0h40adrc71p9cjvml34aci58klaqd2if0q"; - armv7l-linux = "0amxgq98gifcjr9wfx8ddcjqkb1b6pr5q3dwfdbyynksqqd4hrxv"; + x86_64-linux = "0mm6xa0kizgg2f6cql6jk8h83pn89h6q7rrs1kypvj3j0x6ysqsg"; + x86_64-darwin = "1g9syvinj2mx292wrnrdn2znqhg17mrjqij0z1ilag5bi4xmzhcj"; + aarch64-linux = "0xbq6fla0lxan08jgmsva91cbcv8rhzd7mqixrm1lsqh4h0wpssz"; + aarch64-darwin = "1b4a56j256rib1997g9wwiak206axkppl124qg021vyab42x8rim"; + armv7l-linux = "0gb96hi854kyh8694j9mbgl78f4y68czkwmjxhzb054l5b4adjla"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.74.2.22355"; + version = "1.74.3.23010"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index b748a8dee9763..7cd5b4e267d65 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, buildEnv, vscode, makeWrapper, writeText +{ lib, stdenv, runCommand, buildEnv, vscode, vscode-utils, makeWrapper, writeTextFile , vscodeExtensions ? [] }: /* @@ -46,44 +46,15 @@ let wrappedPkgVersion = lib.getVersion vscode; wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name; - toExtensionJsonEntry = drv: rec { - identifier = { - id = "${drv.vscodeExtPublisher}.${drv.vscodeExtName}"; - uuid = ""; - }; - - version = drv.version; - - location = { - "$mid" = 1; - fsPath = drv.outPath + "/share/vscode/extensions/${drv.vscodeExtUniqueId}"; - path = location.fsPath; - scheme = "file"; - }; - - metadata = { - id = identifier.uuid; - publisherId = ""; - publisherDisplayName = drv.vscodeExtPublisher; - targetPlatform = "undefined"; - isApplicationScoped = false; - updated = false; - isPreReleaseVersion = false; - installedTimestamp = 0; - preRelease = false; - }; + extensionJsonFile = writeTextFile { + name = "vscode-extensions-json"; + destination = "/share/vscode/extensions/extensions.json"; + text = vscode-utils.toExtensionJson vscodeExtensions; }; - extensionJson = builtins.toJSON (map toExtensionJsonEntry vscodeExtensions); - extensionJsonFile = writeText "extensions.json" extensionJson; - extensionJsonOutput = runCommand "vscode-extensions-json" {} '' - mkdir -p $out/share/vscode/extensions - cp ${extensionJsonFile} $out/share/vscode/extensions/extensions.json - ''; - combinedExtensionsDrv = buildEnv { name = "vscode-extensions"; - paths = vscodeExtensions ++ [ extensionJsonOutput ]; + paths = vscodeExtensions ++ [ extensionJsonFile ]; }; extensionsFlag = '' @@ -91,8 +62,6 @@ let ''; in -# When no extensions are requested, we simply redirect to the original -# non-wrapped vscode executable. runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ vscode ]; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 094274aa7bd7b..09bc1793818a6 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1403"; + version = "1503"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-hG0ZRAxWOdFtDgKcDysu89LOdULZmJHLi7grfVjAbwM="; + sha256 = "sha256-tRS01z2SnWTDDUfQxZTWiagQuIULDA4aQ8390ZFBqn0="; }; installPhase = '' diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 78afd4db38350..36d2dfe1ff332 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , pkg-config +, which , wrapGAppsHook , libicns , SDL2 @@ -24,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "130.1"; + version = "131"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; rev = "v${finalAttrs.version}"; - hash = "sha256-q2wDpbNaDyKPBL20FDaHScKQEJYstlQdJ4CzbRoSPlk="; + hash = "sha256-gex53bh/175/i0cMimcPO26C6cxqQGPo4sp2bxh1sAw="; }; patches = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config + which wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ libicns @@ -72,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "hiro=gtk3" ] ++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" + "lto=false" "vulkan=false" ] ++ [ "local=false" diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix index cbcdad4a3c2bb..a501139ff47bd 100644 --- a/pkgs/applications/emulators/dgen-sdl/default.nix +++ b/pkgs/applications/emulators/dgen-sdl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://dgen.sourceforge.net/"; + homepage = "https://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 17a3049ea4f06..83da181f24b4f 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -23,6 +23,7 @@ , mbedtls_2 , soundtouch , sfml +, minizip-ng , xz , hidapi , fmt_8 @@ -52,13 +53,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-17269"; + version = "5.0-17995"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "48c9c224cf9f82f0f9f2690b7cc6283d7448480c"; - sha256 = "sha256-WC3jukRygZigLx987CzRmOmJ7DeS1atXrMzU98sRzEg="; + rev = "8bad821019721b9b72701b495da95656ace5fea5"; + sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8="; fetchSubmodules = true; }; @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { mbedtls_2 soundtouch sfml + minizip-ng xz qtbase fmt_8 @@ -131,10 +133,12 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = lib.optionals stdenv.isLinux [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways "--set QT_QPA_PLATFORM xcb" + # https://bugs.dolphin-emu.org/issues/12913 + "--set QT_XCB_NO_XI2 1" ]; # Use nix-provided libraries instead of submodules diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index fffbb3ac93266..0f48dd71e6c45 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -15,6 +15,7 @@ , qtbase , qtsvg , qttools +, qtwayland , vulkan-loader , wayland , wrapQtAppsHook @@ -23,23 +24,25 @@ stdenv.mkDerivation { pname = "duckstation"; - version = "unstable-2022-12-08"; + version = "unstable-2023-01-01"; src = fetchFromGitHub { owner = "stenzek"; repo = "duckstation"; - rev = "1905ce3e0163fd53e56cc949379f74a2e1c6228d"; - sha256 = "sha256-q6r9VCGwYCTzyZ3s1BAhQiA8FKsue7QUcErGtuLJbCg="; + rev = "06d6447e59f208f21ba42f4df1665b789db13fb7"; + sha256 = "sha256-DyuQ7J7MVSQHpvPZhMtwqNM8ifjI8UFYQ9SxY5kikBI="; }; nativeBuildInputs = [ cmake - extra-cmake-modules copyDesktopItems ninja pkg-config qttools wrapQtAppsHook + ] + ++ lib.optionals enableWayland [ + extra-cmake-modules ]; buildInputs = [ @@ -52,7 +55,10 @@ stdenv.mkDerivation { qtsvg vulkan-loader ] - ++ lib.optionals enableWayland [ wayland ]; + ++ lib.optionals enableWayland [ + qtwayland + wayland + ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" @@ -93,9 +99,7 @@ stdenv.mkDerivation { runHook postCheck ''; - # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ - "--set QT_QPA_PLATFORM xcb" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix index 9c7261f093014..80910700da933 100644 --- a/pkgs/applications/emulators/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -4,17 +4,18 @@ , cmake , libelf , libpcap +, nix-update-script }: stdenv.mkDerivation rec { pname = "dynamips"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "1fjjjdaxlw1k95kyq73fndn21qfhrm4cn79av0i4sn7anhg8m83f"; + hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; }; nativeBuildInputs = [ cmake ]; @@ -22,6 +23,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { inherit (src.meta) homepage; description = "A Cisco router emulator"; diff --git a/pkgs/applications/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix index 35e28ba55f6ae..91aec6d52ed61 100644 --- a/pkgs/applications/emulators/fuse-emulator/default.nix +++ b/pkgs/applications/emulators/fuse-emulator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://fuse-emulator.sourceforge.net/"; + homepage = "https://fuse-emulator.sourceforge.net/"; description = "ZX Spectrum emulator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/mame/001-use-absolute-paths.diff b/pkgs/applications/emulators/mame/001-use-absolute-paths.diff index 35ed10d181720..e349cacb2d962 100644 --- a/pkgs/applications/emulators/mame/001-use-absolute-paths.diff +++ b/pkgs/applications/emulators/mame/001-use-absolute-paths.diff @@ -1,32 +1,29 @@ ---- a/src/emu/emuopts.cpp 2022-10-29 15:05:18.591381088 +0200 -+++ b/src/emu/emuopts.cpp 2022-10-29 15:10:10.938037551 +0200 -@@ -39,16 +39,16 @@ +diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp +index 3defd33d0bb..33daacc4fc8 100644 +--- a/src/emu/emuopts.cpp ++++ b/src/emu/emuopts.cpp +@@ -39,16 +39,16 @@ const options_entry emu_options::s_option_entries[] = { nullptr, nullptr, core_options::option_type::HEADER, "CORE SEARCH PATH OPTIONS" }, - { OPTION_PLUGINDATAPATH, ".", core_options::option_type::STRING, "path to base folder for plugin data (read/write)" }, - { OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::STRING, "path to ROM sets and hard disk images" }, -- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::STRING, "path to software definition files" }, -- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::STRING, "path to audio sample sets" }, -- { OPTION_ARTPATH, "artwork", core_options::option_type::STRING, "path to artwork files" }, -- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::STRING, "path to controller definitions" }, -- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::STRING, "path to ini files" }, -- { OPTION_FONTPATH, ".", core_options::option_type::STRING, "path to font files" }, -+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mamePath@/hash", core_options::option_type::STRING, "path to software definition files" }, -+ { OPTION_SAMPLEPATH ";sp", "samples;@mamePath@/samples", core_options::option_type::STRING, "path to audio sample sets" }, -+ { OPTION_ARTPATH, "artwork;@mamePath@/artwork", core_options::option_type::STRING, "path to artwork files" }, -+ { OPTION_CTRLRPATH, "ctrlr;@mamePath@/ctrlr", core_options::option_type::STRING, "path to controller definitions" }, -+ { OPTION_INIPATH, ".;ini;ini/presets;@mamePath@/ini/presets", core_options::option_type::STRING, "path to ini files" }, -+ { OPTION_FONTPATH, ".;@mamePath@", core_options::option_type::STRING, "path to font files" }, - { OPTION_CHEATPATH, "cheat", core_options::option_type::STRING, "path to cheat files" }, - { OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::STRING, "path to crosshair files" }, -- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::STRING, "path to plugin files" }, -- { OPTION_LANGUAGEPATH, "language", core_options::option_type::STRING, "path to UI translation files" }, -+ { OPTION_PLUGINSPATH, "plugins;@mamePath@/plugins", core_options::option_type::STRING, "path to plugin files" }, -+ { OPTION_LANGUAGEPATH, "language;@mamePath@/language", core_options::option_type::STRING, "path to UI translation files" }, - { OPTION_SWPATH, "software", core_options::option_type::STRING, "path to loose software" }, + { OPTION_PLUGINDATAPATH, ".", core_options::option_type::PATH, "path to base folder for plugin data (read/write)" }, + { OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::MULTIPATH, "path to ROM sets and hard disk images" }, +- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::MULTIPATH, "path to software definition files" }, +- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::MULTIPATH, "path to audio sample sets" }, +- { OPTION_ARTPATH, "artwork", core_options::option_type::MULTIPATH, "path to artwork files" }, +- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::MULTIPATH, "path to controller definitions" }, +- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::MULTIPATH, "path to ini files" }, +- { OPTION_FONTPATH, ".", core_options::option_type::MULTIPATH, "path to font files" }, ++ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mamePath@/hash", core_options::option_type::MULTIPATH, "path to software definition files" }, ++ { OPTION_SAMPLEPATH ";sp", "samples;@mamePath@/samples", core_options::option_type::MULTIPATH, "path to audio sample sets" }, ++ { OPTION_ARTPATH, "artwork;@mamePath@/artwork", core_options::option_type::MULTIPATH, "path to artwork files" }, ++ { OPTION_CTRLRPATH, "ctrlr;@mamePath@/ctrlr", core_options::option_type::MULTIPATH, "path to controller definitions" }, ++ { OPTION_INIPATH, ".;ini;ini/presets;@mamePath@/ini/presets", core_options::option_type::MULTIPATH, "path to ini files" }, ++ { OPTION_FONTPATH, ".;@mamePath@", core_options::option_type::MULTIPATH, "path to font files" }, + { OPTION_CHEATPATH, "cheat", core_options::option_type::MULTIPATH, "path to cheat files" }, + { OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::MULTIPATH, "path to crosshair files" }, +- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::MULTIPATH, "path to plugin files" }, +- { OPTION_LANGUAGEPATH, "language", core_options::option_type::MULTIPATH, "path to UI translation files" }, ++ { OPTION_PLUGINSPATH, "plugins;@mamePath@/plugins", core_options::option_type::MULTIPATH, "path to plugin files" }, ++ { OPTION_LANGUAGEPATH, "language;@mamePath@/language", core_options::option_type::MULTIPATH, "path to UI translation files" }, + { OPTION_SWPATH, "software", core_options::option_type::MULTIPATH, "path to loose software" }, // output directory options -@@ -1301,3 +1301,4 @@ - m_entry = entry; - return entry; - } -+ diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 760b9e63d282a..084bf07454298 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -39,14 +39,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.250"; + version = "0.251"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - sha256 = "sha256-jexs/1ovRk9Is5orD7hT9fN+dYm+WA+57aZ6JH7zjL4="; + hash = "sha256-x+QV4gunnERBHyYB2fXJ2LvMv437Z2omvk+fYkmZfqA="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 6e389b8daf640..06ef3d99088ee 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -1,40 +1,50 @@ { lib , fetchFromGitHub -, mkDerivation +, stdenv , cmake -, libepoxy +, extra-cmake-modules , libarchive , libpcap , libslirp , pkg-config , qtbase +, qtmultimedia , SDL2 +, wayland +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "melonDS"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "sha256-FSacau7DixU6R4eKNIYVRZiMb/GhijTzHbcGlZ6WG/I="; + sha256 = "sha256-n4Vkxb/7fr214PgB6VFNgH1tMDgTBS/UHUQ6V4uGkDA="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ - libepoxy libarchive libslirp qtbase + qtmultimedia SDL2 + wayland ]; qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; meta = with lib; { - homepage = "http://melonds.kuribo64.net/"; + homepage = "https://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; license = licenses.gpl3Plus; maintainers = with maintainers; [ artemist benley shamilton xfix ]; diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index d8aec3aa54c26..fc568275d330d 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -3,30 +3,36 @@ , fetchFromGitHub , SDL2 , cmake -, ffmpeg +, ffmpeg_4 , imagemagick , libedit , libelf , libepoxy , libzip -, lua +, lua5_4 , minizip , pkg-config -, qtbase -, qtmultimedia -, qttools -, wrapQtAppsHook +, libsForQt5 }: +let + ffmpeg = ffmpeg_4; + lua = lua5_4; + inherit (libsForQt5) + qtbase + qtmultimedia + qttools + wrapQtAppsHook; +in stdenv.mkDerivation (finalAttrs: { pname = "mgba"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = finalAttrs.version; - hash = "sha256-2thc2v3aD8t1PrREZIjzRuYfP7b3BA7uFb6R95zxsZI="; + hash = "sha256-oWrgYrN7s5tdGJ/GhA2ZaKDVqZq9411fHSoYnLKWDl8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix index 22173fe9e0853..bd9503f017789 100644 --- a/pkgs/applications/emulators/pcem/default.nix +++ b/pkgs/applications/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config +{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config, gtk3, wrapGAppsHook , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "067pbnc15h6a4pnnym82klr1w8qwfm6p0pkx93gx06wvwqsxvbdv"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ wxGTK32 coreutils SDL2 openal ] + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ wxGTK32 coreutils SDL2 openal gtk3 ] ++ lib.optional withALSA alsa-lib; configureFlags = [ "--enable-release-build" ] diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 1d3e0bb126e81..b300dc08268ae 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -38,14 +38,14 @@ in + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.14.1"; + version = "1.14.4"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-WGTPd3xcFk4E/Wf+DEv4pzGYf0dppzV3vUTwrYmZ2YM="; + sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; }; postPatch = '' diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 5c18d47daa8a5..7befac996fedf 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -33,12 +33,15 @@ , nvidia_cg_toolkit , pkg-config , python3 +, qtbase , retroarch-assets , SDL2 +, spirv-tools , substituteAll , udev , vulkan-loader , wayland +, wrapQtAppsHook , zlib }: @@ -71,7 +74,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ] ++ + nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++ lib.optional withWayland wayland ++ lib.optional (runtimeLibs != [ ]) makeWrapper; @@ -84,7 +87,9 @@ stdenv.mkDerivation rec { libxml2 mbedtls_2 python3 + qtbase SDL2 + spirv-tools zlib ] ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix index e95b22d07f555..3966be9e76a18 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/applications/emulators/ripes/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "ripes"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "mortbopet"; repo = "Ripes"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-HdvLi3OKJmr+U/dxCGmq6JR91dWpUL3uoPumH2/B46k="; + sha256 = "sha256-fRkab0G2zjK1VYzH21yhL7Cr0rS4I8ir8gwH9ALy60A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index b88e5f2647290..93d7a58e3cf4d 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14358-a00f9e421"; - rpcs3Version = "0.0.25-14358-a00f9e421"; - rpcs3Revision = "a00f9e42115527aa9654870f194cf2c64329f2ef"; - rpcs3Sha256 = "0avajihbs02nbfqs4kzgckl0v2z4z8h8fgcjs5m4zxvkgj5701nv"; + rpcs3GitVersion = "14599-d3183708e"; + rpcs3Version = "0.0.26-14599-d3183708e"; + rpcs3Revision = "d3183708e81ba2707d39829cc1c0cb226dd9e50e"; + rpcs3Sha256 = "0lx9v614r9afmfknw9qdwawwayg3z0fj6chbhnfghm2j2zgqqbpi"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 80dc86643eb88..3ae67cd7132e0 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2022-09-26"; + version = "nightly-2022-12-16"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "sha256-o0geKXODFRPKN4JgW+Sg16uPhBS5rrlMCmFSc9AcNPQ="; + sha256 = "sha256-VOaXn/dJB0AbuZ8owBbUYEPrL/H8DM73MhwhBjxq2Pg="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { "''${gappsWrapperArgs[@]}" ''; - cargoSha256 = "sha256-erqBuU66k7SGG9ueyYEINjeXbyC7A2I/r1bBqdsJemY="; + cargoSha256 = "sha256-h5qshincT48zYvbNLMXcvxw7Ovupnn9c93lpqY7oNtc="; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index 69137cb8f0304..54a544fc60040 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wibo"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "decompals"; repo = "wibo"; rev = version; - hash = "sha256-dpfKSiIWE9L5BLPH2t8RsUz7Ufkdo/5zn1dewaEgJl0="; + hash = "sha256-J5h/RpF+twb5fBjSDQMVB5SoTWWs8VD/EUuikuj73YA="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta.license = lib.licenses.unfree; }; in lib.optionalString doCheck '' - MWCIncludes=. ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c + MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c file test.o | grep "ELF 32-bit" ''; diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 7f17077132584..3a20726b9b428 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.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VKesly7Jp1PgukArNKvDGzSRh7DaL3A/Dub3dLR6ET4="; + sha256 = "sha256-VQTZj2BCdV2TnXrYRaJqrf9sR35zsojmeoe7t+I3kyQ="; }; - cargoSha256 = "sha256-7+4SIBnu4R2mbH2nWBX9BmJL1n8t46d1vrMpNaUHAo4="; + cargoSha256 = "sha256-jH2BaPiGanBOlOU7JQZ0c0ObCaVURpjvmx2m92Fbdm4="; nativeBuildInputs = [ pkg-config ]; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { zstd ]; - checkInputs = [ zoxide ]; + nativeCheckInputs = [ zoxide ]; buildFeatures = [ "zstd/pkg-config" ]; diff --git a/pkgs/applications/file-managers/llama/default.nix b/pkgs/applications/file-managers/llama/default.nix index 8f3f2c73ff8f5..a4729c49bdb5b 100644 --- a/pkgs/applications/file-managers/llama/default.nix +++ b/pkgs/applications/file-managers/llama/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "llama"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "llama"; rev = "v${version}"; - sha256 = "sha256-32UyFy269rifw4Hjw18FO0F79sDNW8dgJ2MdGXSzLWo="; + sha256 = "sha256-mJUxi2gqTMcodznCUDb2iB6j/p7bMUhhBLtZMbvfE1c="; }; - vendorSha256 = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ="; + vendorHash = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ="; meta = with lib; { description = "Terminal file manager"; diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 9204aad535ea3..8b54d79622a42 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -16,7 +16,6 @@ , libssh2 , openssl , coreutils -, autoreconfHook , autoSignDarwinBinariesHook # updater only @@ -25,23 +24,14 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.28"; + version = "4.8.29"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM="; + sha256 = "sha256-AdijuU9YGAzKW/FyV7UHjR/W/SeptcDpcOx2dUlUCtQ="; }; - patches = [ - # Add support for PERL_FOR_BUILD to fix cross-compilation: - # https://midnight-commander.org/ticket/4399 - (fetchurl { - url = "https://midnight-commander.org/raw-attachment/ticket/4399/0001-configure.ac-introduce-PERL_FOR_BUILD.patch"; - hash = "sha256-i4cbg/pner+yPfgmP04DEIvpNDlM9YDca1TNBdhWhwI="; - }) - ]; - - nativeBuildInputs = [ pkg-config autoreconfHook unzip ] + nativeBuildInputs = [ pkg-config unzip ] # The preFixup hook rewrites the binary, which invaliates the code # signature. Add the fixup hook to sign the output. ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index 95f85430ba0b5..a192edb0b32aa 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; propagatedBuildInputs = [ less file diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 9ae2d97a3d288..51aa407b04a4a 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -51,7 +51,7 @@ let inherit version; sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; - checkInputs = old.checkInputs ++ (with self; [ + nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests ]); disabledTests = old.disabledTests ++ [ diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index e11df27ab6c32..a3d3fda59122f 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -28,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -72,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.13"; + version = "3.22.14"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-l9UaxPBTkKrTygise0nVBDrPX3aRRW62HtIYwrtYp3Q="; + hash = "sha256-VT85cVeKuHQCGQokID9yrbents7ewHK1j7I17oFTvlo="; }; passthru = { @@ -109,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d @@ -132,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 9f445facb1673..929a40d6daab3 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -28,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -109,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d @@ -132,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index fc940cfce3018..59794b88a4fd3 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -31,11 +31,11 @@ mkDerivation rec { pname = "saga"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-v6DPwV20fcsznrEaFJk0/ewU4z3cTjzYYuLkyMwSLV0="; + sha256 = "sha256-JzSuu1wGfCkxIDcTbP5jpHtJNvl8eAP3jznXvwSPeY0="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d66fee8ab717e..d5d64aef6d86c 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-55"; + version = "7.1.0-57"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-V0poyS1QnHhnSc3QbHHE+BctCBv2knriK0ihMF565d8="; + hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/apngasm/2.nix b/pkgs/applications/graphics/apngasm/2.nix index 0313115ddfa8f..81d2915c96df2 100644 --- a/pkgs/applications/graphics/apngasm/2.nix +++ b/pkgs/applications/graphics/apngasm/2.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create highly optimized Animated PNG files from PNG/TGA images"; - homepage = "http://apngasm.sourceforge.net/"; + homepage = "https://apngasm.sourceforge.net/"; license = licenses.zlib; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index e3b966353ffe9..502aeddf81464 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://autotrace.sourceforge.net/"; + homepage = "https://autotrace.sourceforge.net/"; description = "Utility for converting bitmap into vector graphics"; platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/applications/graphics/blockbench-electron/default.nix b/pkgs/applications/graphics/blockbench-electron/default.nix index 1968756496bbb..5afd0f1d876fc 100644 --- a/pkgs/applications/graphics/blockbench-electron/default.nix +++ b/pkgs/applications/graphics/blockbench-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_16 }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_22 }: stdenv.mkDerivation rec { pname = "blockbench-electron"; - version = "4.1.1"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; - sha256 = "0mqdkjhmylrjjfrm05jv1967qqka5263fgcn9qzax08gcq93s18f"; + sha256 = "sha256-uUgVBdYMCF31+L/FV4ADIpUdEAmnW59KfscQxUStPWM="; name = "${pname}-${version}.AppImage"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_16}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A boxy 3D model editor powered by Electron"; homepage = "https://blockbench.net/"; license = licenses.gpl3Only; - maintainers = [ maintainers.ckie ]; + maintainers = with maintainers; [ ckie ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 095905ff06d8a..00733e8a603b9 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; - homepage = "http://comical.sourceforge.net/"; + homepage = "https://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ viric wegank ]; platforms = with lib.platforms; unix; diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index bb157ad18db03..f63b3b1709c04 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -37,7 +37,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest pytest-xvfb pytest-mock diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c9d5afce614ca..cc727a9a85093 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -27,6 +27,7 @@ , libpng , librsvg , libtiff +, libjxl , openexr_3 , osm-gps-map , pkg-config @@ -57,12 +58,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.2.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl"; + sha256 = "18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { libpng librsvg libtiff + libjxl openexr_3 sqlite libxslt diff --git a/pkgs/applications/graphics/dia/CVE-2019-19451.patch b/pkgs/applications/graphics/dia/CVE-2019-19451.patch deleted file mode 100644 index 28d6598330a3a..0000000000000 --- a/pkgs/applications/graphics/dia/CVE-2019-19451.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru a/app/app_procs.c b/app/app_procs.c ---- a/app/app_procs.c 2021-01-30 11:09:52.000000000 -0500 -+++ b/app/app_procs.c 2021-01-30 11:11:05.000000000 -0500 -@@ -785,6 +785,7 @@ - - if (!filename) { - g_print (_("Filename conversion failed: %s\n"), filenames[i]); -+ ++i; - continue; - } - diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index d391ca75544d7..6b75bf11d423d 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,40 +1,68 @@ -{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages, -libxml2, gettext, python2, libxml2Python, docbook5, docbook_xsl, -libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, -gtk-mac-integration-gtk2 }: +{ lib +, stdenv +, fetchFromGitLab +, appstream-glib +, cmake +, dblatex +, desktop-file-utils +, graphene +, gtk2 +, gtk-mac-integration-gtk2 +, intltool +, libxml2 +, libxslt +, meson +, ninja +, pkg-config +, poppler +, python3 + # Building with docs are failing in unstable-2022-12-14 +, withDocs ? false +}: stdenv.mkDerivation { pname = "dia"; - version = "0.97.3.20170622"; + version = "unstable-2022-12-14"; - src = fetchgit { - url = "https://gitlab.gnome.org/GNOME/dia.git"; - rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c"; - sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; + src = fetchFromGitLab { + owner = "GNOME"; + repo = "dia"; + domain = "gitlab.gnome.org"; + rev = "4a619ec7cc93be5ddfbcc48d9e1572d04943bcad"; + hash = "sha256-xi45Ak4rlDQjs/FNkdkm145mx76GNHjE6Nrs1dc94ww="; }; - patches = [ - ./CVE-2019-19451.patch - ]; - - buildInputs = - [ gtk2 libxml2 gettext python2 libxml2Python docbook5 - libxslt docbook_xsl libart_lgpl ] - ++ lib.optional withGNOME libgnomeui - ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; - - nativeBuildInputs = [ autoconf automake libtool pkg-config intltool ] - ++ (with perlPackages; [ perl XMLParser ]); + patches = [ ./poppler-22_09-build-fix.patch ]; preConfigure = '' - NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough + patchShebangs . ''; - configureFlags = lib.optional withGNOME "--enable-gnome"; - # error: implicitly declaring library function 'finite' with type 'int (double)' - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; + buildInputs = [ + graphene + gtk2 + libxml2 + python3 + poppler + ] ++ + lib.optionals withDocs [ + libxslt + ] ++ + lib.optionals stdenv.isDarwin [ + gtk-mac-integration-gtk2 + ]; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + intltool + meson + ninja + pkg-config + ] ++ + lib.optionals withDocs [ + dblatex + ]; meta = with lib; { description = "Gnome Diagram drawing software"; diff --git a/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch b/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch new file mode 100644 index 0000000000000..c461d8a642912 --- /dev/null +++ b/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch @@ -0,0 +1,93 @@ +diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp +index 189737908..a2a479693 100644 +--- a/plug-ins/pdf/pdf-import.cpp ++++ b/plug-ins/pdf/pdf-import.cpp +@@ -152,12 +152,12 @@ public : + void + updateLineDash (GfxState *state) + { +- double *dashPattern; +- int dashLength; +- double dashStart; +- +- state->getLineDash (&dashPattern, &dashLength, &dashStart); +- this->dash_length = dashLength ? dashPattern[0] * scale : 1.0; ++ const double *dashPattern=NULL; ++ int dashLength=0; ++ double dashStart=0; ++ const std::vector<double> &dash = state->getLineDash(&dashStart); // > Poppler 22.09 ... ++ dashPattern = dash.data(); ++ dashLength = dash.size(); + + if (dashLength == 0) + this->line_style = DIA_LINE_STYLE_SOLID; +@@ -318,10 +318,11 @@ public : + //FIXME: Dia is really unhappy about zero size fonts + if (!(state->getFontSize() > 0.0)) + return; +- GfxFont *f = state->getFont(); ++ const std::shared_ptr<GfxFont> f = state->getFont(); // poppler 22.05 ... header changed ++ gconstpointer f1 = &f; // GLib typedef const void * gconstpointer; + + // instead of building the same font over and over again +- if (g_hash_table_lookup (this->font_map, f)) { ++ if (g_hash_table_lookup (this->font_map, f1)) { + ++font_map_hits; + return; + } +@@ -333,8 +334,9 @@ public : + gchar *family = g_strdup (f->getFamily() ? f->getFamily()->c_str() : "sans"); + + // we are (not anymore) building the same font over and over again ++ f1 = &f; + g_print ("Font 0x%x: '%s' size=%g (* %g)\n", +- GPOINTER_TO_INT (f), family, state->getTransformedFontSize(), scale); ++ GPOINTER_TO_INT (f1), family, state->getTransformedFontSize(), scale); + + // now try to make a fontname Dia/Pango can cope with + // strip style postfix - we already have extracted the style bits above +@@ -354,7 +356,9 @@ public : + fsize *= fabs(fm[3] / fm[0]); + font = dia_font_new (family, style, fsize * scale / 0.8); + +- g_hash_table_insert (this->font_map, f, font); ++ f1 = &f; ++ gpointer f2 = (gpointer)f1; // GLib typedef void* gpointer; ++ g_hash_table_insert (this->font_map, f2, font); + g_free (family); + } + void updateTextShift(GfxState *state, double shift) +@@ -721,11 +725,12 @@ DiaOutputDev::drawString(GfxState *state, GooString *s) + return; + if (!(state->getFontSize() > 0.0)) + return; +- font = (DiaFont *)g_hash_table_lookup (this->font_map, state->getFont()); ++ gconstpointer f_1 = &state->getFont(); ++ font = (DiaFont *)g_hash_table_lookup (this->font_map, f_1); + + // we have to decode the string data first + { +- GfxFont *f = state->getFont(); ++ const std::shared_ptr<GfxFont> f = state->getFont(); + const char *p = s->c_str(); + CharCode code; + int j = 0, m, n; +@@ -870,8 +875,8 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_ + std::unique_ptr<PDFDoc> doc; + GooString *fileName = new GooString(filename); + // no passwords yet +- GooString *ownerPW = NULL; +- GooString *userPW = NULL; ++ const std::optional<GooString> ownerPW; ++ const std::optional<GooString> userPW; + gboolean ret = FALSE; + + // without this we will get strange crashes (at least with /O2 build) +@@ -899,6 +904,7 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_ + delete diaOut; + ret = TRUE; + } ++ doc.reset(); + delete fileName; + + return ret; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 244f0c27648fe..6386c39ce910f 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; - homepage = "http://djvu.sourceforge.net/djview4.html"; + homepage = "https://djvu.sourceforge.net/djview4.html"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index e5e77dccbbb42..b03073349f3f4 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-xdist responses ]; diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 09d51db254bac..76409860ffa99 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -25,7 +25,7 @@ # optional server deps , libmicrohttpd , libsodium -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd ? null # options diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index 32098c977044f..41999239af1ae 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; - rev = version; - hash = "sha256-bOpwHaFOoUlh+yyC1go6BeFxfJhUmwZPi6kYAqCagEI="; + rev = "v${version}"; + hash = "sha256-sDrMIryVFkjMGHbYvNDmKb1HyJNGb3Hd+muxUJKhogE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-TkdOq+icU2zNbXzN6nbkXjL1o/Lfumqr/5S0pQaxY5Q="; + hash = "sha256-mztc44hHdqzR3WbG6tkCL38EfgBajRLlpMC8ElpXnlo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 70f83e9a2f2cf..428ddc5073dae 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { --add-flags '--theme=feh' ''; - checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); + nativeCheckInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); doCheck = true; meta = with lib; { diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 984d67f6ba7b9..80e13fda9222a 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool to convert Xfig files to other formats"; - homepage = "http://mcj.sourceforge.net/"; + homepage = "https://mcj.sourceforge.net/"; license = licenses.xfig; platforms = platforms.unix; maintainers = with maintainers; [ lesuisse ]; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 70d35ed671bb7..535b177bd7bd2 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { openssl.dev racket_7_9 ]; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ sconsPackages.scons_latest ]; patches = [ ./fix-build.patch ]; sconsFlags = [ diff --git a/pkgs/applications/graphics/fluxus/fix-build.patch b/pkgs/applications/graphics/fluxus/fix-build.patch index 7810dd59e3572..b19ed9c2cbc7b 100644 --- a/pkgs/applications/graphics/fluxus/fix-build.patch +++ b/pkgs/applications/graphics/fluxus/fix-build.patch @@ -1,11 +1,20 @@ diff --git a/SConstruct b/SConstruct -index 32cb644..0b3a208 100644 +index 32cb644..650333a 100644 --- a/SConstruct +++ b/SConstruct -@@ -225,6 +225,11 @@ if env['PLATFORM'] == 'posix': +@@ -6,7 +6,7 @@ + # application, then calls the sconscripts for libfluxus and + # the fluxus Racket modules + +-import os, os.path, sys, commands, subprocess ++import os, os.path, sys, subprocess + + MajorVersion = "0" + MinorVersion = "19" +@@ -225,13 +225,18 @@ if env['PLATFORM'] == 'posix': ["asound", "alsa/asoundlib.h"], ["openal", "AL/al.h"]] - + +env.Append(ENV={'PATH': ' ' + os.environ['PATH'], }) +env.Append(LIBPATH=ARGUMENTS.get('LIBPATH', '').split(':')) +env.Append(CCFLAGS=' ' + os.environ.get('NIX_CFLAGS_COMPILE','')) @@ -13,4 +22,75 @@ index 32cb644..0b3a208 100644 + ################################################################################ # Make sure we have these libraries availible - + + if not GetOption('clean'): +- print '--------------------------------------------------------' +- print 'Fluxus: Configuring Build Environment' +- print '--------------------------------------------------------' ++ print('--------------------------------------------------------') ++ print('Fluxus: Configuring Build Environment') ++ print('--------------------------------------------------------') + # detect ode precision + if not GetOption('clean'): + try: +@@ -240,27 +245,27 @@ if not GetOption('clean'): + if isinstance(ode_str[0], str): + env.MergeFlags(ode_str[0]) + except: +- print 'WARNING: unable to run ode-config, cannot detect ODE precision' ++ print('WARNING: unable to run ode-config, cannot detect ODE precision') + + conf = Configure(env) + + # check Racket and OpenAL frameworks on osx + if env['PLATFORM'] == 'darwin': + if not conf.CheckHeader('scheme.h'): +- print "ERROR: 'racket3m' must be installed!" ++ print("ERROR: 'racket3m' must be installed!") + Exit(1) + if racket_framework: + LibList = filter(lambda x: x[0] != 'racket3m', LibList) + # OpenAL should be installed everywhere + if not conf.CheckHeader('OpenAL/al.h'): +- print "ERROR: 'OpenAL' must be installed!" ++ print("ERROR: 'OpenAL' must be installed!") + Exit(1) + + # all libraries are required, and some of them require each other, + # hence the order is important, and autoadd=1 + for (lib,headers) in LibList: + if not conf.CheckLibWithHeader(lib, headers, 'C', autoadd = 1): +- print "ERROR: '%s' must be installed!" % (lib) ++ print("ERROR: '%s' must be installed!" % (lib)) + Exit(1) + + if not conf.CheckFunc("dInitODE2"): +@@ -334,7 +339,7 @@ if not GetOption('clean'): + ]) + + if raco_status != 0: +- print "ERROR: Failed to run command 'raco'" ++ print("ERROR: Failed to run command 'raco'") + Exit(1) + + +@@ -377,8 +382,8 @@ if not GetOption('clean') and static_modules: + + app_env['LIBS'].remove("pthread") + app_env['LIBS'].remove("dl") +- app_env['LIBS'].remove("ode") +- app_env['LIBS'].remove("sndfile") ++ app_env['LIBS'].remove("ode") ++ app_env['LIBS'].remove("sndfile") + + # now go through the rest of the libs, removing them from + # the environment at the same time +@@ -425,7 +430,7 @@ SConscript(dirs = build_dirs, + if not GetOption('clean'): + helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap") + if helpmap_status != 0: +- print "ERROR: Failed to build 'docs/helpmap'" ++ print("ERROR: Failed to build 'docs/helpmap'") + Exit(1) + + ################################################################################ diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index d11798a9b290f..c69c9af184b00 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source panorama viewer using GL"; - homepage = "http://freepv.sourceforge.net/"; + homepage = "https://freepv.sourceforge.net/"; license = [ lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 5caa541670470..61a41abac5b05 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Simple GTK 2 color selector"; - homepage = "http://gcolor2.sourceforge.net/"; + homepage = "https://gcolor2.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ notthemessiah ]; platforms = with lib.platforms; unix; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 21ba4c662c22a..36bba9eaa4a18 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://jocr.sourceforge.net/"; + homepage = "https://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index 06c3b03ae5330..f19c0282b1870 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and fast image viewer for X"; - homepage = "http://lxde.sourceforge.net/gpicview/"; + homepage = "https://lxde.sourceforge.net/gpicview/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index d9b6db8d653da..55e57ac01e4c2 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.38"; + version = "1.3.39"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU="; + sha256 = "sha256-4wscpY6HPQoe4gg4RyRCTbLTwzpUA04mHRTo+7j40E8="; }; patches = [ diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index fc686ad1f2120..9da51083c5ab6 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -89,7 +89,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" "man" ]; - checkInputs = [ + nativeCheckInputs = [ imagemagick libtiff djvulibre @@ -128,7 +128,7 @@ perlPackages.buildPerlPackage rec { meta = { description = "A GUI to produce PDFs or DjVus from scanned documents"; - homepage = "http://gscan2pdf.sourceforge.net/"; + homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ pacien ]; }; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 389d5d4294b88..f4d424b3fc30d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -36,19 +36,13 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2021.0.0"; + version = "2022.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; + sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; }; - patches = [ - # committed upstream but unreleased: - # https://sourceforge.net/p/hugin/hugin/ci/edfddc6070ca6d4223d359fb4b38273a5aed2f2d - ./dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch - ]; - buildInputs = [ boost cairo diff --git a/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch b/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch deleted file mode 100644 index d38e07a595e8b..0000000000000 --- a/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:26.873574924 -0800 -+++ b/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:09.069575641 -0800 -@@ -472,9 +472,9 @@ - #else - #ifdef USE_XDG_DIRS - char *xdgDataDir = getenv("XDG_DATA_HOME"); -- if (strlen(xdgDataDir) == 0) -+ if (xdgDataDir == NULL || strlen(xdgDataDir) == 0) - { -- // no XDG_DATA_HOME enviroment variable set -+ // no XDG_DATA_HOME enviroment variable set or empty variable - // use $HOME/.local/share instead - const std::string homeDir = GetHomeDir(); - if (homeDir.empty()) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 2bce94d52d814..6a31bfd0280da 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonPackage rec { twisted ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ nose mock httmock diff --git a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix index f1bac3dd76c46..ceab3eaea3d9a 100644 --- a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "XWwkuw+Um/cflRWjIeIgQUxJLrk2DLDmx7K+pMWvIlI="; }; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.inkex python3.pkgs.pytestCheckHook ]; diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix index 1660d89eacf93..c63bd78ce9877 100644 --- a/pkgs/applications/graphics/jpeginfo/default.nix +++ b/pkgs/applications/graphics/jpeginfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jpeginfo"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; - sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2"; + sha256 = "sha256-3JhQg0SNlwfULkm+2CaiR8Db2mkTyHDppdm/fHSTllk="; }; buildInputs = [ libjpeg ]; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index d4582280079e3..951bb9d7d8943 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.0"; + version = "1.5.1"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4="; + sha256 = "sha256-QPipwBk+BS/u3YxB8ACeFXQSuoW1aynEyG3tEMrhcaE="; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index c0d930c9e28fd..cfb63e0e3f7cb 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.3"; + version = "5.1.4"; kde-channel = "stable"; - sha256 = "sha256-69+P0wMIciGxuc6tmWG1OospmvvwcZl6zHNQygEngo0="; + sha256 = "sha256-wisCCGJZbrL92RHhsXnbvOewgb4RFFei6sr2rhzKLcs="; }) diff --git a/pkgs/applications/graphics/litemdview/default.nix b/pkgs/applications/graphics/litemdview/default.nix new file mode 100644 index 0000000000000..ebd830868f6c0 --- /dev/null +++ b/pkgs/applications/graphics/litemdview/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitea +, gtkmm3 +, autoreconfHook +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "litemdview"; + # litemdview -v + version = "0.0.32"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "g0tsu"; + repo = "litemdview"; + rev = "litemdview-0.0.32"; + hash = "sha256-XGjP+7i3mYCEzPYwVY+75DARdXJFY4vUWHFpPeoNqAE="; + }; + + buildInputs = [ + gtkmm3 + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + meta = with lib; { + homepage = "https://notabug.org/g0tsu/litemdview"; + description = "A suckless markdown viewer"; + longDescription = '' + LiteMDview is a lightweight, extremely fast markdown viewer with lots of useful features. One of them is ability to use your prefered text editor to edit markdown files, every time you save the file, litemdview reloads those changes (I call it live-reload). It has a convinient navigation through local directories, has support for a basic "git-like" folders hierarchy as well as vimwiki projects. + + Features: + + + - Does not use any of those bloated gecko(servo)-blink engines + - Lightweight and fast + - Live reload + - Convinient key bindings + - Supports text zooming + - Supports images + - Supports links + - Navigation history + - Cool name which associates with 1337, at least for me :) + - Builtin markdown css themes + - Supports emoji™️ + - vimwiki support + - Basic html support (very simple offline documents in html) + - Syntax highlighting + ''; + license = licenses.gpl2Only; + maintainers = with maintainers; [ WhiteBlackGoose ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index c44ff57d18f3c..d0cf9af97d214 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - homepage = "http://qtpfsgui.sourceforge.net/"; + homepage = "https://qtpfsgui.sourceforge.net/"; description = "A complete open source solution for HDR photography"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 5c6e49ea9a64e..fbc80d0da6d5e 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -18,11 +18,11 @@ python3.pkgs.buildPythonApplication rec { pname = "mcomix"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz"; - sha256 = "sha256-7zjQcT5WoHxy+YzCDJ6s2ngOOfO4L9exuqBqacecClg="; + hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU="; }; buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index f0693cc6121fe..4a9b91d9c7b84 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://djvu.sourceforge.net/djview4.html"; + homepage = "https://djvu.sourceforge.net/djview4.html"; description = "Black-and-white djvu page encoder and decoder that use interpage information"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.viric ]; diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 99e7b042d161e..7a2577e8af50c 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -47,14 +47,14 @@ stdenv.mkDerivation rec { pname = "monado"; - version = "unstable-2022-05-28"; + version = "unstable-2023-01-14"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "011bcbdcff227e25507e5f2d81a83a2bbe478856"; - sha256 = "sha256-8velNKSCZJtKO8ATwXDl1nU8RbxZ8TeyGiUQFOXifuI="; + rev = "1ef49b92f2d6cb519039edd7ba7f70e8073fbe88"; + sha256 = "sha256-zieJmI6BKHpYyCPOOUora9qoWn+NXehbHKvoi4h81UA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 0acc873b39680..740f9c7cb193f 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Due to its simplicity and lack of dependencies it runs well on GNU/Linux, Windows and older PC hardware. ''; - homepage = "http://mtpaint.sourceforge.net/"; + homepage = "https://mtpaint.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.vklquevs ]; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 7f1ba67acce6a..48cc00d008e94 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -74,7 +74,7 @@ in buildPythonApplication rec { pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ gtk3 ]; diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix new file mode 100644 index 0000000000000..99dc64d5cad45 --- /dev/null +++ b/pkgs/applications/graphics/oculante/default.nix @@ -0,0 +1,66 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, openssl +, fontconfig +, nasm +, libX11 +, libXcursor +, libXrandr +, libXi +, libGL +, stdenv +, gtk3 +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "oculante"; + version = "0.6.41"; + + src = fetchFromGitHub { + owner = "woelper"; + repo = pname; + rev = version; + sha256 = "sha256-2pXfdR5KUD6IUasxyUptxLSLDcvJtwJwOmhHD3I7op8="; + }; + + cargoHash = "sha256-F/NKTsDRfoueVrwlq/RkBR6wNn79NiuT2InAR+XPbqw="; + + nativeBuildInputs = [ + cmake + pkg-config + nasm + ]; + + checkFlagsArray = [ "--skip=tests::net" ]; # requires network access + + buildInputs = [ + openssl + fontconfig + ] ++ lib.optionals stdenv.isLinux [ + libX11 + libXcursor + libXi + libXrandr + libGL + gtk3 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + ]; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libGL ]} + ''; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "A minimalistic crossplatform image viewer written in Rust"; + homepage = "https://github.com/woelper/oculante"; + changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index b0d59d4a7f55e..3178c50c933de 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -23,7 +23,7 @@ let install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter ''; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openboard"; version = "unstable-2022-11-28"; @@ -36,9 +36,9 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace OpenBoard.pro \ - --replace '/usr/include/quazip5' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ + --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ --replace '-lquazip5' '-lquazip1-qt5' \ - --replace '/usr/include/poppler' '${poppler.dev}/include/poppler' + --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' ''; nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ]; diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix deleted file mode 100644 index d6b710595a315..0000000000000 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, boost -, cmake -, giflib -, ilmbase -, libjpeg -, libpng -, libtiff -, opencolorio_1 -, openexr -, robin-map -, unzip -, fmt -}: - -stdenv.mkDerivation rec { - pname = "openimageio"; - version = "2.2.17.0"; - - src = fetchFromGitHub { - owner = "OpenImageIO"; - repo = "oiio"; - rev = "Release-${version}"; - sha256 = "0jqpb1zci911wdm928addsljxx8zsh0gzbhv9vbw6man4wi93h6h"; - }; - - outputs = [ "bin" "out" "dev" "doc" ]; - - nativeBuildInputs = [ - cmake - unzip - ]; - - buildInputs = [ - boost - giflib - ilmbase - libjpeg - libpng - libtiff - opencolorio_1 - openexr - robin-map - fmt - ]; - - cmakeFlags = [ - "-DUSE_PYTHON=OFF" - "-DUSE_QT=OFF" - # GNUInstallDirs - "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config - ]; - - postFixup = '' - substituteInPlace $dev/lib/cmake/OpenImageIO/OpenImageIOTargets-*.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib" - ''; - - meta = with lib; { - homepage = "http://www.openimageio.org"; - description = "A library and tools for reading and writing images"; - license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/graphics/openimageio/2539_backport.patch b/pkgs/applications/graphics/openimageio/2539_backport.patch deleted file mode 100644 index c484b2ef9cf98..0000000000000 --- a/pkgs/applications/graphics/openimageio/2539_backport.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp -index 10b75c21..0287d9c5 100644 ---- a/src/libOpenImageIO/exif.cpp -+++ b/src/libOpenImageIO/exif.cpp -@@ -213,6 +213,9 @@ static const EXIF_tag_info exif_tag_table[] = { - - - -+// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define -+// them ourselves. -+#ifndef GPSTAG_VERSIONID - enum GPSTag { - GPSTAG_VERSIONID = 0, - GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2, -@@ -237,6 +240,7 @@ enum GPSTag { - GPSTAG_DIFFERENTIAL = 30, - GPSTAG_HPOSITIONINGERROR = 31 - }; -+#endif - - static const EXIF_tag_info gps_tag_table[] = { - { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 }, -@@ -270,7 +274,7 @@ static const EXIF_tag_info gps_tag_table[] = { - { GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 }, - { GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 }, - { GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 }, -- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }, -+ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }, - { -1, NULL } // signal end of table - }; - diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix deleted file mode 100644 index e5262ab98d0a9..0000000000000 --- a/pkgs/applications/graphics/openimageio/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff -, opencolorio_1, openexr, unzip -}: - -stdenv.mkDerivation rec { - pname = "openimageio"; - version = "1.8.17"; - - src = fetchFromGitHub { - owner = "OpenImageIO"; - repo = "oiio"; - rev = "Release-${version}"; - sha256 = "0zq34szprgkrrayg5sl3whrsx2l6lr8nw4hdrnwv2qhn70jbi2w2"; - }; - - outputs = [ "bin" "out" "dev" "doc" ]; - - nativeBuildInputs = [ cmake unzip ]; - buildInputs = [ - boost ilmbase libjpeg libpng - libtiff opencolorio_1 openexr - ]; - - cmakeFlags = [ - "-DUSE_PYTHON=OFF" - ]; - - makeFlags = [ - "ILMBASE_HOME=${ilmbase.dev}" - "OPENEXR_HOME=${openexr.dev}" - "USE_PYTHON=0" - "INSTALLDIR=${placeholder "out"}" - "dist_dir=" - ]; - - patches = [ - # Backported from https://github.com/OpenImageIO/oiio/pull/2539 for 1.8.17 - ./2539_backport.patch - ]; - - meta = with lib; { - homepage = "http://www.openimageio.org"; - description = "A library and tools for reading and writing images"; - license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index dbc5b973fe9c0..0bd1fc20c59fc 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - homepage = "http://panotools.sourceforge.net/"; + homepage = "https://panotools.sourceforge.net/"; description = "Free software suite for authoring and displaying virtual reality panoramas"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index 11737a01300a1..c3207eb6c57c2 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "photoflare"; - version = "1.6.11"; + version = "1.6.12"; src = fetchFromGitHub { owner = "PhotoFlare"; repo = "photoflare"; rev = "v${version}"; - sha256 = "sha256-nXVTkkfRpbLZ+zUgnSzKNlVixI86eKoG5FO8GqgnrDY="; + sha256 = "sha256-UIEHQil7NsdIKQlrNPpf7rxj6O6P1xlz0E7FNYTcdT4="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 438fbaf40cf14..b59f17278e08b 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -10,13 +10,16 @@ buildDotnetModule rec { pname = "Pinta"; - version = "2.0.2"; + version = "2.1"; nativeBuildInputs = [ intltool wrapGAppsHook ]; + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + runtimeDeps = [ gtk3 ]; buildInputs = runtimeDeps; @@ -33,7 +36,7 @@ buildDotnetModule rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - sha256 = "sha256-Bvzs1beq7I1+10w9pmMePqGCz2TPDp5UK5Wa9hbKERU="; + hash = "sha256-hugV4I13wZhPnVTUlGlaVxdjpGRvWDnfRVXgV+oy+sE="; }; # https://github.com/NixOS/nixpkgs/issues/38991 @@ -61,8 +64,11 @@ buildDotnetModule rec { mv "$out/bin/Pinta" "$out/bin/pinta" # Copy runtime icons - mkdir -p $out/share/icons/hicolor/16x16/ - cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/ + for i in "Pinta.Resources/icons/hicolor/"*; do + res="$(basename $i)" + mkdir -p "$out/share/icons/hicolor/$res" + cp -rv "Pinta.Resources/icons/hicolor/$res/"* "$out/share/icons/hicolor/$res/" + done # Install dotnet build installer/linux/install.proj \ diff --git a/pkgs/applications/graphics/pinta/deps.nix b/pkgs/applications/graphics/pinta/deps.nix index 66f7e61267247..5f637d347f5ce 100644 --- a/pkgs/applications/graphics/pinta/deps.nix +++ b/pkgs/applications/graphics/pinta/deps.nix @@ -2,14 +2,18 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) - (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) - (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.34"; sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; }) - (fetchNuGet { pname = "GioSharp"; version = "3.24.24.34"; sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; }) - (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.34"; sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; }) - (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.34"; sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; }) + (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; sha256 = "12dv3j8nzhjb5c0093djajdnv8n7m0q7vq2d5ry2v4xk9wqzxpr7"; }) + (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; sha256 = "0n3y5w088k81apxik9amfvjdwcic4k2ixxvnrk9cw6d2wh1d5r8d"; }) + (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; sha256 = "0c5gzg106bnnc4wwwhch6lja68623a9hk8r2sjcv35hl5dh21616"; }) + (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; sha256 = "1b3irarxjbbpf24fw2avdglcslb5653gn6m829yhlcm5ay37pds4"; }) + (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; sha256 = "1a0ixdq1gdb46gkb2nnlydsi10bjrbd3risfyaphsy8fbsyzrzvm"; }) + (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "NGettext"; version = "0.6.7"; sha256 = "1lnq1lgd80xqn80qwq5ipfjnd7nl1ghinjc3krnd546r0c7hwqky"; }) - (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.34"; sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; }) + (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; sha256 = "0cma8j4cy4j3fw0nvsxlqi0azjkvfjsw0wb6k6b2k21rdpy5rbbn"; }) (fetchNuGet { pname = "ParagonClipper"; version = "6.4.2"; sha256 = "0pam44f7iayqjz8nh1x29gxdd4dj00i7m5883cpa64i192pgl94c"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; sha256 = "1dh1jhgzc9bzd2hvyjp2nblavf0619djniyzalx7kvrbsxhrdjb6"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.11.0"; sha256 = "067s9i5mjxlmw0nid3fblr9d0hy1b6zrjzhhi48rf4cs2j72pl64"; }) ] diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 9392f27c1713f..b46c2060ede0e 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.16"; src = fetchurl { - url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; + url = "https://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; sha256 = "1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://potrace.sourceforge.net/"; + homepage = "https://potrace.sourceforge.net/"; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = platforms.unix; maintainers = [ maintainers.pSub ]; diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix new file mode 100644 index 0000000000000..5a0774a09f430 --- /dev/null +++ b/pkgs/applications/graphics/pureref/default.nix @@ -0,0 +1,25 @@ +{ lib, appimageTools, requireFile }: + +appimageTools.wrapType1 rec { + pname = "pureref"; + version = "1.11.1"; + + src = requireFile { + name = "PureRef-${version}_x64.Appimage"; + sha256 = "05naywdgykqrsgc3xybskr418cyvbx7vqs994yv9w8zf98gxvbvm"; + url = "https://www.pureref.com/download.php"; + }; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + ''; + + meta = with lib; { + description = "Reference Image Viewer"; + homepage = "https://www.pureref.com"; + license = licenses.unfree; + maintainers = with maintainers; [ elnudev ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index 7f4f4cc1a9765..e5d148da8e6a5 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -3,33 +3,31 @@ , fetchFromGitHub , qmake , qtbase +, qttools , qtimageformats , qtsvg }: mkDerivation rec { pname = "qview"; - version = "4.0"; + version = "5.0"; src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; rev = version; - sha256 = "15n9cq7w3ckinnx38hvncxrbkv4qm4k51sal41q4y0pkvhmafhnr"; + hash = "sha256-VQ0H9iPrrxO9e/kMo7yZ/zN5I2qDWBCAFacS9uGuZLI="; }; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase + qttools qtimageformats qtsvg ]; - patchPhase = '' - sed "s|/usr/|$out/|g" -i qView.pro - ''; - meta = with lib; { description = "Practical and minimal image viewer"; homepage = "https://interversehq.com/qview/"; diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index a7b96c4227e37..8da308ba61756 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -23,20 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.10"; + version = "0.5.12"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-k1Ov35cz2U39yuIYIr9MW6M/A8MNasoybELC4U3xok0="; + hash = "sha256-wrx8+18jVDIhYhxD8VgU8wlRDLoUwMWIBOzSUozjUII="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-MsLpZl8AvF2BJU6PfC8BmTADR7T3e7+HstHQa+YYJFo="; + hash = "sha256-t0nmfM6Z30c+n0iANjMBVifOhYMXdBqgjxYdhOPOhYQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 251dfdef32f43..a566d9da788c6 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libchamplain , libsecret , gsettings-desktop-schemas , python3 @@ -86,7 +85,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libchamplain libsecret ]; diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix new file mode 100644 index 0000000000000..01601657c8f3b --- /dev/null +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, vips +, gtk4 +, python3 +}: + +stdenv.mkDerivation rec { + pname = "vipsdisp"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "jcupitt"; + repo = "vipsdisp"; + rev = "v${version}"; + sha256 = "sha256-zftvjH5hyWBpjRe5uQBDAqbThQaQFHz0UhzM5q8hSk8="; + }; + + postPatch = '' + chmod +x ./meson_post_install.py + patchShebangs ./meson_post_install.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + vips + gtk4 + python3 + ]; + + # No tests implemented. + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/jcupitt/vipsdisp"; + description = "Tiny image viewer with libvips"; + license = licenses.mit; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix new file mode 100644 index 0000000000000..757bf7cb7b53b --- /dev/null +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchurl +, vulkan-headers +, vulkan-tools +, vulkan-loader +, glslang +, glfw +, libjpeg +, pkg-config +, rsync +, cmake +, clang +, llvm +, llvmPackages +, pugixml +, freetype +, exiv2 +, ffmpeg +, libvorbis +, libmad +}: + +stdenv.mkDerivation rec { + pname = "vkdt"; + version = "0.5.1"; + + src = fetchurl { + url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs="; + }; + + buildInputs = [ + vulkan-headers + vulkan-tools + vulkan-loader + glslang + glfw + libjpeg + pkg-config + rsync + cmake + clang + llvm + llvmPackages.openmp + pugixml + freetype + exiv2 + ffmpeg + libvorbis + libmad + ]; + + dontUseCmakeConfigure = true; + + makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; + + meta = with lib; { + description = "A vulkan-powered raw image processor"; + homepage = "https://github.com/hanatos/vkdt"; + license = licenses.bsd2; + maintainers = with maintainers; [ paperdigits ]; + }; +} diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 6cef9384e4c70..0a238e87fac8b 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -14,6 +14,7 @@ , pango , pipewire , cmake +, git , autoconf , libtool , nodePackages @@ -63,6 +64,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake + git nodePackages.typescript makeWrapper ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 47a47ae4f25d6..288f0446b34ad 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeDesktopItem , ghostscript, atk, gtk2, glib, fontconfig, freetype -, libgnomecanvas, libgnomeprint, libgnomeprintui +, libgnomecanvas , pango, libX11, xorgproto, zlib, poppler , autoconf, automake, libtool, pkg-config}: @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas pango libX11 xorgproto zlib poppler - ] ++ lib.optionals (!stdenv.isDarwin) [ - libgnomeprint libgnomeprintui ]; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xournal.sourceforge.net/"; + homepage = "https://xournal.sourceforge.net/"; description = "Note-taking application (supposes stylus)"; maintainers = [ maintainers.guibert ]; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index a92adee106240..ba6370a5a4147 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.10.0"; + version = "9.11.0"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-77+lsEvmwQ34maW+HA/IpPsEezlzYEYipc74yR6inwU="; + sha256 = "sha256-/fSIV+4j516PgHGn6zF+TfVaVW/lVWykf5J8bnQuttg="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index b47c7c2f7e218..dcea56f16d76a 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.0/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.1/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index c7dcba63130e3..70a00826dc3de 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1875 +4,1875 @@ { akonadi = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadi-22.12.0.tar.xz"; - sha256 = "0hrjs360yggjbrhqfdvzp1ninsr4rnm8ifparj3p9d1q8iyypq9a"; - name = "akonadi-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadi-22.12.1.tar.xz"; + sha256 = "1kb0hf705jqsbv075ja7pfh7yyfnxp5cigcgrdw4i0wh94rr1c3d"; + name = "akonadi-22.12.1.tar.xz"; }; }; akonadi-calendar = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadi-calendar-22.12.0.tar.xz"; - sha256 = "0ml59dq039ll8vhpydxal2ymci0ip4xazliqc30x3vgz91wx1hjh"; - name = "akonadi-calendar-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadi-calendar-22.12.1.tar.xz"; + sha256 = "07pk2ivfmf4pcmhafs17bvh63rqq70pybrv9qj2p6lih52a9021g"; + name = "akonadi-calendar-22.12.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadi-calendar-tools-22.12.0.tar.xz"; - sha256 = "1884w8zxpswv088681g74bk5v1nbvx1b32fnzzsg4vn62vidr189"; - name = "akonadi-calendar-tools-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadi-calendar-tools-22.12.1.tar.xz"; + sha256 = "144k1isdb805zp6mrmpx8n8xww4kv0xd6kp4cziwnbwm46iipwqa"; + name = "akonadi-calendar-tools-22.12.1.tar.xz"; }; }; akonadi-contacts = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadi-contacts-22.12.0.tar.xz"; - sha256 = "1fy81da4s53aan37rbg29jnjy047xdvlnjcgkikwgqjq2623n1y4"; - name = "akonadi-contacts-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadi-contacts-22.12.1.tar.xz"; + sha256 = "1hzgc1bljjf6ac40fsgv5rgndq7s2hl5kn0hc7lb8vkbaab0zmni"; + name = "akonadi-contacts-22.12.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadi-import-wizard-22.12.0.tar.xz"; - sha256 = "01s1x2zlrnbd8s74fa6qfy3rcxcc9vdd2lqg6amglgq2bs4n9dig"; - name = "akonadi-import-wizard-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadi-import-wizard-22.12.1.tar.xz"; + sha256 = "1hlpsnh2v2f5asi07b46n18rhzqcc176n308503xnpmf33iw6dan"; + name = "akonadi-import-wizard-22.12.1.tar.xz"; }; }; akonadi-mime = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadi-mime-22.12.0.tar.xz"; - sha256 = "092vi869rfkp5bs3sxb0zq0fxpv5dqa243xjzap9ari012975d8m"; - name = "akonadi-mime-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadi-mime-22.12.1.tar.xz"; + sha256 = "0gz7xn1pkiidmhiwnha6a9ffkyihv8dxvdym2k8amsvabp08nxa8"; + name = "akonadi-mime-22.12.1.tar.xz"; }; }; akonadi-notes = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadi-notes-22.12.0.tar.xz"; - sha256 = "04gsjwwpnxjgw2rjkzdlkqdcjzdnww3ds9v19nlxi1m3ds4is0n2"; - name = "akonadi-notes-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadi-notes-22.12.1.tar.xz"; + sha256 = "11m38nc3prfar3430makyg9fa3xc2bflyw99lxbfamvh5sk2miv5"; + name = "akonadi-notes-22.12.1.tar.xz"; }; }; akonadi-search = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadi-search-22.12.0.tar.xz"; - sha256 = "1jyy2czrvajbichy9fikl9jyal4cvn15xqq9h2mn85b8qgkf4c7x"; - name = "akonadi-search-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadi-search-22.12.1.tar.xz"; + sha256 = "0hmd6jl3asv4dkicpn05friic61xx0cjz87qznkmknrrlh1hwd8n"; + name = "akonadi-search-22.12.1.tar.xz"; }; }; akonadiconsole = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akonadiconsole-22.12.0.tar.xz"; - sha256 = "1ph9xwy3nbxqhkgqdgnv6gfskb9y2pfdpg8kyz0i73sxnp2kvwr3"; - name = "akonadiconsole-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akonadiconsole-22.12.1.tar.xz"; + sha256 = "1jgmds3qy74hwcxqnrg9nyndpdp5g9ys83jkjgbf61xzzw83fvgl"; + name = "akonadiconsole-22.12.1.tar.xz"; }; }; akregator = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/akregator-22.12.0.tar.xz"; - sha256 = "0kp7plng93s8py1pc9j5jw7l1x1j83r8rn3i51k62i7w95fjraq2"; - name = "akregator-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/akregator-22.12.1.tar.xz"; + sha256 = "14fm2qcc87wawhskc31np9s3i87bmjwy2blzzl4430l6jpgqv0q7"; + name = "akregator-22.12.1.tar.xz"; }; }; analitza = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/analitza-22.12.0.tar.xz"; - sha256 = "1hfzijhmb7qbg0m6dmpfyqys0q68qv1dcmr0k51akhh8zvvsxp26"; - name = "analitza-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/analitza-22.12.1.tar.xz"; + sha256 = "0wjry2ls7fpi6jdcar4wr9ric5vgzbwqgjyjz2xkgd54l9sqbllv"; + name = "analitza-22.12.1.tar.xz"; }; }; ark = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ark-22.12.0.tar.xz"; - sha256 = "0lga0hy29zcand7laimh700pvjrhfilwnjqfw9n08hhmcnv0j45d"; - name = "ark-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ark-22.12.1.tar.xz"; + sha256 = "033y3dcxxvkbfqq9ncv0wxnyqdkbg988jn500hvkgzg87ddj8317"; + name = "ark-22.12.1.tar.xz"; }; }; artikulate = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/artikulate-22.12.0.tar.xz"; - sha256 = "17z8773x4pz4abxvacd0hhsv62v9i1w968xn6hsb2saj7shnzsfb"; - name = "artikulate-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/artikulate-22.12.1.tar.xz"; + sha256 = "1j7lmvds5lq2g97llszy05khwsjw0ypsay49551pm7awk2hhx38h"; + name = "artikulate-22.12.1.tar.xz"; }; }; audiocd-kio = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/audiocd-kio-22.12.0.tar.xz"; - sha256 = "1ab510i31z9dsxf9n0ykyf0v42ldnyaz5lr3xsan620g9zq5y9xj"; - name = "audiocd-kio-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/audiocd-kio-22.12.1.tar.xz"; + sha256 = "0m6ik4p3pfw8sdmqiac42v4mi4mrgmx7dsj0n4zzpfa7nn4iiaz5"; + name = "audiocd-kio-22.12.1.tar.xz"; }; }; baloo-widgets = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/baloo-widgets-22.12.0.tar.xz"; - sha256 = "0l4f6hdh8zaflfd71jak3ccfz31kh7abmij4h69dhxvi1p31sig4"; - name = "baloo-widgets-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/baloo-widgets-22.12.1.tar.xz"; + sha256 = "1s2a7rsm6y5z0p0cp49bv0868di45qrzrkl7s76cnm56bssyrrnw"; + name = "baloo-widgets-22.12.1.tar.xz"; }; }; blinken = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/blinken-22.12.0.tar.xz"; - sha256 = "0ll62mvbfw7ywh5y9j6l2id75a8gyqspynnhwy1cxn0jm8bpixyl"; - name = "blinken-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/blinken-22.12.1.tar.xz"; + sha256 = "1myn9g04dk43gqsahbgqcg5b5vd8yfwaijxyw0pfqllanj7vjlpa"; + name = "blinken-22.12.1.tar.xz"; }; }; bomber = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/bomber-22.12.0.tar.xz"; - sha256 = "06dhaw9kvhqj7a6cbhaj5q39w84fapzilfs5amkamib470zmwx4f"; - name = "bomber-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/bomber-22.12.1.tar.xz"; + sha256 = "01d07xi012lq9prs3lr68l5v4m0z31ddmm5rdldxzrx6vwf1233l"; + name = "bomber-22.12.1.tar.xz"; }; }; bovo = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/bovo-22.12.0.tar.xz"; - sha256 = "1s3drsjrbxyfqk140mxdg5x8zdcgw3brnpb8nsnmdp6jpphr9p74"; - name = "bovo-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/bovo-22.12.1.tar.xz"; + sha256 = "134bcjfd4sz2d96nd4yad9hz72nymphgsdkgm81p7w29dmyk8bz3"; + name = "bovo-22.12.1.tar.xz"; }; }; calendarsupport = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/calendarsupport-22.12.0.tar.xz"; - sha256 = "15sgvswx3jwh9162jax0m21qvzcjp0m1fzpbgr0xjqy9gkirg97q"; - name = "calendarsupport-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/calendarsupport-22.12.1.tar.xz"; + sha256 = "1yz95mlqjac9db7v7k953b4zky5369d9yhrr6f2m8950205xdab3"; + name = "calendarsupport-22.12.1.tar.xz"; }; }; cantor = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/cantor-22.12.0.tar.xz"; - sha256 = "0bzxvc6yzfgf8ci9ipw144yack4r53xg3y6qkg2nbs0g4364yayw"; - name = "cantor-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/cantor-22.12.1.tar.xz"; + sha256 = "0yi2pqh2jarcbx979vgbpm415rbpn5p5q3b6n2276mxq6x338hl6"; + name = "cantor-22.12.1.tar.xz"; }; }; cervisia = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/cervisia-22.12.0.tar.xz"; - sha256 = "16ravvkkj2n4ca0mv44h9bmywls6qmd12y09rbqi612p5baxcm4g"; - name = "cervisia-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/cervisia-22.12.1.tar.xz"; + sha256 = "0v2shjgc8jpzpll00apv2d6lqp08a277pv674skq4fc770aviaxk"; + name = "cervisia-22.12.1.tar.xz"; }; }; colord-kde = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/colord-kde-22.12.0.tar.xz"; - sha256 = "1zc7q6m1ypcaqqmyhjyd0i4rzczycl2c3dbz1nk289vkz3cwhrwb"; - name = "colord-kde-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/colord-kde-22.12.1.tar.xz"; + sha256 = "0ky3dr60szvg8fq6zlk7gsx997zql6hsfqv8navri3c3nra26r4y"; + name = "colord-kde-22.12.1.tar.xz"; }; }; dolphin = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/dolphin-22.12.0.tar.xz"; - sha256 = "09mcsr50www49yfhczn2zx2k6fnzsjrnrqfwi9imll3v7aah8z28"; - name = "dolphin-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/dolphin-22.12.1.tar.xz"; + sha256 = "1slcv108h2i5s9i2hlyiskfpmrc0r4awm3riyw0wa3h902h4lsbz"; + name = "dolphin-22.12.1.tar.xz"; }; }; dolphin-plugins = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/dolphin-plugins-22.12.0.tar.xz"; - sha256 = "06zlk3985a60h25jnln8fw9x9dgax5y76cnx0ialhfv73sllv49g"; - name = "dolphin-plugins-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/dolphin-plugins-22.12.1.tar.xz"; + sha256 = "03bj0jf92s5xb8nzzrh4wkcwm1zp101yg2r624r20djl8rkysivj"; + name = "dolphin-plugins-22.12.1.tar.xz"; }; }; dragon = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/dragon-22.12.0.tar.xz"; - sha256 = "14cxc9hwrswaqq0m1pmd2fil0p2a387ly6p0ribrpnn9bv2kd7wx"; - name = "dragon-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/dragon-22.12.1.tar.xz"; + sha256 = "1rk00h91dhs78h3n97zxj8qxkvs7m94544xhs37qpnm735fdbkv0"; + name = "dragon-22.12.1.tar.xz"; }; }; elisa = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/elisa-22.12.0.tar.xz"; - sha256 = "1i80czxbh357fp0migznn73yxn7jbgplirs1rn0w1kcgqb9365a8"; - name = "elisa-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/elisa-22.12.1.tar.xz"; + sha256 = "1ywi1v2pz9gi3qgdrkcxivcx9sc82swckm1ipaf6x4ygbi5g0r5f"; + name = "elisa-22.12.1.tar.xz"; }; }; eventviews = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/eventviews-22.12.0.tar.xz"; - sha256 = "0s2hlsc21wv957zbcibixh19fd59i8jmx0rmw935khw60h8fmmd6"; - name = "eventviews-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/eventviews-22.12.1.tar.xz"; + sha256 = "1bvlnaknn3jcjwwx9gfsqhq7vywjqbji3zfrmab4hv4v1bp5hgs9"; + name = "eventviews-22.12.1.tar.xz"; }; }; falkon = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/falkon-22.12.0.tar.xz"; - sha256 = "0lmkrbjk65ifj9f53mvbmi3qfm8wcgvv4jikyllbq2vnw4x2r9zk"; - name = "falkon-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/falkon-22.12.1.tar.xz"; + sha256 = "14wngik0hlvj49x0vx2ndyswk3yvh3jc0g21lfrnsvbxsppjvskx"; + name = "falkon-22.12.1.tar.xz"; }; }; ffmpegthumbs = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ffmpegthumbs-22.12.0.tar.xz"; - sha256 = "120828cad82cbi9igmb30vm3i1q6fd9kh0qbmn0hi4d23l3rqnwv"; - name = "ffmpegthumbs-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ffmpegthumbs-22.12.1.tar.xz"; + sha256 = "0xf54rzard24az08mb6z9p23173nxsgmyfkriil5f87k67f7cf28"; + name = "ffmpegthumbs-22.12.1.tar.xz"; }; }; filelight = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/filelight-22.12.0.tar.xz"; - sha256 = "0wz6k3vghc74lwfqday91lfknjx9j4lq1pimb5q92h12ynnrc3ib"; - name = "filelight-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/filelight-22.12.1.tar.xz"; + sha256 = "1ww6h0p0y9phara8m2l6jbwr6vbhi1zid7xdrhfbg0vwz0ql42sz"; + name = "filelight-22.12.1.tar.xz"; }; }; granatier = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/granatier-22.12.0.tar.xz"; - sha256 = "1x2z1al7i8fvcvqhgxmrjsc9nz4s0j76hsywvj19s51fa5l7pcrc"; - name = "granatier-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/granatier-22.12.1.tar.xz"; + sha256 = "17qjf35dzsykn7l5483ccihzqc4wz9p3bn2l3s5yrgizsrgbir0c"; + name = "granatier-22.12.1.tar.xz"; }; }; grantlee-editor = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/grantlee-editor-22.12.0.tar.xz"; - sha256 = "04ikjvx0klr8hjnr4dnj54sj6l9x8phwzgqj5nj3c916nzrm58dr"; - name = "grantlee-editor-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/grantlee-editor-22.12.1.tar.xz"; + sha256 = "11s7kwm0sdcvzf27fx177n2ynklwlkxy8vl4hh42xh9563v9gw67"; + name = "grantlee-editor-22.12.1.tar.xz"; }; }; grantleetheme = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/grantleetheme-22.12.0.tar.xz"; - sha256 = "0ivw13qnc19w2wik0svmkxcz3g7gsh2wlyi9yb5rfp2cqmlcgxmk"; - name = "grantleetheme-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/grantleetheme-22.12.1.tar.xz"; + sha256 = "1xx09jaxg6cwn84svh6wkvxx46qv18rk1dr58dfyxgi3vl3nzihp"; + name = "grantleetheme-22.12.1.tar.xz"; }; }; gwenview = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/gwenview-22.12.0.tar.xz"; - sha256 = "00cadrcfjfajzi9z9nf3jmfpkp6qgfpdvj7saflclx18vbxcddlv"; - name = "gwenview-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/gwenview-22.12.1.tar.xz"; + sha256 = "12i7zri7mxhjfbykb1nhsh5acppcql3gkmjif92qp4f4d7fqrgsb"; + name = "gwenview-22.12.1.tar.xz"; }; }; incidenceeditor = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/incidenceeditor-22.12.0.tar.xz"; - sha256 = "0d27f69hdz17rh6mf81cz3k5s513ff7b42f975iwr0qsv7rdh198"; - name = "incidenceeditor-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/incidenceeditor-22.12.1.tar.xz"; + sha256 = "1agqkqcksqf992albppijysddyhfgc6l1zxg6qyyvw9iag6p509x"; + name = "incidenceeditor-22.12.1.tar.xz"; }; }; itinerary = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/itinerary-22.12.0.tar.xz"; - sha256 = "01rhqg87ckgszz31hg8nyhmkfc46km62c1lnvk53ahk59bw8750h"; - name = "itinerary-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/itinerary-22.12.1.tar.xz"; + sha256 = "1fmsfnjywa0vy91dg2z093x36fcv50gc5xp8hqlrjx4q7hqja13n"; + name = "itinerary-22.12.1.tar.xz"; }; }; juk = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/juk-22.12.0.tar.xz"; - sha256 = "00fw4scpc8sinhnmnf13hq2011z745ry7yil1nbi5l558hv4fcrg"; - name = "juk-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/juk-22.12.1.tar.xz"; + sha256 = "066ll1lbmgy9l9bpv7iw75gknjdb92dbaqpsir0a2j4llj40yym1"; + name = "juk-22.12.1.tar.xz"; }; }; k3b = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/k3b-22.12.0.tar.xz"; - sha256 = "0yfh7yikhcbvl6k6d6bfc8dg6s5s5pm6nq0kjx78a911dwn6irv4"; - name = "k3b-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/k3b-22.12.1.tar.xz"; + sha256 = "0lg8jfgs73j5bfx00g6lbgmmw98l2m5c5g8mkdw5ayr9wg5iwzhl"; + name = "k3b-22.12.1.tar.xz"; }; }; kaccounts-integration = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kaccounts-integration-22.12.0.tar.xz"; - sha256 = "0c8cgny9ihas1gy7d3zxj9zcmpsd51ilryqrrr7jg3vly570p8la"; - name = "kaccounts-integration-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kaccounts-integration-22.12.1.tar.xz"; + sha256 = "0avy1ld72z5sx7nd78lar54x7a7zb7pa7p62bmxyhkmrvvlj6zjk"; + name = "kaccounts-integration-22.12.1.tar.xz"; }; }; kaccounts-providers = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kaccounts-providers-22.12.0.tar.xz"; - sha256 = "0avznj8v3ag9hd5kibvd96p4qq9rhnknfcqsdwmlqbyxzpc4d5nd"; - name = "kaccounts-providers-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kaccounts-providers-22.12.1.tar.xz"; + sha256 = "16acbba803i24psyax9xbb82gs0wqwhpml1hrd3nwkdf7irngdna"; + name = "kaccounts-providers-22.12.1.tar.xz"; }; }; kaddressbook = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kaddressbook-22.12.0.tar.xz"; - sha256 = "1264a7n5gz0d6qp310v1l5cci0aq0wj2k1sg2fq0258sc0ggrbx3"; - name = "kaddressbook-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kaddressbook-22.12.1.tar.xz"; + sha256 = "100rrb6q63p1qawp9ww9dif06q1f9w02xgfrlhki3xvgdkpfy92r"; + name = "kaddressbook-22.12.1.tar.xz"; }; }; kajongg = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kajongg-22.12.0.tar.xz"; - sha256 = "1aqkdqhmg4anc5pjqp7i7h18arfvhms3zlbzicbd2jwyk0d6qq1x"; - name = "kajongg-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kajongg-22.12.1.tar.xz"; + sha256 = "0zc08cgpw0pwbjhrs186m4l5rp61gjbqzh4xh9yg24i3k4yn8z6g"; + name = "kajongg-22.12.1.tar.xz"; }; }; kalarm = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kalarm-22.12.0.tar.xz"; - sha256 = "08xld42gwlzlmxy7f69jmzbdzpv55l580fva3snc26kvhyhigm7b"; - name = "kalarm-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kalarm-22.12.1.tar.xz"; + sha256 = "11h0a1jgp7p0zkyqfd2vmv24nnv02jfcqw1z1pi6qr0ywgn8ba9i"; + name = "kalarm-22.12.1.tar.xz"; }; }; kalendar = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kalendar-22.12.0.tar.xz"; - sha256 = "1lcysp4h1i2lvl0wiz0rs0igkjwzzspm2zgb3ydlpl72b955z8j9"; - name = "kalendar-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kalendar-22.12.1.tar.xz"; + sha256 = "1r4r2pa5p0951vvcvw1gyrs1k41xd4495lb72qkv0nhvvb6lp2aw"; + name = "kalendar-22.12.1.tar.xz"; }; }; kalgebra = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kalgebra-22.12.0.tar.xz"; - sha256 = "1msam4djhplqdjy2d466vq0csimbzgj09yb0h2npn0qfpr3ps0xw"; - name = "kalgebra-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kalgebra-22.12.1.tar.xz"; + sha256 = "0iai8anpxb3qxp927vhz294c3qh2h3fn84l5viry7rsi9wkyckwf"; + name = "kalgebra-22.12.1.tar.xz"; }; }; kalzium = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kalzium-22.12.0.tar.xz"; - sha256 = "139r26mi87msx4gzwmfi2z2fh6i36jfcvx8ynl509w0l6b35nsnr"; - name = "kalzium-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kalzium-22.12.1.tar.xz"; + sha256 = "0jnhhy9xilkafmzbbgxp4l3hx6qsrkkwm7yxf2i7jw5wzax98s1y"; + name = "kalzium-22.12.1.tar.xz"; }; }; kamera = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kamera-22.12.0.tar.xz"; - sha256 = "0jps5lw31mb2gaakr24l4x1l997la90d6d8nifyx8v63kv8fsqa1"; - name = "kamera-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kamera-22.12.1.tar.xz"; + sha256 = "0sxms7m9mxadf9qcxdlvnrav7lvapgbs3q48c2pydgyszrq54b54"; + name = "kamera-22.12.1.tar.xz"; }; }; kamoso = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kamoso-22.12.0.tar.xz"; - sha256 = "0xi3igv4c5j0dq0f7girfq9f0wjiqi04fksbgzyipknj2qrr34d1"; - name = "kamoso-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kamoso-22.12.1.tar.xz"; + sha256 = "024j6ijmgxkdjavach6qi6n81g728kd3qs6r6kkm36j3cl19xnpf"; + name = "kamoso-22.12.1.tar.xz"; }; }; kanagram = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kanagram-22.12.0.tar.xz"; - sha256 = "0lm2pllav4h6dg8cimnnf0ljv2nn5rk948sfa3d72w9wi8jnq8w9"; - name = "kanagram-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kanagram-22.12.1.tar.xz"; + sha256 = "0ir8xa826mvnk8s38mb5p61kfx7hfrxzifacv4hpwn7wqgb37986"; + name = "kanagram-22.12.1.tar.xz"; }; }; kapman = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kapman-22.12.0.tar.xz"; - sha256 = "1wn1w1rxv3lbqjchbnzgiqbxryq8jphhzzykm48xc3xcjh1zicnl"; - name = "kapman-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kapman-22.12.1.tar.xz"; + sha256 = "1qjg13vnwdrkfj7p88rlq1b3vhyxsgd7x6amqwd65qhbiiall732"; + name = "kapman-22.12.1.tar.xz"; }; }; kapptemplate = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kapptemplate-22.12.0.tar.xz"; - sha256 = "1wl2p1m1vmzdzryv7s5kpq176bn3iaygf8pw6lzpnn6wc30gffmg"; - name = "kapptemplate-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kapptemplate-22.12.1.tar.xz"; + sha256 = "0ixgfv3q6a1qiggr0r1fnl2frdblb602p3g98mh4yj824ssh950y"; + name = "kapptemplate-22.12.1.tar.xz"; }; }; kate = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kate-22.12.0.tar.xz"; - sha256 = "1zxz6x74h82xhnq5c7kmja4cdk9aapwzcshh63wwp4kxr617si61"; - name = "kate-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kate-22.12.1.tar.xz"; + sha256 = "0r7smfmdfhsfqr102w5di8xx1smbk5z9q6a9fhlplrdxkfckmw33"; + name = "kate-22.12.1.tar.xz"; }; }; katomic = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/katomic-22.12.0.tar.xz"; - sha256 = "0b4i6v2gcl05851r56mcic1vhyl6fldcfvmdkghvcg88x0ccx7kc"; - name = "katomic-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/katomic-22.12.1.tar.xz"; + sha256 = "15sdvyzy36bw6dwj4v2i02qjw7r4m4xfqk16l8sphw67071vppch"; + name = "katomic-22.12.1.tar.xz"; }; }; kbackup = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kbackup-22.12.0.tar.xz"; - sha256 = "1d7vmb24390435k2bni4zivwb7wrbqnnw3mqr4wifq80k6iy7j4r"; - name = "kbackup-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kbackup-22.12.1.tar.xz"; + sha256 = "12ms38wv9skzn3dbpdqr1b1rrr2skni4k226sh14l8rlh1phrwx3"; + name = "kbackup-22.12.1.tar.xz"; }; }; kblackbox = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kblackbox-22.12.0.tar.xz"; - sha256 = "0hbf9cby03675pyrdjl31kqjfg9gf31j2jwqc9d6bmqv4fhhbyhj"; - name = "kblackbox-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kblackbox-22.12.1.tar.xz"; + sha256 = "0fs2gdlzxf0xmbvf7l833w053s9rhib0cb9iqg9l1kb83j2x0nfa"; + name = "kblackbox-22.12.1.tar.xz"; }; }; kblocks = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kblocks-22.12.0.tar.xz"; - sha256 = "0cqb307dbrvgwq2018n17jr96f6l7dj2y0cmjxmj6lzn7nsb973y"; - name = "kblocks-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kblocks-22.12.1.tar.xz"; + sha256 = "1aq68p5g0khsa3ci6lw1cm2rmrl2lmx7vwyw8idgbpb18b6w211w"; + name = "kblocks-22.12.1.tar.xz"; }; }; kbounce = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kbounce-22.12.0.tar.xz"; - sha256 = "1ipadk75nxnwww8skwpjxxcnwibrjz91i2ypj5rd1zbc2w7icvnz"; - name = "kbounce-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kbounce-22.12.1.tar.xz"; + sha256 = "0w9p2f3x1jmw6l0im4l3grbm2329rrhs1caf60rzdprkk7xpi5v7"; + name = "kbounce-22.12.1.tar.xz"; }; }; kbreakout = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kbreakout-22.12.0.tar.xz"; - sha256 = "0za4c857rkdwwzw8xv5k7pbiv8nyhs99fq6mhq22iylz0lq87id6"; - name = "kbreakout-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kbreakout-22.12.1.tar.xz"; + sha256 = "1x5gda3ilsxbsnwgj7mmf20i5i8bw2nnnf8n5wbhi2sqlh05xmpy"; + name = "kbreakout-22.12.1.tar.xz"; }; }; kbruch = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kbruch-22.12.0.tar.xz"; - sha256 = "15211vk9rkf1lpr5knsgzf9h0a7089ri51pnycma8ks8mwkx049b"; - name = "kbruch-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kbruch-22.12.1.tar.xz"; + sha256 = "1jf4gv7yihfm9djxqxlp90g49zp6j3nxvlgkh3r31ki11a993nha"; + name = "kbruch-22.12.1.tar.xz"; }; }; kcachegrind = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kcachegrind-22.12.0.tar.xz"; - sha256 = "0l73qh9b72y5xqxaqh6d7h898fdr0qk01dmnz2dg53x65c29nyhf"; - name = "kcachegrind-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kcachegrind-22.12.1.tar.xz"; + sha256 = "01ign21xhl5xypxry5jfmay456m64kmsb5292xqrd91kwk56z3ns"; + name = "kcachegrind-22.12.1.tar.xz"; }; }; kcalc = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kcalc-22.12.0.tar.xz"; - sha256 = "1igd1sijsb0fd0msr4jr74vf94d0whjp160az55r1xx75xmbfb97"; - name = "kcalc-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kcalc-22.12.1.tar.xz"; + sha256 = "17msfxjzyjiq4lfl4p3kxndgplc8q3ghjbvfx8z09r0a0bqd52wl"; + name = "kcalc-22.12.1.tar.xz"; }; }; kcalutils = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kcalutils-22.12.0.tar.xz"; - sha256 = "1ya3g981drl62q5gdsg3ikni4v186cz0b79kdcfb184xv8lhl01c"; - name = "kcalutils-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kcalutils-22.12.1.tar.xz"; + sha256 = "077k3wppnzvpwwzf4n9r81rm996x750npsri4acn94ff7wp98r0r"; + name = "kcalutils-22.12.1.tar.xz"; }; }; kcharselect = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kcharselect-22.12.0.tar.xz"; - sha256 = "14avph9m9y4h29mbmngfji6m7wi0kf91a8i0i2shma0sq1kqkz41"; - name = "kcharselect-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kcharselect-22.12.1.tar.xz"; + sha256 = "0c5hswy8vjsbacac3la6n11rf4hr2g79w96qqha4dgjzzparaf4y"; + name = "kcharselect-22.12.1.tar.xz"; }; }; kcolorchooser = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kcolorchooser-22.12.0.tar.xz"; - sha256 = "1qllm0dxqynzrmlhgv5pqzcaisqmfxyrb4z2vbhvm0063ll3r9h8"; - name = "kcolorchooser-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kcolorchooser-22.12.1.tar.xz"; + sha256 = "1kkhp7m69jcskpqrf6maw0b3k5wjfham54iwngyzgznz195cmad4"; + name = "kcolorchooser-22.12.1.tar.xz"; }; }; kcron = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kcron-22.12.0.tar.xz"; - sha256 = "05bqw9p4kdjrf5rvvq4qicagb2a95l0wp0wryx9d6cp7b4cz4ww4"; - name = "kcron-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kcron-22.12.1.tar.xz"; + sha256 = "0i5pnqb39mgllzxqdyp4pa0109i1q59lx3q0b6445r4lbgxmdd8a"; + name = "kcron-22.12.1.tar.xz"; }; }; kde-dev-scripts = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kde-dev-scripts-22.12.0.tar.xz"; - sha256 = "0rxy9cyrqsaipdm0mi6qx49gkmhsqcayjniqlrdfawrj2izs69a5"; - name = "kde-dev-scripts-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kde-dev-scripts-22.12.1.tar.xz"; + sha256 = "0544cjxk8l1hwfzi93xvs0w6fv47dw2s45r5fdzragna3w8nbh9l"; + name = "kde-dev-scripts-22.12.1.tar.xz"; }; }; kde-dev-utils = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kde-dev-utils-22.12.0.tar.xz"; - sha256 = "1dh2s3ds4mj6lncasglj5l6ra5g16h2a9kgb51vh3pbdb8pb5hm3"; - name = "kde-dev-utils-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kde-dev-utils-22.12.1.tar.xz"; + sha256 = "0vk9ziz4dim55h93v6bfszr7nanxs6hxap059rmq3y5vd4cv5fys"; + name = "kde-dev-utils-22.12.1.tar.xz"; }; }; kdebugsettings = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdebugsettings-22.12.0.tar.xz"; - sha256 = "0qmrkgky2w0qmydxb7ya2glm14wc6hyp5fvvz2mln226228wb0i0"; - name = "kdebugsettings-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdebugsettings-22.12.1.tar.xz"; + sha256 = "0fmxh38vc28hjv7brp5khj8mn3k83rwkyjlm6kfxnnxwyp7h3n0a"; + name = "kdebugsettings-22.12.1.tar.xz"; }; }; kdeconnect-kde = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdeconnect-kde-22.12.0.tar.xz"; - sha256 = "123nskl9b7wbfigprp7n2zypx0i2s10yx0s473xyz03j9m5rjlm6"; - name = "kdeconnect-kde-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdeconnect-kde-22.12.1.tar.xz"; + sha256 = "17yzqibcbab3h1vy88m7wd52gc76j0g5an8mr2xw7nrjl6q7mfm7"; + name = "kdeconnect-kde-22.12.1.tar.xz"; }; }; kdeedu-data = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdeedu-data-22.12.0.tar.xz"; - sha256 = "17w233w3cqwqd3vzq27mgn7ydjb9wfg8hp2mqi27h5ci2a048m5f"; - name = "kdeedu-data-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdeedu-data-22.12.1.tar.xz"; + sha256 = "1rfgpb2fa3ivhcicqdb2yvbslgmpw0k1gyrd76awaigymv9hd7l8"; + name = "kdeedu-data-22.12.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdegraphics-mobipocket-22.12.0.tar.xz"; - sha256 = "176hqljaxkzk2b54d4nk0lbm7vwz9ciq5wg2lchw33mb7dwa2dv5"; - name = "kdegraphics-mobipocket-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdegraphics-mobipocket-22.12.1.tar.xz"; + sha256 = "13iijl2gagnpx55h65mlvq1g2iy8m2d8w5aj1wx3496nxcj0fyl6"; + name = "kdegraphics-mobipocket-22.12.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdegraphics-thumbnailers-22.12.0.tar.xz"; - sha256 = "0r717lrhvdzzr5zm2r8pikz31f31654jr0ygyjjyjmgrz3cnw4lv"; - name = "kdegraphics-thumbnailers-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdegraphics-thumbnailers-22.12.1.tar.xz"; + sha256 = "172lv6ysp3b13ks9548iw1s8nw7wi1vxnxsaf97bsirq1by4f42a"; + name = "kdegraphics-thumbnailers-22.12.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdenetwork-filesharing-22.12.0.tar.xz"; - sha256 = "0qfcyjqc43mx4jivkz18hvma8hiqj188gn5q7qdc01md5bq97vjz"; - name = "kdenetwork-filesharing-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdenetwork-filesharing-22.12.1.tar.xz"; + sha256 = "0mwczjnj3nsnlsk5y0v26fszs5gfq8g3yki8xgan7hgc14p4ncik"; + name = "kdenetwork-filesharing-22.12.1.tar.xz"; }; }; kdenlive = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdenlive-22.12.0.tar.xz"; - sha256 = "05v32fidh1z3yk42355pmjxmynhwgdmdsxd7drnhsspb4wbacv25"; - name = "kdenlive-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdenlive-22.12.1.tar.xz"; + sha256 = "1pfp00gkvxmm578fj6a86la1p2iypfgx2j1zk72qdj9kczsnw7mg"; + name = "kdenlive-22.12.1.tar.xz"; }; }; kdepim-addons = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdepim-addons-22.12.0.tar.xz"; - sha256 = "1c52brljcm5rm9z3q9597f4xrc0x4r73xyhfxm5hcxhh1qd1yiwh"; - name = "kdepim-addons-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdepim-addons-22.12.1.tar.xz"; + sha256 = "1zxs8n28yl8a1kbm4ndljs4giyj473alkqlzkjgc60cz6g2fq58k"; + name = "kdepim-addons-22.12.1.tar.xz"; }; }; kdepim-runtime = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdepim-runtime-22.12.0.tar.xz"; - sha256 = "1fns0d87s0nd62cfpwvqx0b7wknh6bkpz7p8kahh10zmvr0x595b"; - name = "kdepim-runtime-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdepim-runtime-22.12.1.tar.xz"; + sha256 = "0vghpf5lnl0mfwdac1mghr48bfvqg16az090w6msn0rs77ai1q2s"; + name = "kdepim-runtime-22.12.1.tar.xz"; }; }; kdesdk-kio = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdesdk-kio-22.12.0.tar.xz"; - sha256 = "07jgzfa39q96kdr5hczj2xh856g43gvxgmznn23km76npvfcdkqa"; - name = "kdesdk-kio-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdesdk-kio-22.12.1.tar.xz"; + sha256 = "1rzcq0v0faa2ix596c209p108wsrj8p8mnvrgkkz6s5gwswqvi0z"; + name = "kdesdk-kio-22.12.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdesdk-thumbnailers-22.12.0.tar.xz"; - sha256 = "1l4jajpdsw5k43i0ibk4gim8xqg0g586aijya2nx33yc492d8pkb"; - name = "kdesdk-thumbnailers-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdesdk-thumbnailers-22.12.1.tar.xz"; + sha256 = "1w09rpri600k6v4z0srw0nfrg0dhqhsvxzj3vmgkksw2rllq7gm2"; + name = "kdesdk-thumbnailers-22.12.1.tar.xz"; }; }; kdev-php = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdev-php-22.12.0.tar.xz"; - sha256 = "0lrhdkvrmhv8h9rqiwpavp02gnjgf3izgkbwqkqj6vl36ky06yp8"; - name = "kdev-php-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdev-php-22.12.1.tar.xz"; + sha256 = "0jna5b9c4ir9x622iivbbz2h6bmp9hbvyxa99h791inpfcgbkxh0"; + name = "kdev-php-22.12.1.tar.xz"; }; }; kdev-python = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdev-python-22.12.0.tar.xz"; - sha256 = "0vgf5c6k6s3k3q1rmgy2c51hfmpvdnsspm95ryjyalpz8wfn2xp4"; - name = "kdev-python-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdev-python-22.12.1.tar.xz"; + sha256 = "064897836jgrfwqssk0fkxpc5bw61d41l0wk1qqavzv0bd22ljn8"; + name = "kdev-python-22.12.1.tar.xz"; }; }; kdevelop = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdevelop-22.12.0.tar.xz"; - sha256 = "073rk92am1ky8p5f2qjpwd0m8wjcm67qz4cgks68h883m2l690nm"; - name = "kdevelop-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdevelop-22.12.1.tar.xz"; + sha256 = "0qlhjdaaisjqmf1ss1nwrj8ppqy6z7aq9vzh18sb924y439bnc7k"; + name = "kdevelop-22.12.1.tar.xz"; }; }; kdf = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdf-22.12.0.tar.xz"; - sha256 = "0zx0d1yn47jw072xyzx98kpywdr8f55zz32r71dgh9pa1mqhf4qy"; - name = "kdf-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdf-22.12.1.tar.xz"; + sha256 = "11hh03mhccwqj141xrpkiz72lg1rwzixr3lsdbkjvx8b7mc2f5rc"; + name = "kdf-22.12.1.tar.xz"; }; }; kdialog = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdialog-22.12.0.tar.xz"; - sha256 = "0ql2ymrzhakacav7mj04wc265w0w5hkrdwpryz6dv9l1jv941dnw"; - name = "kdialog-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdialog-22.12.1.tar.xz"; + sha256 = "1wlmq01a78rw3lkv26wjmbyr56y1k945sdwvl521pz5bzanl2ppa"; + name = "kdialog-22.12.1.tar.xz"; }; }; kdiamond = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kdiamond-22.12.0.tar.xz"; - sha256 = "0kfci70kmwq1f7f0dpkmmk3s0b3jr63r4k81yhfndw4pdhz2v246"; - name = "kdiamond-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kdiamond-22.12.1.tar.xz"; + sha256 = "1b0ybhryxkr2p0vbs03pn70w16cpgbps3n1gmf4iqsg4xh86hhcc"; + name = "kdiamond-22.12.1.tar.xz"; }; }; keditbookmarks = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/keditbookmarks-22.12.0.tar.xz"; - sha256 = "06a73s53m0wdrlyigx2qf4807m0y6i4iqr4xl74zzmz46kn45c9m"; - name = "keditbookmarks-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/keditbookmarks-22.12.1.tar.xz"; + sha256 = "0djcm96hcj7fawyyxg39rnwq01p84c1w7hyrsz6c8cha8875lbr1"; + name = "keditbookmarks-22.12.1.tar.xz"; }; }; kfind = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kfind-22.12.0.tar.xz"; - sha256 = "0bjzmv4mmimrhz0n2ngcfiric6xlh34q87mhbc8by4cqm11xrf46"; - name = "kfind-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kfind-22.12.1.tar.xz"; + sha256 = "1li89qvfj7d6q3m8clk1sgzlwrgki966yvbvsjj6q49c463gjfla"; + name = "kfind-22.12.1.tar.xz"; }; }; kfloppy = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kfloppy-22.12.0.tar.xz"; - sha256 = "0anwmgx91vc20v0dbrl3k6a6qjydnw3qr4mlzgdazljfykp0ghda"; - name = "kfloppy-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kfloppy-22.12.1.tar.xz"; + sha256 = "0kxx2h4wxpdjzg4nzfj2ws6vs1jbq1l2r1n1zsllbaj7bxy7rif0"; + name = "kfloppy-22.12.1.tar.xz"; }; }; kfourinline = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kfourinline-22.12.0.tar.xz"; - sha256 = "1c35421a3y3f0nnykpwsmgmd5jmkp1xd6anpjd7gkp99pkcjarvp"; - name = "kfourinline-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kfourinline-22.12.1.tar.xz"; + sha256 = "0gag64zbm22mwsqkzip7q2lzwc40vqma6cxlf5m40zxin1p0nk7s"; + name = "kfourinline-22.12.1.tar.xz"; }; }; kgeography = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kgeography-22.12.0.tar.xz"; - sha256 = "08iq8blgm24nngdzsz4flyy18gzzaxpdz0na6jjy38h2b5fy9p0r"; - name = "kgeography-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kgeography-22.12.1.tar.xz"; + sha256 = "0xfyvzkzy5pp1321iyyvjy35ayav0adbyfym00np3a0sglpmb007"; + name = "kgeography-22.12.1.tar.xz"; }; }; kget = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kget-22.12.0.tar.xz"; - sha256 = "0kbxqjmsr8nsdzhz5msvb4lq3cdnl373i5hf4wi63m04rp9q0apm"; - name = "kget-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kget-22.12.1.tar.xz"; + sha256 = "18z2nsr07m4d9ybi4jdv1hvxnf0cpvbyy39znba7r3psr3q9j9sz"; + name = "kget-22.12.1.tar.xz"; }; }; kgoldrunner = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kgoldrunner-22.12.0.tar.xz"; - sha256 = "03ah2g7hxxj8k30n6lhs5m0iwvl4xg3q9s0ibsc3jkl1fi7wb2p5"; - name = "kgoldrunner-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kgoldrunner-22.12.1.tar.xz"; + sha256 = "1yrz6iafk01sm4mhjgkz8gsphsaxmrgf0zjjyzqqz4blzhi0fm8w"; + name = "kgoldrunner-22.12.1.tar.xz"; }; }; kgpg = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kgpg-22.12.0.tar.xz"; - sha256 = "0mdih0zgiqgs2av6dfqg5ns9v6bzy7hpksr0w79ag4r6lp586pzy"; - name = "kgpg-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kgpg-22.12.1.tar.xz"; + sha256 = "081g3ib0cd9zyg7vlkj1c99z1x5a1r3v3ck2f7xhlq1vgh6b610m"; + name = "kgpg-22.12.1.tar.xz"; }; }; khangman = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/khangman-22.12.0.tar.xz"; - sha256 = "0ijnrb2svs3465y5qgsqvgjwn6b8py7pwsxklqanigp0d6r89dww"; - name = "khangman-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/khangman-22.12.1.tar.xz"; + sha256 = "19yqlin45fwf6n9a94cd3h5101cw50rvxsvcx02y9cm405pdnx6l"; + name = "khangman-22.12.1.tar.xz"; }; }; khelpcenter = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/khelpcenter-22.12.0.tar.xz"; - sha256 = "0bmkgv0kwd4xnfh2z0m5iqkgy6322085992zzk7qdw943afk415g"; - name = "khelpcenter-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/khelpcenter-22.12.1.tar.xz"; + sha256 = "1cwn1mp79lps764vdilrprj99b9vxmqfxz81zk2vsyywnfyq3nly"; + name = "khelpcenter-22.12.1.tar.xz"; }; }; kidentitymanagement = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kidentitymanagement-22.12.0.tar.xz"; - sha256 = "13p4w7khhx6ax4j36iag04x4gagy04imgp39v1lzg95qgsyvaf9m"; - name = "kidentitymanagement-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kidentitymanagement-22.12.1.tar.xz"; + sha256 = "0zvp52kmg9mmgfjw01il0j9656gqi854i3dvir0djhqrqfv8ivb0"; + name = "kidentitymanagement-22.12.1.tar.xz"; }; }; kig = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kig-22.12.0.tar.xz"; - sha256 = "17wfnvxfgjk3d0k34kwm68qjz5bl6fqghyyyplhw0hjy3hn158pg"; - name = "kig-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kig-22.12.1.tar.xz"; + sha256 = "1mcb98r6j5byvx6bi2rhr3d6c9xdkf9cwnz2wy3v69xsi29var80"; + name = "kig-22.12.1.tar.xz"; }; }; kigo = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kigo-22.12.0.tar.xz"; - sha256 = "0ajx32w2j49pn0b2ki835xbqvb2dlvk4g6q6xaydy6ip6m7rhfwv"; - name = "kigo-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kigo-22.12.1.tar.xz"; + sha256 = "1nl0i1qdbfpjp1vmy71zwa6f2yp9vlzvfdfb4rdsqdz23x4irbzg"; + name = "kigo-22.12.1.tar.xz"; }; }; killbots = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/killbots-22.12.0.tar.xz"; - sha256 = "0wg88wlck60hignx6a542b63j7lqdb4gb14ax3zpbza9akgcraxs"; - name = "killbots-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/killbots-22.12.1.tar.xz"; + sha256 = "0lmd3cr087jjd4h557rsbjqr15j47wwr2is7vv4l3idl3hn3izak"; + name = "killbots-22.12.1.tar.xz"; }; }; kimagemapeditor = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kimagemapeditor-22.12.0.tar.xz"; - sha256 = "1da4qw53q8ghvk65kx7fyky40avys8jg4qhapgrxsk7c8d5p91yn"; - name = "kimagemapeditor-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kimagemapeditor-22.12.1.tar.xz"; + sha256 = "1shpkn79ag1invsmizz9amz5sbphpasp2a9l86mkzm8bwsrqjihb"; + name = "kimagemapeditor-22.12.1.tar.xz"; }; }; kimap = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kimap-22.12.0.tar.xz"; - sha256 = "1ibq3vwxyn05gk6s2hzywz6ymhylsn0bbaxc3gq8krj7r1dliiy4"; - name = "kimap-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kimap-22.12.1.tar.xz"; + sha256 = "03fgi82l8zq1r13akvchlymlzc2ivxhw9br75i5j93v3jvfhindx"; + name = "kimap-22.12.1.tar.xz"; }; }; kio-extras = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kio-extras-22.12.0.tar.xz"; - sha256 = "0lgsdqfcfb18w21ia9mnv91213938g1ab3nkqjda52mv67ra45a8"; - name = "kio-extras-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kio-extras-22.12.1.tar.xz"; + sha256 = "0g1is8hgy9zjzm7l3msg6shcjvrl0x6wf5gji0c34hkrr5axd0gv"; + name = "kio-extras-22.12.1.tar.xz"; }; }; kio-gdrive = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kio-gdrive-22.12.0.tar.xz"; - sha256 = "0sfvg7qnxxiij122l1rqlxdizj7dxzm5hkjbnhxgqifb4x7cizfv"; - name = "kio-gdrive-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kio-gdrive-22.12.1.tar.xz"; + sha256 = "1p3q17c7f6i7q5k3k5rxckl1wdr8bs9z9v8zz2jwnky3licfhgk8"; + name = "kio-gdrive-22.12.1.tar.xz"; }; }; kio-zeroconf = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kio-zeroconf-22.12.0.tar.xz"; - sha256 = "060m3sij5020b0gah4bqqwxrw9krmhz2swfj1ydgjbi2n0mnpwsa"; - name = "kio-zeroconf-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kio-zeroconf-22.12.1.tar.xz"; + sha256 = "0qhl2yygs2bs56nd3ybwhcd4ry0qls2qzhh3lb8y9xqiakz669sn"; + name = "kio-zeroconf-22.12.1.tar.xz"; }; }; kipi-plugins = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kipi-plugins-22.12.0.tar.xz"; - sha256 = "0qm070bgb8aj2xh4gx0jpmlsbwdfsm3vjk7pi21ijd7zrpvwc9j4"; - name = "kipi-plugins-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kipi-plugins-22.12.1.tar.xz"; + sha256 = "1jgjnc0svjyq3ffgiksxcxk140lk3bligh8501jv5q7sy6flcwba"; + name = "kipi-plugins-22.12.1.tar.xz"; }; }; kirigami-gallery = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kirigami-gallery-22.12.0.tar.xz"; - sha256 = "040h03w14vwyyyd00wa0g85zl38cygpcxdynqxlc34qf535r413d"; - name = "kirigami-gallery-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kirigami-gallery-22.12.1.tar.xz"; + sha256 = "1drbqhcjx6ilqj49y8pghg94hwdwnj08wfl33j9ssn59wh6s282h"; + name = "kirigami-gallery-22.12.1.tar.xz"; }; }; kiriki = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kiriki-22.12.0.tar.xz"; - sha256 = "1ry352v5pilw2rhr4gghbqx3xr9c9rknnpfij06dkiigm5d4w5dg"; - name = "kiriki-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kiriki-22.12.1.tar.xz"; + sha256 = "1ad71h5fy6c5826hhdfbzr4x9gbl5z28vqwc9kjhyjvl9x24h264"; + name = "kiriki-22.12.1.tar.xz"; }; }; kiten = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kiten-22.12.0.tar.xz"; - sha256 = "0znwz1z63b6bwi6q89j03swsadpninqvci6zs9zs15csnj0s262k"; - name = "kiten-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kiten-22.12.1.tar.xz"; + sha256 = "0cz5whrmzj6yflqw5cfvazmdf66qcgm1wz94h8f283nnglc4vz49"; + name = "kiten-22.12.1.tar.xz"; }; }; kitinerary = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kitinerary-22.12.0.tar.xz"; - sha256 = "1b5ii2rljr39lnc53i20q98ypwy5wic4dr3dvrrmap526vs948wd"; - name = "kitinerary-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kitinerary-22.12.1.tar.xz"; + sha256 = "0i9mbfm5f57hac9rj50474ck05hrdv4m2qdaqi4jm2dr737wmigh"; + name = "kitinerary-22.12.1.tar.xz"; }; }; kjumpingcube = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kjumpingcube-22.12.0.tar.xz"; - sha256 = "08qa25yxqz6dm9syq8343rs0q9ag0habl050s8zki7hkk4sbrfhl"; - name = "kjumpingcube-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kjumpingcube-22.12.1.tar.xz"; + sha256 = "0cyq25cmcirw7kx6yln1nn0l5va9q7a8ngcldggknlnpap3y5m4q"; + name = "kjumpingcube-22.12.1.tar.xz"; }; }; kldap = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kldap-22.12.0.tar.xz"; - sha256 = "1gbgnk3nrhjpx5q527g2x2fsv15aw4p2j66djp8k8b65zrzwd313"; - name = "kldap-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kldap-22.12.1.tar.xz"; + sha256 = "1dyn01jxlh5qidlnhd989c88id6vxfazn9flhlhsklgcaywf73y8"; + name = "kldap-22.12.1.tar.xz"; }; }; kleopatra = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kleopatra-22.12.0.tar.xz"; - sha256 = "0ijydbbjgqnzplfql09l533n7a78zx3kvwrqbczvvw2k4vl89snz"; - name = "kleopatra-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kleopatra-22.12.1.tar.xz"; + sha256 = "0vg311c1qbvbajb0n46fhy90yafq5rgrh107z172snbvd1v42bj9"; + name = "kleopatra-22.12.1.tar.xz"; }; }; klettres = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/klettres-22.12.0.tar.xz"; - sha256 = "1vi31clysvdindkn3wk8xbrzq9fhicxik3l9cxk4rl9jw9y5gsvq"; - name = "klettres-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/klettres-22.12.1.tar.xz"; + sha256 = "1jad7waik1agaih98x9bm6apmm6plz9kpsy3zfcll80vl0p6g8vs"; + name = "klettres-22.12.1.tar.xz"; }; }; klickety = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/klickety-22.12.0.tar.xz"; - sha256 = "0d4gcn2yzqk3qk85lrjghbxf29p5wf6gy4y6d8m7hyj5fifwxnl8"; - name = "klickety-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/klickety-22.12.1.tar.xz"; + sha256 = "004hj4dbwxy9yyjcgc8awjwc45x9gsh5jfs5w8261l0qj4zinj8l"; + name = "klickety-22.12.1.tar.xz"; }; }; klines = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/klines-22.12.0.tar.xz"; - sha256 = "1r2ggrfvqaxdcjxr9m2pij3366sryga3cm3myr1lsc2fkapi646j"; - name = "klines-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/klines-22.12.1.tar.xz"; + sha256 = "0jsb5842qmi0ll23x6rmmiv91zwyijnvmq6bvk9fs66i0fczgkj7"; + name = "klines-22.12.1.tar.xz"; }; }; kmag = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmag-22.12.0.tar.xz"; - sha256 = "0gn284bazhmgr9814wfqnnwh62bqipk4ixn39ly423jcqdw7il63"; - name = "kmag-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmag-22.12.1.tar.xz"; + sha256 = "09vq93jab8hv918fabz3i50311n6vglpig5nrgdzv72mvy5y86bk"; + name = "kmag-22.12.1.tar.xz"; }; }; kmahjongg = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmahjongg-22.12.0.tar.xz"; - sha256 = "0f63r6ly8n0s93f25xnm94kjdjp384n2jha2inqx1wrayi4n5drd"; - name = "kmahjongg-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmahjongg-22.12.1.tar.xz"; + sha256 = "0103p982wih0niqpzk464m2nwyfxinzl783qj7liwavrgsv1fkfy"; + name = "kmahjongg-22.12.1.tar.xz"; }; }; kmail = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmail-22.12.0.tar.xz"; - sha256 = "1r9d60zl9iqsddc1bab55w390ak2zxrvnivpblx4m7385h38g9q1"; - name = "kmail-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmail-22.12.1.tar.xz"; + sha256 = "02qgsyxs4y37ry2xwwc2x541l4l7gfbhq1gmankn1gp6128p9zhi"; + name = "kmail-22.12.1.tar.xz"; }; }; kmail-account-wizard = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmail-account-wizard-22.12.0.tar.xz"; - sha256 = "07a37lrhhp7gzfb00fzyykq1rpn0cqx49c67yslcrjj3bfmf7vc5"; - name = "kmail-account-wizard-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmail-account-wizard-22.12.1.tar.xz"; + sha256 = "0ncwmhz69fja35fg90a7q8m1vv94cbxapr5n69vgb4xlypf9sd38"; + name = "kmail-account-wizard-22.12.1.tar.xz"; }; }; kmailtransport = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmailtransport-22.12.0.tar.xz"; - sha256 = "12v4ibcs6gnp5scbck8xk4f94bbi25mvsxnqvwdicqifdrpgz1m4"; - name = "kmailtransport-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmailtransport-22.12.1.tar.xz"; + sha256 = "19b6hhgdvnh23v5yl6rz6c0i742lavmmx1xkkkza69ha0nfaphw2"; + name = "kmailtransport-22.12.1.tar.xz"; }; }; kmbox = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmbox-22.12.0.tar.xz"; - sha256 = "15c40f5lavgxwdxshzyk2wfy92c2ws92b64whvljfmc0j16gjdqm"; - name = "kmbox-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmbox-22.12.1.tar.xz"; + sha256 = "1g01n0nvvjpds8bh8zg2r97s3xddhcvlxs6hvb2m7xck0x0w0rnq"; + name = "kmbox-22.12.1.tar.xz"; }; }; kmime = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmime-22.12.0.tar.xz"; - sha256 = "123ykbbmpb7zr3i1p0hfplr9xm2j708g5f5sj8s057m5jqv9x9mq"; - name = "kmime-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmime-22.12.1.tar.xz"; + sha256 = "196sipqw1w4v3va4qy3y4369hyd6zgi8w36fqfkismc1z5lbhhi5"; + name = "kmime-22.12.1.tar.xz"; }; }; kmines = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmines-22.12.0.tar.xz"; - sha256 = "1qvmjn86r2w323ircimrypmnagx8s4cxqhsm30z237s368d7kprg"; - name = "kmines-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmines-22.12.1.tar.xz"; + sha256 = "1n0wbgxjah0n2mik4x1fkb1n3bq7zkkiklj2qn7l64qszdxjmzq4"; + name = "kmines-22.12.1.tar.xz"; }; }; kmix = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmix-22.12.0.tar.xz"; - sha256 = "011n2lbmdj5smbgqg8fk1p6vxrmh2d28cg4yn5a1fnshgwpw3yqc"; - name = "kmix-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmix-22.12.1.tar.xz"; + sha256 = "00nq47v6h452wymj5bv3h0ava8wx1vg3w5kc43bnw7rfgh1ikpm9"; + name = "kmix-22.12.1.tar.xz"; }; }; kmousetool = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmousetool-22.12.0.tar.xz"; - sha256 = "1ahr2vyhfi8ajkp0mbvm0h9q0h68xc2d4q8mp2s2qig9q7gf5wa7"; - name = "kmousetool-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmousetool-22.12.1.tar.xz"; + sha256 = "0z7ph40zld45pzyyh8naczqzvccra7rjcy9d12phcdmii2x05njw"; + name = "kmousetool-22.12.1.tar.xz"; }; }; kmouth = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmouth-22.12.0.tar.xz"; - sha256 = "1pdxm98f6nbcdr1h61j1071djz04bmpm12mx4b0bbc077lyk9qcl"; - name = "kmouth-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmouth-22.12.1.tar.xz"; + sha256 = "0gkq6m3ylcghqsdwv8i8372dsia8cd61s8jfwnw94v41zbi5l6md"; + name = "kmouth-22.12.1.tar.xz"; }; }; kmplot = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kmplot-22.12.0.tar.xz"; - sha256 = "0ma3zd5salizy3zh85jnqrf6m8vfk52f9s0yy4lsmlssdqykvqri"; - name = "kmplot-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kmplot-22.12.1.tar.xz"; + sha256 = "0vvqh5nikfd4lx90c41va6y66iad4dgzcgp1kxwshwlzlkpnd783"; + name = "kmplot-22.12.1.tar.xz"; }; }; knavalbattle = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/knavalbattle-22.12.0.tar.xz"; - sha256 = "0d0bkinr8f76w7g6m7w6q7yf6lgasdbf2q4a6749jpr3m38hbai1"; - name = "knavalbattle-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/knavalbattle-22.12.1.tar.xz"; + sha256 = "195vqwp3k7dpgkbg43pl5y7vlm6858y1p6wqdz54dam1gcg7185g"; + name = "knavalbattle-22.12.1.tar.xz"; }; }; knetwalk = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/knetwalk-22.12.0.tar.xz"; - sha256 = "1d5qpivmwff4f8hw3rc5ynr0pd97aa08442l9ha5kd4rvfwspahw"; - name = "knetwalk-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/knetwalk-22.12.1.tar.xz"; + sha256 = "0jf2jk1i3awww6yalb6k5p4c31d323m4f6dj76r5nnalpj81jkiv"; + name = "knetwalk-22.12.1.tar.xz"; }; }; knights = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/knights-22.12.0.tar.xz"; - sha256 = "0vb6k2pzszkizaf03sa86q7s8qxjh9qvknpqg01vy1wgx0x1207i"; - name = "knights-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/knights-22.12.1.tar.xz"; + sha256 = "106kq9ahr000nnakiq9n8by06qq2av4pnlh23y4n0z52rbhq866w"; + name = "knights-22.12.1.tar.xz"; }; }; knotes = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/knotes-22.12.0.tar.xz"; - sha256 = "027mcipwigc7f4zv3zlhymffhbkdg3ldj2nq20v4bz8p0vybgsv1"; - name = "knotes-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/knotes-22.12.1.tar.xz"; + sha256 = "180g0j1fhhixm4qm61whbik3z1pvijw33v2pb4jjzzhbxn439xcm"; + name = "knotes-22.12.1.tar.xz"; }; }; kolf = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kolf-22.12.0.tar.xz"; - sha256 = "1zg0xw0940pcswbkgg3src6ji2zagdg7axz9mjjxyabs57acdmr4"; - name = "kolf-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kolf-22.12.1.tar.xz"; + sha256 = "1v5xkjh6xdfmll7bcqsv1218bvr6q3z3ac1367gd824bcxv5j5np"; + name = "kolf-22.12.1.tar.xz"; }; }; kollision = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kollision-22.12.0.tar.xz"; - sha256 = "042rrkqk5j547xgcw5dwkya8m0l4f1arns6viix8nyrgrlf5x67p"; - name = "kollision-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kollision-22.12.1.tar.xz"; + sha256 = "0ksq4inaq5a74jxxhsajwxnpgr7wnjgpm70kj0layxvryqjlzmkj"; + name = "kollision-22.12.1.tar.xz"; }; }; kolourpaint = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kolourpaint-22.12.0.tar.xz"; - sha256 = "11avkpyqb3d0w9cfcyg0y7dbwlzgsmivv9qa8fmf8m8jgiv4p2zz"; - name = "kolourpaint-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kolourpaint-22.12.1.tar.xz"; + sha256 = "0m1p1xdi8ax8zanqgmyqndzz1bngz4bxdv4lxjx4nqimgjjrbmj8"; + name = "kolourpaint-22.12.1.tar.xz"; }; }; kompare = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kompare-22.12.0.tar.xz"; - sha256 = "1ac3ywi0sm1whphm2s8ax7cw29x2pfkmbixlps1q0qh2rghz0hx3"; - name = "kompare-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kompare-22.12.1.tar.xz"; + sha256 = "0g6qw3ajgb71rj99f2sni64i7sqdq586i71pj66pj18kx51m4zsn"; + name = "kompare-22.12.1.tar.xz"; }; }; konqueror = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/konqueror-22.12.0.tar.xz"; - sha256 = "047d5v62r78bffax25b66gr4bq9hy80pqdx0jh2pnzb3kif9kcnk"; - name = "konqueror-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/konqueror-22.12.1.tar.xz"; + sha256 = "1nyhrnl0ry5439r75974fy7mks78knxs6m8zg8y24glbmjnb1d0m"; + name = "konqueror-22.12.1.tar.xz"; }; }; konquest = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/konquest-22.12.0.tar.xz"; - sha256 = "0p84hilzrqix0wlkwbv9r9rmmnkaiyw8rypjw0hmjdhpvqg671js"; - name = "konquest-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/konquest-22.12.1.tar.xz"; + sha256 = "0nmrxylx1spvp9m3xwy9xgw2nxrv4k68zanr7q7cxlc95wlxdrk6"; + name = "konquest-22.12.1.tar.xz"; }; }; konsole = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/konsole-22.12.0.tar.xz"; - sha256 = "1a58xw1a298hp8fa034whn57g2j0ii2alwqcbij60az1rng94sm7"; - name = "konsole-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/konsole-22.12.1.tar.xz"; + sha256 = "1jyfl6ibcpxphgh5by3501vk519fkvr5y9jhl1wzx6dh4vw7zh9l"; + name = "konsole-22.12.1.tar.xz"; }; }; kontact = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kontact-22.12.0.tar.xz"; - sha256 = "16cysfafdwsmcbz7x1vqr0bqfys4nsckz274aafddcsmxr0n6zaj"; - name = "kontact-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kontact-22.12.1.tar.xz"; + sha256 = "1m943xcg4csjvcfm9py7h7cr3f2k3xvlidr75ri4sbwnhkl7494k"; + name = "kontact-22.12.1.tar.xz"; }; }; kontactinterface = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kontactinterface-22.12.0.tar.xz"; - sha256 = "1s1c2kwiq7jsdyb1rqv82idw5h9zqn73q21ay36xl3ryz669lpxi"; - name = "kontactinterface-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kontactinterface-22.12.1.tar.xz"; + sha256 = "13l44jm0rfin0vbm4znjn25igfmgkifi993qcq5pq6fy96cj2g8l"; + name = "kontactinterface-22.12.1.tar.xz"; }; }; kontrast = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kontrast-22.12.0.tar.xz"; - sha256 = "0lvx7dwf1k8ar6n244wp2rqn3dd4pzfy6n2l6svdjkrnxj1cpx7q"; - name = "kontrast-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kontrast-22.12.1.tar.xz"; + sha256 = "0vbqxn73p4d0wlv70gv39pz72lrwc92png14vfwi3ka23751mqai"; + name = "kontrast-22.12.1.tar.xz"; }; }; konversation = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/konversation-22.12.0.tar.xz"; - sha256 = "0ql0fmbch8mdyvry8gy641mlljkilbmy5x5n344qkd492hjk9sam"; - name = "konversation-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/konversation-22.12.1.tar.xz"; + sha256 = "12246dlhwak7hxj2p2i1wksijqx0a8iwrk7qyh1543hcjm4mkyyv"; + name = "konversation-22.12.1.tar.xz"; }; }; kopeninghours = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kopeninghours-22.12.0.tar.xz"; - sha256 = "08yspl2bqr7r30285h0mf4diax3lg6k1jhnfhkbr5dhj8l8q3shm"; - name = "kopeninghours-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kopeninghours-22.12.1.tar.xz"; + sha256 = "198m55gwvv5ig28hibk7gib6wj7rxahngw6ryshqgr0yhrir1bha"; + name = "kopeninghours-22.12.1.tar.xz"; }; }; kopete = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kopete-22.12.0.tar.xz"; - sha256 = "0ydxzz0sd6i6hwnny1mnc16k3s9w6ams1086kdayqidgk3zjlsg0"; - name = "kopete-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kopete-22.12.1.tar.xz"; + sha256 = "0x7ya19n2wfd7h4h71sqa9kp02qh2sc0r8wy9njjn6basc6cj7yd"; + name = "kopete-22.12.1.tar.xz"; }; }; korganizer = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/korganizer-22.12.0.tar.xz"; - sha256 = "0w1fsgnjb7104x6i1qndmzhm82dqwbxphcs6rk83p82ay5a4arhk"; - name = "korganizer-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/korganizer-22.12.1.tar.xz"; + sha256 = "11gqa0bxpwra5ml8yb7pp7x4jbn3rndi8c66jhmi89gb33qyfnzh"; + name = "korganizer-22.12.1.tar.xz"; }; }; kosmindoormap = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kosmindoormap-22.12.0.tar.xz"; - sha256 = "1mb8kc2s7w97fmnik2qmyw6hj3q8izs6crd3hcan4grjm1zrp3vv"; - name = "kosmindoormap-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kosmindoormap-22.12.1.tar.xz"; + sha256 = "1fb7hbndys6yji6xmdi6qildzr5s5wknr3mzckjc093sqb5q1dv2"; + name = "kosmindoormap-22.12.1.tar.xz"; }; }; kpat = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kpat-22.12.0.tar.xz"; - sha256 = "09wig0yy9p1wdx0j93acx2d80hicx26m6qnq01gbna91i5d5hffq"; - name = "kpat-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kpat-22.12.1.tar.xz"; + sha256 = "0c0sr0lyskhqvyrhjb4x1hwpp4b5d1kxc6lnxz9w2qlgng8mr73l"; + name = "kpat-22.12.1.tar.xz"; }; }; kpimtextedit = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kpimtextedit-22.12.0.tar.xz"; - sha256 = "1dszqj8v8jvwkkzclibjdpairz52hqnbfsas6rddhyf2mrydspiz"; - name = "kpimtextedit-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kpimtextedit-22.12.1.tar.xz"; + sha256 = "10r1gmsqf2bd2f0x3x0nwdzwyp3b6zg32fq0jkgwd1j1zyxipmaf"; + name = "kpimtextedit-22.12.1.tar.xz"; }; }; kpkpass = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kpkpass-22.12.0.tar.xz"; - sha256 = "0jhqjj16grgm75k6ifdskb3n9ac0c4y1l9psy9h18diq59zba6v1"; - name = "kpkpass-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kpkpass-22.12.1.tar.xz"; + sha256 = "1hp5d7yzklyi9fy1d3dn39xiaxrhvxskchdrpjs83q91l8c49750"; + name = "kpkpass-22.12.1.tar.xz"; }; }; kpmcore = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kpmcore-22.12.0.tar.xz"; - sha256 = "1zq9fxmf77267sglncsr9d7rzd84yapl1w8gl4c3j66x0g9dqziz"; - name = "kpmcore-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kpmcore-22.12.1.tar.xz"; + sha256 = "13dpp7fm2750qbnwrp4rpj9kp9skpqkpq5jkj1s40b6267v7p7b4"; + name = "kpmcore-22.12.1.tar.xz"; }; }; kpublictransport = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kpublictransport-22.12.0.tar.xz"; - sha256 = "1bnsrgpj5qaav4yn3izl8fgg9p0fnnsaf2m8h05wldg1v1dh1m4z"; - name = "kpublictransport-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kpublictransport-22.12.1.tar.xz"; + sha256 = "1f8imxkdayyp8p30ld80jl5v2wlnajmxl03cysx016lckqzds60l"; + name = "kpublictransport-22.12.1.tar.xz"; }; }; kqtquickcharts = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kqtquickcharts-22.12.0.tar.xz"; - sha256 = "109rrwgmyx2r8qq8h65ja9rxyg9vzlid8129aww8x3mb563dngil"; - name = "kqtquickcharts-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kqtquickcharts-22.12.1.tar.xz"; + sha256 = "1ys904z1c104zyi1184xj63nzhpgwraakmsgw6wfbfxpw6sjy293"; + name = "kqtquickcharts-22.12.1.tar.xz"; }; }; krdc = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/krdc-22.12.0.tar.xz"; - sha256 = "09md5bp86naplisba3ifhkclwv6ghbr6i00xbya629zlph2wqrj3"; - name = "krdc-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/krdc-22.12.1.tar.xz"; + sha256 = "1d8lm41i7mwcg5xd9hl9p32kajxz8iv26696f33z9kb5lhh8wv26"; + name = "krdc-22.12.1.tar.xz"; }; }; kreversi = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kreversi-22.12.0.tar.xz"; - sha256 = "00g41dlcfpf7cvhnklyy29jfmd41kmx82jvskk8wqf3gv71mfby8"; - name = "kreversi-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kreversi-22.12.1.tar.xz"; + sha256 = "1aq7qnnmpkkb41znzxvhbfnxr0c60irlirkw7jv2jf7rqlqhahls"; + name = "kreversi-22.12.1.tar.xz"; }; }; krfb = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/krfb-22.12.0.tar.xz"; - sha256 = "0cs97qnl251xr9g75w2zkxvg06hgb3l4yzz5lnzf9qcxv794vjsv"; - name = "krfb-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/krfb-22.12.1.tar.xz"; + sha256 = "04bjybi15bar21334q9zpscw626fih5vnh1ndrz0q95sgyrcpd4z"; + name = "krfb-22.12.1.tar.xz"; }; }; kross-interpreters = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kross-interpreters-22.12.0.tar.xz"; - sha256 = "0bk9bj0p4vsmmgm4bdmpvj8lik9fvjxv0235zzi02y99dc0zh3va"; - name = "kross-interpreters-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kross-interpreters-22.12.1.tar.xz"; + sha256 = "1h97d5gn63r34h9hhn37zmwri1z63c1h30ridahqn45sn2pqigz7"; + name = "kross-interpreters-22.12.1.tar.xz"; }; }; kruler = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kruler-22.12.0.tar.xz"; - sha256 = "0bihszsiic380qdxxp94kljr8fk0mhfxc5jbavr05fz85zprm8ry"; - name = "kruler-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kruler-22.12.1.tar.xz"; + sha256 = "18mp51hpqkc9wiwv1zdnx99xjjz58rvk7camz6fj8n4ns1j5q2g1"; + name = "kruler-22.12.1.tar.xz"; }; }; ksanecore = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ksanecore-22.12.0.tar.xz"; - sha256 = "1vkb6xqxa9qyfgic8mkgbs95ynjk49q58w9r5h0va35zl4z6bhnl"; - name = "ksanecore-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ksanecore-22.12.1.tar.xz"; + sha256 = "0cx4n1hdbdfwd86b29risbgg2fijyvjcf29k3qky9gk1c7cfil5d"; + name = "ksanecore-22.12.1.tar.xz"; }; }; kshisen = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kshisen-22.12.0.tar.xz"; - sha256 = "1xlx7acf9hw7l934rzz7cw9k5pn1fkhiafvw61z7z3zjhzxlvnmx"; - name = "kshisen-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kshisen-22.12.1.tar.xz"; + sha256 = "0phzfzvy8g5dcid92pbx288ix6ri3b9jx6slbqm2wv4p3r96l6hl"; + name = "kshisen-22.12.1.tar.xz"; }; }; ksirk = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ksirk-22.12.0.tar.xz"; - sha256 = "1yf0riblha5hyllxnwrgqk9qr9sy47171f56bskfnrgwnz7qv0h9"; - name = "ksirk-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ksirk-22.12.1.tar.xz"; + sha256 = "13ykkkygs0xaxd907xq3a9di61p7pnxdggsfmfpz8zk5xawavx2q"; + name = "ksirk-22.12.1.tar.xz"; }; }; ksmtp = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ksmtp-22.12.0.tar.xz"; - sha256 = "039iichn7rqswdlqkn5hr4f18cc6z92r1dakm0pj0skaml0yk9z6"; - name = "ksmtp-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ksmtp-22.12.1.tar.xz"; + sha256 = "0vbwp2r90fxkmw51fjvphigqjj9lhk0dprb2wnfi9ik08iqc1dk7"; + name = "ksmtp-22.12.1.tar.xz"; }; }; ksnakeduel = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ksnakeduel-22.12.0.tar.xz"; - sha256 = "1180kbmsjdrg4yyh0fjr75w9n6b799qdxc6jracy9rqby3a3fb8p"; - name = "ksnakeduel-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ksnakeduel-22.12.1.tar.xz"; + sha256 = "16pismxhrygwcbsricmli91sj86w623wkmbblns3yjw7bxy6gg2m"; + name = "ksnakeduel-22.12.1.tar.xz"; }; }; kspaceduel = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kspaceduel-22.12.0.tar.xz"; - sha256 = "1wppvzzyjvj53wyxbhyzmcaf9648in0ymr7ni3nskl0jgcd2hkny"; - name = "kspaceduel-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kspaceduel-22.12.1.tar.xz"; + sha256 = "0qlc3a05ppny6y2kzxqx817qcjmy5zal78bhhxlykn5l4m8hlis4"; + name = "kspaceduel-22.12.1.tar.xz"; }; }; ksquares = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ksquares-22.12.0.tar.xz"; - sha256 = "1f92h6b8czsyhbmb6xyapjvxs1fz9wxp8g4jnv9g94vs8yi2hdyj"; - name = "ksquares-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ksquares-22.12.1.tar.xz"; + sha256 = "1z52c6m7lx9vg8v7kxnblcpag9l3m0r97rv87s7m2g2d3rw4rfib"; + name = "ksquares-22.12.1.tar.xz"; }; }; ksudoku = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ksudoku-22.12.0.tar.xz"; - sha256 = "0x9g7xwj7nhr1dv8yrb2ir7vlixrij1kdcx4f82654pxn9yl5494"; - name = "ksudoku-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ksudoku-22.12.1.tar.xz"; + sha256 = "00zylx2gla7c264csyix9z8k1h5zy2l0s9mrb2fds0i7i70gwcsw"; + name = "ksudoku-22.12.1.tar.xz"; }; }; ksystemlog = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ksystemlog-22.12.0.tar.xz"; - sha256 = "0nyj85hmik9z6z0r07kisirh1hc1yxkilaszld501zxc3xshszj3"; - name = "ksystemlog-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ksystemlog-22.12.1.tar.xz"; + sha256 = "0y7xjf8z8myg3yv7rcdrqj15hj74vibn6myhspb2cn300z617rhr"; + name = "ksystemlog-22.12.1.tar.xz"; }; }; kteatime = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kteatime-22.12.0.tar.xz"; - sha256 = "0x6nlldcxw0igmgjs0ddxhmkgxirs149fbbiqd085d282akn24ln"; - name = "kteatime-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kteatime-22.12.1.tar.xz"; + sha256 = "0w7kvvs5w6zhahr1gq8gqv5sljfnp1bwznjammvc1hnqy1f4pj3n"; + name = "kteatime-22.12.1.tar.xz"; }; }; ktimer = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktimer-22.12.0.tar.xz"; - sha256 = "1nrvank6bjdr5zvsr2320j46apcipzj43kkgjbx63i646kg7jmd0"; - name = "ktimer-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktimer-22.12.1.tar.xz"; + sha256 = "0mid32qr2jgn048vsv7j1jljxzwa87lfh0ybxp94c29z2nkxbxnp"; + name = "ktimer-22.12.1.tar.xz"; }; }; ktnef = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktnef-22.12.0.tar.xz"; - sha256 = "1sf1pbcb82jkqrf871s5ri90ggm8iy03hv86pbddch1nn1mpzr37"; - name = "ktnef-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktnef-22.12.1.tar.xz"; + sha256 = "0pcl7iaq1ipab5gg60w9wczkj8q7mnk62na2kajbgrmaw61slnj0"; + name = "ktnef-22.12.1.tar.xz"; }; }; ktorrent = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktorrent-22.12.0.tar.xz"; - sha256 = "1dic4zarcpmc9cf7cjmdxn96bi027pp2l1lx1jj8yvchjhh4wa09"; - name = "ktorrent-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktorrent-22.12.1.tar.xz"; + sha256 = "093dc7gd9g05v78l5xq3c4k6kqx3x6c5n4w24mzq88x9ilf19jfw"; + name = "ktorrent-22.12.1.tar.xz"; }; }; ktouch = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktouch-22.12.0.tar.xz"; - sha256 = "0as8pbpbnpwhbl7bkifkyg7gy0dp5x8f2n2p9klbwl8b3i04alhr"; - name = "ktouch-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktouch-22.12.1.tar.xz"; + sha256 = "1zw6fkf8kcf1wc63bnc3f2i1ahq7y5vr3068yf49rxvd6dkmwxaw"; + name = "ktouch-22.12.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-accounts-kcm-22.12.0.tar.xz"; - sha256 = "1ir4ypcy6raikw7cv7f1r1iz6xvip59hkrc0gpikwax7v5vpr2l4"; - name = "ktp-accounts-kcm-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-accounts-kcm-22.12.1.tar.xz"; + sha256 = "00sc1jwrqwvia9mylb1xizq0nvkb2zzh72vh9ycpxbxc59x3jdpa"; + name = "ktp-accounts-kcm-22.12.1.tar.xz"; }; }; ktp-approver = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-approver-22.12.0.tar.xz"; - sha256 = "1sx7a3yw14zpc2wk5vvil9c69273a5m2rza2qzs57ms3q976qd59"; - name = "ktp-approver-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-approver-22.12.1.tar.xz"; + sha256 = "1s26y6wmn1m65rk8v1hd511qk21ll52p62hqp39gy4k2wivs1w5y"; + name = "ktp-approver-22.12.1.tar.xz"; }; }; ktp-auth-handler = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-auth-handler-22.12.0.tar.xz"; - sha256 = "075jpvi09gcwi2lmndkbcq4xmrqry5k1nfdvp3hbp021p1qxz5w6"; - name = "ktp-auth-handler-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-auth-handler-22.12.1.tar.xz"; + sha256 = "0qcklfnr5nm8c5x5p52nyjkkl2xjw5jzsnn5wsav8bzcm7pfrvp8"; + name = "ktp-auth-handler-22.12.1.tar.xz"; }; }; ktp-call-ui = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-call-ui-22.12.0.tar.xz"; - sha256 = "12pg6h0vrwcjmkyswz6g5nb0jys0w8sfmgkramja0lrl6l7inrck"; - name = "ktp-call-ui-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-call-ui-22.12.1.tar.xz"; + sha256 = "1v60czwgiad0psas4ky7psyba75bxlg1xry26qrh3xp0r67a2gg3"; + name = "ktp-call-ui-22.12.1.tar.xz"; }; }; ktp-common-internals = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-common-internals-22.12.0.tar.xz"; - sha256 = "0cc6vi42knnm94my4lq29spgrnhn48sjsk4yd4vzig4cn3kf08q2"; - name = "ktp-common-internals-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-common-internals-22.12.1.tar.xz"; + sha256 = "0j48s6dk8a0925c84iwwk9j3vyw5lnx7mc9jfwaw523qi3pdhc60"; + name = "ktp-common-internals-22.12.1.tar.xz"; }; }; ktp-contact-list = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-contact-list-22.12.0.tar.xz"; - sha256 = "1qnvcl57db4ayshgkw19h3ldlw9hr2k2g5jc421swpazaz5k1dx6"; - name = "ktp-contact-list-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-contact-list-22.12.1.tar.xz"; + sha256 = "09dhr3vclymbkhl1zcd1gqpln5gdb6x4pa3as9gygqfiginnzbqc"; + name = "ktp-contact-list-22.12.1.tar.xz"; }; }; ktp-contact-runner = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-contact-runner-22.12.0.tar.xz"; - sha256 = "0h0h7gmdxis9bnvhfyxyiwb9k269jbbczd6jx3fdv672173k21zw"; - name = "ktp-contact-runner-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-contact-runner-22.12.1.tar.xz"; + sha256 = "0d8fj2lf2h1bi36mv2yakc1nz8wmqd2znjx4vjmj7cf49jpr9jlk"; + name = "ktp-contact-runner-22.12.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-desktop-applets-22.12.0.tar.xz"; - sha256 = "14q4xnbb59kyplms3v8708klcdy6kcv8zgq72wgifir98lr9qyl5"; - name = "ktp-desktop-applets-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-desktop-applets-22.12.1.tar.xz"; + sha256 = "1wiwflsavbq971mrycn2qrb5xngd6kmph0xwmxj001r3vj6wmxvx"; + name = "ktp-desktop-applets-22.12.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-filetransfer-handler-22.12.0.tar.xz"; - sha256 = "1lawqw6cnmfmwsmwfg18r2520gmgr7ia5dggm2xciq5vwchvi91a"; - name = "ktp-filetransfer-handler-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-filetransfer-handler-22.12.1.tar.xz"; + sha256 = "0wklr4k2ybbpla0ybnqcj8ms46r14v47ldgy6pkba3lcvydn7zs3"; + name = "ktp-filetransfer-handler-22.12.1.tar.xz"; }; }; ktp-kded-module = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-kded-module-22.12.0.tar.xz"; - sha256 = "0f7jvq1ss55harpsi3canqidrh0y5fq7044rnascc7a72yqzalh7"; - name = "ktp-kded-module-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-kded-module-22.12.1.tar.xz"; + sha256 = "123kvzn2cp2gkpgs3wqigzdmxval39jr0xwwr9mrfnbsdyf9cqs1"; + name = "ktp-kded-module-22.12.1.tar.xz"; }; }; ktp-send-file = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-send-file-22.12.0.tar.xz"; - sha256 = "1zphnwpa8zsvk2zki34rwbvgz2hn5bsmi7k1kay35wml7ijg5a07"; - name = "ktp-send-file-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-send-file-22.12.1.tar.xz"; + sha256 = "190gv19fzarj9mm8xp282sqag85hpam9sjiggcixqzcdmwp509z0"; + name = "ktp-send-file-22.12.1.tar.xz"; }; }; ktp-text-ui = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktp-text-ui-22.12.0.tar.xz"; - sha256 = "1q22p6377l7cz4nznyczwqwkn216psvrf2a30270v5ghz7frd8gf"; - name = "ktp-text-ui-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktp-text-ui-22.12.1.tar.xz"; + sha256 = "1zdxjf2qvi4cg0hk9x9dv91gay4sqpp6h92vy8pi2fids98b5qa6"; + name = "ktp-text-ui-22.12.1.tar.xz"; }; }; ktuberling = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/ktuberling-22.12.0.tar.xz"; - sha256 = "1a1g0y0kv657y44w0nngdmk78xxz0sxm54v98v0zc95cs2ppmxpv"; - name = "ktuberling-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/ktuberling-22.12.1.tar.xz"; + sha256 = "0y7rf74pqd9cjh59w5hz59lixzx8l3qxaaqjyrbrrhal90yxq1g7"; + name = "ktuberling-22.12.1.tar.xz"; }; }; kturtle = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kturtle-22.12.0.tar.xz"; - sha256 = "0c46rmlcsc9mqchm4lcfybms24xkgznzra34lnygiabiyydv9ya3"; - name = "kturtle-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kturtle-22.12.1.tar.xz"; + sha256 = "0w3kki02z0hhldalyf08nnvplska10v7d01bkgx5syrlnq9rvafb"; + name = "kturtle-22.12.1.tar.xz"; }; }; kubrick = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kubrick-22.12.0.tar.xz"; - sha256 = "1xbdxyd79dihjbd8hl1ilp0m4cxdvd4nrz2clqk8rczqxinv7ri6"; - name = "kubrick-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kubrick-22.12.1.tar.xz"; + sha256 = "0azr8j3070j6h7c3alkb559i2b8zb4kvazn6dqavj9bpwmymlpnk"; + name = "kubrick-22.12.1.tar.xz"; }; }; kwalletmanager = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kwalletmanager-22.12.0.tar.xz"; - sha256 = "0z95q3v97xlcck81cwwd0h2ms6w2z3g2sncrbx16jjpjb32571xw"; - name = "kwalletmanager-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kwalletmanager-22.12.1.tar.xz"; + sha256 = "0anas3gnkhk1zinjjpixmlcj00bl2q3s5xb21mk1b4wzyz15w20g"; + name = "kwalletmanager-22.12.1.tar.xz"; }; }; kwave = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kwave-22.12.0.tar.xz"; - sha256 = "1w34hgyxaw3i0wmajsd952cya7l65n51a0gs3aih5g82562bw4cg"; - name = "kwave-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kwave-22.12.1.tar.xz"; + sha256 = "0cvlyrhfw7mc58c25y9cic6c39jc42h3kygdy0v1fp8bg93xzzg3"; + name = "kwave-22.12.1.tar.xz"; }; }; kwordquiz = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/kwordquiz-22.12.0.tar.xz"; - sha256 = "0hb5956m6mfwnblvvgfn9kms3glis8mkaqa9diq297qw4pi0pnmk"; - name = "kwordquiz-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/kwordquiz-22.12.1.tar.xz"; + sha256 = "1xzs0rkmk1mnlss31qhcbwmm6ss9f7my64wsiyfp67rchz9gbl31"; + name = "kwordquiz-22.12.1.tar.xz"; }; }; libgravatar = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libgravatar-22.12.0.tar.xz"; - sha256 = "0029gcmh6ff7m1md4jy1j3k34klcq7mk0zmv03szmh47idrfc5f8"; - name = "libgravatar-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libgravatar-22.12.1.tar.xz"; + sha256 = "0dpvcw5793fsmr23zvnwn2kr194bq880pb3xpq77z9b00yhm6i26"; + name = "libgravatar-22.12.1.tar.xz"; }; }; libkcddb = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkcddb-22.12.0.tar.xz"; - sha256 = "1m6lw1gi2kn7zi63v7axrnn2f1k5flsf78s41i54zgn9a4rn4l2i"; - name = "libkcddb-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkcddb-22.12.1.tar.xz"; + sha256 = "0w6d2qn4xzxywqj3khbzz3g9lgq5bvimvwqjs1p7i6hak5y4aa0f"; + name = "libkcddb-22.12.1.tar.xz"; }; }; libkcompactdisc = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkcompactdisc-22.12.0.tar.xz"; - sha256 = "1mjcrw4fkfxz3v6cn22wbsdx59y4y4bnhjss9b9a954swkkxvasw"; - name = "libkcompactdisc-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkcompactdisc-22.12.1.tar.xz"; + sha256 = "1lv94pzyyh90ga18flky096jdbjnf2rl1wn0p17w4lqlhm2n6d40"; + name = "libkcompactdisc-22.12.1.tar.xz"; }; }; libkdcraw = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkdcraw-22.12.0.tar.xz"; - sha256 = "0r61cghvrcr4ils4kzack2lbhdiclhabbgbl0vnpjzixwnpwn2g6"; - name = "libkdcraw-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkdcraw-22.12.1.tar.xz"; + sha256 = "1sv5mkpf9r7vicyn7kxiaa7ykr81c39hnzh45in95m3ygy9p22lb"; + name = "libkdcraw-22.12.1.tar.xz"; }; }; libkdegames = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkdegames-22.12.0.tar.xz"; - sha256 = "175klhsmh8c9hc109pxl4365gzx5j4lqrbnsx1drxpvz7hy15r4x"; - name = "libkdegames-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkdegames-22.12.1.tar.xz"; + sha256 = "0agyf6zvr24h550jagpngndmag6xmkjc7m0qmc9mjjk2yg6ildcm"; + name = "libkdegames-22.12.1.tar.xz"; }; }; libkdepim = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkdepim-22.12.0.tar.xz"; - sha256 = "03vbrzirg6h0h9icy7a4nqpz4r0spv57vjiw83s501h4d747h4cs"; - name = "libkdepim-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkdepim-22.12.1.tar.xz"; + sha256 = "1n6v9k1gwgvwjw0fqyj4vq9hw5kzy75dl3h6fmh4cyww9hjrjibl"; + name = "libkdepim-22.12.1.tar.xz"; }; }; libkeduvocdocument = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkeduvocdocument-22.12.0.tar.xz"; - sha256 = "1zcipzw7h3h3r3p35z3yk6ckd6wnscl853hcivbx6r7cp7f2m6wh"; - name = "libkeduvocdocument-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkeduvocdocument-22.12.1.tar.xz"; + sha256 = "08svz6c2w9lyax0x6gj8zxikz3nzna0r2l1s41b3bhpjs3y3jkf4"; + name = "libkeduvocdocument-22.12.1.tar.xz"; }; }; libkexiv2 = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkexiv2-22.12.0.tar.xz"; - sha256 = "1bm87v764wy3mg0pwrz6kjzjfncnglzn6q74isgyqwldcdhw5iw1"; - name = "libkexiv2-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkexiv2-22.12.1.tar.xz"; + sha256 = "1rxrw0m3wxdjzlc0plh0l0qpia6ipbx562m5dq9b9w2ppyxk8213"; + name = "libkexiv2-22.12.1.tar.xz"; }; }; libkgapi = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkgapi-22.12.0.tar.xz"; - sha256 = "1ry8qg0r2qqxwdfdasgsp8jvh3nvkks1dhnvhjcd1cqnaaklb832"; - name = "libkgapi-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkgapi-22.12.1.tar.xz"; + sha256 = "0i6ip7vrgvfzx27mjr2hyny6yfi622b5q0gp7kpzs95gnfc2f60i"; + name = "libkgapi-22.12.1.tar.xz"; }; }; libkipi = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkipi-22.12.0.tar.xz"; - sha256 = "0zw0svszsy134l2qg3ynsbr45nq9k11m9x8g7spf2qnrrhwyqsza"; - name = "libkipi-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkipi-22.12.1.tar.xz"; + sha256 = "01xyglfzlk6aczxqcg51yx723p6i0m6d91kwixbj0nzkmjaafza2"; + name = "libkipi-22.12.1.tar.xz"; }; }; libkleo = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkleo-22.12.0.tar.xz"; - sha256 = "0id4i1rfkn79ymsskyhyvkkn3jkcva41m75g6q0r0pl88rlp5249"; - name = "libkleo-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkleo-22.12.1.tar.xz"; + sha256 = "13flblvkglj25af4jhn9qd0w2krmmmc9icgrppxi8cnlrjyb579y"; + name = "libkleo-22.12.1.tar.xz"; }; }; libkmahjongg = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkmahjongg-22.12.0.tar.xz"; - sha256 = "0k5wp4nl89gx4wdny3yjf3523xnl9sc0ysxqhngspa0spzz1316f"; - name = "libkmahjongg-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkmahjongg-22.12.1.tar.xz"; + sha256 = "1x64iv0c0b1hpn0aj6scq1dz22w95fr1ikq317zvb3vff6wwrbwm"; + name = "libkmahjongg-22.12.1.tar.xz"; }; }; libkomparediff2 = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libkomparediff2-22.12.0.tar.xz"; - sha256 = "0cix7nv9lkysclkzb1pbn2nz91mcmah4xr1anv1v16v6a0w31k3y"; - name = "libkomparediff2-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libkomparediff2-22.12.1.tar.xz"; + sha256 = "16bs5ifvprwjk0gkgp3vgqn2mgvzjkv4gm338xn58ziiisk0wq0m"; + name = "libkomparediff2-22.12.1.tar.xz"; }; }; libksane = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libksane-22.12.0.tar.xz"; - sha256 = "0z8yqr3m5z6p6vnjbg07av392x39bja8vj0hx63h419n0hk188k9"; - name = "libksane-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libksane-22.12.1.tar.xz"; + sha256 = "03kp3jq6y8ia2jshxrq74knazmb2v7i8q5pjv2w11v3gl5m9j0kw"; + name = "libksane-22.12.1.tar.xz"; }; }; libksieve = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libksieve-22.12.0.tar.xz"; - sha256 = "1c4ibnbjjdd4d1cbkyb71kfd9dzh6aypp16lvx98plkvfbmb5r69"; - name = "libksieve-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libksieve-22.12.1.tar.xz"; + sha256 = "0wc505rphvywvixclh17abqla6nnyx8i8j4aysisfzjxkfwi1lsk"; + name = "libksieve-22.12.1.tar.xz"; }; }; libktorrent = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/libktorrent-22.12.0.tar.xz"; - sha256 = "0n0wyih1n5w1559jrwrb6zcwyhhkhw2dbypc7d3js4cn7akzsqji"; - name = "libktorrent-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/libktorrent-22.12.1.tar.xz"; + sha256 = "14kk8r67v6wssijqlj6p8sah89cxjgn8420pj4m0cvb4bhkf3vjd"; + name = "libktorrent-22.12.1.tar.xz"; }; }; lokalize = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/lokalize-22.12.0.tar.xz"; - sha256 = "0dznm5dnnpv214x17nq4hmfnbsa6nygdf5zzkj05fma8v7ahksw8"; - name = "lokalize-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/lokalize-22.12.1.tar.xz"; + sha256 = "1mkqk6azf2253z0ifj9y0wf8wdbxwhvn4k659cy3hcdfzd9a73nd"; + name = "lokalize-22.12.1.tar.xz"; }; }; lskat = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/lskat-22.12.0.tar.xz"; - sha256 = "0n4i2gpw4alx5spvz5n59pw28bk545bixqd26vgg9zglry4gsp74"; - name = "lskat-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/lskat-22.12.1.tar.xz"; + sha256 = "0srx44k6zlsskl2mh0xrprxzhfm98ywlvc1br8l639vvr5mx2ms9"; + name = "lskat-22.12.1.tar.xz"; }; }; mailcommon = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/mailcommon-22.12.0.tar.xz"; - sha256 = "03wn859v56iz783c5v8hjm2k6hyi5af77gnabhd2l6j9ss6v7r92"; - name = "mailcommon-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/mailcommon-22.12.1.tar.xz"; + sha256 = "009cgafhq26nqf1km4lcmypw1y0dig06wmy9rby4pis1f3ikvg5w"; + name = "mailcommon-22.12.1.tar.xz"; }; }; mailimporter = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/mailimporter-22.12.0.tar.xz"; - sha256 = "1g6yykr8y2bwpn9b7vwybvxp8wvmbnhsz2p1ff9sq8j0aaw4hmq7"; - name = "mailimporter-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/mailimporter-22.12.1.tar.xz"; + sha256 = "1cgpxavsla32081mynmc4jj6xyg1ahwvqpwvllzdgw060m190r5n"; + name = "mailimporter-22.12.1.tar.xz"; }; }; marble = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/marble-22.12.0.tar.xz"; - sha256 = "05p0h3h8f516h0k6zm4iysifkv44xy49ydy3akxy2w87qyh2sk62"; - name = "marble-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/marble-22.12.1.tar.xz"; + sha256 = "1hhsfzcqg7pzj02j56zgz0n36ps7y8rkpnpbnn14c8l1xvic9x2v"; + name = "marble-22.12.1.tar.xz"; }; }; markdownpart = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/markdownpart-22.12.0.tar.xz"; - sha256 = "0cilnxsrbrv6mp6h98hzijhdflby1jmsj40sa6jxmwi7gwc400cj"; - name = "markdownpart-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/markdownpart-22.12.1.tar.xz"; + sha256 = "1c8hacz0rqgawmvg2vk0m9sbz14s9z4h0fxxbism1pn3xs7nxdhm"; + name = "markdownpart-22.12.1.tar.xz"; }; }; mbox-importer = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/mbox-importer-22.12.0.tar.xz"; - sha256 = "0hvibk29s55q8f8x2zmdx2xphjzf5j1azlyd7gwak7my2gfdn4zw"; - name = "mbox-importer-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/mbox-importer-22.12.1.tar.xz"; + sha256 = "1wy46bkm69hpv2rl0mcq1xdklr54clnqvskadny58pj8g9krjcnr"; + name = "mbox-importer-22.12.1.tar.xz"; }; }; messagelib = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/messagelib-22.12.0.tar.xz"; - sha256 = "1a0gsjd9yg5sinj28wsfiw18saglwmkx7j1zq74dlcy3c4cs96ls"; - name = "messagelib-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/messagelib-22.12.1.tar.xz"; + sha256 = "09w2n3wvs5fdbq5nbr9fdigjsxqrsi2dx6zxpgd9jf1m1bmcfd7y"; + name = "messagelib-22.12.1.tar.xz"; }; }; minuet = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/minuet-22.12.0.tar.xz"; - sha256 = "0l7z82nr243piwdjz7gkkjc29ha7pjn4h5yd8kqjb5vad8i8gy96"; - name = "minuet-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/minuet-22.12.1.tar.xz"; + sha256 = "0zyrbccs2knzj19gh9ykqcyn5j8z9lxnwy15lb2f7h95hqqkn1xy"; + name = "minuet-22.12.1.tar.xz"; }; }; okular = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/okular-22.12.0.tar.xz"; - sha256 = "05v167ml29bn5a3l3qd73j4lis061hkmqpnpmb4wh7vibm0sk89c"; - name = "okular-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/okular-22.12.1.tar.xz"; + sha256 = "0w0agchkh0fszhvshqkvxs4z0i3q1vnaijqkzm119y1pjwynfkaw"; + name = "okular-22.12.1.tar.xz"; }; }; palapeli = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/palapeli-22.12.0.tar.xz"; - sha256 = "14xnhykcp76x86i0g8fpans26xzm6dqbh0x8r85zb66bdbxlybdz"; - name = "palapeli-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/palapeli-22.12.1.tar.xz"; + sha256 = "0r26nlh26f0wwwg19ppq99ljsb0mfpi034h4g7fix5cq5ps0nyk5"; + name = "palapeli-22.12.1.tar.xz"; }; }; parley = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/parley-22.12.0.tar.xz"; - sha256 = "0lfq3qbwbqnp79ihwa48djlkrkglpr96rkmaj183akp4y063g77r"; - name = "parley-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/parley-22.12.1.tar.xz"; + sha256 = "02gqylb3liynnjq1vl67y3zkcadnpixaz3zlfx7j8zxz2p2zlxlb"; + name = "parley-22.12.1.tar.xz"; }; }; partitionmanager = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/partitionmanager-22.12.0.tar.xz"; - sha256 = "1i9l02pyhl2bmnk2qf23p4wl0ps4kqb2q00s851hdx8drgk6f86a"; - name = "partitionmanager-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/partitionmanager-22.12.1.tar.xz"; + sha256 = "06ja3qnxshcg0hxczh6z6wc76dcsm41in8np07ch4l13d6nkpqpj"; + name = "partitionmanager-22.12.1.tar.xz"; }; }; picmi = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/picmi-22.12.0.tar.xz"; - sha256 = "1zxl270jr6b6wdsfgkjvkrda9yd2mhxhfm68d8a1v6g30sxpkc5y"; - name = "picmi-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/picmi-22.12.1.tar.xz"; + sha256 = "06bhkxqhwmk7hpmcsn0s9bql4anlk260dz63g6bcx4c93ln01ypq"; + name = "picmi-22.12.1.tar.xz"; }; }; pim-data-exporter = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/pim-data-exporter-22.12.0.tar.xz"; - sha256 = "0zp6mhh649mh1r0c3gr57gxa9q4vqmxffk0ajqcqnagqm3sn0jkl"; - name = "pim-data-exporter-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/pim-data-exporter-22.12.1.tar.xz"; + sha256 = "1cijyd6qscghppcspimdc7kdvv4la6mbk57z9sj5agx2i05xsda6"; + name = "pim-data-exporter-22.12.1.tar.xz"; }; }; pim-sieve-editor = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/pim-sieve-editor-22.12.0.tar.xz"; - sha256 = "1dawgnbyrg7wq86hmqc8sj1advb6b92w1wdk62l1576n30zzn7f1"; - name = "pim-sieve-editor-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/pim-sieve-editor-22.12.1.tar.xz"; + sha256 = "1nx1vahgxr175fplm4rv7frlr53fqn50xmfsaph42idi7nnqcrl4"; + name = "pim-sieve-editor-22.12.1.tar.xz"; }; }; pimcommon = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/pimcommon-22.12.0.tar.xz"; - sha256 = "1yrih65hnimrd14anyv6l7ydiyg7v886p8sq2rm86n9a77d1993s"; - name = "pimcommon-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/pimcommon-22.12.1.tar.xz"; + sha256 = "128nqsxw275zi6dn3v1pnip9nhraz6pqjlzklkqm5qljfs5z6wk1"; + name = "pimcommon-22.12.1.tar.xz"; }; }; poxml = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/poxml-22.12.0.tar.xz"; - sha256 = "12m8amxij6x0swsqf9c04rnhgmfivfb1iis90swargcywglrj36f"; - name = "poxml-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/poxml-22.12.1.tar.xz"; + sha256 = "0rs0bl0vg8qjaxgxbhlv90rgc7y13xg47j9k6v1q1v0gz07l8ms6"; + name = "poxml-22.12.1.tar.xz"; }; }; print-manager = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/print-manager-22.12.0.tar.xz"; - sha256 = "1yf88nj1mbps5xn26hw97ri9x7ag3ra5pqhw1blzx8zjwa1jxvyn"; - name = "print-manager-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/print-manager-22.12.1.tar.xz"; + sha256 = "09y1x6if1cxsb6xh9b9alfxrfpnzymm71v6hjc0b13jalg7bha1b"; + name = "print-manager-22.12.1.tar.xz"; }; }; rocs = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/rocs-22.12.0.tar.xz"; - sha256 = "10r6immdk9ay3fiawci6hc0zgp8vppqw9g9a2py0yn5agj8vhlzq"; - name = "rocs-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/rocs-22.12.1.tar.xz"; + sha256 = "032jd0r7wyl33y24wnb95vz70kciyw132ph355ln6vrkkymmfy7w"; + name = "rocs-22.12.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/signon-kwallet-extension-22.12.0.tar.xz"; - sha256 = "1x50p82sm9xhln76ckrsykaxzpxrlahfkbwrp7zv8rg34r3sd76m"; - name = "signon-kwallet-extension-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/signon-kwallet-extension-22.12.1.tar.xz"; + sha256 = "1pvm1046mp0dlal9ffr455yhvv0689c4iaiv2vkdz7p2lf3745wh"; + name = "signon-kwallet-extension-22.12.1.tar.xz"; }; }; skanlite = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/skanlite-22.12.0.tar.xz"; - sha256 = "045swnkil4310yng1sj0pzmrx639xj03pxzsczrr3arxmm10rs91"; - name = "skanlite-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/skanlite-22.12.1.tar.xz"; + sha256 = "1j00z785ajqj61qsdbq7pwnw5pjsfkqpk52s7li2kkmikmfhqsq8"; + name = "skanlite-22.12.1.tar.xz"; }; }; skanpage = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/skanpage-22.12.0.tar.xz"; - sha256 = "0gg2wi7biac56v1260qzp85pllhnpanbm2rm5zlfnapws2rvml3h"; - name = "skanpage-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/skanpage-22.12.1.tar.xz"; + sha256 = "0wnkw2ybd4x35c1jfx6rmdj4iz4gh9bpfdc5ydri790l7c2zz1w4"; + name = "skanpage-22.12.1.tar.xz"; }; }; spectacle = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/spectacle-22.12.0.tar.xz"; - sha256 = "05qqzc4nd1q74skghyl6m34s8d8vdbr215x849vy297y5p5q5ars"; - name = "spectacle-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/spectacle-22.12.1.tar.xz"; + sha256 = "05pihywsbml6ncvzd9wih9bm0bwdxvlps9678vai9rdxks7apa78"; + name = "spectacle-22.12.1.tar.xz"; }; }; step = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/step-22.12.0.tar.xz"; - sha256 = "1f7wiwz7vnhpal7p7nmv44wldrz9i32sgk5v7slvjjifdpplzs6j"; - name = "step-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/step-22.12.1.tar.xz"; + sha256 = "1k8s8cyfz895sx5b0w4a71nrsx89zkxk7c8a8fr6jxybgf9gnxz2"; + name = "step-22.12.1.tar.xz"; }; }; svgpart = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/svgpart-22.12.0.tar.xz"; - sha256 = "1spvjn9609k3kiaj2l78cqs92yi11nz00jswfll01ywngg9jnjw7"; - name = "svgpart-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/svgpart-22.12.1.tar.xz"; + sha256 = "08ffgwm7s8r8yc6j956j08y8dikmgssv0h0xlmk6wlxl0bryb4fr"; + name = "svgpart-22.12.1.tar.xz"; }; }; sweeper = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/sweeper-22.12.0.tar.xz"; - sha256 = "1vw2z89cdrks152y08l842147xlnm8ilw3qihnchl0gab2cyapgc"; - name = "sweeper-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/sweeper-22.12.1.tar.xz"; + sha256 = "0an6md9nk8sv2bmjcvghjxydpdz0rf4bhianym22gzsyxxi0bccj"; + name = "sweeper-22.12.1.tar.xz"; }; }; umbrello = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/umbrello-22.12.0.tar.xz"; - sha256 = "0k1lvr97gbhwy0595jpfnby13a7a6hjvpvyy003yv6la5f9pdxl9"; - name = "umbrello-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/umbrello-22.12.1.tar.xz"; + sha256 = "1d72808jwgjwzjkj5kw7wvkfvk05x8w0x2abzsbzhl9qf06jgn1h"; + name = "umbrello-22.12.1.tar.xz"; }; }; yakuake = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/yakuake-22.12.0.tar.xz"; - sha256 = "0siybzac1bvdhi8dph4c19yqlfcwb26nln9v7dy8hvb8lhfl95bz"; - name = "yakuake-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/yakuake-22.12.1.tar.xz"; + sha256 = "0qh48y2jj7lxn0lqyff5s93s4csyw12da6jcixbmcmnm3z33p09l"; + name = "yakuake-22.12.1.tar.xz"; }; }; zanshin = { - version = "22.12.0"; + version = "22.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.0/src/zanshin-22.12.0.tar.xz"; - sha256 = "0nn0qnsghq27sny4vrgypi84gjjbmnd7vz33iibkr92lzdq58fhj"; - name = "zanshin-22.12.0.tar.xz"; + url = "${mirror}/stable/release-service/22.12.1/src/zanshin-22.12.1.tar.xz"; + sha256 = "002smc57r54fs4c2ngk8k20wjjk3khmyfpjlw6hmxbn1hnzl609w"; + name = "zanshin-22.12.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index ac408221324a4..d0ace35400d5f 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.11.0"; + version = "2.12.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-UCPF+tj1ELzLO4+UAYS/SS0i645oO55grbGGAhe7zBE=" "zip"; - i686-linux = fetch "linux_386" "sha256-7vCCOKMSc2vrwSpAO5hYgdz/e6bveG0liG7fjbWge6c=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-mtD1caAc0PIFN8L+pw5tO0Tkg+JD99xBUvPwejVgVwU=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-5oZQEAnRPgE9GABoR0UCr6qjUwAdtFADoonJIeRHGdE=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-WCu1/5dewsjVMyFo+BaAgCOcK08Fe3ldJhDzCl8B+2M=" "zip"; + i686-linux = fetch "linux_386" "sha256-eRNX7+IF9v3JzXxwp5WshqYOC5/uizniWOKSc3q2yL8=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-wvhWwcDufwvh8Isx4QpyyHEJ+3yU7f/0a4r5Itns68c=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-ZOU4huC1FUj0ZiqIgs+4tU8t/w5VVD/UiWGVFHS50sw=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 7896604b0e9a3..ec699d668923a 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildDotnetModule , fetchFromGitHub , dotnetCorePackages @@ -12,26 +13,36 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.3.2.4"; + version = "5.4.1.11"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-qjU5TcYkAFJVYTOCwePGOVR9hYKNtinzLt5P4aTs578="; + sha256 = "sha256-t4azVZVvAJmCCsg/2o+ZWroEmCLfdPYn2iWwVwdhIZw="; }; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0; nugetDeps = ./deps.nix; projectFile = "ArchiSteamFarm.sln"; executables = [ "ArchiSteamFarm" ]; + dotnetFlags = [ + "-p:PublishSingleFile=true" + "-p:PublishTrimmed=true" + ]; + selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; + preBuild = '' + export projectFile=(ArchiSteamFarm) + ''; + preInstall = '' # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors. makeWrapperArgs+=( @@ -40,7 +51,19 @@ buildDotnetModule rec { ) ''; + postInstall = '' + buildPlugin() { + dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ + --output $out/lib/${pname}/plugins/$1 --configuration Release \ + -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore + } + + buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher + buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + ''; + passthru = { + # nix-shell maintainers/scripts/update.nix --argstr package ArchiSteamFarm updateScript = ./update.sh; ui = callPackage ./web-ui { }; }; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 5a3c3271fee05..4b177bf5815ab 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -56,14 +56,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.3.2"; sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) (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 = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -73,75 +71,27 @@ (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"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.3.2"; sha256 = "0bs38r5kdw1xpbjbi5l82xbhfnfbzr5xhg5520lk05pg914d1ln1"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.3.2"; sha256 = "089nmaxzvm5xcf20pm4iiavz2k6lwh69r51xlbqg0ry605mnl869"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.10"; sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) (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.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 = "NLog"; version = "5.1.1"; sha256 = "19m1ivp1cxz1ghlvysrxdhxlj7kzya9m7j812c3ssnxrfrr1077z"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.1"; sha256 = "1z9ayqag1xncn4cs0cz27gxa5cqk6caq5fd81bczlj4sqff7ah4p"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.1"; sha256 = "10y03374lza6cjsi01xmql1v6hcjf6x2r7wfnnckzhzs70x2hhnl"; }) (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"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; }) @@ -149,123 +99,21 @@ (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (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.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) (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"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (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.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (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.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"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 7bc5c7c76f89f..857474c483e3e 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -16,7 +16,7 @@ if [[ "$new_version" == "$old_version" ]]; then fi asf_path=$PWD -cd ../../../.. +pushd ../../../.. if [[ "${1:-}" != "--deps-only" ]]; then update-source-version ArchiSteamFarm "$new_version" @@ -24,5 +24,5 @@ fi $(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file" -cd "$asf_path" -exec "$asf_path/web-ui/update.sh" +popd +"$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 8130fd1391724..2d9b681a2e469 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, fetchFromGitHub, nodejs, stdenv, ArchiSteamFarm, ... }: +{ lib, pkgs, fetchFromGitHub, nodejs, nodePackages, stdenv, ArchiSteamFarm }: let nodePackages = import ./node-composition.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 = "5f9969bf17e4c6915418655b35fc6b790cd2da0b"; - sha256 = "03y4ahq958rxjnddwnc6h95drdpnvpy16adk434aak4l8hqr24sg"; + rev = "a4617d145756f6dcf1f5729e5a60689aa484403b"; + sha256 = "178ip280bqyqd36rka9g2jx7b7wdf3zh56sahg53yxr55zwq5bcp"; }; in diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index 873b479a5994f..6ee3318e15010 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.4" = { + "@babel/compat-data-7.20.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.19.4"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz"; - sha512 = "CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz"; + sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; }; }; - "@babel/core-7.19.6" = { + "@babel/core-7.20.7" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.19.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz"; - sha512 = "D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz"; + sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -49,13 +49,13 @@ let sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; }; }; - "@babel/generator-7.19.6" = { + "@babel/generator-7.20.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.19.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.6.tgz"; - sha512 = "oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -76,13 +76,13 @@ let sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; }; }; - "@babel/helper-compilation-targets-7.19.3" = { + "@babel/helper-compilation-targets-7.20.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz"; - sha512 = "65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; }; "@babel/helper-create-class-features-plugin-7.18.6" = { @@ -166,13 +166,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.19.6" = { + "@babel/helper-module-transforms-7.20.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.19.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz"; - sha512 = "fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; + sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -184,13 +184,13 @@ let sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.19.0" = { + "@babel/helper-plugin-utils-7.20.2" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.19.0"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; - sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; + sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; }; }; "@babel/helper-remap-async-to-generator-7.18.9" = { @@ -202,22 +202,22 @@ let sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; - "@babel/helper-replace-supers-7.18.9" = { + "@babel/helper-replace-supers-7.19.1" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.18.9"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; - sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"; + sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; }; }; - "@babel/helper-simple-access-7.19.4" = { + "@babel/helper-simple-access-7.20.2" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz"; - sha512 = "f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; + sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { @@ -274,13 +274,13 @@ let sha512 = "95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ=="; }; }; - "@babel/helpers-7.19.4" = { + "@babel/helpers-7.20.7" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.19.4"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz"; - sha512 = "G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; + sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; }; }; "@babel/highlight-7.18.6" = { @@ -292,13 +292,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.19.6" = { + "@babel/parser-7.20.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.19.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz"; - sha512 = "h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -319,13 +319,13 @@ let sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.19.1" = { + "@babel/plugin-proposal-async-generator-functions-7.20.1" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.19.1"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz"; - sha512 = "0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz"; + sha512 = "Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g=="; }; }; "@babel/plugin-proposal-class-properties-7.18.6" = { @@ -400,13 +400,13 @@ let sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.19.4" = { + "@babel/plugin-proposal-object-rest-spread-7.20.2" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz"; - sha512 = "wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz"; + sha512 = "Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { @@ -499,13 +499,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-import-assertions-7.18.6" = { + "@babel/plugin-syntax-import-assertions-7.20.0" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.18.6"; + version = "7.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; - sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz"; + sha512 = "IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ=="; }; }; "@babel/plugin-syntax-json-strings-7.8.3" = { @@ -616,22 +616,22 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.19.4" = { + "@babel/plugin-transform-block-scoping-7.20.2" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz"; - sha512 = "934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz"; + sha512 = "y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ=="; }; }; - "@babel/plugin-transform-classes-7.19.0" = { + "@babel/plugin-transform-classes-7.20.2" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.19.0"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz"; - sha512 = "YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz"; + sha512 = "9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g=="; }; }; "@babel/plugin-transform-computed-properties-7.18.9" = { @@ -643,13 +643,13 @@ let sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.19.4" = { + "@babel/plugin-transform-destructuring-7.20.2" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz"; - sha512 = "t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz"; + sha512 = "mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -715,31 +715,31 @@ let sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.18.6" = { + "@babel/plugin-transform-modules-amd-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.6"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; - sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz"; + sha512 = "uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.18.6" = { + "@babel/plugin-transform-modules-commonjs-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.6"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; - sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz"; + sha512 = "8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.19.0" = { + "@babel/plugin-transform-modules-systemjs-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.19.0"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz"; - sha512 = "x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz"; + sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ=="; }; }; "@babel/plugin-transform-modules-umd-7.18.6" = { @@ -778,13 +778,13 @@ let sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.18.8" = { + "@babel/plugin-transform-parameters-7.20.1" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.18.8"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz"; + sha512 = "nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ=="; }; }; "@babel/plugin-transform-property-literals-7.18.6" = { @@ -877,13 +877,13 @@ let sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; - "@babel/preset-env-7.19.4" = { + "@babel/preset-env-7.20.2" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz"; - sha512 = "5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz"; + sha512 = "1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -904,31 +904,31 @@ let sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; }; }; - "@babel/template-7.18.10" = { + "@babel/template-7.20.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.18.10"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.19.6" = { + "@babel/traverse-7.20.7" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.19.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.6.tgz"; - sha512 = "6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz"; + sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; }; }; - "@babel/types-7.19.4" = { + "@babel/types-7.20.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.19.4"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz"; - sha512 = "M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -940,67 +940,67 @@ let sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@eslint/eslintrc-1.3.3" = { + "@eslint/eslintrc-1.4.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz"; - sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; + sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.0" = { + "@fortawesome/fontawesome-common-types-6.2.1" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"; - sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; + sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; }; }; - "@fortawesome/fontawesome-svg-core-6.2.0" = { + "@fortawesome/fontawesome-svg-core-6.2.1" = { name = "_at_fortawesome_slash_fontawesome-svg-core"; packageName = "@fortawesome/fontawesome-svg-core"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz"; - sha512 = "Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz"; + sha512 = "HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA=="; }; }; - "@fortawesome/free-brands-svg-icons-6.2.0" = { + "@fortawesome/free-brands-svg-icons-6.2.1" = { name = "_at_fortawesome_slash_free-brands-svg-icons"; packageName = "@fortawesome/free-brands-svg-icons"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz"; - sha512 = "fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA=="; + url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz"; + sha512 = "L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig=="; }; }; - "@fortawesome/free-solid-svg-icons-6.2.0" = { + "@fortawesome/free-solid-svg-icons-6.2.1" = { name = "_at_fortawesome_slash_free-solid-svg-icons"; packageName = "@fortawesome/free-solid-svg-icons"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz"; - sha512 = "UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA=="; + url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz"; + sha512 = "oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw=="; }; }; - "@fortawesome/vue-fontawesome-2.0.8" = { + "@fortawesome/vue-fontawesome-2.0.9" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz"; - sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz"; + sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw=="; }; }; - "@humanwhocodes/config-array-0.11.6" = { + "@humanwhocodes/config-array-0.11.8" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.11.6"; + version = "0.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz"; - sha512 = "jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; + sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; }; }; "@humanwhocodes/module-importer-1.0.1" = { @@ -1336,13 +1336,13 @@ let sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; }; }; - "@vue/compiler-sfc-2.7.13" = { + "@vue/compiler-sfc-2.7.14" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz"; - sha512 = "zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"; + sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; }; }; "@vue/component-compiler-utils-3.2.2" = { @@ -1606,6 +1606,15 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; + "ajv-8.11.2" = { + name = "ajv"; + packageName = "ajv"; + version = "8.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; + sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; + }; + }; "ajv-8.8.1" = { name = "ajv"; packageName = "ajv"; @@ -1768,31 +1777,22 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-0.27.2" = { + "axios-1.2.2" = { name = "axios"; packageName = "axios"; - version = "0.27.2"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; + url = "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz"; + sha512 = "bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q=="; }; }; - "babel-loader-8.2.5" = { + "babel-loader-9.1.0" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz"; - sha512 = "OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ=="; - }; - }; - "babel-plugin-dynamic-import-node-2.3.3" = { - name = "babel-plugin-dynamic-import-node"; - packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.3"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.0.tgz"; + sha512 = "Antt61KJPinUMwHwIIz9T5zfMgevnfZkEVWYDWlG888fgdvRRGD0JTuf/fFozQnfT+uq64sk1bmdHDy/mOEWnA=="; }; }; "babel-plugin-polyfill-corejs2-0.3.3" = { @@ -2254,13 +2254,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "copy-to-clipboard-3.3.2" = { + "copy-to-clipboard-3.3.3" = { name = "copy-to-clipboard"; packageName = "copy-to-clipboard"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.2.tgz"; - sha512 = "Vme1Z6RUDzrb6xAI7EZlVZ5uvOk2F//GaxKUxajDqm9LhOVM1inxNAD2vy+UZDYsd0uyA9s7b3/FVZPSxqrCfg=="; + url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz"; + sha512 = "2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA=="; }; }; "copy-webpack-plugin-11.0.0" = { @@ -2299,13 +2299,13 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; - "css-loader-6.7.1" = { + "css-loader-6.7.3" = { name = "css-loader"; packageName = "css-loader"; - version = "6.7.1"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz"; - sha512 = "yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw=="; + url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz"; + sha512 = "qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ=="; }; }; "css-select-4.1.3" = { @@ -2713,13 +2713,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.26.0" = { + "eslint-8.30.0" = { name = "eslint"; packageName = "eslint"; - version = "8.26.0"; + version = "8.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz"; - sha512 = "kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz"; + sha512 = "MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2758,13 +2758,13 @@ let sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; }; }; - "eslint-plugin-vue-9.6.0" = { + "eslint-plugin-vue-9.8.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.6.0"; + version = "9.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.6.0.tgz"; - sha512 = "zzySkJgVbFCylnG2+9MDF7N+2Rjze2y0bF8GyUNpFOnT8mCMfqqtLDJkHBuYu9N/psW1A6DVbQhPkP92E+qakA=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz"; + sha512 = "E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA=="; }; }; "eslint-scope-5.1.1" = { @@ -3082,13 +3082,13 @@ let sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; }; }; - "follow-redirects-1.14.9" = { + "follow-redirects-1.15.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.9"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; - sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; "form-data-4.0.0" = { @@ -3244,22 +3244,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.15.0" = { - name = "globals"; - packageName = "globals"; - version = "13.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; - }; - }; - "globals-13.17.0" = { + "globals-13.19.0" = { name = "globals"; packageName = "globals"; - version = "13.17.0"; + version = "13.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"; - sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; + url = "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz"; + sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; }; }; "globby-13.1.1" = { @@ -4036,13 +4027,13 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "json5-2.2.1" = { + "json5-2.2.2" = { name = "json5"; packageName = "json5"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; }; "kind-of-6.0.3" = { @@ -4117,15 +4108,6 @@ let sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; }; }; - "loader-utils-2.0.2" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"; - sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; - }; - }; "locate-path-2.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -4207,6 +4189,15 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -4936,13 +4927,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.14" = { + "postcss-8.4.19" = { name = "postcss"; packageName = "postcss"; - version = "8.4.14"; + version = "8.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; - sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz"; + sha512 = "h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA=="; }; }; "postcss-modules-extract-imports-3.0.0" = { @@ -5044,6 +5035,15 @@ let sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; + "proxy-from-env-1.1.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; + }; + }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -5359,31 +5359,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.55.0" = { + "sass-1.57.1" = { name = "sass"; packageName = "sass"; - version = "1.55.0"; + version = "1.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz"; - sha512 = "Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; + sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; }; }; - "sass-loader-13.1.0" = { + "sass-loader-13.2.0" = { name = "sass-loader"; packageName = "sass-loader"; - version = "13.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.1.0.tgz"; - sha512 = "tZS1RJQ2n2+QNyf3CCAo1H562WjL/5AM6Gi8YcPVVoNxQX8d19mx8E+8fRrMWsyc93ZL6Q8vZDSM0FHVTJaVnQ=="; - }; - }; - "schema-utils-2.7.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.1"; + version = "13.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; - sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz"; + sha512 = "JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg=="; }; }; "schema-utils-3.0.0" = { @@ -5440,13 +5431,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.7" = { + "semver-7.3.8" = { name = "semver"; packageName = "semver"; - version = "7.3.7"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; "send-0.17.2" = { @@ -6025,13 +6016,13 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "vue-2.7.13" = { + "vue-2.7.14" = { name = "vue"; packageName = "vue"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz"; - sha512 = "QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"; + sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="; }; }; "vue-eslint-parser-8.3.0" = { @@ -6061,13 +6052,13 @@ let sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; }; }; - "vue-loader-15.10.0" = { + "vue-loader-15.10.1" = { name = "vue-loader"; packageName = "vue-loader"; - version = "15.10.0"; + version = "15.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz"; - sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg=="; + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz"; + sha512 = "SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA=="; }; }; "vue-meta-2.4.0" = { @@ -6124,13 +6115,13 @@ let sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; }; }; - "vue-template-compiler-2.7.13" = { + "vue-template-compiler-2.7.14" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz"; - sha512 = "jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; + sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; }; }; "vue-template-es2015-compiler-1.9.1" = { @@ -6169,13 +6160,13 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "webpack-5.74.0" = { + "webpack-5.75.0" = { name = "webpack"; packageName = "webpack"; - version = "5.74.0"; + version = "5.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; - sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz"; + sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; }; "webpack-bundle-analyzer-4.7.0" = { @@ -6340,6 +6331,15 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -6367,11 +6367,11 @@ let dependencies = [ sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.4" - (sources."@babel/core-7.19.6" // { + sources."@babel/compat-data-7.20.5" + (sources."@babel/core-7.20.7" // { dependencies = [ sources."debug-4.3.4" - sources."json5-2.2.1" + sources."json5-2.2.2" sources."ms-2.1.2" sources."semver-6.3.0" ]; @@ -6382,12 +6382,14 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.19.6" + sources."@babel/generator-7.20.7" 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" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ + sources."lru-cache-5.1.1" sources."semver-6.3.0" + sources."yallist-3.1.1" ]; }) sources."@babel/helper-create-class-features-plugin-7.18.6" @@ -6405,24 +6407,24 @@ 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.6" + sources."@babel/helper-module-transforms-7.20.7" sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.19.0" + sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.18.9" - sources."@babel/helper-simple-access-7.19.4" + sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-simple-access-7.20.2" 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.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.4" + sources."@babel/helpers-7.20.7" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.6" + sources."@babel/parser-7.20.7" 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" + sources."@babel/plugin-proposal-async-generator-functions-7.20.1" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-class-static-block-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -6431,7 +6433,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.19.4" + sources."@babel/plugin-proposal-object-rest-spread-7.20.2" 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" @@ -6442,7 +6444,7 @@ let sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.18.6" + sources."@babel/plugin-syntax-import-assertions-7.20.0" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -6455,10 +6457,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.19.4" - sources."@babel/plugin-transform-classes-7.19.0" + sources."@babel/plugin-transform-block-scoping-7.20.2" + sources."@babel/plugin-transform-classes-7.20.2" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.19.4" + sources."@babel/plugin-transform-destructuring-7.20.2" 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" @@ -6466,14 +6468,14 @@ let sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.18.6" - sources."@babel/plugin-transform-modules-commonjs-7.18.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.0" + sources."@babel/plugin-transform-modules-amd-7.19.6" + sources."@babel/plugin-transform-modules-commonjs-7.19.6" + sources."@babel/plugin-transform-modules-systemjs-7.19.6" sources."@babel/plugin-transform-modules-umd-7.18.6" sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/plugin-transform-parameters-7.20.1" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-regenerator-7.18.6" sources."@babel/plugin-transform-reserved-words-7.18.6" @@ -6484,35 +6486,35 @@ 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.4" // { + (sources."@babel/preset-env-7.20.2" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" - sources."@babel/template-7.18.10" - (sources."@babel/traverse-7.19.6" // { + sources."@babel/template-7.20.7" + (sources."@babel/traverse-7.20.7" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.19.4" + sources."@babel/types-7.20.7" sources."@discoveryjs/json-ext-0.5.5" - (sources."@eslint/eslintrc-1.3.3" // { + (sources."@eslint/eslintrc-1.4.0" // { dependencies = [ sources."debug-4.3.3" - sources."globals-13.15.0" + sources."globals-13.19.0" sources."ms-2.1.2" ]; }) - sources."@fortawesome/fontawesome-common-types-6.2.0" - sources."@fortawesome/fontawesome-svg-core-6.2.0" - 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.11.6" // { + sources."@fortawesome/fontawesome-common-types-6.2.1" + sources."@fortawesome/fontawesome-svg-core-6.2.1" + sources."@fortawesome/free-brands-svg-icons-6.2.1" + sources."@fortawesome/free-solid-svg-icons-6.2.1" + sources."@fortawesome/vue-fontawesome-2.0.9" + (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6555,7 +6557,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.13" + sources."@vue/compiler-sfc-2.7.14" (sources."@vue/component-compiler-utils-3.2.2" // { dependencies = [ sources."picocolors-0.2.1" @@ -6618,15 +6620,15 @@ let ]; }) sources."asynckit-0.4.0" - sources."axios-0.27.2" - (sources."babel-loader-8.2.5" // { + sources."axios-1.2.2" + (sources."babel-loader-9.1.0" // { dependencies = [ - sources."json5-2.2.1" - sources."loader-utils-2.0.2" - sources."schema-utils-2.7.1" + sources."ajv-8.11.2" + sources."ajv-keywords-5.1.0" + sources."json-schema-traverse-1.0.0" + sources."schema-utils-4.0.0" ]; }) - sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-plugin-polyfill-corejs2-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -6688,7 +6690,7 @@ let sources."convert-source-map-1.8.0" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."copy-to-clipboard-3.3.2" + sources."copy-to-clipboard-3.3.3" (sources."copy-webpack-plugin-11.0.0" // { dependencies = [ sources."ajv-8.11.0" @@ -6702,7 +6704,7 @@ let sources."core-js-compat-3.25.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" - sources."css-loader-6.7.1" + sources."css-loader-6.7.3" sources."css-select-4.1.3" sources."css-what-5.1.0" sources."cssesc-3.0.0" @@ -6762,7 +6764,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.26.0" // { + (sources."eslint-8.30.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6774,7 +6776,7 @@ let sources."estraverse-5.3.0" sources."find-up-5.0.0" sources."glob-parent-6.0.2" - sources."globals-13.17.0" + sources."globals-13.19.0" sources."has-flag-4.0.0" sources."is-path-inside-3.0.3" sources."locate-path-6.0.0" @@ -6807,7 +6809,7 @@ let sources."doctrine-2.1.0" ]; }) - (sources."eslint-plugin-vue-9.6.0" // { + (sources."eslint-plugin-vue-9.8.0" // { dependencies = [ sources."debug-4.3.4" sources."eslint-scope-7.1.1" @@ -6881,7 +6883,7 @@ let sources."flat-5.0.2" sources."flat-cache-3.0.4" sources."flatted-3.2.4" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.2" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -7143,7 +7145,7 @@ let sources."pinkie-promise-2.0.1" sources."plurals-cldr-2.0.1" sources."popper.js-1.16.1" - sources."postcss-8.4.14" + sources."postcss-8.4.19" sources."postcss-modules-extract-imports-3.0.0" sources."postcss-modules-local-by-default-4.0.0" sources."postcss-modules-scope-3.0.0" @@ -7159,6 +7161,7 @@ let sources."ipaddr.js-1.9.1" ]; }) + sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."punycode-2.1.1" sources."qs-6.9.7" @@ -7198,12 +7201,12 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.55.0" - sources."sass-loader-13.1.0" + sources."sass-1.57.1" + sources."sass-loader-13.2.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-2.1.1" - (sources."semver-7.3.7" // { + (sources."semver-7.3.8" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -7313,7 +7316,7 @@ let sources."uuid-8.3.2" sources."v-tooltip-2.1.3" sources."vary-1.1.2" - sources."vue-2.7.13" + sources."vue-2.7.14" (sources."vue-eslint-parser-8.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -7323,19 +7326,19 @@ let ]; }) sources."vue-hot-reload-api-2.3.4" - sources."vue-loader-15.10.0" + sources."vue-loader-15.10.1" sources."vue-meta-2.4.0" sources."vue-multiselect-2.1.6" sources."vue-resize-1.0.1" 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.13" + sources."vue-template-compiler-2.7.14" 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-5.75.0" (sources."webpack-bundle-analyzer-4.7.0" // { dependencies = [ sources."ansi-styles-4.3.0" diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh index 8a382ee25fb41..a0c296900e39f 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix gnused jq curl -set -eoux pipefail +#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl +set -eou pipefail cd "$(dirname "$0")" pushd ../../../../.. diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix index 4932379ef02d5..4c94fa83485c9 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/applications/misc/HentaiAtHome/default.nix @@ -1,5 +1,4 @@ { buildPackages -, buildPlatform , fetchzip , javaOpts ? "-XX:+UseZGC" , jdk @@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ jdk makeWrapper ]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc") + LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; buildPhase = '' diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index e578caad529b4..48541402d4bca 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "ablog"; - version = "0.10.29"; + version = "0.10.33"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q2zoXCmnzzjXSBGFKzondOQRz7CjZp0wCiXxbgpXHIA="; + sha256 = "sha256-vCkLX64aPAem0QvKI1iUNAHWEJZlAOIb1DA9U7xPJkU="; }; propagatedBuildInputs = [ @@ -21,7 +21,7 @@ buildPythonApplication rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 41281385c990d..6047c08264301 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup echo "unpacking $src..." diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 0862453d03aa6..59af845e2948c 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sample Rate Converter for audio"; - homepage = "http://sox.sourceforge.net/"; + homepage = "https://sox.sourceforge.net/"; maintainers = with maintainers; [ marcweber ]; license = if enableAMR then licenses.unfree else licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index 10aac715b48ac..c9f97c5602b20 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.0.2.0"; src = fetchurl { - url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz"; + url = "https://bricxcc.sourceforge.net/wavrsocvt.tgz"; sha256 = "15qlvdfwbiclljj7075ycm78yzqahzrgl4ky8pymix5179acm05h"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { supported sample rates in the standard NXT firmware). You can then upload these with e.g. nxt-python. ''; - homepage = "http://bricxcc.sourceforge.net/"; + homepage = "https://bricxcc.sourceforge.net/"; license = licenses.mpl11; maintainers = with maintainers; [ leenaars ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 85579f0521961..eb773b3c812e7 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.24.4"; + version = "1.26.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI="; + sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index 735355107ef26..5fb336d8de371 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -69,11 +69,16 @@ stdenv.mkDerivation rec { zbar ]; + # https://gitlab.gnome.org/World/Authenticator/-/issues/362 + preBuild = '' + export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED" + ''; + meta = { description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ austinbutler ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 2b6cd7049a5ce..e5514f736cd29 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.2.1"; - rev = "11"; + version = "2.2.2"; + rev = "12"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "sha256-/a0pMXVd7mEp7oaN2mBIJv5uOv1zQ3gvfgiz1XL9ZmM="; + sha256 = "sha256-vSbqT2s5lLEU1SSDaC+sS6qt446iSKYUgKudO5WMOu4="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 37898709493e8..1618bf746ce0f 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-3T0vpyAw21u2+csqaz3Yf10G8IQRDyjReedIo+I4fvw="; + sha256 = "sha256-Z5j5tSIF3AZiZjkFFtyyi3hMqWMXtf6ont2CQ/FSEjk="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix new file mode 100644 index 0000000000000..95ec2826a52a2 --- /dev/null +++ b/pkgs/applications/misc/bitwarden-menu/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pynput +, xdg +}: + +buildPythonApplication rec { + pname = "bitwarden-menu"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OC+MHEiUU6bDT2wSSDtu0KnwDwBpbLTBta0xjfuzlOI="; + }; + + propagatedBuildInputs = [ + pynput + xdg + ]; + + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/firecat53/bitwarden-menu/releases/tag/v${version}"; + description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database."; + homepage = "https://github.com/firecat53/bitwarden-menu"; + license = licenses.mit; + maintainers = [ maintainers.rodrgz ]; + }; +} diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 1d617718ff905..9724ad953673b 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python310Packages +, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { ++ optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase - freetype libjpeg libpng libsamplerate libsndfile libtiff - opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib zstd fftw jemalloc + freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp + opencolorio openexr openimagedenoise openimageio openjpeg python zlib zstd fftw jemalloc alembic (opensubdiv.override { inherit cudaSupport; }) tbb diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index e39612f9ee1c2..7fcd3e37481f0 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -26,15 +26,16 @@ , vkbasalt-cli , vmtouch }: + python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "2022.12.14.1"; + version = "50.2"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-hoWyXCP7/0m8akUGBJyuF2yQcRKR8C7MDBLUdPdtBgE="; + sha256 = "sha256-+r/r3vExnvYQIicKAEmwZ+eRSep6kWte5k7gu9jC67w="; }; patches = [ ./vulkan_icd.patch ]; diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix index 43923c99eae32..34036894d6e67 100644 --- a/pkgs/applications/misc/bottles/fhsenv.nix +++ b/pkgs/applications/misc/bottles/fhsenv.nix @@ -52,6 +52,7 @@ let fhsEnv = { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-bad + gst_all_1.gst-libav libgphoto2 libjpeg_turbo libkrb5 @@ -91,10 +92,7 @@ let fhsEnv = { ++ extraLibraries pkgs; profile = '' - # Remove if merged https://github.com/bottlesdevs/Bottles/pull/2415 - export BOTTLES_USE_SYSTEM_GSTREAMER=1 - # Dirty hack, may be related with https://github.com/NixOS/nixpkgs/issues/148007 - export GST_PLUGIN_PATH=${ lib.makeSearchPath "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) } + export GST_PLUGIN_PATH=/usr/lib32/gstreamer-1.0:/usr/lib64/gstreamer-1.0 ''; }; in diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 702440c32b5eb..249288c77c160 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -28,7 +28,7 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest pytest-vcr diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/applications/misc/calcoo/default.nix index 4af71bae653ea..b0fc6da5eb465 100644 --- a/pkgs/applications/misc/calcoo/default.nix +++ b/pkgs/applications/misc/calcoo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://calcoo.sourceforge.net/"; + homepage = "https://calcoo.sourceforge.net/"; description = "RPN and algebraic scientific calculator"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f9a1faaf036d8..acfe1d9284e53 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "calibre"; - version = "6.10.0"; + version = "6.11.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-JE5AnaCMfe9mI+qLe1LdbbHAdC5X5wLo/zFhcJLLAhk="; + hash = "sha256-ylOZ5ljA5uBb2bX/qFhsmPQW6dJVEH9jxQaR2u8C4Wc="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { - name = "0006-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch"; + name = "0007-Hardening-Qt-code.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch"; hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ="; }) ] @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { xdg-utils ] ++ ( with python3Packages; [ - (apsw.overrideAttrs (oldAttrs: rec { + (apsw.overrideAttrs (oldAttrs: { setupPyBuildFlags = [ "--enable=load_extension" ]; })) beautifulsoup4 diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index d596a2444667b..0ca80417df26b 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.6"; + version = "5.7"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-PxYOI/2ZOz3JSGCPIXfm3WfGZ19D8JhhdNS3FVuXus8="; + sha256 = "sha256-4daM6Z67d52v2LmzqSZ6RSAHznyZNEqvAdWCuVFi0Kw="; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 3592de5f1c65a..4ca37673feebc 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "sha256-nDI5Rq1iPVkj25HRpxmS9zxNDUy+9YsSwbZnEwYt86E="; + sha256 = "sha256-m1oKjyy7fMK6mIf5FRuWCbfAM8qlHXRR/rwHsCZADiY="; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 1401a7a8df282..55bca8aa80585 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -67,7 +67,7 @@ buildPythonApplication rec { pango ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index d79de578cab74..954d16ce3e73c 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,42 +1,45 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake +, ninja , extra-cmake-modules , qtbase -, qtscript +, qtsvg +, qttools +, qtdeclarative , libXfixes , libXtst -, qtx11extras -, knotifications , qtwayland , wayland -, fetchpatch +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "CopyQ"; - version = "6.3.2"; + version = "6.4.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-Ge/TD9Llq4YTAqaL9LBEsgNI9qrf2jLDt7q2ZTI9rmE="; + hash = "sha256-HpWzIABzg0oJqzIehIGpeATLs3ZlmLgtRKaiMIUNAFI="; }; nativeBuildInputs = [ cmake + ninja extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ qtbase - qtscript + qtsvg + qttools + qtdeclarative libXfixes libXtst - qtx11extras - knotifications qtwayland wayland ]; @@ -46,13 +49,14 @@ mkDerivation rec { --replace copyq "$out/bin/copyq" ''; + cmakeFlags = [ "-DWITH_QT6=ON" ]; + meta = with lib; { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3Only; maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. - # OSX build requires QT5. platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix new file mode 100644 index 0000000000000..408838a0a284d --- /dev/null +++ b/pkgs/applications/misc/cotp/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, AppKit +, libxcb +}: + +rustPlatform.buildRustPackage rec { + name = "cotp"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "replydev"; + repo = "cotp"; + rev = "v${version}"; + hash = "sha256-SbS+ch7/45kZb49jW2mnRWQruLrfrNfeZFqEPHQKGUg="; + }; + + cargoHash = "sha256-2lIR3K4/hr4XSmNGFd/dhwoFOtEB9KSnUrZkcaCyc9k="; + + buildInputs = lib.optionals stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + homepage = "https://github.com/replydev/cotp"; + description = "Trustworthy, encrypted, command-line TOTP/HOTP authenticator app with import functionality"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ davsanchez ]; + }; +} diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 13386699ecbf1..343848e673db5 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -20,7 +20,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 configargparse keyring pyasn1 requests six urllib3 ]; - checkInputs = with pythonPackages; [ pytest mock ]; + nativeCheckInputs = with pythonPackages; [ pytest mock ]; postPatch = '' substituteInPlace requirements.txt \ diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 4fc4dd8b61082..197e7ec86d085 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -9,15 +9,20 @@ , libXtst }: +# Known issues: +# - The daemon can't be started from the GUI, because pkexec requires a shell +# registered in /etc/shells. The nix's bash is not in there when running +# cpu-x from nixpkgs. + stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-rmRfKw2KMLsO3qfy2QznCIugvM2CLSxBUDgIzONYULk="; + sha256 = "sha256-VPmwnzoOBNLDYZsoEknbcX7QP2Tcm08pL/rw1uCK8xM="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free software that gathers information on CPU, motherboard and more"; - homepage = src.meta.homepage; + homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ viraptor ]; diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 5f7f101ad6136..4b1a2b2a69f0a 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.6.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-ZXqe+696dNYTkNidEA+s5QQ7Euu7WOdl0EMLU5pKdOY="; + sha256 = "sha256-yT8PDmMntnd5meDPJm1rekfDVgmWFSZTNFEH03AKCy0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 172187eedb4bf..d69073d710e8c 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-VdOXmhfgDzMyspoCFQl64obpQph14XZxR0Nas+crelA="; + sha256 = "sha256-7JGafJE9nwZ95bOWUyVw2uWA2LltE9HxolHGYU079to="; }; - vendorSha256 = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE="; + vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix index 61191374b6ea7..be798894ba861 100644 --- a/pkgs/applications/misc/databricks-sql-cli/default.nix +++ b/pkgs/applications/misc/databricks-sql-cli/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "CLI for querying Databricks SQL"; diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 517b24597a898..cbcebae31237f 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { watchdog ] ++ typer.optional-dependencies.all; - checkInputs = [ + nativeCheckInputs = [ git ] ++ (with python3.pkgs; [ pytest-asyncio diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 6e504ab717362..8c04161844b10 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -14,11 +14,12 @@ , gst_all_1 , libsoup_3 , libadwaita +, nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.0.2"; + version = "2.1.1"; format = "other"; @@ -27,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-55vqxS0ySV8lItxLl1J+wLvPtmR87HzGfAiOKuhigFA="; + hash = "sha256-ytZnolQTOj0dpv+ouN1N7sypr1LxSN/Uhp7qP0ZOTHE="; }; nativeBuildInputs = [ @@ -69,6 +70,10 @@ python3.pkgs.buildPythonApplication rec { # handle setup hooks better strictDeps = false; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/dialect-app/dialect"; description = "A translation app for GNOME"; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index b62d154feb15d..86a6cebc27c0e 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { # No tests in archive doCheck = false; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; [ click ]; meta = with lib; { diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 60a26b7088240..c485375137ea8 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { "NO_VENV=1" ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; preCheck = '' diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 056f3a4606ba8..02455cf8f20e1 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, libwebp, pkg-config, -librsvg, glib, gtk2, libXext, libXxf86vm, poppler, vlc, ghostscript, makeWrapper, tzdata }: +{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff +, libwebp, pkg-config, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, vlc +, ghostscript, makeWrapper, tzdata, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "eaglemode"; @@ -15,15 +16,17 @@ stdenv.mkDerivation rec { substituteInPlace src/emClock/emTimeZonesModel.cpp --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff libwebp librsvg glib gtk2 libXxf86vm libXext poppler vlc ghostscript ]; # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. buildPhase = '' + runHook preBuild export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext -lXinerama" perl make.pl build + runHook postBuild ''; dontPatchELF = true; @@ -31,16 +34,33 @@ stdenv.mkDerivation rec { forceShare = [ "man" "info" ]; installPhase = '' + runHook preInstall perl make.pl install dir=$out wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin" + for i in 32 48 96; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/res/icons/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Eagle Mode"; + genericName = meta.description; + categories = [ "Game" "Graphics" "System" "Utility" ]; + }) + ]; + meta = with lib; { homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; changelog = "https://eaglemode.sourceforge.net/ChangeLog.html"; license = licenses.gpl3; - maintainers = with maintainers; [ chuangzhu ]; + maintainers = with maintainers; [ chuangzhu ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 452c1edc99f81..0644471c5fa89 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; checkPhase = '' unset HOME diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index bab227aee779e..40b4569d11f51 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.3.2"; + version = "4.3.3"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +37,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-z2/UamKmBq/5a0PTbHdAqGK617Lc8xRhHRpbCc7jeZo="; + sha256 = "sha256-40GfOKBTAi8RAsAVrG9rv1Jr5IqM+1yro6YYRsSULxw="; postFetch = '' mv $out ./all @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-vTZArTwbKcf6/vPQOvjubPecsg+h+QlZ6rdbl6qNfs0="; + sha256 = "sha256-NPXGfbEjT9l88ZnGbDcE3+oGxThTzW7YfesBzssGsbc="; }; postUnpack = '' @@ -117,7 +117,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "electrum/tests" ]; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 5029581ac85d3..abb88796ddd0e 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -109,7 +109,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum-ltc ''; - checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "electrum_ltc/tests" ]; diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index b2c5dfe2ccfea..781bdfcb90f23 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 308f2fda81527..e4a5e3dd914b5 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.34"; + version = "6.4.35"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-w73e0bXOI2lgvRzu7j8yVyIO2Zw+7ISl12u1YY4yWNQ="; + sha256 = "sha256-ewtWy8D8qFRQTxZ3lfq1MtWlTVp9O24+NqM/NKCWCgE="; }; buildInputs = [ openssl python3 ]; diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index b92110f99d98f..27e3ea0aced37 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.21.1"; + version = "1.23.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-TahXPbZy7eoSJ/U2wL6GaMM8F6zypf7EU91JVWlevQg="; + sha256 = "sha256-SAyR7SeMFh2twLr8QqKzALlMFLv/oAfySN5+cSNALis="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index b87c43226e0a2..ff84ecdf55f09 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mind-mapping software"; - homepage = "http://freemind.sourceforge.net/wiki/index.php/Main_Page"; + homepage = "https://freemind.sourceforge.net/wiki/index.php/Main_Page"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 2ec4d7df2402a..883ebc7970538 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.2"; + version = "1.24.4"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-KqDprKoqpbNpUrM7nAYj71cuMh6U3s65kqVTW2cHeLc="; + sha256 = "sha256-g+nbHpbo6O4zoDJm6MRwCXY9pM73NV7RKR59s+8LM10="; }; propagatedBuildInputs = [ @@ -16,7 +16,7 @@ buildPythonApplication rec { yt-dlp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/misc/geek-life/default.nix b/pkgs/applications/misc/geek-life/default.nix index 653c940024a6e..ae0fa298594d5 100644 --- a/pkgs/applications/misc/geek-life/default.nix +++ b/pkgs/applications/misc/geek-life/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geek-life"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "ajaxray"; repo = "geek-life"; rev = "v${version}"; - sha256 = "083y2kv5vb217ghy9g2qylqgdgbjjggjj3cq454csnn3cjgq9zfh"; + sha256 = "sha256-7B/4pDOVXef2MaWKvzkUZH0/KM/O1gJjI3xPjEXqc/E="; }; - vendorSha256 = "05fcnmg2rygccf65r8js6kbijx740vfnvbrc035bjs1jvdw29h9j"; + vendorHash = "sha256-U80Yb8YXKQ8KJf+FxkC0EIUFKP4PKAFRtKTCvXSc0WI="; postInstall = '' mv $out/bin/app $out/bin/geek-life diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 591f26abbc725..841aeca58969a 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix b/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix new file mode 100644 index 0000000000000..3553dd118da03 --- /dev/null +++ b/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchurl +, wrapGAppsNoGuiHook +, meson +, ninja +, pkg-config +, gnome +, gdk-pixbuf +, glib +, libarchive +, librsvg +, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "gnome-epub-thumbnailer"; + version = "1.7"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-epub-thumbnailer/${lib.versions.majorMinor version}/gnome-epub-thumbnailer-${version}.tar.xz"; + sha256 = "sha256-S7Ah++RCgNuY3xTBH6XkMgsWe4GpG9e6WGvqDE+il1I="; + }; + + nativeBuildInputs = [ + wrapGAppsNoGuiHook + meson + ninja + pkg-config + ]; + + buildInputs = [ + gdk-pixbuf + glib + libarchive + librsvg + libxml2 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-epub-thumbnailer"; + }; + }; + + meta = with lib; { + description = "Thumbnailer for EPub and MOBI books"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-epub-thumbnailer"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index d39ed4faf4dc0..1b8a7e706dde7 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 = "7.0"; + version = "7.2"; 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-P/1lKmWpwidW3fz2zxgVnFoHmROTVB//byDedoOC4u0="; + hash = "sha256-CE0iuXYHBhu07mjfXCnAPZQUD1Wy95L+tvBT+uepbrk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index d7ba62f28c5f5..888672b5fa013 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ++ lib.optional withGUI qtserialport ++ lib.optional (withGUI && withMapPreview) qtwebengine; - checkInputs = [ libxml2 which ]; + nativeCheckInputs = [ libxml2 which ]; preConfigure = lib.optionalString withGUI '' lrelease gui/*.ts gui/coretool/*.ts diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 7365d297e3b80..9424ceeee51fe 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -29,7 +29,7 @@ in buildPythonApplication rec { sha256 = "00358nzyw686ypqv45imc5k9frcqnhla0hpx9ynna3iy6iz5006x"; }; - pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; + pythonPath = with pythonPackages; [ bsddb3 pyicu pygobject3 pycairo ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 4461df09c2245..281f8dec22720 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "grip"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; - sha256 = "sha256-5Qgsf4+xs0ckhYJk2csKulXC3nWaLRAsQ15qaTkKkjw="; + sha256 = "sha256-lXu0mLLfcX8K1EmoFH0vp2cHluyRwhTL0/bW5Ax36mI="; }; nativeBuildInputs = [ pkg-config libtool ]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index a225c15a4d014..73bc11d4940d7 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ]; - checkInputs = [ + nativeCheckInputs = [ kubectl ]; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index b622d9f19cca7..53344338bd03a 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; - homepage = "http://gtk2fontsel.sourceforge.net/"; + homepage = "https://gtk2fontsel.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/gtk2fontsel/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 695706cefc5b8..aa9b530dee302 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -52,7 +52,7 @@ buildPythonApplication rec { # will fail without pre-seeded config files doCheck = false; - checkInputs = [ unittestCheckHook mock ]; + nativeCheckInputs = [ unittestCheckHook mock ]; unittestFlagsArray = [ "-s" "tests" "-v" ]; diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index 5a03cfe23bacc..ccb597db62d0c 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { sha256 = "0k0gjlqjz424rymcfdjpj6a71ppblfls5f8y2hd800d1as4im8az"; }; - checkInputs = [ manuel ]; + nativeCheckInputs = [ manuel ]; propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; meta = with lib; { diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/applications/misc/html5validator/default.nix index 657996d1da9f5..71ba3dcf100ad 100644 --- a/pkgs/applications/misc/html5validator/default.nix +++ b/pkgs/applications/misc/html5validator/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ openjdk ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "PATH=$PATH:$out/bin nosetests"; meta = with lib; { diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 9985a1a872524..f4f4f579ef56b 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.109.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Eak4sU8UwzPQ5iuoNX+KrAJdZ6ZvBdDyJx4xeQI4sjY="; + hash = "sha256-7B0C8191lUGsv81+0eKDrBm+5hLlFjID3RTuajSg/RM="; }; - vendorSha256 = "sha256-0m5flwvchExP1IDAuE/oTB2eUEbq5KCE8Zvzp5e7yZ8="; + vendorHash = "sha256-GtywXjtAF5Q4jUz2clfseUJVqiU+eSguG/ZoKy2TzuA="; doCheck = false; diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index acc03f59a7018..d923dc9bfedbd 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - checkInputs = [ gitMinimal util-linuxMinimal ]; + nativeCheckInputs = [ gitMinimal util-linuxMinimal ]; cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6"; diff --git a/pkgs/applications/misc/jiten/default.nix b/pkgs/applications/misc/jiten/default.nix index efd28fabae3af..7a3326bc8d9eb 100644 --- a/pkgs/applications/misc/jiten/default.nix +++ b/pkgs/applications/misc/jiten/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pcre sqlite ]; propagatedBuildInputs = with python3.pkgs; [ click flask kanjidraw ]; - checkInputs = [ nodejs ]; + nativeCheckInputs = [ nodejs ]; preBuild = '' export JITEN_VERSION=${version} # override `git describe` diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 7b2973b5075e7..9890ea9ad8db6 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18583"; + version = "18622"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-6S6E7ngTCBXb0epPfYxIswLvfm9r2Ql0wgOs/PxpmIM="; + hash = "sha256-AtV7Lj+z1GOCEl8xUaumYcN848pMsLIfMGmBXved6WU="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-3XEoSCXEpeqZj1y4nns5+0JR1SINYE1rsmQ4fMflxRQ="; + hash = "sha256-q3Kr0YWe6Jm6wO6h7fMANKLCWKfU0zDpBZjRH662eSg="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 141db33e8b1fe..985ce9c1d1658 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "3.0"; + version = "3.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-e2w0E8t6s0OWx2ROme2GdyzWhmCc6hnMfSdLTZqt3bg="; }; nativeBuildInputs = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-bdd pytest-xdist pytestCheckHook @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' + --replace 'rich = "^12.2.0"' 'rich = ">=12.2.0, <14.0.0"' ''; preCheck = '' @@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ zalakain ]; + maintainers = with maintainers; [ bryanasdev000 zalakain ]; }; } diff --git a/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/applications/misc/k40-whisperer/default.nix index 429d798210e6f..720536b18e517 100644 --- a/pkgs/applications/misc/k40-whisperer/default.nix +++ b/pkgs/applications/misc/k40-whisperer/default.nix @@ -23,12 +23,12 @@ let in stdenv.mkDerivation rec { pname = "k40-whisperer"; - version = "0.60"; + version = "0.62"; src = fetchzip { url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; stripRoot = true; - sha256 = "sha256-Nr7WYVu78msn5HuDNtSSvkdU6iCWtbiYZmh0rnMiyEg="; + sha256 = "sha256-3O+lCpmsCCu61REuxhrV8Uy01AgEGq/1DlMhjo45URM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/keepass-diff/default.nix b/pkgs/applications/misc/keepass-diff/default.nix new file mode 100644 index 0000000000000..3f88c00b4f5ae --- /dev/null +++ b/pkgs/applications/misc/keepass-diff/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "keepass-diff"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "Narigo"; + repo = pname; + rev = version; + sha256 = "sha256-jd/cUkTHylLwzxolQUzMlXHauCfXUhcUr/1zKpdngbo="; + }; + + cargoSha256 = "sha256-2e2lGG72HmX7AFk0+J3U62Kch5ylrqvaIpitRF546JA="; + + meta = with lib; { + description = "A CLI-tool to diff Keepass (.kdbx) files"; + homepage = "https://keepass-diff.narigo.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ wamserma ]; + }; +} diff --git a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix index 780de142c5fd7..abed55d91593a 100644 --- a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix +++ b/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix @@ -17,7 +17,7 @@ let homepage = "https://keepass.info/plugins.html#otpkeyprov"; platforms = with lib.platforms; linux; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.ente ]; + maintainers = [ lib.maintainers.Enteee ]; }; pluginFilename = "OtpKeyProv.plgx"; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index f9c78dfc6fbfc..e062c35e80a67 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.49"; + version = "2.52"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "sha256-1hg4bRuQSG+UzEQGeQcSURTmTxt5ITGQqfg0IS7RWt0="; + sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch index 5ff36a21c002a..5d367b0a8266a 100644 --- a/pkgs/applications/misc/keepass/fix-paths.patch +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -43,15 +43,15 @@ diff --git a/KeePass/Util/AppLocator.cs b/KeePass/Util/AppLocator.cs index af02803..8a32c9d 100644 --- a/KeePass/Util/AppLocator.cs +++ b/KeePass/Util/AppLocator.cs -@@ -429,7 +429,7 @@ namespace KeePass.Util +@@ -468,7 +468,7 @@ namespace KeePass.Util if(NativeLib.GetPlatformID() == PlatformID.MacOSX) - strArgPrefix = string.Empty; // FR 3535696 + strOpt = string.Empty; // FR 3535696 -- string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp); -+ string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp); - if(str == null) return null; +- string str = NativeLib.RunConsoleApp("whereis", strOpt + strApp); ++ string str = NativeLib.RunConsoleApp("@whereis@", strOpt + strApp); + if(string.IsNullOrEmpty(str)) return null; - str = str.Trim(); + int iSep = str.IndexOf(':'); diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs @@ -108,14 +108,14 @@ diff --git a/KeePassLib/Native/NativeLib.cs b/KeePassLib/Native/NativeLib.cs index 2d227a3..243f4ee 100644 --- a/KeePassLib/Native/NativeLib.cs +++ b/KeePassLib/Native/NativeLib.cs -@@ -145,7 +145,7 @@ namespace KeePassLib.Native - // Mono returns PlatformID.Unix on Mac OS X, workaround this - if(m_platID.Value == PlatformID.Unix) +@@ -143,7 +143,7 @@ namespace KeePassLib.Native + // Mono returns PlatformID.Unix on MacOS, workaround this + if(g_platID.Value == PlatformID.Unix) { - if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals( + if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals( "Darwin", StrUtil.CaseIgnoreCmp)) - m_platID = PlatformID.MacOSX; + g_platID = PlatformID.MacOSX; } diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs index e20bb3a..4fd875b 100644 @@ -130,7 +130,7 @@ index e20bb3a..4fd875b 100644 private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>(); private static Thread g_thFixClip = null; -@@ -335,7 +335,7 @@ namespace KeePassLib.Utility +@@ -356,7 +356,7 @@ namespace KeePassLib.Utility // } // else { Debug.Assert(false); } diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index 891be1ffa314b..978387eb9919f 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -9,17 +9,17 @@ Subject: [PATCH] loadplugin diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs index 347eaf5..b92e1e2 100644 ---- a/KeePass/Forms/MainForm.cs -+++ b/KeePass/Forms/MainForm.cs -@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms - ToolStripItemCollection tsicT = m_ctxTray.Items; - ToolStripItem tsiPrevT = m_ctxTrayOptions; - -- m_pluginManager.LoadAllPlugins(); +--- a/KeePass/Forms/MainForm_Functions.cs ++++ b/KeePass/Forms/MainForm_Functions.cs +@@ -312,7 +312,$OUTPUT_LC$ @@ namespace KeePass.Forms + ToolStripItemCollection tsicT = m_ctxTray.Items; + ToolStripItem tsiPrevT = m_ctxTrayOptions; + +- m_pluginManager.LoadAllPlugins(); $DO_LOADS$+ - - m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); - m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); + + m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); + m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); -- 2.25.4 diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/applications/misc/keepmenu/default.nix index d169e19a19a5e..8cdbd69912d02 100644 --- a/pkgs/applications/misc/keepmenu/default.nix +++ b/pkgs/applications/misc/keepmenu/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pynput ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; checkPhase = '' xvfb-run python setup.py test ''; diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 6730d1f89b6c6..7af5465ad9e03 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -1,13 +1,34 @@ -{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }: +{ lib +, stdenv +, fetchurl +, undmg +, dpkg +, autoPatchelfHook +, wrapGAppsHook +, makeWrapper +, alsa-lib +, at-spi2-atk +, gdk-pixbuf +, glibc +, nss +, udev +, xorg +, gnome +, mesa +, gtk3 +, libusb1 +, libsecret +, libappindicator +, xdotool +}: let pname = "keeweb"; version = "1.18.7"; - name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.AppImage"; - hash = "sha256-W3Dfo7YZfLObodAS7ZN3jqnYzLNAnjJIfJC6il5THwY="; + url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb"; + hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE="; }; x86_64-darwin = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg"; @@ -18,11 +39,29 @@ let hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4="; }; }; - src = srcs.${stdenv.hostPlatform.system}; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - appimageContents = appimageTools.extract { - inherit name src; - }; + libraries = [ + alsa-lib + at-spi2-atk + gdk-pixbuf + nss + udev + xorg.libX11 + xorg.libXcomposite + xorg.libXext + xorg.libXrandr + xorg.libXScrnSaver + xorg.libXtst + xorg.libxshmfence + gnome.gnome-keyring + mesa + gtk3 + libusb1 + libsecret + libappindicator + xdotool + ]; meta = with lib; { description = "Free cross-platform password manager compatible with KeePass"; @@ -33,35 +72,46 @@ let maintainers = with maintainers; [ sikmir ]; platforms = builtins.attrNames srcs; }; +in +if stdenv.isDarwin +then stdenv.mkDerivation { + inherit pname version src meta; - linux = appimageTools.wrapType2 rec { - inherit name src meta; + nativeBuildInputs = [ undmg ]; - extraPkgs = pkgs: with pkgs; [ libsecret libxshmfence ]; + sourceRoot = "."; - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - install -Dm644 ${appimageContents}/keeweb.desktop -t $out/share/applications - install -Dm644 ${appimageContents}/keeweb.png -t $out/share/icons/hicolor/256x256/apps - install -Dm644 ${appimageContents}/usr/share/mime/keeweb.xml -t $out/share/mime - substituteInPlace $out/share/applications/keeweb.desktop \ - --replace "Exec=AppRun" "Exec=$out/bin/${pname}" - ''; - }; + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} +else stdenv.mkDerivation { + inherit pname version src meta; - darwin = stdenv.mkDerivation { - inherit pname version src meta; + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + makeWrapper + ]; - nativeBuildInputs = [ undmg ]; + buildInputs = libraries; - sourceRoot = "."; + unpackPhase = '' + ${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract + ''; - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; - }; -in -if stdenv.isDarwin -then darwin -else linux + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r usr/share $out/share + + makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \ + --argv0 "keeweb" \ + --add-flags "$out/share/keeweb-desktop/resources/app.asar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}" + + runHook postInstall + ''; +} diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index 2274aa00cb440..c2162b6f0c469 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,13 +1,17 @@ -{ fetchzip, lib, stdenv, jdk, runtimeShell }: +{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "5.4.4"; + version = "5.5.1"; pname = "keystore-explorer"; src = fetchzip { - url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-544.zip"; - sha256 = "01kpa8g6p6vcqq9y70w5bm8jbw4kp55pbywj2zrhgjibrhgjqi0b"; + url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${lib.replaceStrings ["."] [""] version}.zip"; + sha256 = "2C/LkUUuef30PkN7HL0CtcNOjR5uNo9XaCiTatv5hgA="; }; + # glib is necessary so file dialogs don't hang. + buildInputs = [ glib ]; + nativeBuildInputs = [ wrapGAppsHook ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index b4819b70a9333..18952865eb84c 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - checkInputs = with python3.pkgs;[ + nativeCheckInputs = with python3.pkgs;[ freezegun hypothesis packaging @@ -90,6 +90,8 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # timing based "test_etag" + "test_bogota" + "test_event_no_dst" ]; meta = with lib; { diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 7f13494f65f5c..600ea299d18fe 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, callPackage +, libkiwix , pkg-config , qmake , qtbase @@ -11,13 +11,13 @@ mkDerivation rec { pname = "kiwix"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = pname; repo = "${pname}-desktop"; rev = version; - sha256 = "sha256-ks2d/guMp5pb2tiwGxNp3htQVm65MsYvZ/6tNjGXNr8="; + sha256 = "sha256-ghx4pW6IkWPzZXk0TtMGeQZIzm9HEN3mR4XQFJ1xHDo="; }; nativeBuildInputs = [ @@ -26,11 +26,11 @@ mkDerivation rec { ]; buildInputs = [ + libkiwix qtbase qtwebengine qtsvg qtimageformats - (callPackage ./lib.nix {}) ]; qtWrapperArgs = [ @@ -40,7 +40,7 @@ mkDerivation rec { meta = with lib; { description = "An offline reader for Web content"; homepage = "https://kiwix.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ajs124 ]; }; diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index 37f8203e047a5..144d83f6c1509 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config , python3 , curl , icu +, libzim , pugixml -, zimlib , zlib , libmicrohttpd , mustache-hpp @@ -12,14 +12,14 @@ }: stdenv.mkDerivation rec { - pname = "kiwix-lib"; - version = "10.1.1"; + pname = "libkiwix"; + version = "12.0.0"; src = fetchFromGitHub { owner = "kiwix"; repo = pname; rev = version; - sha256 = "sha256-ECvdraN1J5XJQLeZDngxO5I7frwZ8+W8tFpbB7o8UeM="; + sha256 = "sha256-4FxLxJxVhqbeNqX4vorHkROUuRURvE6AXlteIZCEBtc="; }; nativeBuildInputs = [ @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ curl libmicrohttpd + libzim pugixml - zimlib ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; @@ -51,4 +51,12 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs scripts ''; + + meta = with lib; { + description = "Common code base for all Kiwix ports"; + homepage = "https://kiwix.org"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ colinsane ]; + }; } diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/applications/misc/kiwix/tools.nix new file mode 100644 index 0000000000000..fe70f5b317a29 --- /dev/null +++ b/pkgs/applications/misc/kiwix/tools.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, icu +, libkiwix +, meson +, ninja +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "kiwix-tools"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "kiwix"; + repo = "kiwix-tools"; + rev = version; + sha256 = "sha256-r3/aTH/YoDuYpKLPakP4toS3OtiRueTUjmR34rdmr+w="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + icu + libkiwix + ]; + + meta = with lib; { + description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ..."; + homepage = "https://kiwix.org"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ colinsane ]; + }; +} + diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 3ab41da354527..0386b25ee422e 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.27.11"; + version = "0.28.3"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-w3ag+TPUrjPbPIy6N4HPsfraOyoHqBbvjwB1M6+qh60="; + hash = "sha256-keC+QLV/iEEGFDdy/Vt2pCr55qbqQzcx3HokdDi+xSU="; }; postPatch = '' diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 023045d67917a..80da168cdafef 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -1,9 +1,10 @@ { lib , stdenv -, pkg-config , fetchFromGitHub , fetchpatch , cmake +, pkg-config +, makeWrapper , boost , portmidi , sqlite @@ -11,40 +12,40 @@ , libpng , pngpp , zlib -, wxGTK30 +, wxGTK32 , wxsqlite3 +, fluidsynth +, fontconfig +, darwin +, soundfont-fluid +, openlilylib-fonts }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "lenmus"; - version = "5.4.2"; + version = "6.0.1"; src = fetchFromGitHub { owner = "lenmus"; repo = "lenmus"; rev = "Release_${version}"; - sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p"; + sha256 = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE="; }; - patches = [ - (fetchpatch { - url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch"; - sha256 = "1z1wwh0pcr8w1zlr8swx99si9y2kxx5bmavgwvy6bvdhxgm58yqs"; - }) - (fetchpatch { - 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="; - }) - ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr" "${placeholder "out"}" + sed -i 's/fixup_bundle.*")/")/g' CMakeLists.txt + ''; nativeBuildInputs = [ cmake pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + makeWrapper ]; buildInputs = [ @@ -55,10 +56,33 @@ stdenv.mkDerivation rec { libpng pngpp zlib - wxGTK30 + wxGTK32 wxsqlite3 + fluidsynth + fontconfig + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa ]; + preConfigure = '' + mkdir res/fonts + ln -s ${openlilylib-fonts.bravura}/share/lilypond/*/fonts/otf/Bravura.otf res/fonts/Bravura.otf + ln -s ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 res/sounds/FluidR3_GM.sf2 + ''; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DLENMUS_INSTALL_SOUNDFONT=ON" + "-DMAN_INSTALL_DIR=${placeholder "out"}/share/man" + ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/lenmus.app $out/Applications + mv $out/Resources $out/Applications/lenmus.app/Contents + makeWrapper $out/{Applications/lenmus.app/Contents/MacOS,bin}/lenmus + ''; + meta = with lib; { description = "LenMus Phonascus is a program for learning music"; longDescription = '' @@ -69,6 +93,6 @@ stdenv.mkDerivation rec { homepage = "http://www.lenmus.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 54ed6c10f42a7..566730c12222a 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,7 +1,6 @@ { lib , boost , fetchFromGitHub -, fetchpatch , installShellFiles , mkDerivation , muparser @@ -15,38 +14,42 @@ mkDerivation rec { pname = "librecad"; - version = "2.2.0-rc2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "LibreCAD"; repo = "LibreCAD"; rev = version; - sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; + sha256 = "sha256-horKTegmvcMg4m5NbZ4nzy4J6Ac/6+E5OkiZl0v6TBc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch"; - sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs="; - name = "CVE-2021-45342.patch"; - }) + buildInputs = [ + boost + muparser + qtbase + qtsvg + ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + qmake + qttools + ]; + + qmakeFlags = [ + "MUPARSER_DIR=${muparser}" + "BOOST_DIR=${boost.dev}" ]; postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ --replace /bin/sh ${runtimeShell} - substituteInPlace librecad/src/lib/engine/rs_system.cpp \ - --replace /usr/share $out/share - substituteInPlace librecad/src/main/qc_applicationwindow.cpp \ --replace __DATE__ 0 ''; - qmakeFlags = [ - "MUPARSER_DIR=${muparser}" - "BOOST_DIR=${boost.dev}" - ]; installPhase = '' runHook preInstall @@ -65,20 +68,6 @@ mkDerivation rec { runHook postInstall ''; - buildInputs = [ - boost - muparser - qtbase - qtsvg - ]; - - nativeBuildInputs = [ - installShellFiles - pkg-config - qmake - qttools - ]; - meta = with lib; { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 5ac3e9938fc3e..a40b253d4ba09 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.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/CYZMuW5/YoZszTOaQZLRhJdZAGGMY+s7vMK01hyMvg="; + sha256 = "sha256-fi36jsQr/Mn1FyOlle/WSpREQgZU6+h4IJzd3ZfItvI="; }; - vendorSha256 = "sha256-BwhbvCUOOp5ZeY/22kIZ58e+iPH0pVgiNOyoD6O2zPo="; + vendorSha256 = "sha256-gcIPASIk4Zq8y+KppYNRkf/9guCsYv9XskFANrqOCts="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 7004d0dce34f1..b1d3a5c0d6fce 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation rec { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; + # Project is unmaintained and fails to build: + # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int') + broken = true; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 54e3e98d48b8d..ea855f3d30be6 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, git }: +{ lib +, stdenv +, fetchurl +, appimageTools +, makeWrapper +, electron +, git +}: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.12"; + version = "0.8.16"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-I1jGPNGlZ53N3ZlN9nN/GSgQIfdoUeclyuMl+PpNVY4="; + sha256 = "sha256-0tIDoNQoqSn1nYm+YdgzXh34aH1e5N8wl9lqGbQoOeU="; name = "${pname}-${version}.AppImage"; }; @@ -52,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base"; homepage = "https://github.com/logseq/logseq"; + changelog = "https://github.com/logseq/logseq/releases/tag/${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ weihua ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/lukesmithxyz-bible/kjv.nix b/pkgs/applications/misc/lukesmithxyz-bible/kjv.nix new file mode 100644 index 0000000000000..7cec6c592235d --- /dev/null +++ b/pkgs/applications/misc/lukesmithxyz-bible/kjv.nix @@ -0,0 +1,29 @@ +{ lib +, gawk +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "lukesmithxyz-bible-kjv"; + version = "unstable-2022-06-01"; + + src = fetchFromGitHub { + owner = "lukesmithxyz"; + repo = "kjv"; + rev = "1b675c0396806a2a3d134c51fd11d9fed8ea3dc5"; + hash = "sha256-ii5SGZmO99VYbKdebfEbN3rL7LLSSQ0jm5mGqX2G3o0="; + }; + + buildInputs = [ gawk ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Read the Word of God from your terminal + Apocrypha"; + homepage = "https://lukesmith.xyz/articles/command-line-bibles"; + license = licenses.unlicense; + platforms = platforms.unix; + maintainers = [ maintainers.wesleyjrz ]; + }; +} diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index c67ec4cc2737f..d476024553ba3 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -123,7 +123,7 @@ buildPythonApplication rec { --replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'" ''; - checkInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; + nativeCheckInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; checkPhase = '' runHook preCheck diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 342700e678213..bd197395e8514 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # when running these tests inside build, based on free disk space. doCheck = false; checkTarget = "test"; - checkInputs = [ which zstd pbzip2 ]; + nativeCheckInputs = [ which zstd pbzip2 ]; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index b443c16601de0..26e735039b3fa 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mangal"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-T0QoHqL07J4Fb95qluYPb0yZYwdr7vDNLlrp7zPhtrA="; + hash = "sha256-nbJdePlzZFM2ihbvFIMKyYZ9C0uKjU3TE5VLduLvtKE="; }; proxyVendor = true; diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix index b108d1a5647e9..69b61afaee557 100644 --- a/pkgs/applications/misc/mbutil/default.nix +++ b/pkgs/applications/misc/mbutil/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests"; meta = with lib; { diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index b3ca8032b1964..245e0565e7c0c 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,16 +1,20 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30 -, desktop-file-utils, libSM, imagemagick }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK32 +, desktop-file-utils, libSM, imagemagick, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { - version = "22.06"; + version = "22.12"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30="; + sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libmediainfo wxGTK30 desktop-file-utils libSM imagemagick ]; + buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://mediaarea.net/"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index bde522fb0832f..8adfb7453ef53 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "22.06"; + version = "22.12"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30="; + sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index 276cf79988370..a3b5b591f6ead 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ unittestCheckHook ]; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 4366576ccbbe9..39849f6827e45 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.2.8"; + version = "2.3.1"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-646jGcgcEbhHk3PWdkKHWLVX8bNIB3BmYVMoXaGxHUw="; + hash = "sha256-nH2BsfXFwBdu7/YH2OuG90HxYgiuqKJqMC4p0PRlgPw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index c33e0d6a576c9..743c92407e799 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { gtk3 ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ glibcLocales pytest tox diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 13158d7f72576..d9b886cbe2b3f 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "652"; + version = "653"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; rev = version; - sha256 = "sha256-yCdVOT8if3AImD4Q63gKfMep7WZsrCgV+IXfP4ZL3Qw="; + sha256 = "sha256-iw414ecnOfeG3FdlIaoVOPv9BXZ95uUHuPzCQGH4G+A="; }; patches = [ diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/applications/misc/mnamer/default.nix index cad389bf0b9eb..e928e631c07ca 100644 --- a/pkgs/applications/misc/mnamer/default.nix +++ b/pkgs/applications/misc/mnamer/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { ./update_hack.patch ]; - checkInputs = [ python3Packages.pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; # disable test that fail (networking, etc) disabledTests = [ diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index f714b026a8359..1525fb86f8285 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.55.0"; + version = "1.00.1"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-up78503+YqUB2fR9B6W6plYksTJzTj5pkmFJ5eL/mLY="; + sha256 = "sha256-oENMr3d2vFisEFl7gYBQQ0XRBeogAYOfBE5th463laI="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 51e1a15b47bac..51cd4df77bfab 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-YZEPm+k0YzJB8OQAiFUOPc0QR2C0AkSgpNYdoh8jX8E="; + sha256 = "sha256-TUS0eTlQA7O59EvJHrQkqDQexv84ucza6kE4t98AGPs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix index d78d880c2e1d7..82cf9b3d9515c 100644 --- a/pkgs/applications/misc/mozphab/default.nix +++ b/pkgs/applications/misc/mozphab/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ git mercurial patch diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/applications/misc/mu-repo/default.nix index 9da761c5884f0..ff07856e0e8d8 100644 --- a/pkgs/applications/misc/mu-repo/default.nix +++ b/pkgs/applications/misc/mu-repo/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ git ]; - checkInputs = [ pytestCheckHook git ]; + nativeCheckInputs = [ pytestCheckHook git ]; passthru.tests.version = testers.testVersion { package = mu-repo; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index ab91e1d708994..812bc9a5d76df 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -47,12 +47,12 @@ let in stdenv.mkDerivation rec { - version = "1.20.3"; + version = "1.21.1"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-a2AHD27sIOjYfStc0iz0kCAxGjzxXuEJmOPl9fmEses="; + sha256 = "sha256-sk3b4SUGzILeCNXNSUYUugg0b4F12x2YvPk4/5SSWlQ="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index 0ae63d210e767..102991f002566 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Small weblog engine written in Bash for the command line"; - homepage = "http://nanoblogger.sourceforge.net/"; + homepage = "https://nanoblogger.sourceforge.net/"; license = lib.licenses.gpl2; mainProgram = "nb"; platforms = lib.platforms.unix; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 6527a4f57411b..4ae3cdeebd065 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; meta = { - homepage = "http://navipowm.sourceforge.net/"; + homepage = "https://navipowm.sourceforge.net/"; description = "Car navigation system"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix index 32361b276b208..ff12f5d159ceb 100644 --- a/pkgs/applications/misc/nwg-dock/default.nix +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X2AhzQsgUWHkPp1YoAxcbq+Oni9C6Yrnyt+Plxya8OI="; + sha256 = "sha256-RCVG38Y8VV7qGz/CaOZ4aw4Sg3PQdrB29zZqATjvYDQ="; }; - vendorSha256 = "sha256-5vGfWEBiC3ZJzVTHaOPbaaK/9+yg7Nj0mpbJbYpbY/A="; + vendorSha256 = "sha256-WDygnKdldZda4GadfStHWsDel1KLdzjVjw0RxmnFPRE="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index ff0127c106e74..2bb14c1b2988c 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.0"; + version = "0.3.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o69ZCtIT0jh4QnlspiAh58aA61aFkkKu0FdmscHLMIk="; + sha256 = "sha256-OcOF43SOlseb6UGTxLtGH0MRokZob0x+cczpdJc8Hq4="; }; - vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; + vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 24deebce1781f..34600bb351eca 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.6.3"; + version = "0.7.1.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QWDYy0TBxoYxfRAOtAEVM8wsPUi2SnzMXsu38guAURU="; + sha256 = "sha256-+waoJHU/QrVH7o9qfwdvFTFJzTGLcV9CeYPn3XHEAkM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 55aba845b0c04..51841f9852a57 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.0.3"; + version = "1.1.9"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-DYF9fEpZaP4tD/eeZAegDahR7UZyroqNB9bn2U7sgXs=" else "sha256-MpQk5g4184ZkCAjLU5Ug0ReWgVADskS1QuMcnPdNofs="; + sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index e63273b131083..89260c09f7893 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -83,7 +83,7 @@ let hash = "sha256-DCUesPy4/g7DYN/9CDRvwAWHcv4dFsF+gsysg5UWThQ="; }; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ argon2-cffi blinker cachelib @@ -136,7 +136,7 @@ let py.pkgs.appdirs ]; - checkInputs = with super; [ + nativeCheckInputs = with self; [ ddt mock pytestCheckHook @@ -146,7 +146,7 @@ let # substitute pip and let it find out, that it can't write anywhere (substituteAll { src = ./pip-path.patch; - pip = "${super.pip}/bin/pip"; + pip = "${self.pip}/bin/pip"; }) # hardcore path to ffmpeg and hide related settings @@ -172,6 +172,7 @@ let "Flask-Login" "werkzeug" "flask" + "Flask-Limiter" ]; in '' diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index fba1c0b0f5f81..472af0caf484e 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -93,7 +93,7 @@ python3.pkgs.buildPythonApplication rec { dconf ]; - checkInputs = [ + nativeCheckInputs = [ # for Onboard.SpellChecker.aspell_cmd doctests (aspellWithDicts (dicts: with dicts; [ en ])) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index e0af54b1e4e61..17a94511e3fce 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -35,7 +35,5 @@ stdenv.mkDerivation rec { license = with licenses; [ publicDomain ]; maintainers = with maintainers; [ xaverdh irenes ]; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 590ca33045169..357f4fcd87e56 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,5 +1,7 @@ { stdenv , lib +, AppKit +, DarwinTools , alsa-utils , at-spi2-core , cmake @@ -59,12 +61,7 @@ stdenv.mkDerivation rec { ]; postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/TargetSetup.cmake \ - --replace '"sw_vers" "-productVersion"' '"echo" "1"' sed -i '/fixup_bundle/d' CMakeLists.txt - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace CMakeLists.txt \ - --replace 'DARWIN_VERSION LESS 16' 'TRUE' ''; nativeBuildInputs = [ @@ -73,6 +70,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ lsb-release ] ++ lib.optionals stdenv.isDarwin [ + DarwinTools makeWrapper ]; @@ -81,6 +79,10 @@ stdenv.mkDerivation rec { curl dbus flac + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # gtk3 propagates AppKit from the 10.12 SDK + AppKit + ] ++ [ gtk3 jasper libGLU diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix index 9e8440a4c8066..4a61ab65376db 100644 --- a/pkgs/applications/misc/openlp/lib.nix +++ b/pkgs/applications/misc/openlp/lib.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # # See also https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/ - #checkInputs = [ mock nose ]; + #nativeCheckInputs = [ mock nose ]; nativeBuildInputs = [ qt5.qttools ]; propagatedBuildInputs = [ alembic diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index a1f119f6834cd..ffb62dd6c1997 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec { pname = "orpie"; version = "1.6.1"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "pelzlpj"; diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/applications/misc/oversteer/default.nix new file mode 100644 index 0000000000000..87c49c2cf7aaf --- /dev/null +++ b/pkgs/applications/misc/oversteer/default.nix @@ -0,0 +1,76 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, python3, python3Packages +, meson, cmake, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 +, wrapGAppsHook, gobject-introspection, bash, }: +let + python = python3.withPackages (p: + with p; [ + pygobject3 + pyudev + pyxdg + evdev + matplotlib + scipy + gtk3 + pygobject3 + ]); + + version = "0.7.2"; +in stdenv.mkDerivation { + inherit version; + + pname = "oversteer"; + + src = fetchFromGitHub { + owner = "berarma"; + repo = "oversteer"; + rev = version; + sha256 = "sha256-9MWRb0NXUbB8c+pH0mjUzsz849PmEjsZMhQr4wsmlKI="; + }; + + buildInputs = [ bash gtk3 ]; + + nativeBuildInputs = [ + pkg-config + gettext + python + wrapGAppsHook + gobject-introspection + meson + udev + ninja + appstream + appstream-glib + desktop-file-utils + ]; + + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ python gtk3 python3Packages.pygobject3 ]; + + mesonFlags = [ + "--prefix" + (placeholder "out") + "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d/" + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" + ) + ''; + + postInstall = '' + substituteInPlace $out/lib/udev/rules.d/* \ + --replace /bin/sh ${bash}/bin/sh + ''; + + patches = [ ./fix-install-dir.patch ]; + + meta = with lib; { + homepage = "https://github.com/berarma/oversteer"; + description = "Steering Wheel Manager for Linux"; + license = licenses.gpl3; + maintainers = [ maintainers.srounce ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/oversteer/fix-install-dir.patch b/pkgs/applications/misc/oversteer/fix-install-dir.patch new file mode 100644 index 0000000000000..0d5fdec689820 --- /dev/null +++ b/pkgs/applications/misc/oversteer/fix-install-dir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 239acf9..6a06c83 100644 +--- a/meson.build ++++ b/meson.build +@@ -8,7 +8,7 @@ pymod = import('python') + prefix = get_option('prefix') + pkgdatadir = join_paths(prefix, get_option('datadir'), meson.project_name()) + py_installation = pymod.find_installation(get_option('python')) +-py_path = py_installation.get_path('purelib') ++py_path = py_installation.get_install_dir() + + python3_required_modules = ['gi', 'pyudev', 'xdg', 'evdev', 'gettext', 'matplotlib', 'scipy', 'numpy'] + foreach p : python3_required_modules diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 0647ba26dc0ef..3d6e42bd628d6 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.1.9"; + version = "0.1.11"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3J3Xe9LT4bHatU/wWsF0Gq9gGRcSdCzyQnIIfLXE8KA="; + sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA="; }; - cargoSha256 = "sha256-TWpshqvWMRk2A6RvjWWQc7Nu6tOrctUBZmzyjEFKPRw="; + cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index b41b5ffb885eb..bce7760759df1 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -11,22 +11,27 @@ , openssl , pkg-config , zeromq +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Foundation; +in stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.4"; + version = "2.7"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-En2ogxAD61w7DRTsCGIp6fEP/cC2A+pTYIbjeJ1MktY="; + sha256 = "sha256-j3SVwat/LGw/iGcyNn8acR29Ob/WXDKyeCfDTsH+gxA="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ]; + buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index d7ac4fa21e752..1ce8511b27c7b 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { secretstorage ]; - checkInputs = + nativeCheckInputs = let ps = python3.pkgs; in @@ -71,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/mdellweg/pass_secret_service/"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; + mainProgram = "pass_secret_service"; maintainers = with lib.maintainers; [ jluttine aidalgol ]; }; } diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 3416bb348567f..237e229fc54d6 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "pgmodeler"; - version = "1.0.0-beta"; + version = "1.0.0-beta1"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-1+1hKOY8unu6Z7LLv/WQ86JlwWUubQuhPP9OUjyXOrM="; + sha256 = "sha256-5ZIzxo2UvE+aKznF9ZLYFg5z3JkYCB+9rGdVDJl14Hw="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/misc/phockup/default.nix b/pkgs/applications/misc/phockup/default.nix index f93c2b78c4a16..7db0690da891f 100644 --- a/pkgs/applications/misc/phockup/default.nix +++ b/pkgs/applications/misc/phockup/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "phockup"; - version = "1.7.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ivandokov"; repo = "phockup"; rev = version; - sha256 = "sha256-Ho9aZjBvSwFMur2NubhP4olPN31SNTEdQGCUV7nX0uE="; + sha256 = "sha256-ge34Iv/+B0xdrSNc7w3nZJw0DHBUvuh2k/I8v/RRg10="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index eadd7672bec5d..3f4e82d2e4d9d 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -25,7 +25,7 @@ # sed on many of the platforms Plover builds for postPatch = "sed -i /PyQt5/d setup.cfg"; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix new file mode 100644 index 0000000000000..c795e7f763454 --- /dev/null +++ b/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, coreutils +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "pokemon-colorscripts-mac"; + version = "stable=2021-08-10"; + + src = fetchFromGitHub { + owner = "nuke-dash"; + repo = "${pname}"; + rev = "6aa0cd93b255bee35c5716652b8b7dfecb5fcfa2"; + sha256 = "06b86qy2fpzdd81n2mscc2njkrxx0dyzxpgnm1xk6ldn17c853lc"; + }; + + buildInputs = [ coreutils ]; + + preBuild = '' + patchShebangs ./install.sh + + # Fix hardcoded prefixed coreutils + substituteInPlace pokemon-colorscripts.sh --replace greadlink readlink + substituteInPlace pokemon-colorscripts.sh --replace gshuf shuf + + substituteInPlace install.sh --replace /usr/local $out + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt + mkdir -p $out/bin + ./install.sh + + runHook postInstall + ''; + + meta = with lib; { + description = "Pokémon colorscripts for the terminal, compatible for mac"; + longDescription = '' + Show colored sprites of pokémons in your terminal. + Contains almost 900 pokemon from gen 1 to gen 8. + Inspired by DT's colorscripts. + ''; + homepage = "https://github.com/nuke-dash/pokemon-colorscripts-mac"; + license = licenses.mit; + maintainers = [ maintainers.wesleyjrz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index b670f85f7a60b..9ecced78440b2 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -28,7 +28,6 @@ , wirelesstools , libnl , i3 -, i3-gaps , jsoncpp # override the variables ending in 'Support' to enable or disable modules @@ -39,7 +38,6 @@ , iwSupport ? false , nlSupport ? true , i3Support ? false -, i3GapsSupport ? false }: stdenv.mkDerivation rec { @@ -59,7 +57,7 @@ stdenv.mkDerivation rec { pkg-config python3Packages.sphinx removeReferencesTo - ] ++ lib.optional (i3Support || i3GapsSupport) makeWrapper; + ] ++ lib.optional i3Support makeWrapper; buildInputs = [ cairo @@ -82,9 +80,7 @@ stdenv.mkDerivation rec { ++ lib.optional pulseSupport libpulseaudio ++ lib.optional iwSupport wirelesstools ++ lib.optional nlSupport libnl - ++ lib.optional (i3Support || i3GapsSupport) jsoncpp - ++ lib.optional i3Support i3 - ++ lib.optional i3GapsSupport i3-gaps; + ++ lib.optionals i3Support [ jsoncpp i3 ]; patches = [ ./remove-hardcoded-etc.diff ]; @@ -95,16 +91,10 @@ stdenv.mkDerivation rec { ''; postInstall = - if i3Support then '' + lib.optionalString i3Support '' wrapProgram $out/bin/polybar \ --prefix PATH : "${i3}/bin" - '' - else if i3GapsSupport - then '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3-gaps}/bin" - '' - else ""; + ''; postFixup = '' remove-references-to -t ${stdenv.cc} $out/bin/polybar diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 8ec18a8748637..b45854a6d180f 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -32,7 +32,7 @@ let inherit version; sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; - checkInputs = old.checkInputs ++ (with self; [ + nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests ]); doCheck = false; @@ -81,7 +81,7 @@ let # however `click-7` is needed by the older flask we need here. Since it's just # for the test-suite apparently, let's skip it for now. Mako = super.Mako.overridePythonAttrs (lib.const { - checkInputs = []; + nativeCheckInputs = []; doCheck = false; }); }; @@ -119,7 +119,7 @@ python3'.pkgs.buildPythonPackage rec { passthru.tests = { inherit (nixosTests) privacyidea; }; - checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; + nativeCheckInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; preCheck = "export HOME=$(mktemp -d)"; postCheck = "unset HOME"; disabledTests = [ diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 0a6c0d056685b..36e95ee8f098d 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -4,21 +4,39 @@ , installShellFiles }: +let config-module = "github.com/f1bonacc1/process-compose/src/config"; +in buildGoModule rec { pname = "process-compose"; - version = "0.29.1"; + version = "0.29.7"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-FB0PjvPBfbytIXwYs+eT9PMnKX/yymrajlJ42FDlMFs="; + hash = "sha256-gVXil6Gc65/6VMuONfVyxU6SSV0vCbJKXDvtG4a+pbU="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse --short HEAD > $out/COMMIT + # in format of 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X ${config-module}.Commit=$(cat COMMIT)" + ldflags+=" -X ${config-module}.Date=$(cat SOURCE_DATE_EPOCH)" + ''; + ldflags = [ + "-X ${config-module}.Version=v${version}" "-s" "-w" - "-X main.version=v${version}" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 442f9d0e9b50b..528fe1aec0c85 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -4,28 +4,24 @@ , pkg-config , gtk4 , stdenv -, DiskArbitration -, Foundation -, IOKit +, darwin }: rustPlatform.buildRustPackage rec { pname = "process-viewer"; - version = "0.5.5"; + version = "0.5.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MHVKjbD1/h7G94x6dpyRT/BPWQVUFurW7EvAUJ2xZeU="; + sha256 = "sha256-ELASfcXNhUCE/mhPKBHA78liFMbcT9RB/aoLt4ZRPa0="; }; - cargoSha256 = "sha256-NkJjwB4rBV4hFRwYHILMET8o4x1+95sVsFqNaVN8tMg="; + cargoSha256 = "sha256-K2kyZwKRALh9ImPngijgpoHyLS+c5sDYviN74JxhJLM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk4 ] ++ lib.optionals stdenv.isDarwin [ - DiskArbitration - Foundation - IOKit + darwin.apple_sdk_11_0.frameworks.Foundation ]; postInstall = '' diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/pkgs/applications/misc/procmail/CVE-2014-3618.patch deleted file mode 100644 index e3aa5600e40ea..0000000000000 --- a/pkgs/applications/misc/procmail/CVE-2014-3618.patch +++ /dev/null @@ -1,18 +0,0 @@ -From http://seclists.org/oss-sec/2014/q3/495 (with whitespace corrected). - ---- a/src/formisc.c 2013-08-04 00:13:33.000000000 -0700 -+++ b/src/formisc.c 2014-09-03 11:42:25.986002396 -0700 -@@ -84,12 +84,11 @@ - case '"':*target++=delim='"';start++; - } - ;{ int i; -- do -+ while(*start) - if((i= *target++= *start++)==delim) /* corresponding delimiter? */ - break; - else if(i=='\\'&&*start) /* skip quoted character */ - *target++= *start++; -- while(*start); /* anything? */ - } - hitspc=2; - } diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index dafc73925b549..ea299d73cbb0f 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "procmail"; - version = "3.22"; + version = "3.24"; src = fetchurl { - url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz"; - sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; + url = "https://github.com/BuGlessRB/procmail/archive/refs/tags/v${version}.tar.gz"; + sha256 = "UU6kMzOXg+ld+TIeeUdx5Ih7mCOsVf2yRpcCz2m9OYk="; }; - patches = [ - ./CVE-2014-3618.patch - (fetchurl { - url = "https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30"; - sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq"; - name = "CVE-2017-16844"; - }) - ]; - # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. postPatch = '' @@ -33,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail processing and filtering utility"; - homepage = "http://www.procmail.org/"; + homepage = "https://github.com/BuGlessRB/procmail/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 9c996e321152a..c0a1e7e0217d2 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -26,12 +26,11 @@ , openvdb , pcre , qhull -, systemd , tbb , wxGTK31 , xorg , fetchpatch -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: let wxGTK-prusa = wxGTK31.overrideAttrs (old: rec { @@ -82,7 +81,7 @@ stdenv.mkDerivation rec { xorg.libX11 ] ++ lib.optionals withSystemd [ systemd - ] ++ checkInputs; + ] ++ nativeCheckInputs; patches = [ # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355 @@ -103,7 +102,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; separateDebugInfo = true; @@ -183,5 +182,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/prusa3d/PrusaSlicer"; license = licenses.agpl3; maintainers = with maintainers; [ moredread tweber ]; + } // lib.optionalAttrs (stdenv.isDarwin) { + mainProgram = "PrusaSlicer"; }; } diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix index f569932475534..f32f60bac1ac2 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -2,40 +2,55 @@ , rustPlatform , fetchFromGitHub , pkg-config +, expat +, fontconfig +, freetype , libGL +, libxkbcommon , pipewire +, wayland , xorg }: rustPlatform.buildRustPackage rec { pname = "pw-viz"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ax9d"; repo = pname; rev = "v${version}"; - sha256 = "1d46m7w6rzzjpxc2fxwka9xbz49szbfrl63kxlv6kw4lknrladjn"; + sha256 = "sha256-lw4whdh8tNoS5XUlamQCq8f8z8K59uD90PSSo3skeyo="; }; - cargoSha256 = "sha256-jx1mUP6ezpwUhmDD9tCJBhHCHU8fEMlB738yYfB1psc="; + cargoSha256 = "sha256-XmvM5tr6ToYi0UrFnLju1wmp/0VEEP/O7T9Bx0YyFW4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ + expat + fontconfig + freetype libGL + libxkbcommon pipewire rustPlatform.bindgenHook + wayland xorg.libX11 xorg.libXcursor xorg.libXi - xorg.libxcb + xorg.libXrandr ]; postFixup = '' - patchelf $out/bin/pw-viz --add-rpath ${lib.makeLibraryPath [ libGL xorg.libXrandr ]} + patchelf $out/bin/pw-viz \ + --add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]} ''; + # enables pipewire API deprecated in 0.3.64 + # fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + meta = with lib; { description = "A simple and elegant pipewire graph editor "; homepage = "https://github.com/ax9d/pw-viz"; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 8f8aef6c8cfd9..25b69cf156195 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -6,7 +6,7 @@ , zip , gettext , perl -, wxGTK30 +, wxGTK32 , libXext , libXi , libXt @@ -19,20 +19,26 @@ , curl , openssl , file +, darwin , gitUpdater }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.15.0"; # do NOT update to 3.x Windows releases + version = "1.16.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-EyyQHp2MlGgUnikClgvP7I313Bh6H3yVPXel8Z/U6gQ="; + hash = "sha256-5/TOg+hiy22vlPJHheE638abhS3B5Jrul0Umgwu+gi0="; }; + strictDeps = true; + nativeBuildInputs = [ cmake gettext @@ -42,24 +48,29 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + wxGTK32 + curl + qrencode + openssl + xercesc + file + ] ++ lib.optionals stdenv.isLinux [ libXext libXi libXt libXtst - wxGTK30 - curl - qrencode libuuid - openssl - xercesc libyubikey yubikey-personalization - file + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa ]; cmakeFlags = [ "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" + ] ++ lib.optionals stdenv.isDarwin [ + "-DNO_YUBI=ON" ]; postPatch = '' @@ -79,6 +90,8 @@ stdenv.mkDerivation rec { for f in $(grep -Rl /usr/bin/ .) ; do substituteInPlace $f --replace /usr/bin/ "" done + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace src/ui/cli/CMakeLists.txt --replace "uuid" "" ''; installFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -99,7 +112,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://pwsafe.org/"; maintainers = with maintainers; [ c0bw3b pjones ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.artistic2; }; } diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index 0e473c6a1ba10..4da032bafeee7 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; }; - checkInputs = [ pytest-runner pytest ]; + nativeCheckInputs = [ pytest-runner pytest ]; meta = with lib; { homepage = "http://python-cerberus.org/"; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index d986c13b84b3a..fe3bf0c521153 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { homepage = "https://pythonhosted.org/pyditz/"; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 675df5d5ba3ed..f51f53e9b72d2 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -63,7 +63,7 @@ in python.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ perl gpsbabel ]) ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales perl xvfb-run diff --git a/pkgs/applications/misc/raider/default.nix b/pkgs/applications/misc/raider/default.nix new file mode 100644 index 0000000000000..cf368fbe79dca --- /dev/null +++ b/pkgs/applications/misc/raider/default.nix @@ -0,0 +1,58 @@ +{ appstream-glib +, blueprint-compiler +, desktop-file-utils +, fetchFromGitHub +, gettext +, glib +, gtk4 +, itstool +, lib +, libadwaita +, meson +, mesonEmulatorHook +, ninja +, pkg-config +, stdenv +, wrapGAppsHook4 +}: +stdenv.mkDerivation rec { + pname = "raider"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "ADBeveridge"; + repo = "raider"; + rev = "v${version}"; + hash = "sha256-fyE0CsQp2UVh+7bAQo+GHEF0k8Gwl9j4qclh04AQiVI="; + }; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + itstool + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + gtk4 + libadwaita + ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + meta = with lib; { + description = "Securely delete your files"; + homepage = "https://apps.gnome.org/app/com.github.ADBeveridge.Raider"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ benediktbroich ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index d6ec124f74516..64baaf5d1b088 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "remarkable-mouse"; - version = "7.0.3"; + version = "7.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e6xJBZmWXAPOHNNUMOGLjbe3QmvW0SRwfMNJVZsM3gw="; + sha256 = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 2a3fbb4470110..2da548619b140 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.23"; + version = "0.0.25"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-x6J3lQqSiqROLFB+S6nY/ONSluc7ffqJcK93bQpsjIs="; + sha256 = "sha256-7pwCd9tey7w5B8UgsMLHegPqmmY1prLM+Sk9o42X9lY="; }; vendorSha256 = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg="; diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index b0a09f4e0ebdc..e3fd00d8cdc4d 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rmview"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "bordaigorl"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-lUzmOayMHftvCukXSxXr6tBzrr2vaua1ey9gsuCKOBc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oCF37WQqNIXut2k+xr528twGxwPoH/sQ2leThagQJAU="; }; nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index eca870ed2ad0b..f620bb7bd8325 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -17,14 +17,14 @@ buildPythonApplication rec { pname = "rofimoji"; - version = "6.0.0"; + version = "6.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - sha256 = "sha256-8gaoPn43uurZBCex5AQXHShgw46Fx3YM4BIVDjTN8OY="; + sha256 = "sha256-eyzdTMLW9nk0x74T/AhvoVSrxXugc1HgNJy8EB5BApE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index e7a21fab1f412..9506825a2ffa0 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.4"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SsZRyODeYRQk2pVspKzfJbSRX/zjD+M+aaK+YXPu6CE="; + sha256 = "sha256-IjFDhkqtMitdcQORerRqwty3ZMP8jamPtb9oMHdre4I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index e299ec2ac86b7..69a71c6563cbb 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "sc-im"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "sha256-H+GQUpouiXc/w6GWdkSVvTXZ/Dtb7sUmBLGcpxG3Mts="; + sha256 = "sha256-QlnxMe0WsRX9J2xzpf2Udcf9+N3MvQWqmYl2YKsGpYM="; }; sourceRoot = "${src.name}/src"; @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/andmarti1424/sc-im/blob/${src.rev}/CHANGES"; homepage = "https://github.com/andmarti1424/sc-im"; description = "An ncurses spreadsheet program for terminal"; license = licenses.bsdOriginal; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index abd47c149ebb2..d300691934b25 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "isamert"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7yyORM77oByH1gxx/TNkjJQBsig6ZxsfeI3ijg71oBs="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index 22a1b9e74b78b..f9a7cc928e10c 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -5,7 +5,7 @@ , pkg-config , scdoc , stdenv -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${version}"; homepage = "https://sr.ht/~kennylevinsen/seatd/"; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; freebsd ++ linux ++ netbsd; maintainers = with maintainers; [ emantor ]; }; } diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index fb0a19dbb44a0..5bf957ec7c1b8 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { setuptools # needs pkg_resources ]; - checkInputs = [ + nativeCheckInputs = [ ffmpeg ] ++ (with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 132b8f0ab9e4e..3eb965e36f115 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.5.0"; + version = "3.6.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-VUf5fCVOZCn0iY51eBS/fIvlxQF+BY+k75I+NY7yqzM="; + sha256 = "sha256-VhBrSepJdwJRu+AqXWUzdDO4ukJPeoZr07B/X8Jr/RA="; }; - cargoSha256 = "sha256-ivSVcpUDGK0dJDy+jY7BYQIFCXu/npV0MiNe3nlsUho="; + cargoSha256 = "sha256-R1U0ZYQMA1VFd5zEjFzl5QhwqqEMaCFb/5H509IBj60="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index bfa0fb1d50559..6c809ef2af2c9 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "unstable-2022-08-30"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916"; - sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4="; }; buildInputs = [ @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://sioyek.info/"; description = "A PDF viewer designed for research papers and technical books"; - changelog = "https://github.com/ahrm/sioyek/releases/tag/v1.5.0"; + changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ podocarp ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index cedd870173130..c6c73115eb69a 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-K8VsqaNUPxh3/Yddy6DFiOyjRuZ6r6bU456Pm31A1og="; }; - checkInputs = [ + nativeCheckInputs = [ bash go ]; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 6a40f13034e76..de787ca669d07 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.5"; + version = "1.1.8"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-wqSDSLzm2RYV7XZPX0GQDR+TUgj4hLJ9FpVP3DYN7To="; + hash = "sha256-2LD1vMmQvibcnAgBwjfSBJysTnUGptGzPHfi/7tZ0hg="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/applications/misc/spacenav-cube-example/default.nix index 697d13c8c0e2e..990aedbc71ec0 100644 --- a/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "An example application to test the spacenavd driver"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/spnavcfg/default.nix b/pkgs/applications/misc/spnavcfg/default.nix index fcd4630e80393..6424204c460aa 100644 --- a/pkgs/applications/misc/spnavcfg/default.nix +++ b/pkgs/applications/misc/spnavcfg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Interactive configuration GUI for space navigator input devices"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 384e4f10940ee..6b90e9689d44b 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.13"; + version = "1.14"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-oirTDIbvG9/iAkYrquX+ciujAnLUmubkBVvTyaiz2g8="; + hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E="; }; postPatch = '' diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index a1179417719ba..21ac1939f4e9d 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -26,6 +26,11 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/timothycrosley/streamdeck-ui/commit/e271656c1f47b1619d1b942e2ebb01ab2d6a68a9.patch"; hash = "sha256-wqYwX6eSqMnW6OG7wSprD62Dz818ayFduVrqW9E/ays="; }) + (fetchpatch { + name = "update-python-xlib-0.33.patch"; + url = "https://github.com/timothycrosley/streamdeck-ui/commit/07d7fdd33085b413dd26b02d8a02820edad2d568.patch"; + hash = "sha256-PylTrbfB8RJ0+kbgJlRdcvfdahGoob8LabwhuFNsUpY="; + }) ]; desktopItems = [ (makeDesktopItem { @@ -74,7 +79,7 @@ python3Packages.buildPythonApplication rec { xlib ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run python3Packages.pytest python3Packages.hypothesis-auto diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/applications/misc/stylish/default.nix new file mode 100644 index 0000000000000..b1fed22b7ffe7 --- /dev/null +++ b/pkgs/applications/misc/stylish/default.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + curl, + feh, + file, + jq, + util-linux, + wget, +}: +stdenvNoCC.mkDerivation rec { + pname = "stylish"; + version = "unstable-2022-12-05"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitHub { + owner = "thevinter"; + repo = "styli.sh"; + rev = "d595412a949c6cdc7e151ae0cf929aa1958aa7f1"; + hash = "sha256-lFnzrYnTFWe8bvK//aC1+TapWIFNsNP60Msn7D0tk/0="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp "${src}/styli.sh" $out/bin + chmod +x $out/bin/styli.sh + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/styli.sh --prefix PATH : ${lib.makeBinPath [ + curl + feh + file + jq + util-linux + wget + ]} + ''; + + meta = with lib; { + homepage = "https://github.com/thevinter/styli.sh"; + description = "A shell script to manage wallpapers"; + longDescription = '' + Styli.sh is a Bash script that aims to automate the tedious process + of finding new wallpapers, downloading and switching them via the + configs. + Styli.sh can search for specific wallpapers from unsplash or download + a random image from the specified subreddits. If you have pywal it also + can set automatically your terminal colors. + ''; + license = licenses.mit; + maintainers = with maintainers; [ tchab ]; + }; +} diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index d8af8fe07c209..e4409d1ac7600 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.4.3-1"; + version = "0.4.3-2"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bqrp/XS4OJIRW2ChHnf9gMh/TgCPUEb9fP2soeT1Qe4="; + sha256 = "sha256-QgkUxT5Ae0agvalZl1ie+1LwxgaTzMrKpQY3KkpWwG4="; }; - cargoSha256 = "sha256-TWXK36cN8WuqfrMX7ybO2lnNiGnSKmfK6QGWMBM1y0o="; + cargoSha256 = "sha256-LPcN5xWOrl+MYVDKRIAlJoDepSSE9LTEN4fUS7bPS2U="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ udev ]; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 767d0c768ded0..a15b0a4ab7cb2 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -118,7 +118,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { runHook postInstall ''; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook pytest-django pytest-factoryboy diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index d1286fe7179d9..af8a538a822bd 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-Qgan0mnDTQx+KKCAnRpgi9CCbXIRBMQtAyH/Mr20VSw="; + hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0="; }; postPatch = '' diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/applications/misc/terminal-stocks/default.nix new file mode 100644 index 0000000000000..b1d4c67ac89b4 --- /dev/null +++ b/pkgs/applications/misc/terminal-stocks/default.nix @@ -0,0 +1,25 @@ +{ lib, buildNpmPackage, fetchFromGitHub, nix-update-script }: + +buildNpmPackage rec { + pname = "terminal-stocks"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "shweshi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AzLMqp5t9u1ne+xCKp0dq/3V3DKJ1Ou9riAN+KqkStg="; + }; + + npmDepsHash = "sha256-GOg6B8BWkWegxeYmlHSJjFNrb/frb6jdzjjNSGF38Zo="; + dontNpmBuild = true; + + passthru.updateScript = nix-update-script {}; + + meta = with lib; { + description = "Terminal based application that provides stock price information"; + homepage = "https://github.com/shweshi/terminal-stocks"; + maintainers = with maintainers; [ mislavzanic ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 4ccddcd70071c..e51f7633e013a 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -1,26 +1,15 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, bibtool -, pybtex -, pymupdf -, pynvim -, pyperclip -, roman -, pdfrw -, pagelabels -, setuptools -}: +{ lib, buildPythonApplication, fetchFromGitHub, bibtool, pybtex, pymupdf, pynvim +, pyperclip, roman, pdfrw, pagelabels, setuptools }: buildPythonApplication { pname = "termpdf.py"; - version = "2019-10-03"; + version = "2022-03-28"; src = fetchFromGitHub { owner = "dsanson"; repo = "termpdf.py"; - rev = "4f3bdf4b5a00801631f2498f2c38c81e0a588ae2"; - sha256 = "05gbj2fqzqndq1mx6g9asa7i6z8a9jdjrvilfwx8lg23cs356m6m"; + rev = "e7bd0824cb7d340b8dba7d862e696dba9cb5e5e2"; + sha256 = "HLQZBaDoZFVBs4JfJcwhrLx8pxdEI56/iTpUjT5pBhk="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 730af1a5558b3..57dbf849a3ae0 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "23.0.3"; + version = "23.0.5"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-X1WNfpsHRkk2UNTExn338r4pWhtC1osrCo6V8g7Pxcc="; + sha256 = "sha256-6pXbHkLdJw0+G9lep/tGkbSGAf8AobkQQgvw6gPYlro="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 4d3baf3feaeb2..765462d78acf9 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,19 +5,21 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-2Q+5EVeF8kXO4RogQIQHafV0AKIEKBFGqt27Vkanwss="; + rev = "refs/tags/v${version}"; + hash = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M="; }; - vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; + vendorHash = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ - "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" + "-s" + "-w" + "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" ]; # Tests require internet @@ -26,6 +28,7 @@ buildGoModule rec { meta = with lib; { description = "Terminal stock ticker with live updates and position tracking"; homepage = "https://github.com/achannarasappa/ticker"; + changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ siraben ]; }; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index bc7e5bd61fcb6..916dacd5e52af 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.16.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-C0FCdCgycCh+3iG4D9HMOzx/r+MoYdJUgWL5fs8T1rU="; + hash = "sha256-+V6nV2L1lE5QEkZcDMg9WE3iiBuZN/QTMR+XX/IdjmA="; }; buildInputs = [ sqlite zlib ]; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index 28222e0e12879..f28797b88e570 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -2,23 +2,19 @@ buildGoModule rec { pname = "todoist"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "sachaos"; repo = "todoist"; rev = "v${version}"; - sha256 = "sha256-lnx02fFzf8oaJ9T7MV+Gx4EpA4h7TVJK91o9+GU/Yvs="; + sha256 = "sha256-46wNacsK2kGHaq2MgcW4ELI2TIY+4leraGQwU4V7sVo="; }; vendorSha256 = "sha256-ly+OcRo8tGeNX4FnqNVaqjPx/A1FALOnScxs04lIOiU="; doCheck = false; - postPatch = '' - substituteInPlace main.go --replace '0.15.0' '${version}' - ''; - meta = { homepage = "https://github.com/sachaos/todoist"; description = "Todoist CLI Client"; diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix index 947b5c336bbff..9438201d45a82 100644 --- a/pkgs/applications/misc/tofi/default.nix +++ b/pkgs/applications/misc/tofi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "tofi"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "philj56"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KLHZrfoQ6x3EeKWo/TMp30rEIqdq16i8YLr4zFHbnSc="; + sha256 = "sha256-HhkXypRGerWWHrR4maR3AtayWSy5qhl/LYwBHWGKboU="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ]; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 22df6613008f7..6f6151d1ea295 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,19 +2,19 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.29.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-SrPjotEkP8Z2uYB/4eAJAk3Zmzmr0xET69PmkxQCwFQ="; + sha256 = "sha256-qZk42zGHWpeN5rZPFw7xAmDIvhPzqTePU3If+p/L98c="; }; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; - [ requests beautifulsoup4 future wcwidth urwid ]; + [ requests beautifulsoup4 future wcwidth urwid psycopg2 ]; checkPhase = '' py.test diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 7667b4103d48c..a20e3e2650f1f 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { watchdog ]; - checkInputs = [ unittestCheckHook mock freezegun pylint ]; + nativeCheckInputs = [ unittestCheckHook mock freezegun pylint ]; # Skip test that has been reported multiple times upstream without result: # bram85/topydo#271, bram85/topydo#274. diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index 4cc925d3bf955..641723016a8a6 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { gtk3 gobject-introspection glib ]; - checkInputs = with python3Packages; [ flake8 pytest ]; + nativeCheckInputs = with python3Packages; [ flake8 pytest ]; propagatedBuildInputs = with python3Packages; [ svgwrite pyxdg pycairo pygobject3 setuptools-scm ]; diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index fb1a85b1e4910..d4188829d40ba 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { py.test ''; - checkInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; + nativeCheckInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ]; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index b02227b8bae37..b5e23f15b0ba2 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.26"; + version = "1.0.34"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-ZSlrPhCArPEVTKX7BbUfKA+hYi7TpmJbGjWmbBUwes0="; + sha256 = "sha256-AnuPTv9W+2yDcM803DZaNIn4S7A78JEv6S8pA18whVA="; }; - vendorSha256 = "sha256-PYVXEPmWgtME3XljJzyGAri/GW19PIkQpscFFRNuVXQ="; + vendorHash = "sha256-go7eZHhrQ1ZcLOn56a3Azn3eRyAesAkgLabPbwzKtds="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index d5d4b766e7752..91ad479f450e1 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index c82bdcc6001e9..527db967b9742 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -55,14 +55,14 @@ python3Packages.buildPythonApplication rec { dbus-python pygobject3 pyinotify - python-Levenshtein + levenshtein pyxdg pycairo requests websocket-client ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ mock pytest pytest-mock diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 0b1bed6785755..012285064d2da 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook +{ lib, stdenv, requireFile, dpkg, wrapGAppsHook, autoPatchelfHook , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender @@ -6,11 +6,12 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.13"; + version = "5.8.0.24"; - src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb"; - sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79"; + src = requireFile { + name = "${pname}_${version}_amd64.deb"; + url = "https://www.upwork.com/ab/downloads/os/linux/"; + sha256 = "sha256-9X1U/ImI8GfCiYLpLD+jICYAYsAr1NJLlOMvecXK7hc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index edee8a37fe7a4..95c3153eeb084 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule , unixODBC @@ -11,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-YshGqp27N1iOBWSE9UH1zsQlFar2uKf4Jq2W8kSN0Qc="; + hash = "sha256-Tsv2nUlxu/nUsupQgYn1CAy/mrwq14OEFZErgO34thU="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-qHs5Z7NRdQKPOmYSozhSVQfINMxJewVwQ1Gi4SMWT+8="; + vendorHash = "sha256-Zd8/1i9YwVoOoJ1NG5gMGB781IbNBL5lfkrSwYNn9Hg="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 5ea0a82c850eb..fc66c908be70b 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-wcOLUA/U+xRwo7slnACCURQO7D0F3pFP2/SHDfEHeTA="; + hash = "sha256-t6n4uID7KTu/BqsmndJOft0ifxZNfv9lfqlzFX0ApKw="; }; - vendorHash = "sha256-f8EHDxu+NWAFJx9ujzsiDhNymdEzExmdreP11gV56AI="; + vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38="; nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ ttyd ffmpeg ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 36a7285b3d25d..6e9909d38a1dd 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -71,7 +71,7 @@ buildPythonApplication rec { ] ++ lib.optionals withPcap [ dpkt dnslib ] ++ lib.optional withXclip xclip; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 890a69f3b1616..529c809806dac 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { urwid ]; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ]; diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/applications/misc/warpd/default.nix index 683b725ac5e16..e2d5715447f7c 100644 --- a/pkgs/applications/misc/warpd/default.nix +++ b/pkgs/applications/misc/warpd/default.nix @@ -2,35 +2,29 @@ , stdenv , fetchFromGitHub , git -, libXi -, libXinerama -, libXft -, libXfixes -, libXtst -, libX11 -, libXext -, waylandSupport ? false, cairo, libxkbcommon, wayland +, withWayland ? true, cairo, libxkbcommon, wayland +, withX ? true, libXi, libXinerama, libXft, libXfixes, libXtst, libX11, libXext }: stdenv.mkDerivation rec { pname = "warpd"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "rvaiya"; repo = "warpd"; rev = "v${version}"; - sha256 = "sha256-aNv2/+tREvKlpTAsbvmFxkXzONNt73/061i4E3fPFBM="; + hash = "sha256-5B3Ec+R1vF2iI0ennYcsRlnFXJkSns0jVbyAWJA4lTU="; leaveDotGit = true; }; nativeBuildInputs = [ git ]; - buildInputs = if waylandSupport then [ + buildInputs = lib.optionals withWayland [ cairo libxkbcommon wayland - ] else [ + ] ++ lib.optionals withX [ libXi libXinerama libXft @@ -40,10 +34,12 @@ stdenv.mkDerivation rec { libXext ]; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals waylandSupport [ "PLATFORM=wayland" ]; + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional (!withWayland) "DISABLE_WAYLAND=y" + ++ lib.optional (!withX) "DISABLE_X=y"; postPatch = '' - substituteInPlace Makefile \ + substituteInPlace mk/linux.mk \ --replace '-m644' '-Dm644' \ --replace '-m755' '-Dm755' \ --replace 'warpd.1.gz $(DESTDIR)' 'warpd.1.gz -t $(DESTDIR)' \ diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 1bd63b77b1397..d22c9a9088168 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -20,6 +20,7 @@ , inputSupport ? true, libinput , jackSupport ? true, libjack2 , mpdSupport ? true, libmpdclient +, mprisSupport ? stdenv.isLinux, playerctl ? false , nlSupport ? true, libnl , pulseSupport ? true, libpulseaudio , rfkillSupport ? true @@ -30,18 +31,18 @@ , udevSupport ? true, udev , upowerSupport ? true, upower , wireplumberSupport ? true, wireplumber -, withMediaPlayer ? false, glib, gobject-introspection, python3, playerctl +, withMediaPlayer ? mprisSupport && false, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-hcU0ijWIN7TtIPkURVmAh0kanQWkBUa22nubj7rSfBs="; + hash = "sha256-sdNenmzI/yvN9w4Z83ojDJi+2QBx2hxhJQCFkc5kCZw="; }; nativeBuildInputs = [ @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { playerctl python3.pkgs.pygobject3 ]; + strictDeps = false; buildInputs = with lib; @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { ++ optional inputSupport libinput ++ optional jackSupport libjack2 ++ optional mpdSupport libmpdclient + ++ optional mprisSupport playerctl ++ optional nlSupport libnl ++ optional pulseSupport libpulseaudio ++ optional sndioSupport sndio @@ -71,7 +74,7 @@ stdenv.mkDerivation rec { ++ optional upowerSupport upower ++ optional wireplumberSupport wireplumber; - checkInputs = [ catch2_3 ]; + nativeCheckInputs = [ catch2_3 ]; doCheck = runTests; mesonFlags = (lib.mapAttrsToList @@ -83,6 +86,7 @@ stdenv.mkDerivation rec { libnl = nlSupport; libudev = udevSupport; mpd = mpdSupport; + mpris = mprisSupport; pulseaudio = pulseSupport; rfkill = rfkillSupport; sndio = sndioSupport; @@ -104,9 +108,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/alexays/waybar/releases/tag/${version}"; description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; - maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault ]; + maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz ]; platforms = platforms.unix; homepage = "https://github.com/alexays/waybar"; }; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 2a29eab29730d..9ae1b348e3d47 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -1,28 +1,27 @@ -{ - lib, - stdenv, - fetchFromGitHub, - zig, - wayland, - pkg-config, - scdoc, - wayland-protocols, - libxkbcommon, - pam, +{ lib +, stdenv +, fetchFromGitHub +, zig +, wayland +, pkg-config +, scdoc +, wayland-protocols +, libxkbcommon +, pam }: stdenv.mkDerivation rec { pname = "waylock"; - version = "0.4.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yWjWcnGa4a+Dpc82H65yr8H7v88g/tDq0FSguubhbEI="; + hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w="; fetchSubmodules = true; }; - nativeBuildInputs = [zig wayland scdoc pkg-config]; + nativeBuildInputs = [ zig wayland scdoc pkg-config ]; buildInputs = [ wayland-protocols @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dman-pages --prefix $out install + zig build -Drelease-safe -Dman-pages -Dcpu=baseline --prefix $out install runHook postInstall ''; @@ -47,6 +46,6 @@ stdenv.mkDerivation rec { description = "A small screenlocker for Wayland compositors"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [jordanisaacs]; + maintainers = with maintainers; [ jordanisaacs ]; }; } diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 1de667f132e30..472f7ad42a506 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.6.5"; + version = "4.7.4"; src = let downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; - sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0="; + sha256 = "sha256-jRtlnKlrh6If9wy3FqVBtctQO3rZJRwceUWAPmieT4A="; } else if stdenv.system == "aarch64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; - sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc="; + sha256 = "sha256-gWCBH2zfhJdJ3XUAxvZ0+gBHye5uYCUgX1BDEoaruxY="; } else throw "Whalebird is not supported for ${stdenv.system}"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Necessary steps to find the tray icon asar extract opt/Whalebird/resources/app.asar "$TMP/work" substituteInPlace $TMP/work/dist/electron/main.js \ - --replace "Ao,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" + --replace "qt,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar runHook postBuild diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index 1f5ee3ccfee42..1f9c048e71f4e 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "writefreely"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "writeas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qYceijC/u8G9vr7uhApWWyWD9P65pLJCTjePEvh+oXA="; + sha256 = "sha256-GnuqYgiwXdKM+os5RzuUYe9ADOhZaxou5dD7GCEE1Ns="; }; - vendorSha256 = "sha256-CBPvtc3K9hr1oEmC+yUe3kPSWx20k6eMRqoxsf3NfCE="; + vendorSha256 = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; nativeBuildInputs = [ go-bindata ]; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index d57eb48781733..7e3a391eb5bb0 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It constructs a virtually 3-D formed universe from a directory tree and allows you to "cruise" within a visualized filesystem. ''; - homepage = "http://xcruiser.sourceforge.net/"; + homepage = "https://xcruiser.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index c9af439b447b2..538bf3507a7bd 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.18.0-mo1"; + version = "6.18.1-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-Ma5wXaQBAVWJsL2wVOHxQ2aSAG9wOywk/abtUi03JvY="; + sha256 = "sha256-ZHSDJLZ+5WTqJwSWT05VuN7VAK/aD0dimVFiZ39IWvg="; }; meta = with lib; { diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 2d8af0465a772..eab545cf08189 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,9 +1,24 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib -, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, autoreconfHook +, intltool +, pkg-config +, wrapGAppsHook +, enchant +, gdk-pixbuf +, glib +, gst_all_1 +, libnotify +, pcre +, xorg +, xosd +}: stdenv.mkDerivation { - pname = "xneur"; - version = "0.20.0"; + pname = "xneur"; + version = "0.20.0"; src = fetchurl { url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz"; @@ -11,14 +26,26 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - pkg-config intltool wrapGAppsHook + autoreconfHook + intltool + pkg-config + wrapGAppsHook ]; buildInputs = [ - xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib - xosd xorg.libXext xorg.libXi libnotify - enchant gdk-pixbuf - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + enchant + gdk-pixbuf + glib + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + libnotify + pcre + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXtst + xosd ]; patches = [ @@ -27,10 +54,15 @@ stdenv.mkDerivation { url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch"; sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy"; }) + (fetchpatch { + name = "enchant2.patch"; + url = "https://salsa.debian.org/debian/xneur/-/raw/695b0fea56cde4ff6cf0f3988218c5cb9d7ff5ae/debian/patches/enchant2.patch"; + sha256 = "02a3kkfzdvs5f8dfm6j5x3jcn5j8qah9ykfymp6ffqsf4fijp65n"; + }) ]; postPatch = '' - sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure + sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure.ac ''; meta = with lib; { diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index d858605e9044b..6b58dd1caf5db 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -4,54 +4,81 @@ , fetchFromGitHub , stdenv , pcre2 +, gnome +, makeWrapper }: - let vendorHashes = { x86_64-linux = "sha256-BwhWA8N0S55XkljDKPNkDhsj0QSpmJJ5MwEnrPjymS8="; aarch64-linux = "sha256-T1aGz3+2Sls+rkUVDUo39Ky2igg+dxGSUaf3qpV7ovQ="; }; - +in +flutter.mkFlutterApp rec { + pname = "yubioath-flutter"; 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; + passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; - vendorHash = vendorHashes."${stdenv.system}"; + vendorHash = vendorHashes.${stdenv.system}; postPatch = '' substituteInPlace linux/CMakeLists.txt \ - --replace "../build/linux/helper" "${helper}/libexec/helper" + --replace "../build/linux/helper" "${passthru.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/ + 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" + ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper" + + # Move the icon. + mkdir $out/share/icons + mv $out/app/linux_support/com.yubico.yubioath.png $out/share/icons + + # Cleanup. + rm -rf \ + "$out/app/README.adoc" \ + "$out/app/desktop_integration.sh" \ + "$out/app/linux_support" \ + $out/bin/* # We will repopulate this directory later. + + # Symlink binary. + ln -sf "$out/app/authenticator" "$out/bin/yubioath-flutter" + + # Needed for QR scanning to work. + wrapProgram "$out/bin/yubioath-flutter" \ + --prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]} + + # Set the correct path to the binary in desktop file. + substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ + --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ + --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" ''; + nativeBuildInputs = [ + makeWrapper + ]; + buildInputs = [ pcre2 ]; + + 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; + }; } diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index a37ae01990ab2..12e5f52d6b2e7 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -12,7 +12,7 @@ , meta }: -buildPythonApplication rec { +buildPythonApplication { pname = "yubioath-flutter-helper"; inherit src version meta; diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/applications/networking/alpnpass/default.nix index 5cc0ac1cf05cf..1d24c80287703 100644 --- a/pkgs/applications/networking/alpnpass/default.nix +++ b/pkgs/applications/networking/alpnpass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Inspect the plaintext payload inside of proxied TLS connections"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 68a35cf768773..45e064a31b70c 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.46.133"; + version = "1.47.171"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-362XVFFsVWR/H0mcn1XQh3tsemksEnqR5quOIwf2QQE="; + sha256 = "sha256-0hKosta1fxth9ScDRmrrt8BH4CTIRm0ghetY4Jkuco8="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index 035be9585ddd7..ec24158635eeb 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -1,17 +1,29 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "captive-browser"; - version = "2021-08-01"; - goPackagePath = pname; + version = "unstable-2021-08-01"; src = fetchFromGitHub { - owner = "FiloSottile"; - repo = "captive-browser"; - rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c"; + owner = "FiloSottile"; + repo = "captive-browser"; + rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c"; sha256 = "sha256-65lPo5tpE0M/VyyvlzlcVSuHX4AhhVuqK0UF4BIAH/Y="; }; + vendorHash = "sha256-2MFdQ2GIDAdLPuwAiGPO9wU3mm2BDXdyTwoVA1xVlcQ="; + deleteVendor = true; + + patches = [ + # Add go modules support + (fetchpatch { + url = "https://github.com/FiloSottile/captive-browser/commit/ef50837778ef4eaf38b19887e79c8b6fa830c342.patch"; + hash = "sha256-w+jDFeO94pMu4ir+G5CzqYlXxYOm9+YfyzbU3sbTyiY="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; homepage = "https://blog.filippo.io/captive-browser"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 50cbc80e0c7e9..23b47c84555f2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -45,7 +45,7 @@ , ungoogled ? false, ungoogled-chromium # Optional dependencies: , libgcrypt ? null # cupsSupport -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 34c6f773046a2..c4f2257d1b2a2 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -197,6 +197,9 @@ in stdenv.mkDerivation { export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" fi + # Make generated desktop shortcuts have a valid executable name. + export CHROME_WRAPPER='chromium' + '' + lib.optionalString (libPath != "") '' # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not # contain an empty section before or after a colon. @@ -231,6 +234,5 @@ in stdenv.mkDerivation { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; inherit chromeSrc sandboxExecutableName; - updateScript = ./update.py; }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c9399336bdd13..752bde8992489 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": "108.0.5359.124", - "sha256": "0x9ac6m4xdccjdrk2bmq4y7bhfpgf2dv0q7lsbbsa50vlv1gm3fl", - "sha256bin64": "00c11svz9dzkg57484jg7c558l0jz8jbgi5zyjs1w7xp24vpnnpg", + "version": "109.0.5414.74", + "sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd", + "sha256bin64": "1qfp9li90p2d6asy60v12h7r4025l01yf3dzcdyihvr0la3bhdrx", "deps": { "gn": { - "version": "2022-10-05", + "version": "2022-11-10", "url": "https://gn.googlesource.com/gn", - "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", - "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" + "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", + "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" } }, "chromedriver": { - "version": "108.0.5359.71", - "sha256_linux": "0lxmzmjpy4j5k3hx7wxdbbk87fr883a6323r9fj5nmylb230i3p4", - "sha256_darwin": "14kl58qlxkfq7hipg717nwawzcx7qzg77v322ikgrvqi03f0saci", - "sha256_darwin_aarch64": "08rbp1dqv1xvy1w9jsip3140frbifzblgrn6i9xr612hxysxhap6" + "version": "109.0.5414.25", + "sha256_linux": "1gybh9nyc2j96ics1898qkrn1aajb2gpjb8l6b2p0hs24iqhjilg", + "sha256_darwin": "1w3sz9sxjkir2wwkzjx870qq04xzf9z7b59m953w33mkfm6zvz71", + "sha256_darwin_aarch64": "1qfg22glac44y5pdzscm2yr6wjnhm7p7pkiadblky27fp13dpyv0" } }, "beta": { - "version": "109.0.5414.46", - "sha256": "17wzll9024c80fhgxi33ix1rpmqh9sbpx6qvw9cvhdlmhn0b5017", - "sha256bin64": "199n8a7pjnhbgkm2dwh9hq7pzf39x932bh6b056jqp032d5c00ns", + "version": "110.0.5481.38", + "sha256": "0y3clfzqnbyz0v53w3ha1kx4jb9skdf22ihs09i8b568dj1m9mwj", + "sha256bin64": "0gvxsgw0ywq8d689g8790fymhksqg744m3j7kg4hcnmiyqdajl0n", "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" } } }, "dev": { - "version": "110.0.5464.2", - "sha256": "18k4rrwszk4xz416xi6li9b5pdajlscfgg4cyv67y10z7f28qwby", - "sha256bin64": "0hzv55bba4041400zjysgzz1n8svzvi156xyrayfr5ynapf7g2rd", + "version": "111.0.5545.6", + "sha256": "0c5v7w0fbhrgqialncx0adyyah2026icwrxjwywridah1jrbm90a", + "sha256bin64": "1m3s40hibs3f1j3g2asq102iijjd59xrqqz7iv82za1slnrcbfg5", "deps": { "gn": { - "version": "2022-11-29", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "70d6c60823c0233a0f35eccc25b2b640d2980bdc", - "sha256": "04md36i6l07c1bq8mqghrnbf308j9avmqkwqjqm8gciclnrnlsii" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" } } }, "ungoogled-chromium": { - "version": "108.0.5359.125", - "sha256": "0n8aigw7qv6dzd8898xz435kj79z73v916amfaxyz69g57pnpqhn", + "version": "109.0.5414.87", + "sha256": "1nhqbl4070n3f3j9867j78k8vig69i8m0k0s17z5axqv2qkn76k8", "sha256bin64": null, "deps": { "gn": { - "version": "2022-10-05", + "version": "2022-11-10", "url": "https://gn.googlesource.com/gn", - "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", - "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" + "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", + "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" }, "ungoogled-patches": { - "rev": "108.0.5359.125-1", - "sha256": "1dacvzi6j4xyjjnrsb79mhhj7jc992z1di9acl4appfydlqadgv3" + "rev": "109.0.5414.87-1", + "sha256": "0lq0zk21qfm8wvi0fl0gnjm0wnk29dsi8b9qphldwysgla8y8m3j" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 96952bebf97b2..79afc0ac17d6c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "109.0b6"; + version = "109.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ach/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ach/firefox-109.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "76b65d1590e9cda011579e09ad84e0c6a9cab8cb3d5134471aa56a85fe3ae2de"; + sha256 = "b948a55f78d7b3a84abc982f2b98ed587111a9e00c4ed170058d1a85bb439374"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/af/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/af/firefox-109.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "85ae096397e6ea6e798ac5e9a86033f102b5c4bc414fd254cb13929b859db92c"; + sha256 = "4d228b9199b9d4a1741196925c17d83a7d32e14556878a7d73cd108197a7c762"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/an/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/an/firefox-109.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e95f579d3f614a6a377ef46fbc8965cebfd4ea887f27f84f76bc0f1c53b14fc5"; + sha256 = "7f0986afc8a5bfe255014e47ed9e2bb7b92ce07941eae599b28a0acc6d3fe54e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ar/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ar/firefox-109.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "6a9ba4e50bc8b98dbbe3362743639ab60594f4b2d2ac85ffe26156b4826e59c6"; + sha256 = "8e016f41a7e3ed8b56c93593fce6f947903d292eafd72d5ca6518fbd2afb8bcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ast/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ast/firefox-109.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "62850d7abf809b64c7248060fceea9c83995db8ebcc5e835b08a530bd0a15a66"; + sha256 = "0ec22faedfdaa353bb17ea80b3d467fb126b0e85f2c1a0b99907b89d6b56da07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/az/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/az/firefox-109.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b2a4ac5d321f997767836cddc7bbcf381f2f0bba8cd9638067c3a38a4e9a5bbf"; + sha256 = "03661f5d49915da64adf9b0b5fdd1612c3b718b91610586159936c5c365cc906"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/be/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/be/firefox-109.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "92975b9ada6b8ecf94a4a96a5511f75a2dbaaae55e4b0b8f392790787246d171"; + sha256 = "90ec691576893aecef562eeae9b0c1bdbefdfa6cad6aed8bae8a69aceed96079"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/bg/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bg/firefox-109.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "8bd37b2dad222637955fbeead40a28009b53eb160941dde6ef8794d127ae8790"; + sha256 = "a009214ab8dba8ebb423b6cd6a06551f21fd6786ab1ea1f8d3c2ff985ec6e4e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/bn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bn/firefox-109.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "4f1c87fdfd74174aa5f1fbccc57449067a2b399fd64d22420fd20991aaed8cfe"; + sha256 = "0e6fa43647b071edf3deb6ecf3866919e81fa2fbfa96e4192393e7161730c853"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/br/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/br/firefox-109.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8e8304e970b082e2db3b2f4ea92a5a6f074d464bf6c9351ac42a6ecb8f086d98"; + sha256 = "f039c42dec5c42a823d87c9e75080625574c6b39d2f77c639f7c9acb0b8fe00a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/bs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bs/firefox-109.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "5ecd605311d64be3a38d533fe8c428168d154946cc1dbc865b7544354adc48c2"; + sha256 = "0e05f64d31c83b932d64a9deda1f96316140f554a5394d0af3e128f3ba1ec4f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ca-valencia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ca-valencia/firefox-109.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "53dbe1c04987d19a6a44b7ec69811ebaa83002b360deb0c9f8661c3385a680c8"; + sha256 = "684bbc73582247a088d318148f5af484b005ef8b976cc0b9964cd661e9d1a797"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ca/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ca/firefox-109.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d866620aa3453fa5442592b5c4b4d9eab80996bb7d1af2f45743351e45f0b312"; + sha256 = "c457bab76716e4bb2ae68ba65bdee46a4bf158e63c8ea48706426cff947bd689"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/cak/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cak/firefox-109.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fbe47bd70b36e945d5c5f48915db9742778cb1fb84c5b81eda4239eea4f59ebc"; + sha256 = "35f0afc76c474c1441d53f6c0efde1cfa81082a14d4376bb793a54ca7f336e15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/cs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cs/firefox-109.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f6e31a67193b59769772e63d784e766b52fef0e68d744c29f60a6d3161b9ed5e"; + sha256 = "07b58e331695a32ad0aec8a2ebcde5d188687735024ea324e2ca93c6211bc465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/cy/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cy/firefox-109.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0fea07272469ddfa5c1c2f1c75d029cb2c2d928f9113029f0b8d3b3744843701"; + sha256 = "54160bb1974a1a96e7ea857dc3becc2b09983ae49776e22458b4f7bfc6e29dd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/da/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/da/firefox-109.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "41f86a0b76a1522c3e18c29970770abf16bb3049b8eb6e027b7cf521853dab1b"; + sha256 = "65ad803f63edd0ee806f06f18f4d2c18c1c906057a212c56f8884844e5347f2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/de/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/de/firefox-109.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2f21f743c7f4b57b2450231a10a0e258f28b679ee38ade91283522e27490232d"; + sha256 = "82e167ce22d058d86cde56ad0b3d9fc309f85a535846451d9816e009b78c40b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/dsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/dsb/firefox-109.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f10c424a734e435a3258afd26821dde6099f7e05b87dee48a2baa22871e7220a"; + sha256 = "8c69525da6122eda1ff2444bd7338fd14d8294a656fee2619832a66342a9c971"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/el/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/el/firefox-109.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7a9a833026c32fe80198515972911cdf3f5f161e9ab8954743498b0d048bc7f8"; + sha256 = "09a0576ccdb7e9388a8d1b107e93df85cb070fcefce70edc7ff0e42f0ad705bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/en-CA/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-CA/firefox-109.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "c363a4b5ff6ae8d0c0be0c2415582dd90b906480b4ea793ee214749f00de9748"; + sha256 = "9ed6cb1595ac81b78f0aa80eb0a71043ae564071a81b23f0f685c9c27a7b4d47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/en-GB/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-GB/firefox-109.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "22c55da72c49cac9c155518586a077cc2ca7f679f798df028998d2abccd6cb35"; + sha256 = "18e07a151303426b4439ff475e0fe9893d281318ceda35203be77d14c841fa5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/en-US/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-US/firefox-109.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3b37d1b033c90825866498445f34ed4e601a67254fea8d9ed21a7da468a960e6"; + sha256 = "42666b7ce609193259d3e8dec2552afdab0d5986159760480801152967751c3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/eo/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/eo/firefox-109.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "347875e2af9b93187c837c1af7e89cfe813111fe4a55369b3292572058dece7b"; + sha256 = "ba38a011874ad940dbc8d1ffb6f691eb3fb4f14e15d0c707929af82b55c676cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/es-AR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-AR/firefox-109.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0cd77bf06ab4863f5d19b45bb12f9b32b25f36882f5fbcb050b72d6e40c858d9"; + sha256 = "593cae822d499c7afde80ffb3503489f5292b4c69f6e14da82e264d920b06ebc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/es-CL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-CL/firefox-109.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "2f1c6b173c44819fe11d17b9dd5ba20c094ec3fb5b6b0b54d5446edc0c00eae6"; + sha256 = "eed80c73022ac75364b95556f72177462c381fcdcc66f4e9d2a9cc202e6d22a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/es-ES/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-ES/firefox-109.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "693bb5c0722e54cfda5b2a6fa212bf45e5c0549712641c4d46ffc19f0353818d"; + sha256 = "20c4e5cd93c63117d472d982df1282212fe8ff894ad90bd7ba32c2fcf43afc9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/es-MX/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-MX/firefox-109.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6fd6c8e2b9a00a121a1b77d1938152150ddaa3c3996d3808bb20828bf1f349fd"; + sha256 = "437680ccf9a74365dbef29f1414920f0bea138e7628d1eac1fc3a774d667173a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/et/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/et/firefox-109.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b173958674ad40039464b82c30d1462d3735ad24819a6fc303668519444c9dff"; + sha256 = "6952c27c55ef99c82c99b684ba56919f053d6a4fdfca929c0251259f92ce3b01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/eu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/eu/firefox-109.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "dcd1509e658fc791cff0a1257a9c42569d1cfa50c7aa1248c8da660d53f6e5e1"; + sha256 = "9bdb71d4663e2ddfdf1d48965fd6657f905bb939f14910c7675a36743ac6c52e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/fa/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fa/firefox-109.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "0f7ee9e852a057eae2b1d8e377621735eeed3f21e9bed26fd3fd628d771e571c"; + sha256 = "7d6fe01c0be2fb3d2f4370a7388db7e9081483697e5a1e3a4daedf58c4e86881"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ff/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ff/firefox-109.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "7e1bcf2da77499069727a22dbe287d9f072678b9806f365e01b6bb7e5a389be4"; + sha256 = "3ecba2eb326f8ab4b60bd1d338c70a10d96f193dfa8a580ce1981f4e478ed66e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/fi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fi/firefox-109.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "33383ae71d32dc72e4675deec657b7127ae318ddaaf48f84a6fec43c9a83b4b8"; + sha256 = "2faf7574da2d14635dcec25ac9ed9af011d587a41cfdca710162233453019918"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/fr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fr/firefox-109.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "eefc9f92dfacc01857367dc92e7b812fbc800f8bab41f6b87cb747c18cf26fc4"; + sha256 = "934a037d582e5a54a7abced26eb13378b44bf7d17c40634c1bbb7ea96d077703"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/fy-NL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fy-NL/firefox-109.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "91681ca8839d7053d1e4ac1fad8b2141ce72921fe455ea3194db0cafc2d46e5d"; + sha256 = "068a82e5be65d8260450b28f09444d6272d657c36cbf8b5fb60400be79c14233"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ga-IE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ga-IE/firefox-109.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "2f335840e58c18258f37488f347be9f0e24e0df517ade66140f2edf761053caf"; + sha256 = "63577e9e3696105c7d2d3290510c2732d002930cbfe4ede75513e3cb4d9ec26a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/gd/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gd/firefox-109.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "116295fe3d13a97b4564b5fff1d768a367c4b65825bbb43c2f53a2c8a574755a"; + sha256 = "663373cb3a0d15ffb883ac0018f3d50af393986ffde005028a5c599524f4f25e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/gl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gl/firefox-109.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "6e0954767384ad621889de027060c64e84650b6bb9f2c615b9be5ed6f699357a"; + sha256 = "48e0c828735a0fa9802eed9e49629d8cb95407c3608db18b25d6adf60d3e8e7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/gn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gn/firefox-109.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "757397f213c101b5c12d2e9b9e4efad00373ca309e649c7738c1cbec5c6da098"; + sha256 = "da30951c841bd55f3a6cf5ec0226b900b9b0db4b1217278ff87bf15f61dcbdcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/gu-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gu-IN/firefox-109.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "bf0eed98cdd99ebf18419fb5dcee25863cc43aa6afb834d6bc301c46751a0e7d"; + sha256 = "c5a3b0697142ea33df51451177992a10a4ab5d1b44ae53838b50f7be9e4d8d24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/he/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/he/firefox-109.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "06c429876e85485d969dcc53acb64b6a67b92f4fb79ebfd8c5d18c4b3bfebfba"; + sha256 = "196a01669604ff24673cf986d3abe0f925553f46af63dc70d2dfed097cb11e8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/hi-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hi-IN/firefox-109.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "85f19b43aeccc26210094d5fa4241333c095c70b15b9f4f3b4c9a3ac2d9860f3"; + sha256 = "dd386d0889f1a2cdc2604faf7cb41a93b377dfcca220c1e0c46dfc3a1f17c378"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/hr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hr/firefox-109.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9bc1a8668a802868671381f9530dc42043ffe9c7b170ec711b54713b747fca89"; + sha256 = "1b2b58f0492c890b988164dafca86311de1e94ef6e429ecc2e998353eb042da1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/hsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hsb/firefox-109.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "46f808228e278783151452694bf853912f084b02063ff6e96612ee99ca11bc20"; + sha256 = "66431f173a0b5864650a45266f75df36d21f36915e0986d2496181ce0586a9dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/hu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hu/firefox-109.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "57784c1e1ef48643140e514fa0e705a33b6d6d8630da327f1733ab82b1fdd97c"; + sha256 = "38d281c815cff7d248c132613c24bb99e7bd20ac19f53aff525fdd39da08e5ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/hy-AM/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hy-AM/firefox-109.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "413bd5e27069303cde793c0347f82e686bc7140ca101d2df98ba7617f60dab38"; + sha256 = "57310d44addb0911ef0d8e7d4c038f9758d51909fb4a9e4e82883a8a70c76075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ia/firefox-109.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "fb0c6c3a9658c219a6f188baa8473dcd2a134d6654a24205241bb9a5bb08f9a2"; + sha256 = "17371ff0b7d5140dcda675f877eba8b7ba83eca4f189bd7d60700bdca5de37f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/id/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/id/firefox-109.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c2b3a23b77e5922b049f5788cef3291592bd4880f61546175b33302eaf534566"; + sha256 = "a41418278b8d8e6a222d0566448d0c330d025edb9926edb6539c5a21fb91140f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/is/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/is/firefox-109.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1046fa8d5ff4b01b149427e960b95b16dfa877d141813d03240638813910d017"; + sha256 = "772075ad183f5a6914561f69f9ee8d09972af6f05017282255386791f31200e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/it/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/it/firefox-109.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "67f35e5414ff8fb80e577eebf714f7cf09d42ef14987030633be047172e8751c"; + sha256 = "cbc0a9a027bfc8f0e6b184f9614d3d38fd18a13459d3f5b5b7f60105d6ee963c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ja/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ja/firefox-109.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "7291194d73fc2600a5b0a7adff109061d89385b6dd6e38098aa8de0c83da987d"; + sha256 = "8a3729c31bf4e24044a3b1186ecae173a964f2aa8a7631cd6e3abdded7d0b824"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ka/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ka/firefox-109.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0a03ec58bcfd49470cb5c7af906565b4233d9152948691073b795135701bfe53"; + sha256 = "0e2e1c2854bf995321533457ae0fd2832f0b0546c6dc48cfa52c628d5d657928"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/kab/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kab/firefox-109.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ca5d92c1dd49acc0c3f9a31118a951e771066e4285eb6b3b1d6fc7d2f47ebe3a"; + sha256 = "b1ac75c09a4478caa7511c35df3f91f45d3c8047d5dabeade6f29edddbf6ea7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/kk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kk/firefox-109.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1cff3740044ddaaf9c33f6f21d4193563e9e1410da7f19e54c97b6c485f2fa44"; + sha256 = "4ddd63e75296b907e1518d099da9334545e8d12e19c63e757f0c4a4b504b8e2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/km/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/km/firefox-109.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "1c5f4d97ce7e150c0604e6af7dd25e0fb91bc54d7ddf0cce5cf3104480cb623a"; + sha256 = "84f17f62677718f562ab88948ad3778da1a43c41b8b55210a493cf66f3f0f90d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/kn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kn/firefox-109.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "a5093ca9c7c1b9e2fe311f5223e42eb690e7bcd396912af8ff5e3564117aa4d2"; + sha256 = "5aa037120a0f3060460e04d0eb2d20fbb280f55de268b6cdc0aaceafd6c3791c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ko/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ko/firefox-109.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "2b10bcf7e33cdc237ff68552fa042f924a0cf562488b5591877da5893782e17c"; + sha256 = "7f30d2f69dac635c5424e8b9077eebb1dadc0e56a45f9641160d4ab396669e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/lij/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lij/firefox-109.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "3b714fb52f8dd65e167a0a900a71d08abaa984c404622f571323d1f7343777dd"; + sha256 = "8d0f18632e52509377261d8c2e818d7db39b0fcbabcbf7d192f6e7d4a276cd88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/lt/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lt/firefox-109.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "db2016786908c359a3c4723d8cf037dfb801622de2860f636f2d1851d534c505"; + sha256 = "652d793fae33d4ab5f4928bc3110eb8a3efa785212f37987df12c3a70f1c5632"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/lv/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lv/firefox-109.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b4c86d97ee9662cd1f137cac3eabdfafae3c5aca3a40cdb44a6860663a6f53ef"; + sha256 = "c26444347b52d226f125bd079fe3669bd931eda59e4734859140ad527f907bbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/mk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/mk/firefox-109.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "33e8d8d8090ba5459d967431b79ebafe71cf36109215bd1e81811aa5f5f0444b"; + sha256 = "086fb00bcab4ebbc59aa3b703c3e52f2456d0312d33980e1d19c041d8cd84b22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/mr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/mr/firefox-109.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "8323abe3208cd8c4eb4ab0f22bb54ead61608bc4d686f5b470c4e39e13ed9b51"; + sha256 = "83d9fb93e771c8b70fd3a00c401ce2fbefe0b7ce353622615790d56a9eb723c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ms/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ms/firefox-109.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b6f23602feedb8822c395a2894ff6c0d235ace8065a2bf64534ec1d986a2ccb9"; + sha256 = "ee1db3faa7d2b7d082b025f93961d7081bb13da59d024d8e6019ccae25b702ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/my/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/my/firefox-109.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "dbcf632b59e19e4726526eeed8b3cb3dc89d90cb2c76584aeccdf896c4ec7a08"; + sha256 = "dfa95a578db544259328fd04596a3259d807f949bc91aa8b795556b17dafc204"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/nb-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nb-NO/firefox-109.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "317e694ef36f9b6929b20a2f905c5b10ca2dc61384c7adf09286dfbdfb2d0f2a"; + sha256 = "d7938fcc2cb97e530aeb061e4426aa73a3b1e180053d208644354df351058733"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ne-NP/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ne-NP/firefox-109.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "7b9007f45f9ba227d682b5a464fa453bdc896e25377c59a77f5e89c84301420c"; + sha256 = "b24984604d50e957451dac478147b5ea1805510c2333d42d8e3434c5fce06215"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/nl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nl/firefox-109.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b0a403b76141b1b83d1f1821f767f2e708348984d92dda28c4aef138391f4301"; + sha256 = "7f391dc89c6bbeecdcca4f7fe214f3711f97ab2796ac21e82c785e33eeb5f6e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/nn-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nn-NO/firefox-109.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "bb82e38a42e0506f1a2f484d524cf995de58bdefe3708c42717ce95d8fdbf9fc"; + sha256 = "4a041204cb01998b671a5cac77c468a72149d02d018ec1f5ace7ad9e0132c655"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/oc/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/oc/firefox-109.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "80d9d8d45d23fa5b8237847950083bdb564b35535fe9d153cb8cc2b49b063a7b"; + sha256 = "2b1152fdb3af68d9faa76d9c6d3d8fede128bf1688fd69a50b98b7bc0300ac67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/pa-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pa-IN/firefox-109.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "12020c15da8eeaa8c758b38836cf850d806f9f25f2d8fd95f9705f953808da33"; + sha256 = "d185ddb3497ae946fe87b808f843db7acf8645833ef3b54ea948197acb3f3885"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/pl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pl/firefox-109.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "0a99c3857482fc0f4ef1c129e059bd12030baac473b3a42645cad490abe114b7"; + sha256 = "163119ad361e157566be68baf959b62ecee6de303348a8466818826de9b25e64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/pt-BR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pt-BR/firefox-109.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "55a3b67009c3bf4054a4274d1f4ba87d457281c91120fb539c8da91af79e46ce"; + sha256 = "ff99006fbc8266a69c270cecb50c56dda5d891517ea9b137b0c76ed288d04f02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/pt-PT/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pt-PT/firefox-109.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "61e902231ed793a82fd06530a9f293c7b9dd5b7d3604357e366490cb6b08a0a1"; + sha256 = "2674cfaf4febe771a9a00d292503dc18a296e29b42eacef4ce4e78107190bd1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/rm/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/rm/firefox-109.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ceaee42ac49c007117fa06d9e63c19d5e82bd48193106a0cc7655a60d42ed229"; + sha256 = "830700c530eef545dee9f7badcd49671c3a0d97581deabea5c909e46950056cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ro/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ro/firefox-109.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "108a03d3ce21bcb5bac5d8300604c5f13d360db6b597a0624547b672feae6d6c"; + sha256 = "864d7cbfde7574d2bd737c40695142f3e40219c0154962b18284cf3d5a2c2427"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ru/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ru/firefox-109.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4942a5a404183e6ef11e151c63c5f8e9b076adbf031276eebd2f91da7f55e76a"; + sha256 = "32f3ad6dcfb15e3fd4c6a98ba231e302f8fb71c6edd29b4d820ca93a161ed126"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/sco/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sco/firefox-109.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "4e346553ffbadb67b1d66c255f49911ed1969f8e715b68bdcf718664b2543098"; + sha256 = "29ec16d715e6272e282df71f4a95738bd3cf0f2060c991665540d77eba73f65c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/si/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/si/firefox-109.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "c6da81f84558d4c70ec87dbba86f34fef3149140c0484a8a54f1c72ba999ad65"; + sha256 = "3adb3fbe6a22d63a9c78b30025c5d938b078327d20c1267dfa43fd5204e81c8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/sk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sk/firefox-109.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e21100f403f37ede36e61560945912e0f1b0206d979bab27a42a6a70b4328c4f"; + sha256 = "fd2c585fc89c3a7bdad4bb9a14071f6316371482e6c69c916b4c6ecb45b8af18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/sl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sl/firefox-109.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f1ffc8ef3707e39e7ac513bfafca729447d35b2c7f7b48e48823d3b5fed9f720"; + sha256 = "37f12d5dc272bd897670882400b74e23dbf5905a874ec3c0d0fad971cbdae5ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/son/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/son/firefox-109.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7e6b064d1c4b9fcaac53b29cbf8f3ff55e52f1f9afce3176d3a4bc1dacd08e94"; + sha256 = "6161d139b125a0c5af7b06c1b17f95dd9847b06eed4b256d94a1dee5ea62df74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/sq/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sq/firefox-109.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "36cef6f9c0a2a241d8f119c7f0864e3211c229e316f48525e659e5ef4861e894"; + sha256 = "be76d77a806f97e566ffcf1bcea54dc502d1447d34811ea47b9decd7bc49a243"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/sr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sr/firefox-109.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "81024ece3b201234757882a49cec7212ed3693cd710e0bad457d211cf05aa36c"; + sha256 = "bf9cb5c2d17a00351ea9cb5918625bf4c97ae2497c4452c6c214988e6c1f701f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/sv-SE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sv-SE/firefox-109.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "80bd71ba0ec90eb6262740183e22b4b40d4d8ae2eed816ac49f38490e4078994"; + sha256 = "a551c2dd59af31bd26129a4260ad8c2e79c1af2d2983a5119a6524ab2a56d11e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/szl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/szl/firefox-109.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "52ac19efa28d720f20ff29386209de7b68a31e34dd708693b3d18b9e3b34a807"; + sha256 = "5bf1dc480db4aef779d2ff6c5fb05170bace4154661928384039d3d34b058c3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ta/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ta/firefox-109.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "5cba4f7a818070bcfc34083445d86e07bf50bf1c41f523e20f31525a74b50973"; + sha256 = "90679166c06545d56b086a33eea9882b36e86ff4208be6bbbe469e7aaf651e79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/te/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/te/firefox-109.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c75107837bb90ffcb07a9b68bb39522c82c8ce5270fdb5279a2e7d7684b905c5"; + sha256 = "55005551552b1d516db54a0fb27e59f58c478204745355bf249938661ac356ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/th/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/th/firefox-109.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f33ee340dbc6cd2d29b3450ba6c78492d40089f4c7acd9e2efad7a7a239773a9"; + sha256 = "9f2f26564759d6a97a9315c367301fece20b809363deb64c32e97819ae38157b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/tl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/tl/firefox-109.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "5a63143ed539eb585e917d039d6a38b137e7191f4445c9b39b47ed0cde00df6b"; + sha256 = "9054a8d512665615a66d9855cc69fdf168508b1bd226237d088eea8dcf004a06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/tr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/tr/firefox-109.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "cfe6031cb4db61098f3a5316877baceddd03a29179aeffe652b910ba81ca5456"; + sha256 = "b90beedd15614b07c24702875e56d2648c6b703fa19bb0a1785282c6034af068"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/trs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/trs/firefox-109.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "74a0a59dcc84e385031f5965316f190244f17131891c044a7358bffbd01f87c8"; + sha256 = "40e41ad2dcf06f8143f5b7f27a0e20d7fe32a01e99dcf1d44e183bddb2f81131"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/uk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/uk/firefox-109.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ddece8f58611439193c5c57a5fcd4aaa281501bba094ec08b62b0920d02d2e99"; + sha256 = "923a92d67ba1beae95e8af40f734be94dc48aa052672e21e051295d2a04ead60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/ur/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ur/firefox-109.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8a373b6fd4afed3754ba42d7d01e90d284f46b18fd2d7490f542668bcea4158f"; + sha256 = "2316371eb6946ec9e108d391a45455cecd38d7795e26133c37b4172ea1977fde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/uz/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/uz/firefox-109.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "fb79f921e4e99fa4c3eabb3dc7c685b942e00adaf75fe240799b65f04ff2e1fe"; + sha256 = "5d32a7c3165d177b2986534c133dc376a6c588febd0abe69b111c09a4d990f75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/vi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/vi/firefox-109.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7284e0728e1bcff1cf4ae89e82af6bb740f81dd3163f4386ee7efdb23357b082"; + sha256 = "fb02c22efce62374a11450a08dd344e0ab1a0ddd74060a79c39a6246668ca5e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/xh/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/xh/firefox-109.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "874ac3dac48897b36aed1ddf79e95d56da3558b831098d4ab67797797a9522b3"; + sha256 = "dd91b4dcfc2e067f299b066345960af90d57eb3bd7523b8680b155f285287ff6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/zh-CN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/zh-CN/firefox-109.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "05445944ccb4bd4b9f61a5e558f3015dba6eddb9f8d2fc9dd6832795a2d1cf77"; + sha256 = "52ef6c7d5c1ac6f63033d9d2d36ccab1c28029d1d0150dc6cb6eaaf90e8b984e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-x86_64/zh-TW/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/zh-TW/firefox-109.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cd3428cc9e8d8b74ae86de06e3bb66332a5e8c923295484834142808caf790b0"; + sha256 = "29272c5953ffb2a6726c7da9c73b86ff64094628504270a45f3619f8cbe45f48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ach/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ach/firefox-109.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "29b053ba9a0c8708970d63954cb36f06fa4601c3aacfa8ed007e46b4795d097b"; + sha256 = "c283396e76a59a009a06b28f8e9f71b2dea929f7fbe3111cc59f75d1e986f6aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/af/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/af/firefox-109.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a3960e0643fccb8036dd4c362627b2a43ce6cf969daa44a85c2400b1f01ab314"; + sha256 = "64e8e61908f821b4157e33ff06e763b89c66e8482d4526c11711957133de7205"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/an/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/an/firefox-109.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "67fd9e1a3a805f823f0f8d315ab14f899889e057232a80517e041aaa3c30901b"; + sha256 = "bce6d2f4afe2aa8210f495b438786d73c647e2e54625d9cfdc4a93bfa1d4d922"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ar/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ar/firefox-109.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "48ff5d4079eaee1356a9fe4c5c15af6bef510471a1b0d5db876fcb30d3e4ac2f"; + sha256 = "8d1c08f96238565a2c78e626b5e3916897a2b7146eee6cbcb7fd7a54862e2e5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ast/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ast/firefox-109.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e6cdf05250899cd6eddb0cacbba2927df19b7a650e108e50050b710d0d119ed0"; + sha256 = "fb02bce602d5122aabf80daaee3a790b90cd1ce553a871ea6e44da4d2283e882"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/az/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/az/firefox-109.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "5829f56eca98ad61dc8b2a8840c4540919f4c4441dd3d79939afc4c080fa35b6"; + sha256 = "e021af60171b998c37d531c082df022a2c0cf99acb841c2c7235ece8093137c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/be/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/be/firefox-109.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1a16cda11f51fba7b6e410e9bdd0b714f72ccc8eb0e21c5f7215b7ff9eada025"; + sha256 = "ad2130cad5b7d216ca6b06be19f8ba906e1d44f30ccb9675656a972e93797618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/bg/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bg/firefox-109.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1679974d553c8ea6c903df6cf953ab0f7d36480ff6e3636edead7c43740d852d"; + sha256 = "cab9bea6be83af82ae2d293e03db5164081f438fa026067ee26b1748c89d2eb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/bn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bn/firefox-109.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "512149c721644005d99897c7435aa5bf5afad1826078ea21c0a0a8cf00f1536e"; + sha256 = "cbb0ba2805be954bb894a35bb6e119643992d8bbd7fb4933773c119de73225a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/br/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/br/firefox-109.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6c5af8912e0b4205299bcaba3e25a2d40be9757d8bb98dc7e1dfc8645aece3f4"; + sha256 = "f8c07354ffb8c865dafa1828e62ee7c0a1e89b1c9e8203e871660368ed68d0e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/bs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bs/firefox-109.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "1939bd51147a7fbee5daa075d4c2aec14f0e1b7ae92cc30e385569aa39354a3d"; + sha256 = "11a71957066c42418902ea53687303844f9451218768551b23fc3828e74170ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ca-valencia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ca-valencia/firefox-109.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "6288ffe8badc357ba4235c9bf3ff71ace6825a6215775813eb3eb181616b6457"; + sha256 = "61e8f1b65322fce46cde4d9208c88008578e017c94c1eb5f91630f95b4acd521"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ca/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ca/firefox-109.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "18d6f59dc088d49da640bbd6d7a7dabc0b578a47862124e092a944576ac7b6f8"; + sha256 = "d2a6295eb35514e2bd289f280fab59148b18f349a6ef0d7d4cbe69247b6c89d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/cak/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cak/firefox-109.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "09f405fdc5503442501d88cacd5eb823c28a3323b4dd1c95702da1d9d16c2ec8"; + sha256 = "336c24aaa28ab1accf2f3ae9195a3ac753f2c3a2ceb3378d04822e866979b530"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/cs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cs/firefox-109.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "537d56ae6dfd7445c280d6a07d3ed33581fcb5eed2c36f4029ca9abce215c49a"; + sha256 = "2d81cca9b20dc40358d4b6b482440bd803ad3e3282197ce8e8b46c046fb22fa9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/cy/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cy/firefox-109.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4f0cfce474fd2bc4b70263f3b1e22fcf98d83203f1b37bf3888fa93262906f06"; + sha256 = "8359257b1a67702cd150922f2e27bfc409ddd54ef66f736449c9317c96bc9056"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/da/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/da/firefox-109.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b935d26ac2e572c2254426f0d83364156fdfe1a77c85bcbf32f1217c51c8a950"; + sha256 = "09b338b9d805571611dffe140f950ed5451d1abe9c0b43d2c5b8a3cf2f454adf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/de/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/de/firefox-109.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f2c02ebfe4822a9d33db2c8f6926186efc786d38573ee1ad5e67acef560f7b43"; + sha256 = "1ef1a33e292e27f75604ab017fdcbd57fd91e6b63070b83dbb11048575bf7015"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/dsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/dsb/firefox-109.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a08148bac60082b6337a3ed69129079088d61dde0c0cdf469311eb06ee89786e"; + sha256 = "937742961306039bffd669c360e5bd3813530ba1eaec3d463b5d7507208caef7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/el/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/el/firefox-109.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "69d7ad1537dec0c3792bed0e79aa902a7a3c8626612633881d0f75b6384e62b4"; + sha256 = "eadd17f96c9a20914740700436720c7383ea040cfd49dbee313c9f63cd543e9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/en-CA/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-CA/firefox-109.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f5dcd07c7e2a986a2eaf9052c18ce5379d99e06d3a7ac2ae48a679dfadd99dff"; + sha256 = "246c8c7e12287762e824227396c310295ca44af147102d434bcdadb34a674868"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/en-GB/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-GB/firefox-109.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3335754c9818b8c157bcbd7b7866a13b26f1094374f721dde5b8a6948b56404c"; + sha256 = "1bc4b65e27ac9ed36670cb30f906125e5ed6416f1e74cce4c27ad66174e268dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/en-US/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-US/firefox-109.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c24d2e9691a505257d3f2d4e46e90e248b88109f307fc798144d32fc758752b5"; + sha256 = "f2f74d4ccaa6d1836cfe35f2066600811669afa661e75923f5efa463f6419b35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/eo/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/eo/firefox-109.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "844dc29be3c818c9e6d1635a89f75ae39ed5e4f45b05a6419e2e00812e4ad62a"; + sha256 = "03aea5c221f43a03266bfb6dcfa47b1adab597781a7eeb76d97a38addbe01e7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/es-AR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-AR/firefox-109.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c7475f22e28df89451e5e3004d75d6f07667d75e4a0efc7071ef87016fbff2ac"; + sha256 = "f33ae2b6c29d3b2d0c3654511791acd8af5d5510b32b5d88cd43986a190f1dfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/es-CL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-CL/firefox-109.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "587f6bd53eda35d38ce8a1457be4f4e3508837205dbd69a50fb5cc777ab8d107"; + sha256 = "cad86c57d5bf9b8e29da7b445f2ceb6bfbaaf4cd4d4f10fc17cf636251f96ab8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/es-ES/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-ES/firefox-109.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0e8030751e25ea05e76fd8895e20ab52f49bd0349f3cb9b7a2637bcb0b7feb17"; + sha256 = "fa77b1256964d833ef2441f7d96849e0b71e3fe46018433798099878c04f0309"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/es-MX/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-MX/firefox-109.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9b0e890c089b378c3a4d2c528b3abf9ded15aa40d999190ece4fb507b85459c0"; + sha256 = "f89936ecc46e466ce51523551fa36e56b9d5fb60869b36f0df50e558897ab35c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/et/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/et/firefox-109.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c72df38123ffbf51fea1e52602f4b4bcc515318333f903c5c70a4679085ed938"; + sha256 = "03c8b27bd364f62a76f1c77ea440a5c2e15b7a9fcb494fb2472fec3f9c3ddadc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/eu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/eu/firefox-109.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5d4d14d3d12434f3a5b759cd9ed2fce502f58362d8ff0bd5b17cb6d24eac2d1e"; + sha256 = "b830123c80c92dbcc6068fb119255558c33781d7a6455cb5632f1d881cc283b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/fa/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fa/firefox-109.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0325caa071abacb9f4955d6935b853b421be095a7a501a0cf8c62c1ef769fc66"; + sha256 = "ab9b9cb6040d1f2cb8c383f54b86c16e4f3bf0c43fd81e69b926061eea752942"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ff/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ff/firefox-109.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "36074a0679cd0f8f0d56d0ac0d988c50ca13de1d8dcef25a3fccdbc09c7d6ca2"; + sha256 = "5d35b634780ff8a467cee0a5c9d6a629a82e445822f60d1dac150d4f40af8164"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/fi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fi/firefox-109.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "245676a6f8641dd9b22589bab729b34e9a8bf6d20cdf8a85f12d330c487fd1a8"; + sha256 = "dfea0b395fcfa9b6bb20c00fc3522cfa0f52dc398b3344090a2f717fb5305b74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/fr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fr/firefox-109.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2a973e484f365d7100e0188ee70cd4ba33e1141fca475a8682f5396788a5e027"; + sha256 = "f75c35f0ed8cbd6c45c93774f5031b0555465473fa85a3b12501b3e91701cbd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/fy-NL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fy-NL/firefox-109.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "422a1102443ebbf3b21317535679e578f37e49dcbb42fa9e1719bc378762e3a5"; + sha256 = "4fae4df1046e30117ebcab39f930f2b5e4e4e702a8a786b39d840725885be2e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ga-IE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ga-IE/firefox-109.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fc9a6ca8e4fa7f18a0016e08cc7ed008e37f51060ed0c23dd5d52802f4247bab"; + sha256 = "2853ab5a94565fa23097331c3c2ca491b7aac8c52a921a07e3c62fb45ddcfedf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/gd/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gd/firefox-109.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "10d35f87b2ce9b3d6c4cb259b1f524142da895ec644ad34811ffd0ce1ba18960"; + sha256 = "d4249520b4ad65de6914342ef8fcb37b3d7f5e9a4d1de333a280156735d89fbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/gl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gl/firefox-109.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "80b7d6f63e80840eb0d7b880bbd7ca1fb028c38e76ed463170c3e55551b51f4a"; + sha256 = "193cc568dc201ac86e66c6badb73dff2f00479900fbf3e1f3df0a29c46f7ac5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/gn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gn/firefox-109.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "bd5b56ca97282df811e56bd397c161ffb69eabdba9039138acd5043dff157013"; + sha256 = "288aa3ab090e369696f87f2d266b55b6b604611d48de5b0323a8dcf6b8131081"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/gu-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gu-IN/firefox-109.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "497be1920d1641fbb8666f7fb500b9baf5b51ad3e9f2e88cda0ff97f599fb1fb"; + sha256 = "8751c272912bd68d0ba4a4329e31848916794171e76ecf1ec480d9bba87143a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/he/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/he/firefox-109.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "27878763304bd08d62c8957d418e00a6abb7bacf3abd84581f8c2ace1dbda615"; + sha256 = "6263e6a44cffe19c7b3ac15f4c2ec024a9c4ddd6713607db80789fc5f4ef77ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/hi-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hi-IN/firefox-109.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "138a54dfc2774d272b8ddc6049c34406af212f677c94d1219702f16fdf2b7a9b"; + sha256 = "8d42e30626c4a2921bdda59511ec26adf9f7fdd669df49c75dfd32ec09203bd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/hr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hr/firefox-109.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "6f96eaab77512853b8959ac8020a817d1b553ddecfa3b341bbddac44c4145f71"; + sha256 = "9f145d7adc51f2b266d67ec5774451d04727fe86070fbcd7d78c869c4121618e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/hsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hsb/firefox-109.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "3a53e97e99ffcc2f7017f10e03f4fea1b6dfeaa1a81f639c17473e28a169c0b3"; + sha256 = "366403587328bcd5f6554513d0884deebc305597f2f294238afb16c2db4c0bd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/hu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hu/firefox-109.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "0a625621d26355f6be44ce4175dfa09e657ac491bcbfbf45652a3841f52e396b"; + sha256 = "5d0cc99b99d43a7ab939cca744b92826d5199b2000a32c5cf34a65341043fa1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/hy-AM/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hy-AM/firefox-109.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "97882862dcdd9bced5142b666acd7aaeffb7bbfdd1fd804780c5fa2255a989a9"; + sha256 = "cb5f333b84d36446104a72bd49caec3d43e202464694f9e78337d3e607e1f4a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ia/firefox-109.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a12831d8e18a63b21491a8461104fc758c8bb1875c783ab224aa5b1b006b6e45"; + sha256 = "ad48fd8343c13624284798179424c2b954740e165c86b62f8c0555a27445e955"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/id/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/id/firefox-109.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "774f14c382de7c198c395d4df99306ed24f1eeb6eed8c9ffaaf14406f9197ff6"; + sha256 = "3729410ceae83654259e8c1f9af7aa6bc1cfa8c96d44a981ca0555b915b54cbb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/is/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/is/firefox-109.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7fddb45e66de233708d9b5a183e31d1029df24210245e7ea3dc0843b54aa8bae"; + sha256 = "b16f8b5d8188167a676f9a4356d7b8fe3430d495957a5b5ee38505752e08aeb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/it/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/it/firefox-109.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "93c4272a248c863fa116cfd8d9b35bf03538b71133a37592b0eb85cbe25dc185"; + sha256 = "366dc68de5e29e5ce6777ab654a67c25fbf5681ee42b3cfff68dfc4119d65dd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ja/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ja/firefox-109.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1b3af120e83c3aa1688e524441b586328319ac5995658ace971862d6a3c93e27"; + sha256 = "7ee29129e13769d3ef0b4491c24c3dfff8f483d6f56d1e8ab7524c64579be466"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ka/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ka/firefox-109.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f5d0a98d363f7f2f1e199bab95b1c89c2976ebb22ed21134f1bf6f59cbcb754d"; + sha256 = "1e1a51f53eed441d028eb880a364da796746c2d95951d521820480ba3af19cbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/kab/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kab/firefox-109.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8960e1e8cda98f457e083f2fb3597268bbebced8784c3510fdff04d3ed14ee57"; + sha256 = "b97d20a23d560195218be01ea0ba5e54ffc01d0a297e920b755ea8e717c3b819"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/kk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kk/firefox-109.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6636307d895aa73bd32b1d95b7960c2874e8afe93166d5d7090ba5059aad30a4"; + sha256 = "7fc9e69c16e0c01a31b4e9cc6c7542891537bb3e0033297e6792b4962c540a71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/km/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/km/firefox-109.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "52ec66d553569f45a10cd46960ab8ea9b43972497bb2f8d5ebbeabfeb051dca1"; + sha256 = "6ca48c5868342eeb3ebad49a36e5e478df83b44a5fa0a5fec3ccc9efb6213207"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/kn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kn/firefox-109.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "10bcb0136312692d3dd66e60613f4294b476fe8f3148af7fa417686a2e56bef5"; + sha256 = "62c44308be90402c05e573103acd768e93439ae1c058610282838677c553e564"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ko/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ko/firefox-109.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a1905f699a66e880301e25fd8b2883f437f3abde11ee34fcff04e3db8b9c9e9e"; + sha256 = "2cbe9806e77b05098177fb3e700f74f489395cfb6894737643ddaa820b4cc6b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/lij/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lij/firefox-109.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6b74a03102dcaabb5aae6e3c27ed981a77af28bd9a6eec331cac0f2257f4765a"; + sha256 = "6ae2818eacd6353ce0104a41e1a02487bcc852ae650079f17b9c3d24bfa32246"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/lt/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lt/firefox-109.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "9b6c30d9dd27ef92027a0f8a6b63b135340aeabe136eb1c6c455298510d3a659"; + sha256 = "7d5f0a3b857e3b4927f79f6467efb05d362df1849fb696918ff498b0ec5ec493"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/lv/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lv/firefox-109.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "fa4fb7e88312738aa6df80aa2f23d3ce2abaa778ebf61d434b3a9fe580de59f6"; + sha256 = "5972f0d493c1048f81c3d2e771543649685c436699733e010ca0352720441652"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/mk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/mk/firefox-109.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "bc599c6855d121b369bdf88fc687cb818fb776bd7d4f499ede523811dc0c457a"; + sha256 = "8b926b986211014b183c2b431a601cff6d41546d0c52164d800590377ca33ffe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/mr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/mr/firefox-109.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8c85e661ef78dd34513c12b3853a6d159dec1e06885c3db8481937ac4922fef1"; + sha256 = "0db18d1f1b5603160d310bb71037586cd3f850ce547551588715323b8a4591e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ms/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ms/firefox-109.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6ffbbd0aa4ead9f3344ef242e2c179f69e3915550d324fa657cb819e8afb5dbb"; + sha256 = "6d29e0e308485c5b9ccc561c1ff73dcdd3449d5ec172e87eaa1d4c6414ea562f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/my/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/my/firefox-109.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "cc245ea3954c367881eb0811d8fd1362ba6f19ea2b078e66ea4b464ca1a3af18"; + sha256 = "69e7e315a8910daa7325007b5deb83cf43fb29ffac66d7e0a8e3eb8a372d771c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/nb-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nb-NO/firefox-109.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "3212f3711849b8be2bad9701baae3e2de99df6ad2668bc6f85b443bdf885afe5"; + sha256 = "f1cedc730d9a71fafd39268f343ede8c4e09f4c70e6f3798e4cc6a62e20bac38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ne-NP/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ne-NP/firefox-109.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "7e527fb065624e93eb3b6e53d84a469652585c130335d8fce16e9883c97f95be"; + sha256 = "8d04cad68f00675081fa86461b638e566a3e93b113ec824d147ff858d0488f75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/nl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nl/firefox-109.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c65715c9ef60ee3e9bbf627bb5b8e82f2207f486b1f10b2aec1225d58247e1f4"; + sha256 = "da982c4645969987b5233313f867cc0201db446c38ef6fd3e3dddd1c21cfea6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/nn-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nn-NO/firefox-109.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fab55d70f753077f5820e8bbe1695d3a00c8064caec873c909ab3740cded04f4"; + sha256 = "ae24268f96885e4b5153a8ada3cf66bb7059ef006d54c3c69a6cf6a9599bceca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/oc/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/oc/firefox-109.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "73a3848a751c5a8b180c6e052d8f4f2d42281ea160a469f911c29cbe2da23d0d"; + sha256 = "f764ebc811b12637c081483260f091421afee5af636689b4c99e41c5e8482767"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/pa-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pa-IN/firefox-109.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "fcdabe1f19e42a893e79137c9878a1fad74d7f325ce1949709176b397067cab4"; + sha256 = "2d4ac283513a21017f8cdd1a2e7d2914dc1f6b44bd7d1f3cb692d897283fc491"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/pl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pl/firefox-109.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "30b7d96f56501b80fc72f4082b676efb8ef9b7b6b6b92643b7187ab1acfbf625"; + sha256 = "385e1993424817038268e41b4c82e5b7676977bbe66f15cadb4de94e02a17d7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/pt-BR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pt-BR/firefox-109.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "65428b14f3d2c29068869dc204475f7fb76e0e6c1783cc695b692c6907090a36"; + sha256 = "0e43c68826c2d2e86122f610465a71de7ddf86d4e87e438639c28816c6e7215a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/pt-PT/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pt-PT/firefox-109.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0ed0230e9983c6edb61dda90eaf83ede5198777392b7b58b51db89dbd23f983b"; + sha256 = "6129db67a61679e1836b09e515481ba64d1c8e4fc81df7216749282a071243f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/rm/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/rm/firefox-109.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "912c185a6ffb8ef607d4a3bdba06c68800de7bdf93d4e5322de0edaf8cbed100"; + sha256 = "9964cd8d26a4e828d383f179337ad64c7d757f9765adfd8a79b4e7f3b644570c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ro/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ro/firefox-109.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "33fc4aa14ac6c2607fcc637125bf97110cf44a8c67492206d59b3de42fea01cd"; + sha256 = "f7586714053c133eb2acd5a299354ff919bfdf1a6e92804df130959140979ace"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ru/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ru/firefox-109.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e58103b0efe16766a813cedb56504044b16bd4f94956c8050b53fad466b13c11"; + sha256 = "33e547e99de3cd5ed363ee9e66c54fddcb52af677b21f2ff8929e3c42732e0ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/sco/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sco/firefox-109.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "01023043ef7e5f72ed744f4790f5a871130e2c5792faa1fa1f3e5366f989c033"; + sha256 = "df707abfcabef24d9af77f658b8e01627c69bf242fa57d258cc6d390e858c9e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/si/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/si/firefox-109.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "03707f607805927f505f60fb7f2646a012095742eb30b29abdc323f50ba7704d"; + sha256 = "1959ec07d6db26b4f0846588ec074d24b5543285186fceb32ecbe057acc1b245"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/sk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sk/firefox-109.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ac914e4275e4324695fe10b653ab3b5a5c58fe3af40a8250d113b40deeaa23e7"; + sha256 = "a9c235d177001657460acb0adacc3a7d8b30fabefb96680f09002562c9d78718"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/sl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sl/firefox-109.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3ce0525f23e6a6e6d97e68b1981178188d8770625d056a244a8ebb1f621dd836"; + sha256 = "da573b4345abf16f193984c5480083c13a65fe2ccb72be245f92e4852dc9a7b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/son/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/son/firefox-109.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "272387d7d55aef3b8f013a6f7e3cc87bf647638dffb84c591e639c8e8682056a"; + sha256 = "147060d1b9dd3c4c0a31e67303cd08b38caba1b495d2c33e172b1b0480993871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/sq/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sq/firefox-109.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "71191b96b324f1006e564c964582ef0c044b8ddb8209bda95c5a25d07a29bd97"; + sha256 = "411c287d77eb774e52ca4bb528852ce4c38f86c5147c322371633277436e5c66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/sr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sr/firefox-109.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c76729128552b8c040df2315f994992782730c8d9e42330f4e2494864c57a053"; + sha256 = "d62d2956beb460c1c6a07429ca18dda1b470d93eecc5bf233712b399155dc670"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/sv-SE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sv-SE/firefox-109.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8c989e5fbc182d70928ce20c09cbb96fdbea9d3e9c54bc718335a25e1a24d7f7"; + sha256 = "e22d8628bf6cb94f139efdd16fe52bef13179611943c047e5802d46ba396e9e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/szl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/szl/firefox-109.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "155940dda7606994e95484062a20f61da15a73b2bf2dab86a2bc6c141dfed798"; + sha256 = "60f54f251a528e69d9de932a1aa9af16b29c118b021fb6578a6d679f19f35d24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ta/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ta/firefox-109.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "ca5d2f0f8c9267341df12df097102fdff2f74c216fa97fc63a9a44b321e42f96"; + sha256 = "cd521c26658fb537c36f21283e28be09b79198733c2c10b44a0e8e5a56630d5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/te/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/te/firefox-109.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e223580ff3427d4eb67b19be8ac3447139fd741f05dcf964d718a3d2afed5539"; + sha256 = "93d8363e822e23ea4afe3c649fe92b958f9066d7fc7789f604af99b6f435d693"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/th/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/th/firefox-109.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "26e6fd7e103715499f453b61c83dc0eac4d3cb19aa6c52a881a72f75e97a60df"; + sha256 = "bb0d863cf8bbd3bc03d5e4f51af437c5a55736f347998ee1be1e5c0a115d3ce9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/tl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/tl/firefox-109.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "96a401a95f3d4b69ebedb1b6cc3a49f77c7c40f4c7d7558319f65ae715e50e8c"; + sha256 = "66ae66674078504c2d67a5405c407076eab99fea1d5eca0bf4567bf3aa822e15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/tr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/tr/firefox-109.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0d71a867ffbb5d398cbe8845f8c1cfdae5a6a2d2376f516b833f576dd018d3ab"; + sha256 = "1c0b9d7368c4f9cb61d713d677408482219febc302ec4d8317e20d5f1d1075e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/trs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/trs/firefox-109.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "5033544bcc9eb29613f46429792f186a6ee678618f3c08b77cabee90bce0bbcd"; + sha256 = "67fae3d8b9a6759f0bee55b97a8846afda2281e94c9ea35f9de9eb427d5398aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/uk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/uk/firefox-109.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "b21c551502c21a048751bdbbaa77700dfb572a5a43f45476eadc138357855bd8"; + sha256 = "330897b83e0aaab964f0ddf3a07240ed2e4e5f9dd59595b2b3462c258981cab7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/ur/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ur/firefox-109.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e970d58372693c64399c8114ecdbfe5abbeae62ce1adb5d2372050f6e991ccd0"; + sha256 = "6eebf5cccd785a0eb3d14fccb756cc6b9653dc01f3e48c6a1e4956d4329d1d4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/uz/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/uz/firefox-109.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2b789b1b5cabe05313838cc19540c2722b018dafac6912fe923d980bb5fd06a8"; + sha256 = "97b82f8be3b0450646a7fb68c6b5cc9812e3618a1f4a26a339b7e9f672cee114"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/vi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/vi/firefox-109.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "574728df151fbd88a2588c2958ca877041ce88b9144492e4d1e237f6b964e8c7"; + sha256 = "28b48033d6e698b643783433b948e8033d06322a6f164facd3bc6dec64e967aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/xh/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/xh/firefox-109.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "6ca7acaf782fd34feaa3c27a87b38dcd5c59e3dda3ca1a97b9815b0b41f393db"; + sha256 = "dea53c99e972e709483027174697536f300b1debeea03b653189be61b860a668"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/zh-CN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/zh-CN/firefox-109.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "10322f94dc986f9f06256387d862718b3c3145ce019deef0ba6020aea1679fe2"; + sha256 = "dec3dcb0645e170ca312c38f8d91c6f5391316158ad6c0ac2b9eff1d34ff7788"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b6/linux-i686/zh-TW/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/zh-TW/firefox-109.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "409c4d71e3a2750fc34bac6c3e596b237e076d26975a6f38e6aa5dce0e70f9e4"; + sha256 = "ea01a8b6dc57617d3006b5f24a21206da765abf93eabec4afa50dbad1f7f9b95"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 6b6594218a553..d2d4ea9e741f1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "108.0b9"; + version = "109.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ach/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ach/firefox-109.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "451e069baefd29bafca61bc7258b91200a040d86657e178f5358e9cb0b4681cd"; + sha256 = "8963843b90eaab67194c344a3c5dc329de16725869917ce03d9be64ae31813fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/af/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/af/firefox-109.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2159c48163a9de89bd2a5ffda4733a9403a07fb94fa05482e459e673027bdf95"; + sha256 = "16cb8d7b81535243792110635cdbaf664bc87bb72971a641d54fa140d8a8d513"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/an/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/an/firefox-109.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "1a7ae4eae843a4eceed02a21c22f7fad217d8e50ecc76a3802e2bf745d385fb2"; + sha256 = "413cb55e1107a3ce4819d8821a8b7280acda3dc88ca5141b6f9a2710ba3f54cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ar/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ar/firefox-109.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "67391c7a827772f22586c4ecf4d49932ba19d26801b4a0705f99c928815189b2"; + sha256 = "87c15a4bd1de2f9ec72a04f09a2c71298df771571d7cdbe2dee0c2c7709fe8da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ast/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ast/firefox-109.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1a845e56c442c6744f40525f863a2fda547cf5122400be0c683093ebb1879a36"; + sha256 = "e7f36b517c1988c49309d4c1748d784393d7435f4654f0dc4e157348e2a326c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/az/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/az/firefox-109.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c3b04994d43c8d823ad015b37f2594ca8924a86c5eafd3e1d3f9ee5f4b95201c"; + sha256 = "43ed16939646c715d86507c597130a2f22f519c3a8ccae479abf249c8ceb1612"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/be/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/be/firefox-109.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "64dc4f69630f479569c273c3e7e05779cb498cca75fcc6ee91e88a8d3a588da1"; + sha256 = "5dd9975563073a441b2ea4255c09b06c5a51b91312423850f06dfc1d25465894"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/bg/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bg/firefox-109.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0d0d79ea02517014ae8f7bd045cd5056120cf03791036f0c605eecb9dd59462e"; + sha256 = "0606249c7bda6d890b921202b4b276ff5cd713e67aa7d232def6d69d80d1a7a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/bn/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bn/firefox-109.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "efc6af54c4b90ab4b0dbb809f957cf82a58ce661b96c1d46f9ea8ec09af98e61"; + sha256 = "a543c108fe17795c6873c48d7547a8600709d7cf11844311e6c8b488597f72a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/br/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/br/firefox-109.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "983a6f5665f7b9cd7f52d32597a630e4889e955e4ad98df81d86a08cb0a2bacc"; + sha256 = "3182406fdbed589a24ebd100331f9fe39e0f802e807ff269aecb9940fa7017ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/bs/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bs/firefox-109.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "4cc070a90fc7ef54e2a826aa6f836381cdabcd32c4037181062f5a3fb9e97192"; + sha256 = "5e2f2ea112fca3ad70daf614ce8f5353376a858dbb827dbafcc9cca58e8cd73b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ca-valencia/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ca-valencia/firefox-109.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "95dd91ad4ddcb19b18111b807ef179d72e6df991f81e90fa1b385eeda42e5e98"; + sha256 = "ca020b62eb8191aedb3beb209edd37f9e048389d1189008c119cac3e516d1851"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ca/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ca/firefox-109.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "16a8dc681541db25a875d5b64494ba181316d5576d56adb790a3ff8c19f992a8"; + sha256 = "64230635ad1bb9a5ca8d701bb20b0cfe0f906f5c346bfef84f477a2f9f7ec792"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/cak/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cak/firefox-109.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "bf412e9e0224fa46ec90118e1c11625fbc195694b0b77c30d6ed02e3e30d561f"; + sha256 = "8eb27b956da7c692ce11a478651e70e414b0e13db2da2d7dfede0bbd36bcd12c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/cs/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cs/firefox-109.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6bf7fbd0a1e6160a4cc4048b7b046a84c26a8ac824e728c0b87b61347463da00"; + sha256 = "d2a3a2e9834f439d942a779cc3b025bb725a353db6a040b0fc243f0c61beac1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/cy/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cy/firefox-109.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0b50a34e6798cf1dbf47998e3e74927e313be26311811cb745507b2f005fc910"; + sha256 = "0b10019898be0886cc759df75f15021dd07cecb08c7d30ec0dc9af73183c3c51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/da/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/da/firefox-109.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8dd0d6adf188c66a26bcd9f84c6dd8133fc5ac2351dea2a6e2c7dfcc9f37d854"; + sha256 = "8b32aac9e98c68e8d229efceeeb341a7d6eeb1ddf2d37b84bc05f30ae1bee695"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/de/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/de/firefox-109.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "eb9bb3d0b3295d02ed204a65a5878e887a2e2d43c86d29f6982d7b502beb5d81"; + sha256 = "28342c1f3324b66d350516dd1c06487050b52f8a2152a5f8601421bcd702bdf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/dsb/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/dsb/firefox-109.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "dc229b395986b81a3f43512134dcbf30cfc88cae16737301844745d55b2d87d3"; + sha256 = "80733097438a7f694c6fc8d79a93416496b4e845070de648fad06a61bceacd2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/el/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/el/firefox-109.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "8efbed80c21f42c1328e561117511fb99ce8d17ab5fe4f895d9dcba71fbacceb"; + sha256 = "2dd8fe5726a3fb43796d4608c7a3ce076e47cceeb75c98ab8ffc6dcdeabfc139"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/en-CA/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-CA/firefox-109.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5a4e45c8c554f2f005334f52c40cba50f9ff8eacfaedc2aea6940d8580a4ab8c"; + sha256 = "ad62b030296da6049848ea83ec10cc05657099a8bccbfdba95c4268e97623988"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/en-GB/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-GB/firefox-109.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "159c42fcdfe4bd0105a7a4600ff7e78a74bf6d9768aa496462af94d7f1f3793f"; + sha256 = "52940c1002c0e5cc29712a9b430a209c24c9d5b4dede131c955237299ccb9e74"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/en-US/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-US/firefox-109.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6dbb883a80966e0f5d80e00dcbd6d1c123f6582dabaf3f69cc1df1c78e50024f"; + sha256 = "d033dc84fb3f054865fd0f2497af4a60fde033f9a42c4ed6130f5fea048437fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/eo/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/eo/firefox-109.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "dcabda40890017d3386aaca7a228499eff2f327509c81020d20f1bb418237f7f"; + sha256 = "dc55d45ad8c22b5ab4290cdce6ac1f648ae2f48ddfaf9255a6e3cf1a1c42f1f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/es-AR/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-AR/firefox-109.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "92e81ade3edf591f673421d586812286d2db16b4fe825d74077fb90c573d4d39"; + sha256 = "28bef42268819cc8ab4ca0edd643bf444d92c76795be944ea20361fc293cef62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/es-CL/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-CL/firefox-109.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "2b39d99e83d359e5bb8a9afbfbb3aa87263bb73b0aa713f90069d75e4a7643c1"; + sha256 = "948f601cf86e04af37c3587a1b62c6d91e49483fcb2c1af142007d1de864bba7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/es-ES/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-ES/firefox-109.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "20e064cdedc4b4150d7af7672316e857ed2f9ec7d981922abbd63e8b30376bbb"; + sha256 = "c3aca3a4eb8731f30559df8137a58288a31449f708356659fcda97b8a1d24050"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/es-MX/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-MX/firefox-109.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "d74b8cbf3c052d9c5248c9bff04501a9b13a1114c868234aeda89edf884f9742"; + sha256 = "e32d31832d542933f6caf10bddce23841ab181e1d74d9c2ba1aff069ed47c4e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/et/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/et/firefox-109.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "0ea3b50071e0ffa636313aa86c8c8f92fcae26e1ab566c8f207256d008d985a8"; + sha256 = "ae9af0467dfadfc5f3d25ac79b41bdc1d52b329819c9115cd086c52651fb3931"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/eu/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/eu/firefox-109.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f270427e55f10f7ab1981746fa0899c9436dc2d90cf49f6d43d04ef20fa6a545"; + sha256 = "6db620908bdc5844d4c448e1e5bb8a91994eefce9636a7e1513bdaf44e822862"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/fa/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fa/firefox-109.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "73ac85220c001bfc3a1c3a26b743eaa0cb288203df33a41c61761c464c658ec0"; + sha256 = "8b064dabe1f7476413343bdd4f043f2af5b4b1ba69a9aa87241befd2b8983465"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ff/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ff/firefox-109.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "a3616bacfd9e00e95c0a444970fea82f4feeaa1f2c5a6be548627b60f4935c2a"; + sha256 = "c37f319437ecafb75eb864d903ea670c4047af96944eb6163a69a71f0570c7da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/fi/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fi/firefox-109.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b13bec1d694c4bfcb0bf7b4fe792137b05eef1aa3e1988f23ef9739205bfb3fc"; + sha256 = "6e67ee392b95554d0b554fdc4f090fdffbfcff008c1d8fc5f6eb4c07ade3a936"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/fr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fr/firefox-109.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2e78512589db196bebec3d4ff82e259ae38ee8fbfe6da69a0e6dc6d352d51c10"; + sha256 = "d1752fa0522b713d4da15e3697f7446e20a73cd7af221c6ade0266767cca8258"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/fy-NL/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fy-NL/firefox-109.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "99d8dfbd95331c029132f4accece50e39d8d17881fe05c60a4e876c71d67d4bf"; + sha256 = "7ee4a7d70d4d247e1b87d01e609bf354569792d8dc82c7fad32caa1bd010fc1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ga-IE/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ga-IE/firefox-109.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1c0c43def45802092b8af4efae913d8e4abd6042801c0021634c0c60028851e7"; + sha256 = "b129e94f5170cb9bcd2610f3bf8ee70033d703448d4c7387668d2d5b86fc5eb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/gd/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gd/firefox-109.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "41c420d061e4deb6e04a8402ab95b887624ab9595ac6d6e27d62cd9a24616db8"; + sha256 = "2d84c1337cf1f86ad663ffa0b6d476409535d0c44ec9888757104543217c50a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/gl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gl/firefox-109.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b83cacd788d4cdb9847722e54d090bf5cd89cc710761c872868e78264cd6adb8"; + sha256 = "42c42d4852f59a7801e2ae8417697e57afb595f7eaffeb1129a5fff7471be895"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/gn/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gn/firefox-109.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5518e04497b7ed77921c2b1aedbfe03c484d53cc96c744109db2b0f02bea38b0"; + sha256 = "ae4dca721ff5d36cc7606e47e49c58ae6571102db45d08c69e08cb78a8a8f44e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/gu-IN/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gu-IN/firefox-109.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "1e14ac2b25669a4c77fe60e5ed44b71dfd88aa0d5641e89664e17b56db9f9dbe"; + sha256 = "d502ef5aa86adb6faf1ed511983cadf5263e405d38b622ade74fb54e5cb95bc7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/he/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/he/firefox-109.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6ada1adc3f85d4b43c021823747e540ac14ba47f31e556953884fb675eaafcfe"; + sha256 = "44dcf29064071af9b9e60af405ca846ad22f3222d809bc7b92dbc9a3985c9d54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/hi-IN/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hi-IN/firefox-109.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b15a53790ab635226512713a2715afb05f2d1b613d5194ebd34c31a843546007"; + sha256 = "9ecd5fbc6fbecc142a69893bae5a54d819f13ffc01881a3bed6d99c258a13664"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/hr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hr/firefox-109.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "2f950ce1b159a767199ff2a782dd1ebc092518bb98ef2b74266793a1b7355de9"; + sha256 = "cf5189fa145a5a7166a4350402e2c490a5a816dcb85bdec60cc87b7f10d5fa04"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/hsb/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hsb/firefox-109.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "15f3b4af349a5bc823037629e5018bc811c1d3591f1f3113c75f0a6a86571707"; + sha256 = "6fa4c9ecc43f2fba816197ce103221cd224bd0d50b742768ee57c7a14cd8665c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/hu/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hu/firefox-109.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "43aa717e369dbb730b543385a32dc3127343436f222f49d48d746cfa617ca670"; + sha256 = "2b9f0b7910f859f63748721c7eb556154e3679ac1e02cc265dcecbe387b35e07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/hy-AM/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hy-AM/firefox-109.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1f26b5e4563d86aba0e044553ea3b7801fde745cbd4d108373afac658244b36d"; + sha256 = "f3f41e9fb027a08c42092175e6a32888e2b4add89b8f73bc77e672563479cbc2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ia/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ia/firefox-109.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "860295542a0c41a62b83e654b89cd96d01db7e7f6195ca1acc853d3ca6ed0879"; + sha256 = "c652cfeb05449620b7e2a578e93c6112ca0cb9e086271048c2eb1190ae6ead02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/id/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/id/firefox-109.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "45a6c55cc1eddcf0b37459b3c3a04ec5ffd0212f302bd659bb70a9f876b498b1"; + sha256 = "37fb22407e5c1b6df25bb7a607472331d5b8e5b961a2c7feec3db712b3f3a692"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/is/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/is/firefox-109.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e9f2feab646a09cef748376bdc9233847ce95a64ac9e78f1df42323c8f5270c5"; + sha256 = "1a8ce80a4948b714c1a6c8d5dc23d59273c31190efbcb7ba483c63302b0032cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/it/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/it/firefox-109.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "661ddf8ba1a8d93b115fbbbe7a798cb216c023d8d8c5a5bcc170241752e08ad6"; + sha256 = "0f9efbb387cc609792ccd89ac53855b32482723f8e383fc1ac27a00968317382"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ja/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ja/firefox-109.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "fa18cd9978adce267652f94e76c672f4cc96301775be4fe610b10bfa2b996c8c"; + sha256 = "b1e6a24e6b35dcf65c92b995615e60c7c5b48e66634343d8c56338e18c0525ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ka/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ka/firefox-109.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cf653ba171891a5f349375f8d6c630171b5086740aed5b0dcdd8016ac2d5a237"; + sha256 = "d145b1b2592a1173c8cb897d886cddcbd63c4e718adffcd21d280c57ca331b0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/kab/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kab/firefox-109.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8495558040d75adb392afbc1604b8be13701919b59e62ae57b462fa02cf45d32"; + sha256 = "52d6a3ad3d11ae3ea5a913c2c6b0d9277b4996ca9e6f91344bc0462f35cad436"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/kk/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kk/firefox-109.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "50102a38e15a0a61507b961e53ff4e7347288bc71ff203628cd57928707b0640"; + sha256 = "54c95d0948df3631a23442220afb2ced0533b7ac1a5432dbd1bf71ee43153749"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/km/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/km/firefox-109.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "8b49e8851c531668e520b3cfe3b43cd06824c1c5503c5f2762f186095d904975"; + sha256 = "ec449661503444aff1fc173a5cf24916107ec08aa33a03f264ece19f772246c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/kn/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kn/firefox-109.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8c0ca687a9cc6045c17c2b664cb70678fe06c28d06a6eed34a03363bb8c4302c"; + sha256 = "93ff15cf17fd99ba549ea5a23613722cef18b0794b5990880141833dad532f6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ko/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ko/firefox-109.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a8c2871dd19e47846b614c71642f4e03220f23fa0259c64a05d3a638c5bd8d82"; + sha256 = "cb2751c4f9314dbecf34618fae4fce13a2f2065c7826b3d597db161654f23bf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/lij/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lij/firefox-109.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4db62c1945ba97b9745e182b73230fc24dbf01a3dcc258a84519f3531337b35c"; + sha256 = "b74a6706e4fc8d95aafff6fb2c0ecd9460a834e6742384c08ad338127cb3e563"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/lt/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lt/firefox-109.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f0ecb94b2e0f69c250cc00e26c20c3bffcbcc8ed8f195437a7f5a89c69a18b34"; + sha256 = "4eff1a8f24110849032a35b1475fc6bff13113a770151f647c2f58040341b6b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/lv/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lv/firefox-109.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "943acf9d0d0ea4f6d9084d340525ed71a4c6e96e9a32a95baa0a34ed93659d69"; + sha256 = "b7ae8f49d245ff94ac594d4ce764fb89072122e7b3995e5f55819e0225a0516f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/mk/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/mk/firefox-109.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "208f2707902656768ef3cda0292befaa8af3192fb7893385dc5fb81e2c5b69c7"; + sha256 = "3fd85290cddbf2b6fac943cfa1bbf3517f9d9322c0bdd46eeb927379469af392"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/mr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/mr/firefox-109.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "1ee538a2d43d3684e2ad31fc69b26a53b6f281502b2ca75f878ad394a322e78c"; + sha256 = "807f5e9a7676c89072385f788bc2386cebb8df5913d0a531650cdbd4ef32cca9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ms/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ms/firefox-109.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0eac75bdadd5c600b3cc1245c00c0fed9777a45185994ebf2231240c4b2058cb"; + sha256 = "68f563f9815aa96fc12534f7d1809e529d9f87da9e2ad4e4f416cbefe9e43994"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/my/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/my/firefox-109.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "a144c04259eed0cb8a9486c6b81c25415b8d40b53ed65899d7128667adbdb293"; + sha256 = "7b0a6bf57faf08ff121b8478ff682ab17930039b903883cdcee0c65dedaa3e37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/nb-NO/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nb-NO/firefox-109.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "46f7d42de7ae0a2aa151f9420ed2127d6ff5397993d248fcc733afb1366fcdfc"; + sha256 = "81415ed3aca0d2fee858f17f6fffe5473f696df80cadb3dc2ffe31cadf605bcb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ne-NP/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ne-NP/firefox-109.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b271fd5cf3e0b636e815d7a6a323a5c90841f0174fab16342837c52778410902"; + sha256 = "477254383468b5c027db5eafae857127009a53c370e207f178a35c9c788cd679"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/nl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nl/firefox-109.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e659c52e250f4ac0aa5593b2a8a5d6b53fcd6e09dbf7d6c10f2a7ad9202c559c"; + sha256 = "903c504704a727f64310999512fef8573cc9aff0aeb6ab3ccb2f05aa6b073e9b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/nn-NO/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nn-NO/firefox-109.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "782b23598b4271a05d533c54489d42c6806622b60d6b5becb1974fef2b3060a6"; + sha256 = "5c76822f248c4e654fe98f93ed3a92cd05c7843aaa1826d8ab1d443f845e1433"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/oc/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/oc/firefox-109.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "852e0a892ac85584d3e041e0931375c635c587114321c2db94647f3b0623796d"; + sha256 = "9540a86d41ca55c71dfd3eb700d51cc6e98810e41c83cbe4cef5fe32067449d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/pa-IN/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pa-IN/firefox-109.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2aaed1af13d64c49154c7f4e37c3707f03f5fec5908a275e99b5a2750b90aa17"; + sha256 = "0e93716de0e1c5237f699824f50424b4af74a0da2c1475be42323b18478ffcf0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/pl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pl/firefox-109.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1aab2ae45caa95b57ede425d23bee7c5be7f32b348f98caf91e7fc1abb29cb88"; + sha256 = "0506596bf6e04c4416c4cfde7ef6a0c066d0e2a8e008f2280319a2127dacd5c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/pt-BR/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pt-BR/firefox-109.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9ea03f65d7e4977f2af22640cc2948ca628afb6005340b8e1e1c57b8372fef88"; + sha256 = "9bf1c8d46c5cf5f87825d124b8dd5bd4833a0a733a380843d3c31aefee7d0898"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/pt-PT/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pt-PT/firefox-109.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a6d7276781537d29530115da364e84b5bddd985730ea23cba0458122c3b3abf8"; + sha256 = "80e5a37922cb7de806331d39f3ce9b316a3311f7b29082736da594c9d577b3f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/rm/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/rm/firefox-109.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6d7526bc931260821604427406c3ff1d595e4808bcffe1b4b0045a49f0b29d16"; + sha256 = "17624a24e93845efe04a5478c88c8db4a3dab1b1adf36e08cab4b74c7d1be077"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ro/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ro/firefox-109.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4b872a9cdbccc9455f3349a9f581a6a95e9ecfc570682273e098620ee8a38faf"; + sha256 = "6396edc2baaef91581257501fdd066c4303596d82b72037e3a4cb6ae6c688c85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ru/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ru/firefox-109.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e92857f5e4ef880fa72d4cec711e6ff50de67cd7f57368390d1d6eda952800b5"; + sha256 = "58239fcd06b3f24a6a333a5fefd05f3c61db175b66e4444317dadb767c3abf6c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/sco/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sco/firefox-109.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0c17bf19d9961c004aae60951ed894ddca2fed31075aabea941d263ee4a07adb"; + sha256 = "bb04339afed59eb0672a2009616c1cd155328b169ed4eb8d2a2062575a42f10e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/si/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/si/firefox-109.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "76d65ec2557251e78cc8a5967d44f5a914420b01f0ef193185ef8f7c1631016b"; + sha256 = "4a0b83beaebbff9ed0734d72cc5cc57f1b0633145a22729f75925e7c2a85daa3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/sk/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sk/firefox-109.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2f8385848c4beb99e499ff7d02e79c343678133e36c6b16caa0c1ace7a8fe85c"; + sha256 = "205ff3dd21f368c47f5bc93f1630162b985a81b744bc6641caabe71b8824d8dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/sl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sl/firefox-109.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "37ed253708be9d1f0fe08e5a80c50eccec47274bfd7d1d0584109fef961ab006"; + sha256 = "289dac2addf1f9ceecfc97e25f206b2f4b8792042c6eb712fec897eb7413e909"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/son/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/son/firefox-109.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "aff3fa3b7ca8ee3bf1647ee73db2dd14de857f7d2a355cbd6e0f942193010880"; + sha256 = "d1d4567e68f6eec483ac938dba9bb2de1bcad451132e38da48af711fec6041dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/sq/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sq/firefox-109.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "12607216767f590da49b105f41055d6478ca02a026045882550d0b686bcd4bf2"; + sha256 = "e5b19462f11933671f59144eaff72b1cdd87e59c40dcbdb21d39e16b6c771eb1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/sr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sr/firefox-109.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ae6d0b5fc8217bebe086412925154305a46ee8a173035e6ed6b09244f34de388"; + sha256 = "7295466d7bb5e04a439b6155b7cc79a96111c9951bb4cc9f51babfb4786c74b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/sv-SE/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sv-SE/firefox-109.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "7d416fa90f9ce79bfedbd5394b672f8d5ae42d0beebc7961f8a447dadfd3f08d"; + sha256 = "9342438f3d48f87aefc41eab6bb317a9328f3ce25e180ada327fd6752e67411b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/szl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/szl/firefox-109.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "a8f2e23a10e0d75cb1be7542661d894da1e893b82bb3434e777037b096c6d1e4"; + sha256 = "7ff03a1c8c542462ce4e67196f55ff8378dc649baf3ab9cc9cb79d307fde9cd5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ta/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ta/firefox-109.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "26f58211ba33854c39aed3a64512be591dffe0b412ce569ed1b3ada11ae5ec1c"; + sha256 = "ff7cc22bab69027967927c2aa3174c536fae4a5ae2b232962e6a77dccfde4a45"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/te/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/te/firefox-109.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c2e90d7c53b7be1887a550f84ac91f7c14f7e93a572ba5363885bd7afe9708be"; + sha256 = "366306f278a5930b4389ae70e81a35095204ac50a650602e7160a609d6d272c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/th/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/th/firefox-109.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "bbbd44adbefd089fe0c392de3c74d0d038d3eef5aed7544f52183dec3bc4993a"; + sha256 = "de68926b8a6feea9b0d84869811230ac800205fc541061dd1e2f5cfabf6e23cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/tl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/tl/firefox-109.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d5639d31f6c78ad0d1101ba8f419db8553d06df07760b87eb169364c6dbb4b51"; + sha256 = "02e81afe57f3fab02d7886fbe3fb3b38a37707635abe358ec77f4c46313e778b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/tr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/tr/firefox-109.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d2cca49452c49bae0751caa0326a30dbe4f02a17917e93b4c1497b0ae6e606d7"; + sha256 = "1725ab0df146f01457025c118d7bd74a5105060ee6c54ac05251c63793dd7b86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/trs/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/trs/firefox-109.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "467e27a9832acbb76b4aeab825e7d4c9058985396cdd2bada911d8fda0cf2c69"; + sha256 = "72c41adcacb9b4071f40a36246357ec3c4377d5a3f1265de7a6c2bd4a5bfe7fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/uk/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/uk/firefox-109.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b691eb4c6b76aa8c98338e2a7cb905f3d3135f27cd521d9331c3fc8f15168d8f"; + sha256 = "60f226b017022fbae92d3238fbbc66b5b80a8a428cffc680bee7380bb492d13a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/ur/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ur/firefox-109.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5b2d2d387bd20660cf2482deb6c2d1fe08acee8fbc5a550a5fea970188dd6475"; + sha256 = "18eab55243a30490ee84cc1cf7eff37141e5a9c31872b51bef84db5f33cb0885"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/uz/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/uz/firefox-109.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ba250162505e548fbaddef5e7fa423bd41676bfc8cda8bb7520bf99469a3cf3f"; + sha256 = "abd767b20dd0a1e442dde976f2389293244c0ed4025ab7c6b82eaa81e615ef7b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/vi/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/vi/firefox-109.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "9d8a20aa2b11b52bceb60252b672758e363b93b263a49e798108adcaf2ab2dfc"; + sha256 = "8058c7c336213fe1b6ee419960a1df4c7651830a911bd4ab0d799f4e5d2f70be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/xh/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/xh/firefox-109.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "99e844adc3c4f7697cc2ef937db78726d6c54efbbc52c4b0d8526949e93f07ee"; + sha256 = "2943e6f92b1951bc63ad45a78a852012537b29fe7ca59137d56a724be9159357"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/zh-CN/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/zh-CN/firefox-109.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f6efd3c9cac48f053d6cc8475ac6c76c9bbe3bf6ac271e4af6fd51d007784c7b"; + sha256 = "8b111607dfedc130e31e9d51dd72e9eb3be947565ee3bfcfc91c07da792af928"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-x86_64/zh-TW/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/zh-TW/firefox-109.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dd0e30ce09bac2b169dc9e71bfcf79a7844307b30bbf800275b78996e4b03e3c"; + sha256 = "8ec2ad39e4e8db4d50d9ed2a24361bea76ffbcf38dd9521e235b0fafb45d3947"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ach/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ach/firefox-109.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "768a4f6e0f29a13215f4c872aac01d1a614d32163e8a603525829d4c7a3c182d"; + sha256 = "0dbbc46496169ca1331d87b87b8148502123dd9b909ddf41bfd6c94a8deb506e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/af/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/af/firefox-109.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "09148933e26abc6b7500fc0c30d748af54e7cb6688f797f8104069de111d218d"; + sha256 = "8179eb2c61535118b859204023a421a0a4bc85e43f07bbfe93aaac439ca9b4bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/an/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/an/firefox-109.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "dd87cbd784356baf8c8f7c1e59895cc687b053bb2ece7041bc641b5c550d8f98"; + sha256 = "ecf07700fce298ac673acf886067ecb1cd4b7e9b58d870176c474c80ffebb988"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ar/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ar/firefox-109.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "69348bcd3bfefb6ec2a5b84fef1b42421519491881bce14a2a43142cb44967c9"; + sha256 = "da4b1e9fc735cbb3887b7601ae87ff426bf2d97cff5aeeb4da5f53e7e8ce849b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ast/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ast/firefox-109.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "63f7612999bff672fb9ab632be02ad9aafa8a24779b137aa2395af56fabcb045"; + sha256 = "11f6cfb00f3acddc7daf988c59dbe8fa09533ddcafcf17434f85d6d963b38f2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/az/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/az/firefox-109.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7e42707603b1bbd7af417e00541b29d947175345e2149b9ce442dd7f8ed13742"; + sha256 = "c94c20828469c9c00c39d6f3d5d20ae97a5b00e40be2b0381aa9d6978a05b4a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/be/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/be/firefox-109.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8c5508ac62f2e38567bedb1c3ac2f2770ed49b423720454afd6dd24de6a91d0b"; + sha256 = "3ff50dbed1d2e136b06e9e057c21b8f7072017d46f3c0211fc8df913eabf8eff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/bg/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bg/firefox-109.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "766dec68aaf8d6fdb08d4a096534d175b87d015315b555cb5f5dd1a67d74b811"; + sha256 = "2392ab96c9f4acda6aab08b9269e311128174688f4468c17f32f174cc53fc0b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/bn/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bn/firefox-109.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "8c22160f9d2be01e38c696f3c18fc1c883310a40f9880d290a17a1cca44fd9f8"; + sha256 = "242d6d3bf76674906a199fda2f630c39d1c64827b951abec417b9a88b6c1a051"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/br/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/br/firefox-109.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "531d2acc7ae662daaa4afeb792ce85d512d0f8611251e3d232361cbaf4b2f951"; + sha256 = "73596148b62699f7f9b5a9f799d16f725b98356c4f41939a1eb947826729a7c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/bs/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bs/firefox-109.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "32c697ad8ec4f18eb4ae1ca3ff5347dfe32ff6b599522945e83757ee52189ecc"; + sha256 = "f48258de891f463e7ab0b8d99e9d90e350cc59f84429b78cdd998ccf4655150e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ca-valencia/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ca-valencia/firefox-109.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "bd8b8200eb50d76242b381687c42bd25ab9cdb59554dec0315c738da66151605"; + sha256 = "2bfde9ad05bd74543d661f6a46f226cf2dfe6fe142f9e93710031612e9db1f78"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ca/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ca/firefox-109.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bcd5ea27c86f7d7c3499632c4f0443a5dc596488430bdca9e01cd124cffd73b7"; + sha256 = "ab33f070d3824655165ae73982896a07e14a09621f45fc4bef08a9ffc900f6e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/cak/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cak/firefox-109.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c00fac0df927de50b7057b59fb47412cbb9f5c9a350444bcbe191ce169d7c1bc"; + sha256 = "a573be6a12bc57f26b0ac9fe64049dde38378253fd12e4e74d873a74945388cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/cs/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cs/firefox-109.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5972111873c4477a460593620f2d931b0d79a6c4c78c498925b52789686f893f"; + sha256 = "1fd4304eab350c9e4429cd89f291ac82cb26f445433e5f4eae30c880f9219d7c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/cy/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cy/firefox-109.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8239e803e638100e0fc47350b0cb9e70d48b031503f401bf88328a7bc5124ca3"; + sha256 = "4d9fea847c16fd2c3b13c9d5572bd4fc9adbebff3024a16c0d1bb6a75aa33139"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/da/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/da/firefox-109.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c298897ccacb429c28c9b3d7667033d8a78f4896742d60533451cfdd10d721b7"; + sha256 = "d775a720ee867d28739baeb48b4ad1da55b6068cb4e635255b03d31fc49000bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/de/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/de/firefox-109.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "fce0510df072398a6e7c57ec133ae1905405733f1d63252b918f755f8183e4bd"; + sha256 = "b6fedcc823112d5641453e5a7c2702aed141430be299568158b345882299556f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/dsb/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/dsb/firefox-109.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "019a3b5a085ffad46c1201bcb498c415acf23e9faf5f81ad9e276c5dcd7ffeac"; + sha256 = "32430f2fede1c15a0940a3d6793ce62c2e1a8a588556fc037f6abadbfca9b793"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/el/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/el/firefox-109.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c72b88eade49ceb56b69431ca7ab7927e752b360e691f06398529df4c3bd17ec"; + sha256 = "474aee143ae3bb9428f37b58d3956eda03290c66d32b9506f072c080e8947d49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/en-CA/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-CA/firefox-109.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "bccbc578d10a6f566dc7332aa8b4891ddd4790a34a1639d5af8e6ae9cec68c6d"; + sha256 = "118ff11e80902624afe7fb0d4f8b813a0c8bccb0aaa18816349f160f5a4db034"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/en-GB/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-GB/firefox-109.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "cd77f5f139496cd7e85a049ab1470d21ddfce7b8fc98c57c0e3f2ecb00106393"; + sha256 = "13308c1285c9c7b2242b569c5f7a234af7014b938506827c6ba16c5a74f154e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/en-US/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-US/firefox-109.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "3e5a717c9e75925aa4d9016b3e4e8e8059315c3899de460c87adf11532fffbda"; + sha256 = "68ada04e8720d492ea0e3e47a7bdcf9f6409e02ed4000eaf3819baf66dc15097"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/eo/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/eo/firefox-109.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "defa5766025e98f73a35e21d49704c79bf9c439ff08d149f8305b3cdf0d5978c"; + sha256 = "797788a6ac192906e877361d16a9834521a4c3d82fedec15507358b56b3f8bed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/es-AR/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-AR/firefox-109.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c704c8bcde9ae854d3d727815894e823bf867fbad534729ca8bc5057d69178aa"; + sha256 = "323763965eb1bf68b80591e39737899bad295115950f4ebbd180b4eb4c3dfa03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/es-CL/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-CL/firefox-109.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "fa256a3c92798d44d2e405d1658e8899018d402015be362ffd61c08271af1c7c"; + sha256 = "b63e6d8cacf9e5025b91bd3ee5be53ddf32e51d1dda68685411a7b744306f97b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/es-ES/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-ES/firefox-109.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a82e5ca4121fe922b40684d9cb98c2fff9e075a32403d6b3f93ed5c93ad6915b"; + sha256 = "2b26b1ec4a83966fb9fd0e205dc232e523a2e5279bdd28b108742f67f29401ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/es-MX/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-MX/firefox-109.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "efb61187a4321e9da9a1eb9aa4cbf88ada01e90914a0691cd458c8f116b1ad60"; + sha256 = "6e752d3752fc37dca4263da817f8ba2d48df30548bae78fb51f77336687f5080"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/et/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/et/firefox-109.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "ea8755149f98b8155bf598cf836bcd7502b9a9bc6857a235393a16f94a4a7869"; + sha256 = "086778327dcf24bcec7488444d647f670d71493a61415fbfd54b9eb14319d376"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/eu/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/eu/firefox-109.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "807d1a358980322800f05bd4b3caac2441ba19823e93f7c4fc1aad199429f49f"; + sha256 = "767667b8919b4e93f08cc61dd7c9fee38cfb8e0f2762c6f7b8d1cec924fdfbbd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/fa/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fa/firefox-109.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "c8e05e521cda329d1f7a0b7cbc4e61cb2f64ea9db18d61f0e60bcee8bb95b605"; + sha256 = "b100933c810cb7aeedf37c8f91a701e2c7a54678807cc10dcdc7e39619c0183f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ff/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ff/firefox-109.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "a8d7bdfd58a0de0af8dd88ace0bbcb2a104b4155fa99e7ab0b99467e9e66e4df"; + sha256 = "1b435af69429797ff657cd798874cde9e27fce62db2bebeb84ed34e11ccd9cf4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/fi/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fi/firefox-109.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "2ec4a1f6d1030f42fe47140312e2571afd969d9ff023be970dbc15e071cb5299"; + sha256 = "ceb39147a069a997655b92cf62ce2cf3f737b9fe7f6330dc125a4397cfc13f81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/fr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fr/firefox-109.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "5dd082ae2f77ba46f2ca602e41d8f305e789768323f1fed913e067c228572a64"; + sha256 = "bdd9d494c1243180553dd4ac5e07bdf0111a5c4eaf5414cac109e3f381d5043e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/fy-NL/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fy-NL/firefox-109.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "989e048913b7bdd6c3c00cc9539bb6397ce8dab18f3b32f1cef6fcceb7647472"; + sha256 = "dcf1d2de6e6f7e3073f13a4ec35e8fab7b17e3c2eb16b884ae8f54cb65ad9fd2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ga-IE/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ga-IE/firefox-109.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "69244292f057f914a2113e4295a4bf6482ffb7053450897407ca9d3997a1bfed"; + sha256 = "fd68b5c0bf263cf853672055eb6f5c0c2ae47020c9e7abae94eacc272c710627"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/gd/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gd/firefox-109.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d6da9e1e520c733297ca2f68cda3943c8c7455211839243d968c71d1a47ab0bb"; + sha256 = "2aa6a04126d84aea6827ec1d3e2334067dfdf85e916d859c89b19fe067aecbab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/gl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gl/firefox-109.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "216f5eedb11c548b09a9294ee512bd5b1722307a84ae8899e117ba3e7eecf8ba"; + sha256 = "a2b35efa90e5660fad92264baed540bb26983eb80c4d5c546da4dc1101f75160"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/gn/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gn/firefox-109.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "0e2b6f9b2c4bb8757e3960e3e9eb7943298adff2df6954ccbc4514434a521463"; + sha256 = "bba1a62addb6f7822fff493b10f2dd2de8eceba78fbc8381493bf2916a37fa1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/gu-IN/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gu-IN/firefox-109.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "237d24e5bd11bd6c8f4e19e721a7b79f4a1e2d083b483a3ec0aefca0232e3dce"; + sha256 = "c5ab20cb7bd45a6eef11f9306e3677498a2b7e4576c2a684aea28438077a3ad3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/he/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/he/firefox-109.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5c4f80ccc356f36143828bac05ac6513d5ffde31e5c0a0d9adfde9416b056bc9"; + sha256 = "1065459c93318f644e0f014b670d31951a64c4ea5387cea0ccbe078a14951d21"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/hi-IN/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hi-IN/firefox-109.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "054eb5dda7d63690e053518d2d1d562b8fbebfce671b8527286941d38d44afd2"; + sha256 = "7a7654d985ad1c43b65e7ac0a61bbf91365de50cdfa63dcb93f0d76f2a3b6c5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/hr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hr/firefox-109.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "fd19778e2436a86124206fb135c19c2ae58cbe4c128da0300fc8f2cdc5275fae"; + sha256 = "70ffea6fbea09b8509e3cb4d14ffde3e868842038bc0ce92d84b4b64218f59df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/hsb/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hsb/firefox-109.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c8b2aa17fff3af15a36741928e668793c01ce36908fda3dd1f6c3519432a9615"; + sha256 = "9b6458f322a22c995d8fded291d3c29343bcac02a4fe05d5869b40b6ec0441da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/hu/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hu/firefox-109.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "db65ffe869a3b8bd75b70c35c276a08fb4202800e6b41d6aabdd7653033d0531"; + sha256 = "8f39e43afd357795606b02843ecdae313c12aed788ad1f584bee761dce19cdf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/hy-AM/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hy-AM/firefox-109.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "bcdc7b19d99743d6718d2b3c3ef078cbe3151a0ade00c7902bdee4ab6c47ff8c"; + sha256 = "635ec02dadceed704593eaf0d758ca2ae4280348d61e022c120c2a55e504b04d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ia/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ia/firefox-109.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f74efaed82c385c329486261e267fccdf2062cb301b22f6cd2bbe00022c7fe55"; + sha256 = "a579662d968ef168fd09e3ff1e6bf590b29972cfcb204530493cef77b3afc640"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/id/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/id/firefox-109.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f4084989ecde2a6724ef5004c98198a68b7a7ef3843f050bce66bb8098a543db"; + sha256 = "d3daff6b081caeb14ef1a520618d4b30735de82fcc5769b3f2a78b145a62e84a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/is/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/is/firefox-109.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "da7f815a7df925cd766619775d26b63e1afe65175480a370870cbc6b1bb408bc"; + sha256 = "9780325e6860ee71e93ab3c2f7340aaee8c113c90608ed15ba44a572b32ecd25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/it/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/it/firefox-109.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "42b85d6a3ed69835133a13e803fc89455c90dc5882c8d4ccd9b51f77982b7b8b"; + sha256 = "f5dcd00febcb098b7e658aa0bf5dd716adb7ed62e3c6db3cd27e47b3653f12b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ja/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ja/firefox-109.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "5d2455eb75324b4cc2ab6bf6bc8ba7370eb85d716d7f3258da324d4af41df24b"; + sha256 = "9d01e50c9a868a3e1784a56c98d46e5d73300045f1c87da01bca0afcb13edc56"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ka/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ka/firefox-109.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9049a83ff15a822e470cea174fac7eac418d45d8bf88f6aef2f9ad594eaa4eb3"; + sha256 = "36b53fbc7de3a55a76592992406c64a255015ad093dc0ba8826552a2ba05922b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/kab/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kab/firefox-109.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "31b31c33ef7cb205ace0a6a8f73d581ead1de595a7378ec033410fcca133b4cb"; + sha256 = "2dfe85e6b60acdba2d1bf546067e6d8a64cb04c6c99669cba2ae9f2bcb684532"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/kk/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kk/firefox-109.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "57b37be71d0b43e3cfdbc0eb918a1c4df2986c9d86a7120544deb5173ceb11a6"; + sha256 = "a7de228d5430ab08cfd385c9418493ca581c1aac9aa542427937e43a25f189a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/km/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/km/firefox-109.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "5182c69e50bb09b88c4ea68363a5240fcb79f018f8e58f23141e5840b882922e"; + sha256 = "3f3d4ab4fe2cff4d92e2bdebfc3b01d8b4ceb80579d3d46a7a1644bb90c0f642"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/kn/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kn/firefox-109.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "98e89ecf579a786d00d8b8a2b2d7ff2d418e44457c799055458324a5a0c4c2ed"; + sha256 = "752470af2f3069040921a7704873e2a41053f8fe874d80cc432822b386fb4666"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ko/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ko/firefox-109.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "51f6366c5dbc25c7caa0782c5384f72d5a85cdf976bc86804690f666b0db9063"; + sha256 = "8b765dd21952d49205198ab32d6989b67c8342c634d67c7913795991948a539e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/lij/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lij/firefox-109.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "9e8778ac4bdb17ea85f11bc36d6df90cb4f326dc959d6238ac4cf704fe7f683b"; + sha256 = "1184c8a41414f8a92ffe8811259086e49b20e324302670680c1b6fa445ca8466"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/lt/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lt/firefox-109.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "9ad7ca78a97190e4b14ac15e2ba07acfa4abacb6f84bc761a456a272465cebb9"; + sha256 = "078263d1a8c1ec76281be089f949d022991b44ff6ce3d03f79e6e10f1153d4d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/lv/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lv/firefox-109.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "2d5299f088c6e4b370e203f76871b6605d2af12622968ea28049f2d3100c443a"; + sha256 = "550d4c73f19efb8aa8d435e9bf651395e1bfba2e34a11190100a9ffe3e35894d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/mk/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/mk/firefox-109.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "5b28e0caffda2db5cd032eb1cc163d85a2c5cfad1befc98357d87898d055f518"; + sha256 = "b1ce6af31d2016ee7b91bae37f0592234c897d684b5b74a3c75e42a400d3bb16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/mr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/mr/firefox-109.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "69170df28d83a5e67e0c4e99d7d62bfafb20874fad624cce0d7885947192d41b"; + sha256 = "a5a5dbda6d557bfc66cb46573e39ed758f7393bf35eefc70859eb8f1a682706b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ms/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ms/firefox-109.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b0539bc182e9950ac2914909d564a6b01e5f4bf73ca2032a494e1b3ca3ce2bd8"; + sha256 = "69967991a118fab3ac407dbf8349c6e3cfd2aa6dd1f858bcbc647ad2aeef45ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/my/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/my/firefox-109.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f204fcf8a73e4e68980558ab24670c4a5a89ea896b0e3477a663f15990daa22d"; + sha256 = "528572edf884be725b14b65f9d7fd549d2efd3d78a4242c4605b73ac8dd922d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/nb-NO/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nb-NO/firefox-109.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ee0af5a39f32199a75baff39d1659935fe0a009bd325711c22c06a602bad5908"; + sha256 = "6b1819f52a09603e9e8dacc25445cb635e96f08f3563e01c52b5df1397fe32b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ne-NP/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ne-NP/firefox-109.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "87cae98dd71ae77fbadfb9211efa9b5960d686deaba1a5923afad4444de38c85"; + sha256 = "645c35f6fbb637de6ba1b9e0bb6d71cee1cb0ce1f9132544109f9beb4ffbc304"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/nl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nl/firefox-109.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a7801e4e80d7c17ad3d24c6218476e998ae88ebfc3f9df3eed1c0a16cd823ecd"; + sha256 = "64eddb4cb43d45a46b9df2354661367f75dc91047b3f02e520ea1c3f4ed9f6a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/nn-NO/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nn-NO/firefox-109.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "cb9edb77ac69ee580c904feec42987fbbe6bca98d8285c430f2260973f6d38a6"; + sha256 = "800cba266513ce66af2be977ea8747e3b90975c9b7e1decafb214f981188af13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/oc/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/oc/firefox-109.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ec61fd51f49d3c6e02d86cf25adbed9f546e234c2967634b31510c0cd9ccb4f0"; + sha256 = "3f6833e565b05198efe714c25fa80383913e03f94a8e805c1797efe891c259f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/pa-IN/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pa-IN/firefox-109.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "65f090b6a759a22d4ae407e0b455e01c26b387a0cc9e03ff8ec9748452fb1730"; + sha256 = "86fda421422504b638c88d67c8b19b060e741299db7dfc474a547dab8f21f28f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/pl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pl/firefox-109.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "134c16791e7b61189273e353b3f15ee49d8dd1ff406ccad755df04434c8471a3"; + sha256 = "1acf4380cd83c082b83dfdda747dc4b5091bd32cf381d224bd29fe11b9c9accb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/pt-BR/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pt-BR/firefox-109.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9e722853d8f54aecd152709f3f9175863bf49def714ea577ee4920ca0194473e"; + sha256 = "15f21f70c4ed36bf02c1b29ee7d7d93a30b6775627ec842e02aec4e78b2aa0f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/pt-PT/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pt-PT/firefox-109.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e45fe04b74ee061fb6c885ed5bc1cf51701c559a68c7eaa20e195699c383a55f"; + sha256 = "974f7fb72b6ea6198afcd74f7cda3e2018cee088a001dc08e880e1c4366c7be7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/rm/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/rm/firefox-109.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cb76f9545ea82ddee195740f11990226d92ce6bb5f3cda0e3a280302dd3b8f2f"; + sha256 = "7489ea896e1f7612e94527302ef02b8e9e9e7c7d2fd98776e4c05eefa1671395"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ro/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ro/firefox-109.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3cd6994654dd4d0ad916c1e1d80a8c209c670ee853539be19874db6049b6f99a"; + sha256 = "cbe47e14f2305db969c326e95fddd088a38e2d8c198c8ad90ad8a28b06588265"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ru/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ru/firefox-109.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8260061f179788417a064118dc636992172fc4bc28d0d849113ea662e7714468"; + sha256 = "66bf47f2b2972fcb089569c3064e394b77ed737dc2d97b76d3a4718484539bda"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/sco/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sco/firefox-109.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a681fd03aa473cd16cdda8563565f5d39f48066467e3fb4b168ce35451b01f44"; + sha256 = "5b122c5d227f617b6b4a0508d454a5fdf32a4338644ef905718c003a0e8913f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/si/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/si/firefox-109.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "73402c5f40ded7d48b4991ab219b19c27fe0372de430e06f5560698c42df401e"; + sha256 = "d68852c3d719dee2f1d8655826667dfda650ba227950e7678834593c8acf3f83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/sk/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sk/firefox-109.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "16836b1e4283eb7f01a4abf0a471b2ec901d716d0e583056673f0e67c2f8abe0"; + sha256 = "c8c3153072d63fe00494690fea7c55ef6c04911cdbf2473135d00c65edf2550b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/sl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sl/firefox-109.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d9ece47f105c7bf236aff1f2e4dccb3d1822385f220ff3b1c553300960c6255d"; + sha256 = "fb7f97a2edd3100fb3124bf19a6ba31836343cbfe4db5c3a60a97617e700d5ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/son/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/son/firefox-109.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4a518e991581231fe90939ebe0968ac67e223f7e509281af854ed4eec75a9ecd"; + sha256 = "8e78110ed2cfaffd2ba7d4dfae9b2dcd59106d3d4c763dc6ec95b50938a2ce1e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/sq/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sq/firefox-109.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0e8ef10e2adc199ecfd94ab90957b1f39bd6002564c7c5d4e07e8c014aba33aa"; + sha256 = "b72e721424df588e738882088168c129d71e04148197cf2736a55f077215e2d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/sr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sr/firefox-109.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "03f8be2e921bf595eaa6c900197b4c0b65886a0811db300b7d9e5e7165951f71"; + sha256 = "2bc67362e7e4baabc9d12bd8f7683f6a8201b74dbbff83b5d3f0035c4dcbd011"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/sv-SE/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sv-SE/firefox-109.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8e4889fd7bcbaff73b00abfe39fb9ceb1bcda7220fad7d1234748e96dfd20390"; + sha256 = "62137df0a8f5f28d5415a65141a9ef9fb3334f428ceff2d0cc2368e2ebe46d62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/szl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/szl/firefox-109.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "2864ca65463093ab8edaeb742b962271d3e00adfcf5544ee84416b6742e4e25b"; + sha256 = "167ae2dd7d0449253fd59f208169d2895c7d204b47b3a712fed65c0a0396bb44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ta/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ta/firefox-109.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "61760898bded9a5743554bb4afb621386dcf838ea709f879fe98aa9e59165a57"; + sha256 = "700133f0cbce4d2f8e576de2b87097374e24a21ab0ff73d79cc1fc07e10d9e13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/te/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/te/firefox-109.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1cffcb4bc63da982e54f4441c245d00fc7e86e4876474aa9f62ae41939f2bf46"; + sha256 = "019f6c7822d8a65d552f9276d481d44194da2b6b6c4d86489208cc540f8420e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/th/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/th/firefox-109.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "fbd9ae71925fcac0f7cf76ce2e672642d65c890fa8c0e8ee2bdc28f7ee62bac1"; + sha256 = "a41701983d698ae7f02a99854e3c40a2c8943ee1ca3f28712367e13152baa7ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/tl/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/tl/firefox-109.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "7873208d4ca3d61f6fb107a0a1e7e9345276b61c488166d06fd9ac47eaa8d5c3"; + sha256 = "6c28b7be19776c338d600d6ccc1f51821d3a28fd11719feb4cb2f591aff9b298"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/tr/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/tr/firefox-109.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "2976f7bc410fc4fb125429e3f7babbd09f39f2718782731cc83825edfc5ac990"; + sha256 = "8290ab47a1dcfd32ef7824f05852b6004328faeca4f0ce8e2164ed69e2f2b9fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/trs/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/trs/firefox-109.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "beb92f287182e8ee007cf2b44fe6d09a3b366860826497f872b2bfac6aca83e5"; + sha256 = "ed11eebd2d048bba7a1671e9b43dc09da712d7535d8ee010dbda5874292abf15"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/uk/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/uk/firefox-109.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8a1d87bd718fa6ad6e5bfc5f181d38377672b987e42b1864dc0247dddc0b15a4"; + sha256 = "22e0597f170fc9ce9dafdaf0f1f200171f1794f4cc488b3481ac73f2de4e8fd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/ur/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ur/firefox-109.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "0854525a8671acda78a22229c1f037bb62b39b32ea9b5f625c91e8c3a7d19c2e"; + sha256 = "1204d370ff90ad47e376f4e49c090a72c00e75f3966163aa5d8522f92490cd32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/uz/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/uz/firefox-109.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "1828c64da90f195b5dabcc6d7fcaf40c2d149882e36953d47808733c6dc9d678"; + sha256 = "12043a8e7803af1e49a6546b104a79d652e2e703f3f704e2530bcbe315a26d9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/vi/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/vi/firefox-109.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3725988057fe9dd9254d04e76ce3895824ea591a75c803bd77dc97b5a78d6d1e"; + sha256 = "ea306e85e24d3b34093a894c813b2524d7f2200ff09fc2c26c815e244720e7ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/xh/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/xh/firefox-109.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "28560926ee7fe42d860a94f3197e9620c742a0dbcf3bdd7ecd18a8b41bbdb947"; + sha256 = "34c4063edd0bcec3850e0fc15e9d948863ea3b34689738f90ee5a7796b296baa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/zh-CN/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/zh-CN/firefox-109.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a5e46186096e2dda9477bb0dd023149c43c6dc0762414c00099aeff9e6dad2b9"; + sha256 = "5980c6f932f2336980f8fc613f065949336df40cbf1ce92bb2f8f9c04dec41e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/108.0b9/linux-i686/zh-TW/firefox-108.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/zh-TW/firefox-109.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ecf9459b7b255b7013fff6a32904d5fde8cf3a63b6510ff82ab69ca33ad8d502"; + sha256 = "8e726dae987f0ae4793757f763268b1d375e69f324ff5e9ac5dec2367e1cc3cf"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index f6bbf8b85e2fa..5996ef9363fa7 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 = "108.0"; + version = "109.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ach/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ach/firefox-109.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b6951773f41261fa8e932267630eda0cab5b3ddf12125a6846d250206151cb1d"; + sha256 = "062f6070782a197d5509b8bc046db13f72260eb45f78a3a33b166c29af2c6438"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/af/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/af/firefox-109.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9cec99e30f644fec0c4734de7698989bf2fab936ad4f1eec57ba05147212c505"; + sha256 = "56fb07597494f85547b279e65222263d103ac2bc78901c3722c59f12d769c47c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/an/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/an/firefox-109.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "b1487e98f27d407f67763eb059a8b3a137495325c05daf69b04190919d72a5ec"; + sha256 = "ad460c6b6b64401562359f6ac7664dae5c87bc51ff5b5f9db95b117ec41b77d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ar/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ar/firefox-109.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "40b9bd078a4549179e5f2ae730b9c1d5db486897391769353b2b093ae8d9f933"; + sha256 = "bdc967b1d2da7e49f0313710a2062a62ffd14a0e3ab8613049909c9a07a3980a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ast/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ast/firefox-109.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b3d2f094f52d0768a0d32a364f4976b0da38f1426a7a2bbe17a5bd7d2451dc8d"; + sha256 = "b44fe9c2a93d68fd6a20e9f6000eb81635d9bcf78b0f97c526e3e7f216b2e249"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/az/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/az/firefox-109.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "697a26012211189778ec174b86f46005e5fe3579b28302c93a0152c2f3e04840"; + sha256 = "d9f78c078b1d34928ed6c18a3c0413c6f079979545a381e001a851cc792f75fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/be/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/be/firefox-109.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "259adb8609ce04a85cf7e0ad06a885f484702e43c0c2c6e110b10cd87d3d7433"; + sha256 = "87f5fa2f8560d9f68d8d4d77d16fb3bfb20287c87769065625cd319941cede8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/bg/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bg/firefox-109.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "685d537594410610f54b1518619ff187c97b53f9ab03d7a3e875da5c4c29c080"; + sha256 = "106d7c1fa3d37b16eaff03503e03dac0bc503d56ce49fc3718417ca3bfe1ab85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/bn/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bn/firefox-109.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "cb669c9f0852cd5a06ca5f852d3bf5df7dc424a8263cb89e4d3593bbcc2210d5"; + sha256 = "bc9be31ae2e0c36417df8c86d85f69e22c17ea1b193b214f75137de31fef6aee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/br/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/br/firefox-109.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b1515ae6c9e8acd57745a86392046105a5d0be2735cf15ce28551bcc4fad9dab"; + sha256 = "664fff02c73dd60df2c49ebdc4cdea3a09e999f956dcaef502561dc33f6b4ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/bs/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bs/firefox-109.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b692a84fd8b839607e209f663ceaee0ec9468b8dfc5d32a0556aa6825de782b3"; + sha256 = "547a8e9b82c014ac7098a1eda0900cd3725f5fb185d66ba2beceda1d97e79fa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ca-valencia/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca-valencia/firefox-109.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "603711bf9c60df5088363f20b282534bb4272a362b24e25a53cc9d9e26b457dd"; + sha256 = "b995776faa868cd21b1dd7c8bc2e8e6f17a7c9f032c63c3c259b967d3192ea4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ca/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca/firefox-109.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "033966501867d0aa5f6f17a22da9248a80e16fc6487e297b353affb33a2d4155"; + sha256 = "4adbf820fb10f4982294840549ce98e87ec2d65e5b2c693e6d05c0c330167d8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/cak/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cak/firefox-109.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "98224bc7dc74ff0b313b053674c0fd13fb0c28b55d029ac0980d28d7034f05ca"; + sha256 = "b6d11e53a0163e23e3d6519d411b63476cb4cba693df7b41214ca60c813bc575"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/cs/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cs/firefox-109.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f3c181bb092002883bd8cff7ffbe34bae20c6c6afd9ffba392da58153f755693"; + sha256 = "4163fb90255d52d860c17f72f7787642c6ff054c169aa6f2e9c6293e0cde109f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/cy/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cy/firefox-109.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "9b8549dbc69e2fc397c62974599d2a394136abb6db51bba8a9c20b8fb6d2bb7e"; + sha256 = "dac9739e42d38bbca3627591aa2bfbc6655dcc2347a6696d96f040362f56fe68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/da/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/da/firefox-109.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "078d4b2a26d0ce1ee389f10ae922170c834d1264d16b7e5eff563b3444e0c95d"; + sha256 = "793ad841ed9da31087e42363878af022fff237a6281a711736a70e732b588de4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/de/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/de/firefox-109.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f58c0552738e771df296ee6b8955de1734662178b3faaf116c3cebd4c946da4f"; + sha256 = "e408d6f72760e031122fec82f3d8dc21b622128650f1fc8ff811c3c696e3c48e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/dsb/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/dsb/firefox-109.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "79c7c8a7fec1fdf44d93f7f7642b79dd3fcb93855034327fec9b8f306ea1800f"; + sha256 = "ed4e02c2c324ed25cac1d6cc654d62b5b22670be82dbb3e415783af0e7a7feec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/el/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/el/firefox-109.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b68fdad776f10975a687d1e9ebbd22c4ddd5824563693b977a30446dd64befad"; + sha256 = "3396a7d6d938cc7793bc876e313dd6f57c60042f93883f7bd3bbd79ef97e7e3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/en-CA/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-CA/firefox-109.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cc1f146e165f102567d4220348d060e64b4de783754d94827da263d35c38e58d"; + sha256 = "40eb2e205a353daec0e0f07f12633c2aba09cee6372e8e3ed78cceed96611cba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/en-GB/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-GB/firefox-109.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8be4158a41d69f0cf9d5d2ee6c3ad8e80eb6d131bf6e91862562858888a9b784"; + sha256 = "947b937d27c138ebf79377f17ac9cb5fe89bb59abe123a45ca1c050d13e439ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/en-US/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-US/firefox-109.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4b87f3a9eb03efeb9b228f07eb8c2131fbe43979f7d72eb499c669249df7b420"; + sha256 = "f19775cc6adecc529003ba0239bd46e94ca70a866f19b071a367905184f6d4f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/eo/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eo/firefox-109.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c8e120fee5f3e98c71fc349e9464b1df1b8b39dd6a539c97524f72a91afc556d"; + sha256 = "6a868b2c8d4d544d69c8d3544927b2ed5f478d14d38f00854ef7d7fe3c1b29b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/es-AR/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-AR/firefox-109.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "fcd654ac683c35945ece4756b9b6cccf9658b5963a74d97e27ec6a4edfffceff"; + sha256 = "81d80d069e36f108191f1072392b438ea5eca11205b9a50d6fb1d2f550c569cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/es-CL/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-CL/firefox-109.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "c920e4ccc17b1fc53456d5b9c89a73f3ed21c12a24a1f2b871848da5434f838c"; + sha256 = "57e2647d0d3b5e3e7b593a0cbb260b1927475cb7ec1f401b0f39e772aaf76570"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/es-ES/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-ES/firefox-109.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1e5d5916b353b032fcc7ed534a9170885d70fe67f64fb3a7b10c4c07097bcd1e"; + sha256 = "6958018e306b9d64a2f23db4f2ff9cb111123573e6bdcacb8789221dee7e269e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/es-MX/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-MX/firefox-109.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "133d5fc5b908a2978c30765bcc7d975a627eabea122a2412e338075965214b62"; + sha256 = "bc69b78e261368d51034daee9d374e38241e228102889710b59af48afe0c9aec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/et/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/et/firefox-109.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "14542c095607274d935bb1c908a74465cc68fb48545a077f87044618e8bea6ae"; + sha256 = "7746ef524a271ed1095c1352b4da1edfc65a66a7f14fb164d90771fd5622d1d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/eu/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eu/firefox-109.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c037122941aa911040e6a17b36055440b5fd7ca52450809a868616458e6836d4"; + sha256 = "321e106491e39a0cbb9f0221a11db8cca1792d3f6135fc52766dc7e4a1adc243"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/fa/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fa/firefox-109.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "24e8383ae440b3e43282a21b4ff75ff2e785c14519e1a26c4592cbf2b8372a44"; + sha256 = "23adbcfc211c0c16a23c5cbd89e0d42845c566a5c3736e82d2a5ff67ac0b6e11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ff/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ff/firefox-109.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "5d4223ecc1c9e40bf55dd80ee935b64eb80d90559250383a97debf232334fe71"; + sha256 = "3c7205f0be5a6018c7fd80bab737233d3c73f9013f2cfe819f4ef9633a264c7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/fi/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fi/firefox-109.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "df89a4d5b7546f0eb4b0e0e339df1dff3496087eb1d7ef0e5d6363f6ccda0715"; + sha256 = "11ce6ca3943c70c8d4f66fc600ad0fa16486739894c5e0621b660067daf06f25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/fr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fr/firefox-109.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b5d1afa0168865ad1eeb06ac3f3d2ffe3aa1839e33b81852cfb5b02ff65cf168"; + sha256 = "3f39b2aa077f059c63901f530d54bea442dec7ad28cecda60571f9266b48e63a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/fy-NL/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fy-NL/firefox-109.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a79e13b2cf30ecdf161dff50c814bdd1c3ea8a788a287a812dbff18d7e47b603"; + sha256 = "9240fcf0840dc078a9076082dabb46bc16ff02e37de948e9176b6301b4b95bb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ga-IE/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ga-IE/firefox-109.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "34f714309286796c54c3bd05467c9d2dfbfbc7dcd8f16cd149a06e596da5ece2"; + sha256 = "92e6e5a5b1635aedf7be819e0ff31746e9b3b18ea1f7c37dc149f78d806c466b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/gd/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gd/firefox-109.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2cdd989a65daf8292e2e304b51f758420eac88ce3c59885efd67d7ffee1b33e7"; + sha256 = "ff0607125dc57c5c5dffd89dfadfda99ac9a4274c4db2fd69f99bdf238bdef12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/gl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gl/firefox-109.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a85cd54f0ffcbfde9bdcb7ed8939d9f7981b2c2b2aaa578082c0e99f5de82f13"; + sha256 = "b1555fe9a0fd4fd9cf0d492628f88390bed5e1f97ef7debd8ef9fbd934bb2e48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/gn/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gn/firefox-109.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "78fb37ebef93586a679d8b85cd63f608ecfce86e0c48d68c12be160a6e2a1645"; + sha256 = "61cf8d06dc696fff4d2702c9e051e2b6139b74befe8531320898112e6791e350"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/gu-IN/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gu-IN/firefox-109.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2a6308bd2aeb83a814d040a65944c7d13224453df2e2461f9f49093f4b695ee0"; + sha256 = "3d81bfc292238dd2f47562f97f5712520d3d48dee7a87f97214015920885c44c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/he/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/he/firefox-109.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "113c4c8622b52f1343ba464bff4ecb6584b57319c7a5b87e3633a498aac556e5"; + sha256 = "f7f8650b94144ac7aca761df3f89f817b58f514f711c42c4d4f56b7a5ab0f028"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/hi-IN/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hi-IN/firefox-109.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "d5070f22e1cf2a6c96043b0ad4ff6c03b86b737f5fbe5fcc7a480e7d5f43704a"; + sha256 = "67d8a5d54a07a27d0929d2a1f71780b7d80c44bb5e0ff6e5ffb05f10f112d5f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/hr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hr/firefox-109.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a43b685c109493be76f0cb563ee37bfa56cdcefd47552605131e277164490df6"; + sha256 = "856bcf27f0c2b0c01b91898624836a24fc649e8dea105c3d3d86da14d18a9f68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/hsb/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hsb/firefox-109.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "723c72102b1957d50dce39f7cd3d14013f83f26bc2f45c0cdd48a5425702ce4d"; + sha256 = "3843d0d353d7514af25c16509584ecc317233d69b02ce542961797143ef92417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/hu/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hu/firefox-109.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "73d01f6c449dde42f030599dc88a4fdeaee39e5c103e2a6d104834de313f8dfd"; + sha256 = "0e3b6e9849ff77d992868f02fddc44f88da5c15025ffa060a77eec6cf9fe9224"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/hy-AM/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hy-AM/firefox-109.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a9c3a114df97ddfb8ab421becd32099007f23de31fd45fbd2f58465bc7c728ff"; + sha256 = "5b506130d90add811cfd56f8fee26348aac2d6f93a2807a47126afc5472628b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ia/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ia/firefox-109.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "7414edb036bb8eae20baca49c15a072b846cb066a060c8f13167a6caac3e7813"; + sha256 = "98859afffcbdc36a712fd6cb8cbd4bc12e9b61948fd5b4cee719656973326f42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/id/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/id/firefox-109.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "75fa751294e37bb1c9015d885f087578cc4c6192d303af02afa94176dc93148c"; + sha256 = "98b6fe2329be9c4fc275980672f31ae9d61483d7e2ef850856ebd3fc6e90fa10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/is/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/is/firefox-109.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9969925fd46a1d6d7808968e1bdf3b3bb791821f5f6eeda5df1fd3b6ea019105"; + sha256 = "0f699d8558b08864174fa7aaf5beb0ad01cda7362b9cc86594283ef9ca4b0138"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/it/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/it/firefox-109.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0429dc99554c2047e7b5d0a37eb7965a483cc24189134de8ad700a7a65a5ccde"; + sha256 = "2c113a10dd45abd677a7abb2b1c64a574d19845c71761e65d44870ae2f593c5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ja/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ja/firefox-109.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "835d9ff99678360bf2427e814d52d8d2c33a05b66642cdd4e4a5892b1e06e920"; + sha256 = "a6d1ee0307afbf5fcb6f0ec0c899a2ea1ba67cf548f98c2d508d54c72a88e7d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ka/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ka/firefox-109.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b79de320bbdff5cdb0a4de0f9d67c595de9640b819aabb47a95ec1dc23820e63"; + sha256 = "7edbcda348b7d51378320d7681d591930cd963c00fcc2b80c22e4902cb30787c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/kab/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kab/firefox-109.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c2a940e4972d591e3fae01938af3674c9c75074db6b20a5a71cc6f3b0f365308"; + sha256 = "74aada0320298c54f607b3096a607fffc8aa7de0015b353cffc1e3b27582c4cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/kk/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kk/firefox-109.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ec96c45bdfba4b58bfd71edc0c80564114e468e84473af7201592a670b9c0d6e"; + sha256 = "4188205963323b35fc89ba17e0fccefe3df50810d7954201a973262f303f5ce2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/km/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/km/firefox-109.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "4ccb48df90814255b7afa7171d2f37dca55020a4f6cccca44b24d486546d32d4"; + sha256 = "f1a92901fb0c7835ef9112f53f4109b6b82dbd0a571fcf021e791a12f38f6a93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/kn/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kn/firefox-109.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "bfc79bad909e4c987191d66a945e5577219fb7209b3162624a4197e4ee7929e8"; + sha256 = "47a348c1e5590ba65773fc586d95516c108eebd44a597875a76a4b8d32a4e075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ko/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ko/firefox-109.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1cb13dc47d035488b045849316cf09d1dde156c3069fa97d36dc86b79ef9f087"; + sha256 = "ec61b0e9f07146b797a7f224fb83a1e50751b875be0331dade5386eb916fd3ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/lij/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lij/firefox-109.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c525208fa0f43d0b976757920ea8fb23bb70b0167a4adcdb4fc6529dee24c2f2"; + sha256 = "2652857e6007ddbb127aeed33fe6a4bdba8ed44888aafe764b81e8e150511bc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/lt/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lt/firefox-109.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "50f8cc9ed3a9c36defaf2c3c68cd04f3c463892bed9565b3860d036023d1c994"; + sha256 = "9163745ad65e5be8d030eae894c6f9d27960abe6203649f3f18add16cbd298a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/lv/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lv/firefox-109.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4487e7ce489314aa7338c0036531ba3997dea9f103f2b76a29d41db6ab8540e4"; + sha256 = "87ab351a62968471dd16fa4949f0e8fe269223ae03511c03e99b4abe03d6df72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/mk/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mk/firefox-109.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e19b7e3367a030dde240058385ee5eb8252f0f8a7bbff05cfbc1780bb573aa14"; + sha256 = "533a3f586cc7c4ca38d4fc8c88c16b9595d859e8d3972387677b55cee603aec1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/mr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mr/firefox-109.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "850aadee9b69ce1813f2ade8ab32b4aa990a6ced260d0cb623dc20468ef8b46c"; + sha256 = "298f5d07eea30a8dfa5e16b08151c459f72e24a0c17d6a2f8baa842483a78ee6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ms/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ms/firefox-109.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0155f1befa516ffaba4d3eb8372219b672c989287abc2519e69f144f04562664"; + sha256 = "07802a9e8c4d9ca8e2a83eecf29979d1c3123ba5f0c280017d0030696477e605"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/my/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/my/firefox-109.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "d5ec2e05cfc3ea636e5ee2fb01db11c054f2c6c10a6fb5f839003978ddff4b03"; + sha256 = "077ad784cbcd2a3663e4c614deaf921d66681ec5b21d5c5e759fb074de17b259"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/nb-NO/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nb-NO/firefox-109.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0676c75e0be185ae5a89dd87e6b0ac960ab300df9b9999d4ee097a22c059648f"; + sha256 = "51d7c62bef495e4ff9e6261fd15001539a104041716d4a97f3195ecae479b233"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ne-NP/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ne-NP/firefox-109.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "de5205a9c2e0c48d2e2ea2ec803fa22c9a91ba0ef50c275d00921fafc5b95a1b"; + sha256 = "2fcb5b5b2c7deaa17ec65878243345fcebb26b38b8d267ee3881f366829f86da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/nl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nl/firefox-109.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f7af36abeafde05bce3810b2cab03136ebd2b40a9cb158564704ce8218963790"; + sha256 = "4412f358192301406602aecf7341e64ae1e4909b4a0e80701fd73c0a561ba092"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/nn-NO/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nn-NO/firefox-109.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2969c8594d78c41b9fac76f4ada74c5ef834639a3b8e3da83c15d3952af01c59"; + sha256 = "8116120da4d557d412100fe5029cc338073f5070d90cdb3e0f9b49242f66c668"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/oc/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/oc/firefox-109.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "8a55a8ccacc4342e99d54cd58ca04a8f779897c8bd5b82e2a42536d7b6562cb1"; + sha256 = "6e4115e51ec23a42ccb7f6f10caac0040d72d4448141cac68ae8f24b1ad90504"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/pa-IN/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pa-IN/firefox-109.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "86adf572bbf98b13fce452d4d7ccbebded451346a3baa3490adfb281dc7a1897"; + sha256 = "640c20ccdeded7f2a25ea0ab72214a4b6f4aa2d937de24853886653684d26b8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/pl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pl/firefox-109.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9af76801beddbf7f95c82a2554585765480b9d7ba2089b4a368d9869d7919617"; + sha256 = "9ac0462dbb62901a5678bda5360b417a56bbe74003e912323ed1a29661cff1b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/pt-BR/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-BR/firefox-109.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ab5d7ad4f5293aea5128a51b37a0ffec8025cf2c28ac1e6ebb7fac2cddbbf185"; + sha256 = "593fbf46826fb0726b25cf1469129d7c3db274e2137966e49c904ee27109e0bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/pt-PT/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-PT/firefox-109.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4368aafa8e6b8b7d8c38f0d8e240ebaf8f8d9f2cb5db716e8a7994d90f41dd85"; + sha256 = "b96d176444864c0a4814936fa5b0d67fee05739339a5ac01d76735bcee9aeb92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/rm/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/rm/firefox-109.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "894fef86560d58746bf6b4cb22cfb6ee530e8070fdc205ac0fd9f628a152e04d"; + sha256 = "93d375449f6f70b4043790cc66377559d85c5c6039570701e8435cbc76038e72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ro/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ro/firefox-109.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "7ebd21474bdd636505d526f627796bfe9f18393c4822bf0445721f8e2aaa3d77"; + sha256 = "fd032aed6dcf2afee5185c68e4661077b12fff708ce47147b8b297886525fb9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ru/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ru/firefox-109.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "76eea954965e628ea246cb9956a184e168fc3b24413b89b1c5659bce9ec259ab"; + sha256 = "828c606c289b7ce94417626cdf114fed256a0cb247b3f06c46152db777324805"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/sco/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sco/firefox-109.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "86e2f63d0edd8c12753ec74239be8d019830ad8cd38fe5a0927d9c405669b626"; + sha256 = "0a400cefa3363f357c53ede79d9538fe01ee03b1e6d1a6c9ae67b3ad32207ca7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/si/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/si/firefox-109.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "6ee0342525f151c3e641978dea40dba1960e55102d9d54285643e0ede09d42b6"; + sha256 = "e414f9004ee3ea08c7f7b39817188fe3e3dec51b2cc258b2a8ea28cf273097e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/sk/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sk/firefox-109.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "aec36efc38150057174e6a0365d09898a5c25623b69e39ca479a500952493341"; + sha256 = "97da979bde015cf37c7eb45c78e3abdcf7ca7d92b56c322982d8574c1652b9f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/sl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sl/firefox-109.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "fa9501dd26b4e0d4572c145ab5d54bf469f41f985d1cb7c8448412f275ac6d07"; + sha256 = "016347c5c91e3ff2ceb53782121d8cefa2913464b3876d351cba418bdfe2b30b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/son/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/son/firefox-109.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7fa75a93a584a88f20fe8e90c7e231e39172c0f21fdf183a64e36bdc3a98a2f9"; + sha256 = "7a82c207a3ad9b1a23e3885d94c7844714a59e74ca8441894da6e3873184cc46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/sq/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sq/firefox-109.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9d7208ace7ae100cb1635f2206d5873d4685c0674716255f5c17a303ac9f5187"; + sha256 = "e89444502f35cba552f7ba907fe2ab0aefc9e32cfc9f1d1c826242b131c0a1df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/sr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sr/firefox-109.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "fb210329fb5d8f49251969c88aa563b2fa8abef0a246a450b819cdff4ec2dec5"; + sha256 = "0d6ac85cd35ee3dff23a7f0d1b973acda106516ef81d6b6e1fc7b6065a61c03e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/sv-SE/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sv-SE/firefox-109.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "88f9138ef978a197d1549117824e7d6f790db2fa243308b39bbea38747294da0"; + sha256 = "617d72496a921013702ac3a72c6fbedb8fcb1da2a07f674c7ecfe984816fd783"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/szl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/szl/firefox-109.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "35dd4dcac109ee7ce282eeb34b98ca9f52c48a61295e8d98ade571d634968e97"; + sha256 = "44bb46f6e244f9ea94458ad84dd37545f4d5ddf3b1d7c345e61f256a1a9c8a6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ta/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ta/firefox-109.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "b3aca8c7fdf49e0178e548f9cdd16fbb6a7ef86437469ca66022a786612a9b9e"; + sha256 = "7a36826a160d9de16d87a18dcbd7ac8106dca32d584d79a3eb8c0ba93a06c345"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/te/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/te/firefox-109.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c4e8c6be7ce4b5827c157b5a9313d4be4feed0bb32b4c0fa303d8233e38cd554"; + sha256 = "34fd96347fa0ccda294a2194a4da6f570fe04f3afb19f99369c150273be59fa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/th/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/th/firefox-109.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "24723a85f28c5cd5f1efc9bd6637f4256f4e34e4badefa464ef546984d48a936"; + sha256 = "13e4cb908566d2a0a928df5832f704e4f5d9159bf187b919de05e2ef7dbab6ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/tl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tl/firefox-109.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "33dcf80b737cd3580a5004427e95658418846c59fd1d8743f17cde45518ab474"; + sha256 = "67c3fa7c129d81b16ebbbe422361406f63160f5eb0a896237bc2f2b0b2f314aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/tr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tr/firefox-109.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ee84eabd88a6de1a3e97fbca0cb04fe77366a727af6ac754ee6a5f668e31495f"; + sha256 = "bba8a0982c65fec9dfc86bc8103b01f5a120c199bcb22ecf904106c270686d40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/trs/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/trs/firefox-109.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a91e3152a596ded79dd50cf2c304f63fe10c46813ce312afd866393956fc3f4b"; + sha256 = "452654c105453ff942cbb5a893b411d494fe51cd96a08aaf7a034b12859dfdd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/uk/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uk/firefox-109.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3aacf5eccf9a839a802b870f120ade2babc76ad3935c208317604fbb7f517ccd"; + sha256 = "8f4f152b50df0a968fcaf0d9275b5dcf05efa98133133797874cbdeef1fb6b48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/ur/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ur/firefox-109.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "534e70e0cad2c88fd938f72f27ce08f9bfde6c4b5ee171863c5a1422038bc02e"; + sha256 = "152ae600ea8afc8314eef375436eca52045f0db788ba19142f07f330a4a13445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/uz/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uz/firefox-109.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a68efdfde59ea7406eca684b7cf5c60037568a75c53d783647231cab45e6818e"; + sha256 = "ad7863d60cd8cbdb5eba0eed7d982db15e92a426ea2e403cb002c71b14cf540a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/vi/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/vi/firefox-109.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "aca3d2b8def22ab9c8098ff62f0bf7b56bfaaf04995ebb0c97a5179b909c55b9"; + sha256 = "32cee9d8f484735a3bad323b2a37fb2fc55dad88a4a493eef777473b56aff922"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/xh/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/xh/firefox-109.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a6881b471e96a6b98f3fbae1f73221603e8f019d49d2342b4c1014035ee1fd6b"; + sha256 = "00a6d3877213685e35d175df3684b3024a3e0fbc7b284b1cff8ea25a1ee4cb00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/zh-CN/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-CN/firefox-109.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "1603e76a24926bfe95c6728d0cf0ef250585dc119aa469c8a4441f702e364926"; + sha256 = "75241d745d714ee885d73c802900be3606d236aa08683b4ec56887b918555a2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-x86_64/zh-TW/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-TW/firefox-109.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c1d1950ff259f6eda3d34ab313af38af0fb91a6e7bf884a2a775425033d07640"; + sha256 = "c0ecc79ebb0a989ee976f5c2c9fba5c4d63bf65706635663e2cb83667f7b8a38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ach/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ach/firefox-109.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "56abe1e7bdbf83c421c06fbe2e287d588917178d3a0c0f0094f1f21f8bcfee07"; + sha256 = "319dcfcd2957576f02bfd28a192daf0ce87bea110c782890c4f1c7dec05d591e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/af/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/af/firefox-109.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "781a8f92b12dfb17a8bd1ce7febafbe22c7b28fb340eeee28e94f946d6e9b320"; + sha256 = "14214ec48f3aef6381b3a55827d589505236fd9120df43486a39775aaaeba43d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/an/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/an/firefox-109.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "73d5bc9349edf3173b4f41c9df3c732fe44263198e1a742460894c0db94fdfd8"; + sha256 = "5694505371af1b4589abc4038f7cefe2650b9eb78ef546db83f886ef3ccd6a77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ar/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ar/firefox-109.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "50c943ae795656e4550fab6b1f0e6ee6be0b1c1f301666b99c42b1c5e40b258e"; + sha256 = "ad21038b033aa55b7c520712f4aab50471deecc681454c7a1cc97f7604444878"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ast/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ast/firefox-109.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7c6afa5f7b7d36439573c5e3f1055c0b096e6d9cd222533f9f9b7d9090be88f9"; + sha256 = "7f7ea232c8249535b4f1a4f0443627f115740a39755c43e3b296da494c1705ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/az/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/az/firefox-109.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "317fce57a29265d9488bf9f9a63839e7e25ed2d389a1918d42577f6cd04233d1"; + sha256 = "a37020472cd15d7ecff01ab0a732d26557a3ee665465c54f1e6d623a213f3685"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/be/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/be/firefox-109.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "40efc486d4a3cc6133df414a6b7773438056831660558a42f1a2efa09a738016"; + sha256 = "dd7b9fd2d267b503171d3894c238db5cbbbb003bcde623700abd8ce0d81fb8a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/bg/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bg/firefox-109.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4506c0496d572932085bfe87e5c103795c931051b3e3bb5436db79d2a318f81d"; + sha256 = "c4de3366f58998129beb1def4283fb28bc3b90464a090e3f71198862a8b4af7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/bn/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bn/firefox-109.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "2fbfbec560b24bdedf7b52040aa5caa0955b00ff7d8551d467df458eb8f73e17"; + sha256 = "30e97ca633178bdd4ef10103c5b7795b0f7f5bc97cd3b3d4e2fd01138ad79fb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/br/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/br/firefox-109.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "24355c0756b5d1540d8f160c739ade86e9e8e27d83f0bef4f36a99cb949ae41e"; + sha256 = "f4ed775564c26f45ec26fa7d1b440b30cca17849f144031929cbe1526f7c630b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/bs/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bs/firefox-109.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "abedf170c0126f3990b1fb4d57a95dcba450987c8a80c1ffd121eff5f4f67111"; + sha256 = "d568367dfa066d2b5eb7ab920fd16f0a66de02468cc548df8883baab27ba4e5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ca-valencia/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca-valencia/firefox-109.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "6d65f1dfb996edbee731ecf283fe97e7b74ce8a66916520678ca3c69484c8861"; + sha256 = "b33df0c70b943f857df218064db9f20ca21381f1217322dbfe4e6fd4f2902d95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ca/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca/firefox-109.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "6f548a7b523785a73af8280a7baa7b9ca8a2c39b21c95dd5a49f794df00aee56"; + sha256 = "78b1e2ed95ac41994e35e94d3df2a61306e24268be86c587f6a7cadb5c62b65e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/cak/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cak/firefox-109.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bce493d13f481f0504a4051a45ef74f7fad67031dd25fe9edabbb9674d8c5f46"; + sha256 = "2b9210305ad57917402d0a1eabfb188b70f582c44fbc67b84d09d1c23e18988a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/cs/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cs/firefox-109.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "e282714c83bba9da9ee1c0c69dbd3f8fc30525d5cfc6e6cc81d25e349da8be3e"; + sha256 = "9e4ce61151c0ca0610c83d734bb619d4dce26d40efcf6efb54e42d467a5ae2f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/cy/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cy/firefox-109.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ac2491f7be6dbd675bb752eb2e8af48b9783a3a16786169c5ecebe1b7e77794d"; + sha256 = "5cb9864ef458ef304b7a6b40ad71d8131f1ff3c3a215cfeca4e811e14b362927"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/da/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/da/firefox-109.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2c7af614756a6de3aa2401dc54a2a61b809a0104496d3bcbd2c0de9462e34639"; + sha256 = "0e6ea695300e68b8b6385e6a5e4022e645133ea1205c7d902ce898d59c913cc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/de/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/de/firefox-109.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ace978aac190d5bb19afd962cb0b4221a9c1b5ffdc02b74ac13f389e60d6f366"; + sha256 = "8ff84702ee8f877d9628d96d828e51e7e9cd333307df8ddb2bbf58d5d8805b78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/dsb/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/dsb/firefox-109.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8dfb7fb9dd65bcce11d53899636fe481e56c57ab9f96c0eb9d0be77df61e200a"; + sha256 = "efe721496f5d5567d7ac62d19b0510814c20b6e503c15c1740d50e7fb1a41d44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/el/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/el/firefox-109.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "00fb884e77393bfdde94312cfb7d759b8dc38f7514ce055a8c45d2697ff28f5a"; + sha256 = "95a87e1447dccf05fbab815dcebeaa213501a81c8dca244a2f63a1da300cc22a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/en-CA/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-CA/firefox-109.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "88b9a335a0f1d1aad13868c80444b2569f1d453005051ed23c5fb1dc60a58623"; + sha256 = "a1d3e2f468c8c0776151a7776d6201e39beb37ff845825b1a031b2cf1a04a0da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/en-GB/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-GB/firefox-109.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ec41453c120b5c1e64023d6f45b84792c858aeeca8c5a0ad402f67fd3b98c0a2"; + sha256 = "0952eb1ac27fa387678f1d9f6e64a718462652d823bd630ccb1ef39f26369270"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/en-US/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-US/firefox-109.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "3be27a6ca32732ed28c1f0b23d17811e23f2bc258804d785235d6f587d39ee86"; + sha256 = "793fbbb013c18956806e9e5d1f67de94a649c3cd8d10b3a75bd388b87ddae916"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/eo/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eo/firefox-109.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "aabd8fcdcf126a1282ba6f24adc9cb10c67b298b0fdd945d056349825dea57a9"; + sha256 = "0cbe5fa5f994171a57ac84a4edb9d63adec71bb13709256c99e2b259458eadbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/es-AR/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-AR/firefox-109.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "2eb508ceea57399803c9225dd50a35080c82608f992fc029e0d44f8e39d1e392"; + sha256 = "e6b717709cf8cc3a5dab27b0c1b9082f6d71da77faabeb13248574790a42e1fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/es-CL/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-CL/firefox-109.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "f4861de41a02f356d49d1155ad6b8134707f9ff3ac2778909cbc8c63870d46ef"; + sha256 = "e2c6016a7e50035e8478fb0eadedd67801f0ded948171fc13586ac46d49bc914"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/es-ES/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-ES/firefox-109.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "f71c4e233bb774cea8119f2a704cd32818b0b6b97638a222e61c0c9212c50450"; + sha256 = "2c41f6d48b07e054514aba80b3a396b70316f0fefff8c31301e5f44e3de74209"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/es-MX/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-MX/firefox-109.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a52ed25865f45caac5f05e621f84545da7a14f488a62d7ea2ea6e7f53e6ccdbf"; + sha256 = "b51ed9a76071d56cace6e7aece52efeeefa26dc26e1233fc0e2ad64317c9f4ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/et/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/et/firefox-109.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "95f24a5af92ba1128e40482b37954ebecdbec5252f595cb217bbea5056f8c7ac"; + sha256 = "8094ece309d8c55bf9432425f2a79f29eee565f7d6dc8080986b088007cfdda5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/eu/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eu/firefox-109.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "dca9cc7271bec0952a8da1a2a1f9d95d2be50d24dc4a65aa1a78663d16d61f76"; + sha256 = "07ed9c2af5a7e5ce0452e4fa4da38daf3d20f5f4f6f059dcfb4ac3b7ffc657b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/fa/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fa/firefox-109.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ff145e0a7fcaac3e5770501c9103c3fd53109a971efb30d4f1a5e9234ce6159b"; + sha256 = "0dc870f5bcd2e3411fa6006aed8e2b295d99f6e47e7a3e4a88860d7001401b5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ff/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ff/firefox-109.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "2386ade5034cd327a988eee8352f1d06c0e39f6b8064779709b0be480416d379"; + sha256 = "c319ac17fba19833d16c96f848e0a1e6ddf717922648a7d3776524dc94140b88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/fi/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fi/firefox-109.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e1b908a250a35f81e64b3421c2ac45dca43020b684319e0bc57d25aed3335663"; + sha256 = "98e907dd0d23b45c5f8360e39642e9df062d6c89cb84dea1cd62f70dae2d4d62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/fr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fr/firefox-109.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "184c7d46542ee3ced202e6f38c2790e6cf3cd2940eced78eca17c065370aac36"; + sha256 = "7b56c5b71df91ed86b10a66a30d24ae02ae84d75972ce367c288a27b171082b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/fy-NL/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fy-NL/firefox-109.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d4fe0c82879f57e46c26df52642e2cc23c76062df16f8143e58b19c5a39bca55"; + sha256 = "5edaf14de80f9cdcceea8e2f291425a74f714bac482fd83d046ffab6e5ff4530"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ga-IE/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ga-IE/firefox-109.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "77bc3e8ed744dfc1e86e6815ea7978291b26f895d94d8aeacc9cc4d5d0452c00"; + sha256 = "ea2815b2ed95be115252e25d0a1893a5d9f6865c16e7b8f0acdb6f05e9447f9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/gd/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gd/firefox-109.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "365f5a0541206c0f9fe4de887e526337ae66131623ae0ac66c7ac1247841b579"; + sha256 = "c4da99ff08acd9f6af5975223f8fdc675fca53138b1dd089ce1e5d98641624a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/gl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gl/firefox-109.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "9e7678af7fbdcd765a69bd1813cd880e9f2e234225043b538b8d0beea4ae8910"; + sha256 = "e77e5c5e23dd7cfe8d6310b30c4a1e3302ce0d8e5a7ea332eacf5f8735107ff9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/gn/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gn/firefox-109.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "7471650db1459ae204152262d9610b79fd498b2f0e06ea8ea5b2caa03aefa212"; + sha256 = "97fec0c7a9caa8f598ee28b149e8010f39d649c7beffccaeab56757c0d4312d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/gu-IN/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gu-IN/firefox-109.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5c11d77dd2545fe9c4d107832999c4259d4232af1e523ce6efba58820cd4be0a"; + sha256 = "7d303a03ec303693f627604e3b419d949a8cf7f903ae813d18c2c5449d9480ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/he/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/he/firefox-109.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "98ad8be52761b404c0b669d362c49c8790cd8aafe67abbc4eaa0c326fb55de4b"; + sha256 = "7f64f45a8654aaf4fd8b29f980b01d0746d205baf498734416667cee3ac3e70c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/hi-IN/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hi-IN/firefox-109.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "a4da7c91d56e11f9b7dbbd779a566514fb2985378e0822a858fb68ba6d12d939"; + sha256 = "17446de5dbf9c6fdf7b7967f36c329ffeef97faa1fc4c2fdb64f932da30c759c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/hr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hr/firefox-109.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9e1de928ab92880828c1b4e8f568780392363b8baa7e0f93db9acdf857def05f"; + sha256 = "2059f6e3a10f0bc2f1cff8179d294c75476dbe21b31c5830a7da933a7cd60bb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/hsb/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hsb/firefox-109.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "238ff3f87b3425ea54fc73bf5f0c0aeadbff7428747b5a9218a5945b11d068a3"; + sha256 = "273f47c51638cd3f7dbce9678b52e6a99fba46502bc56587a0eec1b1cbc858ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/hu/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hu/firefox-109.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "eb8823158e91b969aea46811e973585611ce5d4221f1b92c6196b46ba5fd615f"; + sha256 = "d00e86d775419bb5ac5e9016dd839d41dd8fc9ac73cbef71ac01e9f40b1fd752"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/hy-AM/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hy-AM/firefox-109.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "de42d34669f8dfe3f53659aab9acc094794da78301dbceb04abb7e12ebbe15f3"; + sha256 = "e8e877347b98c65294ab695f1074995aa54067b97ab655dcb794b66bff84b7df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ia/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ia/firefox-109.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "322457f09cba1dd38685643e3f5c8ff890054097112745d9319782467d31b384"; + sha256 = "0cdf2c81a5dc30155c67ae1decf3f36377e732f2a8b0529554241a16e9e7a125"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/id/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/id/firefox-109.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b72e6c6b4eece8156e188efd36575f9b433d8ca2c356254c54bf6245e50d4b27"; + sha256 = "92604c3f8e4691bfde59cc9f2f22cb1828d0de5efd5ce58bd2e140016116cfb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/is/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/is/firefox-109.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "637bfee9bbe84257b194fa6d57aa2b3726805b5dc5ec324cf4361948cccfc341"; + sha256 = "d4cd9389342f390786d4045dfff5e81d6a06cbc3d008c3d0e7fe38ad285111c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/it/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/it/firefox-109.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ff8b0a88af76898e323c07dda2756f38a0416cbbae2dbcba53b20d5eb050b47a"; + sha256 = "c8d102823192b2b4ebed1b587c87067738227392df6629f865f5294070018c45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ja/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ja/firefox-109.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b41d6a06811d521b585e027fed4bd1572895c880ae48707ffd6bba54c9c80f94"; + sha256 = "e00c6bc9778d92618ed4349f8006667d249f2d621496a7002853ec51064c0b6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ka/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ka/firefox-109.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "54c66f3fa76920b0244756425fd712c77686a3ee8e44a32434f788a38c770997"; + sha256 = "c0116995e70225b71ca02ace86a571944fe998a748ae6e0c628a2e2525c3d4a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/kab/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kab/firefox-109.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "6619413c322a5923cbfab95ba5190a9d441f4adc83fe57fd496fd185a29e5753"; + sha256 = "c6c4a7a503ff8c136b7c0dff132b3ae63326aa8c4271dd85f8c10f09755d7c23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/kk/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kk/firefox-109.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "e6c12831368405bbd5a1a20d8ae2780813ebfadd254559480a2826ff28f697df"; + sha256 = "d5b185c6676eb01aa6c10e2b604d385cd2bab24ad19a8f561606b46cae1d90c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/km/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/km/firefox-109.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "d771af960fa8ac584a6e6935ea5315416525134ba525249394674e8476ada69d"; + sha256 = "2e3565182881dab53c55af1f02f09fb77f2c60949f7a7c7fa5d43dd69f3d47b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/kn/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kn/firefox-109.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "bcefcd94660e0be805c2d14ddec105d5c60b4bf9b0200a53f7042bab48ec95b5"; + sha256 = "696ad3222dd83d3e5f2351a6b062fde5e6f756403593a37396f95de5db3f6aa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ko/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ko/firefox-109.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6a2ded017635605f1d8f2faae95ceec297abc22dc57ab6db8fd42668ee4bea08"; + sha256 = "fe249e81f407cf7bfffd6bd13d828bfddb805a5ce06a0ee8ea7cb1e9273011cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/lij/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lij/firefox-109.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "18b197e5d832b312be5529cd14e939f74cc233c1aeae186f961881a25615d326"; + sha256 = "a1f8cba2592421e82d4d5a13052d2f48bc3217d91d68cd7699182c40a42c49a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/lt/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lt/firefox-109.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "184f64a74edddf7c1f192dea1191457b2d9436faf1ff0168038f3faf3d2e5221"; + sha256 = "56810f8dcfaf802e9d93f23294d713fd867c48cfd9baf1400a93e0c9dbe09b6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/lv/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lv/firefox-109.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "06d698ec349364ee548999a3739d9ebd4166d27a16e730e437322e3b438ae1e2"; + sha256 = "47d4b1517b101e62e4aa1e39da57ce53792e024fd0ea2ab06e06182cc83636ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/mk/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mk/firefox-109.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "67429316eeac3b605f568da0971321dd9fe51b0b942b527a56e52c7f13720c7e"; + sha256 = "95644ffb52b917a82b5cfa3a15fa8540f310342fbf840aad367f7b7ba2eb2865"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/mr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mr/firefox-109.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0938cf62338a65f6be395706fbcf2ce0cefe732269b40b728b1001de23383d7d"; + sha256 = "5dd79eef34d39d828e0bde386b0a7bc2e34ff65b6e2c84c19c50affd560be86f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ms/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ms/firefox-109.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "96eae9eb57b69cb29abce306228361db299c0d0995e179d26a11685196713df7"; + sha256 = "1c34352dd995aa5593826ec6509a9a571fef56c7cc5492091037797a264c9079"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/my/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/my/firefox-109.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "fade9b50b7707729eabef0e4ef4461af37aee4234069a6efb5f3d1afdcea3625"; + sha256 = "b6a8f8c5ad88ecb6225f7f1a084d207773cf55cfad23ab75bda3b6de2e1a5b8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/nb-NO/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nb-NO/firefox-109.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "22781a6753d44889acbaf0d1e88d0c86972e5b47d36fa1aa6950e67df9dd6f24"; + sha256 = "2bf5f1181ee86090e75679a08e361556facf8c07b06501e8f3c6029798b3334c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ne-NP/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ne-NP/firefox-109.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "24795b6da6633b1f6de4f1b9102dbde4b1177ad9894aa482d68c78915107de71"; + sha256 = "3021f8bf36270a7bc708ed790d628ea624daca8f0023d5abdfb5843b83b0573a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/nl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nl/firefox-109.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "91595a90c6e771fe5d30aac08b39f5d15e458afb4867b33bdc202796f2636276"; + sha256 = "f1928dfca113a782f085890bf9dfafaa9baaef79ed8162ceccd6c90cf38990b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/nn-NO/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nn-NO/firefox-109.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "010d6b1388b385b7a41643739feef519de5e486b4cff0a109c83d973ce08b9e5"; + sha256 = "fcc01179902449f16d6724179378d8d8c251fa4dabec4ca78506b750bf7a157f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/oc/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/oc/firefox-109.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "76a8ccb6d65ede9a4d0d64b9eb1d907853bba544ea417c0abd0143d34194aac3"; + sha256 = "ad48b0b59681fcd32ec5d889c4ccd12c9015a446077baf18516b038d4267ca55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/pa-IN/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pa-IN/firefox-109.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8a307d344d472cf8414bd86880fe1dbd9743d39836fe86e14fdc51abbe15d2a6"; + sha256 = "44e54441e9d082a44eb1b1e3a29d65d75658afbf3b4b04fbea427c4d621fb630"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/pl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pl/firefox-109.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "bee5bbeee0165b18d352b5cfb6ee3e6ab998ddf11052f77fb4f7cbd14881a970"; + sha256 = "fbd8bef9474e6bff05cea3d434b48caacf24b7d74fb7289372cd0ce4d6b3455d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/pt-BR/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-BR/firefox-109.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "04782c1ed890c530498771abdcf10c47e3a954147430f417c2cb9d348ea2666e"; + sha256 = "dcb42a3248e7bdfd6de2325f0aa287e94f6a78705fb8d42d0b94213df4aafd7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/pt-PT/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-PT/firefox-109.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "78ef4f882f913aa8d0afcc009a5eda11206ba4192bfccf335b48ee3cf5d7a5e6"; + sha256 = "95f41a8bd3c7954664fbb42a23d5f5022e36a853d2152ce268f32fb08bc25566"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/rm/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/rm/firefox-109.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8dc4562c4dd39d984a9e889848a281b04e7d00861cb8a42a7ff0bd007cfa54e1"; + sha256 = "8164d8494080384dc4f78823b777e3d2b8a09b163d5e7847304b7edcf421b94b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ro/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ro/firefox-109.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3a643cba7e2842cc9cd41607d69918c651dfd6925c6fd676bd4a356d828fbcf5"; + sha256 = "28269a8aa45459cb0774d1ec859bab026075bc7353f4363b4808c12dac731c35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ru/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ru/firefox-109.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "06ae820981ab243156bd2f23ca7b211abe37ff8e2ce599fbff1375beb9f7a310"; + sha256 = "c1f3f0fd7ad91593ed1ceb34d54225e3c1c16f57017c5a406bd1b91b6f9e321f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/sco/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sco/firefox-109.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "7300fffe8616203fe7281bd5b59ce7f7e38422f71b433b780dd7a76e982806c0"; + sha256 = "9724c6631121e21d9488fcbaa4ae86ea521b5a61dbb0de2e26bf6af9a9b7c68b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/si/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/si/firefox-109.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1af9921b29d867e651ae93f1a1b179f5b8cab85a40730a1eb3cbb3fd1fca8bf8"; + sha256 = "33ff8d8ffd16893f068772c98c115389b0a4286d390709495a811dcef01fb8a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/sk/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sk/firefox-109.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b25e71a2d93fdf6492ee6aabd3334fe76bb7485f317fc897349df4054a36d29b"; + sha256 = "cc34d8293b7166eb96ab4d96cb9bba7e5aa7d4f15f04ddf2d34704c207f48949"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/sl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sl/firefox-109.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d933490dcf276ee4e2a61c7537d6e03cd42ca0e61e8818a4478f4a83d46c6522"; + sha256 = "1cec19b6eba4aad9aa75ea747bb750333b9a0f335adc125eeef95e5b6fa767be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/son/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/son/firefox-109.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a263986678e2c6e309330e6320e2a3b0193a5a27a2eea24cdf4902ef553c5031"; + sha256 = "6b4765482ac58f176a52643df225df8b3458003e14a47cbf18cbb36c7e1f34f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/sq/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sq/firefox-109.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e88768b98f0090b31264f775cc32ce32e8ef929f33b1e250cb2dd5f5fe0ecd5b"; + sha256 = "817fc0345699467e3f4fb1fdbd850361c66ff5c82aaf93ea9a33d1075f72632b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/sr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sr/firefox-109.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "05d08fae3d9a284fb432791555c8434fadfaffffd90ea3b1fe69ccc09794b49d"; + sha256 = "708c949b5f1bb394b493b990bdf1da3cf9bfebcaa6aba549bcd5858b20e8c1f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/sv-SE/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sv-SE/firefox-109.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4912b143f4a527243d13d128f9d3bff516795b58d05c451139ceea0ec3609d1f"; + sha256 = "39c2407ff8b0bc638ab884faa1f6d86bfe071fb143a63fb81229e5312142213b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/szl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/szl/firefox-109.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d47b9ecc61977553c7be966159cb82ca501c7affa5682fb3770b3f8d1645464a"; + sha256 = "15fd363256e36bdfab2bad4d1544c191d74a8d4d4a180c9a7d12b5e64a0f0d8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ta/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ta/firefox-109.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "81fcfec603292745e851a8896cd3c3caef0415c03087c1bfb14d8c102e29edae"; + sha256 = "548693e96ac123f33e12c3016dd7b0e7fbb9f3a403dab9682d4498a6d82a00ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/te/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/te/firefox-109.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "77210e502969bff34024bb6686782319f4a6e500084c78b1275adad701e5028f"; + sha256 = "e01a856488bf18c4d345db891909fe8813649f463bbf1171c2099de03556ba7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/th/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/th/firefox-109.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6b55b5e89a0c336c42b5840558bf7253b193bc7568d34c58405430359e7d7dd0"; + sha256 = "c2320b7f67f35778049023cbef382b208b68a0e18ab133fd806b4081a8c49a3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/tl/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tl/firefox-109.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "4f51e452e71a255b03babcb3dd144a63a40bd4194095b3d3a69a0d86a4e085ba"; + sha256 = "ca5fae50ed972e07a340fd575ff72fb6908e1cf5810e3302fe6de286f2354040"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/tr/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tr/firefox-109.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "21f300244f4680823232a17260f97e42c317b68b04e12f70899c570c107ffb6e"; + sha256 = "b8d9d4c422db8378d3df478dace847e2ce9c7c7a9250fb9f7f10dc3890f33dba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/trs/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/trs/firefox-109.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "70eec318b1b3cbdc4e9f52cd61c95de34f238a2178c84d25d4485ace907e211c"; + sha256 = "b40b8f0c453b6ac332b8869491fa201ef015aeac0d1675dd75e4cdffcb8c406c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/uk/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uk/firefox-109.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "28d0f9addea5dc2f7d9251f63938a17f3c197389b68e09f1f907b3dcdc86093e"; + sha256 = "d0fcdf9bc345bb37906805c123b9f262b14624cf19ff2f25714246d0330818cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/ur/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ur/firefox-109.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "0ff037ccc3ab4cf0237ea4f1a05afdfc2e9b2cbdd8d5fdc4febd7485e2fbcf29"; + sha256 = "e5a34fc5bf63aa6e5ce478204dfd5f598b7ae1af64a52b9b07803b6ab49ece5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/uz/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uz/firefox-109.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c25a9b38d03b4151249c7147bd607227066a87af012af7ef3c379d09fe700ec6"; + sha256 = "dfd51f2d04a3cd1686a7e07860c39d01fe351d8dca6a6952386fd453b8cbc08d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/vi/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/vi/firefox-109.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fca5145827605d2594732e768bc49b70bd20ffa4706ce4bf48373c0a12c11a58"; + sha256 = "338973416fc1724a46ea35725620f0fab14a816914b6d5e1ab6da8cf3edd6733"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/xh/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/xh/firefox-109.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "316e76123e952c1dc03b30468035deb285faa492e2f244704aa967f5ce3d2e90"; + sha256 = "8bdb1fb5e397edc1a66d74306cbaf3eb9ef6bdc547ee77543d9615438f6630a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/zh-CN/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-CN/firefox-109.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "bd9e0d035629181a74a93f5d487a64ca74ca2112dbac980ad7469ed339a43b36"; + sha256 = "9f9a94fd32c7ab92f2ccf149ee6f3422d159151b48451b245eebd5fcf46d1632"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/108.0/linux-i686/zh-TW/firefox-108.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-TW/firefox-109.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "40b6a9d8c16517669067a453b7676cffa43f60e47d4cd116f77994883363c7aa"; + sha256 = "a0b5b5d3774fe3d2717271fdaac2fca1723e20340af4ee93e90e8fe32a8eb6a5"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 0f57ddefe1694..e8deb9fcd9cc7 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -471,6 +471,8 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; + NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; + # tests were disabled in configureFlags doCheck = false; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 37717252cdf35..de0ac8eb7a1dc 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 = "108.0.1"; + version = "109.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "e6219ed6324422ec293ed96868738e056582bb9f7fb82e59362541f3465c6ebca806d26ecd801156b074c3675bd5a22507b1f1fa53eebf82b7dd35f2b1ff0625"; + sha512 = "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7"; }; meta = { @@ -29,11 +29,11 @@ rec { firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; - version = "102.6.0esr"; + version = "102.7.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308"; + sha512 = "2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b"; }; meta = { diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index a46ea32cebf42..0a0eb47b0a192 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-xS6cyramlcItjRBSSunzm39zcGXdX9s/pvi0tsaTkW8="; + hash = "sha256-9onjQ7fRLlL5/1vMtNHjBBcB7Fyk1ERaHg5IwtwbJQg="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 4070556cdce6f..fe510c7fb9d48 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "108.0-1", + "packageVersion": "109.0-1", "source": { - "rev": "108.0-1", - "sha256": "1gfqxlcgf7qxgisbj565ndrfhkk68py2jpwrx7k2j7zpszkb2f4m" + "rev": "109.0-1", + "sha256": "18nd0shx1r2y2gn42sa2jlckcymmnx3fkm4fp58c80gcppslh1fs" }, "firefox": { - "version": "108.0", - "sha512": "fa800f62cca395a51b9a04373a27be48fc3860208e34ecf74d908127638d1eb8c41cf9898be6896777d408127d5c4b7104d9ee89c97da923b2dc6ea32186187e" + "version": "109.0", + "sha512": "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7" } } diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 4dc06cd466b50..d1631feb879a6 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.27"; + version = "2.28"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "sha256-2N3L/O3nzd6Aq+sKI2NY9X+mvrK8+S4QliTpuJb567Q="; + sha256 = "sha256-L9VJmxPe5ZRXwTLBZ7hJXEDe2nU4lInGzMtoMZP0VLQ="; }; buildInputs = with lib; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 3e08b228159c0..9efa3e79dc054 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.4.1.1"; + version = "31.4.2"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-lr8xT9tRxVjg1DxUZuCyWuCFBPPdmkvsnmAsoX8o/6Y="; + sha256 = "sha256-vJhjQfsa05fFNL24tUBHfKoKZG2aLXp5xBdUqqGDtAE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 29f3cbd0b13bc..5441c7a58cbdd 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -1,14 +1,14 @@ -{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib, p7zip }: +{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }: mkYarnPackage rec { pname = "vieb"; - version = "7.2.0"; + version = "9.5.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-4iokmUzs72aVHb95D98ZITRygn4gGAc/K+M5uMnF2NM="; + sha256 = "sha256-SWHjzrEvRlTn4HJnT81Le4KsFDypN3QH3F/z7zZ8p3E="; }; packageJSON = ./package.json; @@ -37,8 +37,6 @@ mkYarnPackage rec { unlink $out/libexec/vieb/deps/vieb/node_modules ln -s $out/libexec/vieb/node_modules $out/libexec/vieb/deps/vieb/node_modules - find $out/libexec/vieb/node_modules/7zip-bin -name 7za -exec ln -s -f ${p7zip}/bin/7za {} ';' - install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop pushd $out/libexec/vieb/node_modules/vieb/app/img/icons @@ -48,7 +46,8 @@ mkYarnPackage rec { popd makeWrapper ${electron}/bin/electron $out/bin/vieb \ - --add-flags $out/libexec/vieb/node_modules/vieb/app + --add-flags $out/libexec/vieb/node_modules/vieb/app \ + --set npm_package_version ${version} ''; distPhase = ":"; # disable useless $out/tarballs directory diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index 0e518f5ef4afa..d9ce8e30269c8 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,20 +1,16 @@ { "name": "vieb", "productName": "Vieb", - "version": "7.1.2", + "version": "9.5.0", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { - "build": "node build.js", - "buildall": "node build.js --linux --win --mac", - "buildlinux": "node build.js --linux", - "buildmac": "node build.js --mac", - "buildwin": "node build.js --win", "dev": "electron app --datafolder=./ViebData/", "fix": "eslint --fix app .eslintrc.js build.js", "lint": "eslint app .eslintrc.js build.js", "start": "electron app", - "test": "TZ=UTC jest --testEnvironment jsdom --coverage --collectCoverageFrom 'app/**/*.js' -u && npm run lint && echo 'All good :)'" + "test": "TZ=UTC jest --testEnvironment jsdom --coverage --collectCoverageFrom 'app/**/*.js' -u", + "test:all": "npm run test && npm run lint && echo 'All good :)'" }, "repository": "https://github.com/Jelmerro/Vieb", "homepage": "https://vieb.dev", @@ -26,20 +22,28 @@ ], "author": "Jelmer van Arnhem", "email": "Jelmerro@users.noreply.github.com", + "funding": "https://github.com/sponsors/Jelmerro/", "license": "GPL-3.0-or-later", "devDependencies": { - "electron": "17.0.1", - "electron-builder": "22.14.13", - "eslint": "8.9.0", + "electron": "22.0.0", + "electron-builder": "24.0.0-alpha.7", + "eslint": "8.29.0", "eslint-plugin-sort-keys": "2.3.5", - "jest": "27.5.1", - "jest-environment-jsdom": "27.5.1" + "jest": "29.3.1", + "jest-environment-jsdom": "29.3.1", + "terser-webpack-plugin": "5.3.6", + "webpack": "5.75.0", + "webpack-cli": "5.0.1", + "webpack-node-externals": "3.0.0" }, "dependencies": { - "7zip-bin": "5.1.1", - "@cliqz/adblocker-electron": "1.23.6", - "@cliqz/adblocker-electron-preload": "1.23.6", - "is-svg": "4.3.2", - "rimraf": "3.0.2" + "@cliqz/adblocker-electron": "1.25.1", + "@cliqz/adblocker-electron-preload": "1.25.1", + "@mozilla/readability": "0.4.2", + "darkreader": "4.9.58", + "highlight.js": "11.7.0", + "jsdom": "20.0.3", + "marked": "4.2.4", + "picomatch": "2.3.1" } } diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 4f5254819b168..135587f6b47ef 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -2,172 +2,169 @@ # yarn lockfile v1 -"7zip-bin@5.1.1", "7zip-bin@~5.1.1": +"7zip-bin@~5.1.1": version "5.1.1" resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== "@ampproject/remapping@^2.1.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34" - integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg== + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== dependencies: - "@jridgewell/trace-mapping" "^0.3.0" + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" - integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== dependencies: - "@babel/highlight" "^7.16.7" + "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" - integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== +"@babel/compat-data@^7.20.5": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" + integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== -"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" - integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== +"@babel/core@^7.11.6", "@babel/core@^7.12.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" + integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== dependencies: "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.7" - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.8" - "@babel/parser" "^7.17.8" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.7" + "@babel/helpers" "^7.20.7" + "@babel/parser" "^7.20.7" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.1.2" + json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.7.2": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" - integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w== +"@babel/generator@^7.20.7", "@babel/generator@^7.7.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" + integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== dependencies: - "@babel/types" "^7.17.0" + "@babel/types" "^7.20.7" + "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" - source-map "^0.5.0" -"@babel/helper-compilation-targets@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" - integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== +"@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" + "@babel/compat-data" "^7.20.5" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.21.3" + lru-cache "^5.1.1" semver "^6.3.0" -"@babel/helper-environment-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" - integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== - dependencies: - "@babel/helper-get-function-arity" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" - integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-module-imports@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" - integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-module-transforms@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" - integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw== - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.17.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== - -"@babel/helper-simple-access@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" - integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== - dependencies: - "@babel/types" "^7.17.0" - -"@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" - integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-validator-identifier@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" - integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== - -"@babel/helper-validator-option@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" - integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== - -"@babel/helpers@^7.17.8": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106" - integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw== - dependencies: - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - -"@babel/highlight@^7.16.7": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" - integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + +"@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== + dependencies: + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" + +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-transforms@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz#7a6c9a1155bef55e914af574153069c9d9470c43" + integrity sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA== + 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.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== + +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== + dependencies: + "@babel/types" "^7.20.2" + +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== + +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== + +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + +"@babel/helpers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" + integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== + dependencies: + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" + +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== + dependencies: + "@babel/helper-validator-identifier" "^7.18.6" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" - integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" + integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -204,6 +201,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-jsx@^7.7.2": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" + integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" @@ -254,43 +258,44 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" - integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/template@^7.16.7", "@babel/template@^7.3.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" - integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/traverse@^7.17.3", "@babel/traverse@^7.7.2": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" - integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.3" - "@babel/types" "^7.17.0" + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7" + integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.19.0" + +"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" + +"@babel/traverse@^7.20.7", "@babel/traverse@^7.7.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz#114f992fa989a390896ea72db5220780edab509c" + integrity sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@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.7" + "@babel/types" "^7.20.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== +"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: - "@babel/helper-validator-identifier" "^7.16.7" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -298,52 +303,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.23.6", "@cliqz/adblocker-content@^1.23.7": - version "1.23.7" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.23.7.tgz#21a1035e479d8f4dc4e7ecc2500cf8a4149eaace" - integrity sha512-tgCFcWhBty+WI3ObYBLDk56i1G7nScd5TBAOXlQf2EIbVJ+DC+G0YE91YHhQpzfy4ySI/wRGyEHrKzTRgmkuKQ== +"@cliqz/adblocker-content@^1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.1.tgz#da81e7838e288a6f0fdb8a97a0df8169accb74a1" + integrity sha512-7gl2VdNPBfj7aPoq34B5miwGcnda/7LCr+BqnpcSOjdLV6jjT2FrNSAKGFvcH23q0HM1IFhYDV6ydTgsdWFCnA== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.23.7" + "@cliqz/adblocker-extended-selectors" "^1.25.1" -"@cliqz/adblocker-electron-preload@1.23.6": - version "1.23.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.6.tgz#7f8db3df95afb385917df00ec5300847448437d1" - integrity sha512-xVBrIqfvcuh2Y07ZkEogzgkyqJuZvOqhRoFnuTyW2q97AmWAGLT6IjEGjl/vX7vMP0Y1b8wubdjI3VHnKvNKDg== +"@cliqz/adblocker-electron-preload@1.25.1", "@cliqz/adblocker-electron-preload@^1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.1.tgz#83bd59d8e94436c451af3525d9902fa5fa1be3ab" + integrity sha512-edNVEqGrXqe/Qwi0D9/V8xmtyeJlhNPaelXilYa1ne7jG/OT7pee+7Vi4BWezl0NQ77WF3/mY9Bj4eJkEO0uiQ== dependencies: - "@cliqz/adblocker-content" "^1.23.6" + "@cliqz/adblocker-content" "^1.25.1" -"@cliqz/adblocker-electron-preload@^1.23.6": - version "1.23.7" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.7.tgz#6aff5198c518c2d35f67a34bd213664a2a86e3ae" - integrity sha512-bGWf4r5q4savAGs3Kl4aR7XBH4J9AmrErDmcYu+tJk9V3rhTGXUi29kMl0D5x2JimhRmnKOeJ/Q2GJSUjvnmsg== +"@cliqz/adblocker-electron@1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.1.tgz#44d9034e35c78938a772b10f8096df55a4accc41" + integrity sha512-CKStwRTR2L78EjgmuUpLKkV9s/uVnwQNGr7I/hyMkEROXbGdrN7P5LhwO+kkewccZ+3JtE509PBmZAp0EP71dw== dependencies: - "@cliqz/adblocker-content" "^1.23.7" - -"@cliqz/adblocker-electron@1.23.6": - version "1.23.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.23.6.tgz#e550f2ffa2b5d0404d0090c3870d0a849d3cd5d8" - integrity sha512-wzkCfBCo5RvRanzsVOu65xHW9GAUDqsg+tP8GYld6/hgMMb96KJZJVpvrvwvsneAm9T55QE4ef1utZbIIwltqA== - dependencies: - "@cliqz/adblocker" "^1.23.6" - "@cliqz/adblocker-electron-preload" "^1.23.6" + "@cliqz/adblocker" "^1.25.1" + "@cliqz/adblocker-electron-preload" "^1.25.1" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.23.7": - version "1.23.7" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.23.7.tgz#4782829c97b7ed229789a14d4e39b2339825077d" - integrity sha512-3y1eeHHZS3qvvv3dDZDjVVr6g03GeUBbDExCW/GOiHdo+qKYmM2K40EaLN+Upzc2ppuum9UKvzsHxG8Hs9R/kQ== +"@cliqz/adblocker-extended-selectors@^1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.1.tgz#cfac0080952311399805fe153cd9e7e1331b3c6d" + integrity sha512-4MdMe/YfIok5d8WYVcLR3Ak7vGrmeUV47frgmXEe945luY93vwlzk1NiLYW1JM5Gdm+VePweoS9cJ1/QUTmv+Q== -"@cliqz/adblocker@^1.23.6": - version "1.23.7" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.23.7.tgz#d439fe8b62d2789c274b5e124cddb930de25f59a" - integrity sha512-HUvC7CcmNbcIftcRhFeuQhHSpyNdOVdXazXDL0+avvWR0cxlI9zcC8yHMRKjxeY6nsiOXdyEFby+V5KgJvfwaQ== +"@cliqz/adblocker@^1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.1.tgz#4d3e8894ce48ad0d0f8b26a4a1003f0676b7f734" + integrity sha512-1C1/ELI94/XewdUj/o1+Q4ziOigMvTZQA05UERfDoKqpJ+0cbrEF/UImrzpX7n+kYsR7xTJvmf+iNM3zS0tfsg== dependencies: - "@cliqz/adblocker-content" "^1.23.7" - "@cliqz/adblocker-extended-selectors" "^1.23.7" + "@cliqz/adblocker-content" "^1.25.1" + "@cliqz/adblocker-extended-selectors" "^1.25.1" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.180" + "@types/chrome" "^0.0.197" "@types/firefox-webext-browser" "^94.0.0" tldts-experimental "^5.6.21" @@ -355,56 +353,124 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.13.0": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" - integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== +"@discoveryjs/json-ext@^0.5.0": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + +"@electron/asar@^3.2.1": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.2.tgz#f6ae4eb4343ad00b994c40db3f09f71f968ff9c0" + integrity sha512-32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + +"@electron/get@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" + integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" - got "^9.6.0" + got "^11.8.5" progress "^2.0.3" semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: global-agent "^3.0.0" - global-tunnel-ng "^2.7.1" -"@electron/universal@1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37" - integrity sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag== +"@electron/notarize@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz#38056a629e5a0b5fd56c975c4828c0f74285b644" + integrity sha512-9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ== dependencies: + debug "^4.1.1" + fs-extra "^9.0.1" + +"@electron/osx-sign@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz#8e91442846471636ca0469426a82b253b9170151" + integrity sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g== + dependencies: + compare-version "^0.1.2" + debug "^4.3.4" + fs-extra "^10.0.0" + isbinaryfile "^4.0.8" + minimist "^1.2.6" + plist "^3.0.5" + +"@electron/rebuild@^3.2.10": + version "3.2.10" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz#adc9443179709d4e4b93a68fac6a08b9a3b9e5e6" + integrity sha512-SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg== + dependencies: + "@malept/cross-spawn-promise" "^2.0.0" + chalk "^4.0.0" + debug "^4.1.1" + detect-libc "^2.0.1" + fs-extra "^10.0.0" + got "^11.7.0" + lzma-native "^8.0.5" + node-abi "^3.0.0" + node-api-version "^0.1.4" + node-gyp "^9.0.0" + ora "^5.1.0" + semver "^7.3.5" + tar "^6.0.5" + yargs "^17.0.1" + +"@electron/universal@1.3.4": + version "1.3.4" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777" + integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg== + dependencies: + "@electron/asar" "^3.2.1" "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.0.3" debug "^4.3.1" - dir-compare "^2.4.0" + dir-compare "^3.0.0" fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" -"@eslint/eslintrc@^1.1.0": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6" - integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ== +"@eslint/eslintrc@^1.3.3": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63" + integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.1" - globals "^13.9.0" + espree "^9.4.0" + globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" - minimatch "^3.0.4" + minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@humanwhocodes/config-array@^0.9.2": - version "0.9.5" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" - integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw== +"@gar/promisify@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== + +"@humanwhocodes/config-array@^0.11.6": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" + integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" - minimatch "^3.0.4" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" @@ -427,192 +493,245 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba" - integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg== +"@jest/console@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz#3e3f876e4e47616ea3b1464b9fbda981872e9583" + integrity sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.5.1" - jest-util "^27.5.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" slash "^3.0.0" -"@jest/core@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626" - integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ== - dependencies: - "@jest/console" "^27.5.1" - "@jest/reporters" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" +"@jest/core@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz#bff00f413ff0128f4debec1099ba7dcd649774a1" + integrity sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw== + dependencies: + "@jest/console" "^29.3.1" + "@jest/reporters" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - emittery "^0.8.1" + ci-info "^3.2.0" exit "^0.1.2" graceful-fs "^4.2.9" - jest-changed-files "^27.5.1" - jest-config "^27.5.1" - jest-haste-map "^27.5.1" - jest-message-util "^27.5.1" - jest-regex-util "^27.5.1" - jest-resolve "^27.5.1" - jest-resolve-dependencies "^27.5.1" - jest-runner "^27.5.1" - jest-runtime "^27.5.1" - jest-snapshot "^27.5.1" - jest-util "^27.5.1" - jest-validate "^27.5.1" - jest-watcher "^27.5.1" + jest-changed-files "^29.2.0" + jest-config "^29.3.1" + jest-haste-map "^29.3.1" + jest-message-util "^29.3.1" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-resolve-dependencies "^29.3.1" + jest-runner "^29.3.1" + jest-runtime "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" + jest-watcher "^29.3.1" micromatch "^4.0.4" - rimraf "^3.0.0" + pretty-format "^29.3.1" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74" - integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA== +"@jest/environment@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6" + integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag== dependencies: - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/fake-timers" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" - jest-mock "^27.5.1" + jest-mock "^29.3.1" -"@jest/fake-timers@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74" - integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ== +"@jest/expect-utils@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6" + integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g== + dependencies: + jest-get-type "^29.2.0" + +"@jest/expect@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz#456385b62894349c1d196f2d183e3716d4c6a6cd" + integrity sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg== dependencies: - "@jest/types" "^27.5.1" - "@sinonjs/fake-timers" "^8.0.1" + expect "^29.3.1" + jest-snapshot "^29.3.1" + +"@jest/fake-timers@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67" + integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A== + dependencies: + "@jest/types" "^29.3.1" + "@sinonjs/fake-timers" "^9.1.2" "@types/node" "*" - jest-message-util "^27.5.1" - jest-mock "^27.5.1" - jest-util "^27.5.1" + jest-message-util "^29.3.1" + jest-mock "^29.3.1" + jest-util "^29.3.1" -"@jest/globals@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b" - integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q== +"@jest/globals@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz#92be078228e82d629df40c3656d45328f134a0c6" + integrity sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q== dependencies: - "@jest/environment" "^27.5.1" - "@jest/types" "^27.5.1" - expect "^27.5.1" + "@jest/environment" "^29.3.1" + "@jest/expect" "^29.3.1" + "@jest/types" "^29.3.1" + jest-mock "^29.3.1" -"@jest/reporters@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04" - integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw== +"@jest/reporters@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz#9a6d78c109608e677c25ddb34f907b90e07b4310" + integrity sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" + "@jridgewell/trace-mapping" "^0.3.15" "@types/node" "*" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" - glob "^7.1.2" + glob "^7.1.3" graceful-fs "^4.2.9" istanbul-lib-coverage "^3.0.0" istanbul-lib-instrument "^5.1.0" istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.1.3" - jest-haste-map "^27.5.1" - jest-resolve "^27.5.1" - jest-util "^27.5.1" - jest-worker "^27.5.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" + jest-worker "^29.3.1" slash "^3.0.0" - source-map "^0.6.0" string-length "^4.0.1" - terminal-link "^2.0.0" - v8-to-istanbul "^8.1.0" + strip-ansi "^6.0.0" + v8-to-istanbul "^9.0.1" -"@jest/source-map@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf" - integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg== +"@jest/schemas@^29.0.0": + version "29.0.0" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a" + integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA== dependencies: + "@sinclair/typebox" "^0.24.1" + +"@jest/source-map@^29.2.0": + version "29.2.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744" + integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ== + dependencies: + "@jridgewell/trace-mapping" "^0.3.15" callsites "^3.0.0" graceful-fs "^4.2.9" - source-map "^0.6.0" -"@jest/test-result@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb" - integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag== +"@jest/test-result@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz#92cd5099aa94be947560a24610aa76606de78f50" + integrity sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw== dependencies: - "@jest/console" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^29.3.1" + "@jest/types" "^29.3.1" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b" - integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ== +"@jest/test-sequencer@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz#fa24b3b050f7a59d48f7ef9e0b782ab65123090d" + integrity sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA== dependencies: - "@jest/test-result" "^27.5.1" + "@jest/test-result" "^29.3.1" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-runtime "^27.5.1" + jest-haste-map "^29.3.1" + slash "^3.0.0" -"@jest/transform@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409" - integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw== +"@jest/transform@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d" + integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug== dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^27.5.1" + "@babel/core" "^7.11.6" + "@jest/types" "^29.3.1" + "@jridgewell/trace-mapping" "^0.3.15" babel-plugin-istanbul "^6.1.1" chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" + convert-source-map "^2.0.0" + fast-json-stable-stringify "^2.1.0" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-regex-util "^27.5.1" - jest-util "^27.5.1" + jest-haste-map "^29.3.1" + jest-regex-util "^29.2.0" + jest-util "^29.3.1" micromatch "^4.0.4" pirates "^4.0.4" slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" + write-file-atomic "^4.0.1" -"@jest/types@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80" - integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw== +"@jest/types@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3" + integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA== dependencies: + "@jest/schemas" "^29.0.0" "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" "@types/node" "*" - "@types/yargs" "^16.0.0" + "@types/yargs" "^17.0.8" chalk "^4.0.0" -"@jridgewell/resolve-uri@^3.0.3": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c" - integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew== - -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.11" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" - integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.0": - version "0.3.4" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" - integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ== +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== dependencies: - "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.14" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.17" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" @@ -621,6 +740,13 @@ dependencies: cross-spawn "^7.0.1" +"@malept/cross-spawn-promise@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" + integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg== + dependencies: + cross-spawn "^7.0.1" + "@malept/flatpak-bundler@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" @@ -631,6 +757,48 @@ lodash "^4.17.15" tmp-promise "^3.0.2" +"@mozilla/readability@0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@mozilla/readability/-/readability-0.4.2.tgz#a425f3dccdbe777d45a4e791bd703ebe633ebb87" + integrity sha512-48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.8": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@npmcli/fs@^2.1.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" + integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== + dependencies: + "@gar/promisify" "^1.1.3" + semver "^7.3.5" + +"@npmcli/move-file@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" + integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + "@remusao/guess-url-type@^1.1.2": version "1.2.1" resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz#b3e7c32abdf98d0fb4f93cc67cad580b5fe4ba57" @@ -666,46 +834,46 @@ resolved "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.1.tgz#755d09f8a007476334e611f42719b2d581f00720" integrity sha512-yvwa+aCyYI/UjeD39BnpMypG8N06l86wIDW1/PAc6ihBRnodIfZDwccxQN3n1t74wduzaz74m4ZMHZnB06567Q== -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@sinclair/typebox@^0.24.1": + version "0.24.51" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" + integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA== + +"@sindresorhus/is@^4.0.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== "@sinonjs/commons@^1.7.0": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" - integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== + version "1.8.6" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" + integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== dependencies: type-detect "4.0.8" -"@sinonjs/fake-timers@^8.0.1": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7" - integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg== +"@sinonjs/fake-timers@^9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" + integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== dependencies: "@sinonjs/commons" "^1.7.0" -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== dependencies: - defer-to-connect "^1.0.1" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + defer-to-connect "^2.0.0" "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": - version "7.1.19" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" - integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== +"@types/babel__core@^7.1.14": + version "7.1.20" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359" + integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -728,17 +896,27 @@ "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" - integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": + version "7.18.3" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" + integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.180": - version "0.0.180" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.180.tgz#b7fb831848f6b6c49abffd85410b73037c02381e" - integrity sha512-A/CuuKAaHq2CHEpYBAtl0lp2ib7TTXK7VjJI4q+c+1U/HDvZLJ8IlsdEDzzHdvkNdh36bGONxrMnO9YZrKqbAw== +"@types/cacheable-request@^6.0.1": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" + integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "^3.1.4" + "@types/node" "*" + "@types/responselike" "^1.0.0" + +"@types/chrome@^0.0.197": + version "0.0.197" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz#c1b50cdb72ee40f9bc1411506031a9f8a925ab35" + integrity sha512-m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -750,6 +928,32 @@ dependencies: "@types/ms" "*" +"@types/eslint-scope@^3.7.3": + version "3.7.4" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" + integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "8.4.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb" + integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== + +"@types/estree@^0.0.51": + version "0.0.51" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" + integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== + "@types/filesystem@*": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz#307df7cc084a2293c3c1a31151b178063e0a8edf" @@ -782,7 +986,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graceful-fs@^4.1.2": +"@types/graceful-fs@^4.1.3": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== @@ -790,9 +994,14 @@ "@types/node" "*" "@types/har-format@*": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.8.tgz#e6908b76d4c88be3db642846bb8b455f0bfb1c4e" - integrity sha512-OP6L9VuZNdskgNN3zFQQ54ceYD8OLq5IbqO4VK91ORLfOm7WdT/CiT/pHEBSQEqCInJ2y3O6iCm/zGtPElpgJQ== + version "1.2.10" + resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.10.tgz#7b4e1e0ada4d17684ac3b05d601a4871cfab11fc" + integrity sha512-o0J30wqycjF5miWDKYKKzzOU1ZTLuA42HZ4HE7/zqTOc/jTLdQ5NhYWvsRQo45Nfi1KHoRdNhteSI4BAxTF1Pg== + +"@types/http-cache-semantics@*": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" + integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.4" @@ -813,10 +1022,31 @@ dependencies: "@types/istanbul-lib-report" "*" +"@types/jsdom@^20.0.0": + version "20.0.1" + resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808" + integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ== + dependencies: + "@types/node" "*" + "@types/tough-cookie" "*" + parse5 "^7.0.0" + +"@types/json-schema@*", "@types/json-schema@^7.0.8": + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + +"@types/keyv@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== + dependencies: + "@types/node" "*" + "@types/minimatch@*": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" - integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" + integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== "@types/ms@*": version "0.7.31" @@ -824,14 +1054,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "17.0.22" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.22.tgz#38b6c4b9b2f3ed9f2e376cce42a298fb2375251e" - integrity sha512-8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw== + version "18.11.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz#5c009e1d9c38f4a2a9d45c0b0c493fe6cdb4bcb5" + integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng== -"@types/node@^14.6.2": - version "14.18.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" - integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== +"@types/node@^16.11.26": + version "16.18.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz#d7415ef18c94f8d4e4a82ebcc8b8999f965d8920" + integrity sha512-XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w== "@types/plist@^3.0.1": version "3.0.2" @@ -842,85 +1072,265 @@ xmlbuilder ">=11.0.1" "@types/prettier@^2.1.5": - version "2.4.4" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz#5d9b63132df54d8909fce1c3f8ca260fdd693e17" - integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== + version "2.7.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" + integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== + +"@types/responselike@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + dependencies: + "@types/node" "*" "@types/stack-utils@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== +"@types/tough-cookie@*": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" + integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== + "@types/verror@^1.10.3": - version "1.10.5" - resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz#2a1413aded46e67a1fe2386800e291123ed75eb1" - integrity sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw== + version "1.10.6" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" + integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== "@types/yargs-parser@*": version "21.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== -"@types/yargs@^16.0.0": - version "16.0.4" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" - integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== +"@types/yargs@^17.0.16", "@types/yargs@^17.0.8": + version "17.0.17" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz#5672e5621f8e0fca13f433a8017aae4b7a2a03e7" + integrity sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g== dependencies: "@types/yargs-parser" "*" -"@types/yargs@^17.0.1": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" - integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA== +"@types/yauzl@^2.9.1": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" + integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== dependencies: - "@types/yargs-parser" "*" + "@types/node" "*" -abab@^2.0.3, abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== +"@webassemblyjs/ast@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + +"@webassemblyjs/floating-point-hex-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + +"@webassemblyjs/helper-api-error@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + +"@webassemblyjs/helper-buffer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== + +"@webassemblyjs/helper-numbers@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== + +"@webassemblyjs/helper-wasm-section@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + +"@webassemblyjs/ieee754@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== + +"@webassemblyjs/wasm-edit@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-wasm-section" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-opt" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + "@webassemblyjs/wast-printer" "1.11.1" + +"@webassemblyjs/wasm-gen@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wasm-opt@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + +"@webassemblyjs/wasm-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wast-printer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f" + integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A== -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== +"@webpack-cli/info@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0" + integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA== + +"@webpack-cli/serve@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8" + integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw== + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +abab@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + +abbrev@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +acorn-globals@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" + integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" + acorn "^8.1.0" + acorn-walk "^8.0.2" + +acorn-import-assertions@^1.7.6: + version "1.8.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== -acorn-jsx@^5.3.1: +acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-walk@^7.1.1: - version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" - integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== - -acorn@^7.1.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== +acorn-walk@^8.0.2: + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^8.2.4, acorn@^8.7.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" - integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== +acorn@^8.1.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1: + version "8.8.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== -agent-base@6: +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== dependencies: debug "4" -ajv-keywords@^3.4.1: +agentkeepalive@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4: +ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -930,13 +1340,6 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - ansi-escapes@^4.2.1: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" @@ -969,49 +1372,65 @@ ansi-styles@^5.0.0: integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== anymatch@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e" - integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw== +app-builder-bin@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" + integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@22.14.13: - version "22.14.13" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.13.tgz#c1f5b6afc86596357598bb90b69eef06c7c2eeb3" - integrity sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg== +app-builder-lib@24.0.0-alpha.7: + version "24.0.0-alpha.7" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.7.tgz#fe798994f89cfa7f8e6ebfce8e73a816ba32ae16" + integrity sha512-kEzDjym0AV9pO4SX8+RaJX9fmxrrKlDzHxqAN7cxSgDM8BUneMJqeWtf9+Hqv6PMXAvpnRsrSHtNaYgDkhQdFA== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.0.5" + "@electron/notarize" "^1.2.3" + "@electron/osx-sign" "^1.0.4" + "@electron/rebuild" "^3.2.10" + "@electron/universal" "1.3.4" "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.14.13" - builder-util-runtime "8.9.2" + builder-util "24.0.0-alpha.6" + builder-util-runtime "9.1.2-alpha.1" chromium-pickle-js "^0.2.0" - debug "^4.3.2" - ejs "^3.1.6" - electron-osx-sign "^0.5.0" - electron-publish "22.14.13" + debug "^4.3.4" + ejs "^3.1.8" + electron-publish "24.0.0-alpha.6" form-data "^4.0.0" - fs-extra "^10.0.0" - hosted-git-info "^4.0.2" + fs-extra "^10.1.0" + hosted-git-info "^4.1.0" is-ci "^3.0.0" - isbinaryfile "^4.0.8" + isbinaryfile "^5.0.0" js-yaml "^4.1.0" lazy-val "^1.0.5" - minimatch "^3.0.4" - read-config-file "6.2.0" + minimatch "^5.1.1" + read-config-file "6.3.2" sanitize-filename "^1.6.3" - semver "^7.3.5" + semver "^7.3.8" + tar "^6.1.12" temp-file "^3.4.0" +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -1024,22 +1443,10 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -asar@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" - integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== astral-regex@^2.0.0: version "2.0.0" @@ -1051,31 +1458,30 @@ async-exit-hook@^2.0.1: resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== -async@0.9.x: - version "0.9.2" - resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" - integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= +async@^3.2.3: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== at-least-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -babel-jest@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" - integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg== +babel-jest@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44" + integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA== dependencies: - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/transform" "^29.3.1" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^27.5.1" + babel-preset-jest "^29.2.0" chalk "^4.0.0" graceful-fs "^4.2.9" slash "^3.0.0" @@ -1091,14 +1497,14 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e" - integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ== +babel-plugin-jest-hoist@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094" + integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" - "@types/babel__core" "^7.0.0" + "@types/babel__core" "^7.1.14" "@types/babel__traverse" "^7.0.6" babel-preset-current-node-syntax@^1.0.0: @@ -1119,12 +1525,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81" - integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag== +babel-preset-jest@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc" + integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA== dependencies: - babel-plugin-jest-hoist "^27.5.1" + babel-plugin-jest-hoist "^29.2.0" babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: @@ -1137,6 +1543,15 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== +bl@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + bluebird-lst@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" @@ -1144,7 +1559,7 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.0, bluebird@^3.5.5: +bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -1154,20 +1569,6 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -boxen@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - 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" - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1176,28 +1577,29 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.1: +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + +braces@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" -browser-process-hrtime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" - integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== - -browserslist@^4.17.5: - version "4.20.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" - integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== +browserslist@^4.14.5, browserslist@^4.21.3: + version "4.21.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" + integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== dependencies: - caniuse-lite "^1.0.30001317" - electron-to-chromium "^1.4.84" - escalade "^3.1.1" - node-releases "^2.0.2" - picocolors "^1.0.0" + caniuse-lite "^1.0.30001400" + electron-to-chromium "^1.4.251" + node-releases "^2.0.6" + update-browserslist-db "^1.0.9" bser@2.1.1: version "2.1.1" @@ -1206,40 +1608,22 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -buffer-alloc-unsafe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" - integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - -buffer-alloc@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" - integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== - dependencies: - buffer-alloc-unsafe "^1.1.0" - buffer-fill "^1.0.0" - buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - -buffer-equal@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== -buffer-fill@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" - integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= +buffer-equal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" + integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg== buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer@^5.1.0: +buffer@^5.1.0, buffer@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -1247,49 +1631,78 @@ buffer@^5.1.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.9.2: - version "8.9.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28" - integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A== +builder-util-runtime@9.1.2-alpha.1: + version "9.1.2-alpha.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.2-alpha.1.tgz#378bf1194325a9b362ccd2c32c8af46ee95f7c94" + integrity sha512-4sbKIB0N9J/pvixX9HYUyRtMZT+cN+bgPJ5NqejyqSPxFzj7IFe1A9K14l5nnfpMVxzUSZVQMerniDeGszZ9OA== dependencies: - debug "^4.3.2" + debug "^4.3.4" sax "^1.2.4" -builder-util@22.14.13: - version "22.14.13" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.13.tgz#41b5b7b4ee53aff4e09cc007fb144522598f3ce6" - integrity sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA== +builder-util@24.0.0-alpha.6: + version "24.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.6.tgz#777977507a6f83eb55d2ffbc560f597b5b47269b" + integrity sha512-vSnVMyuZK0RArELPk1dLUdcunZ2Gj0mpAFat73yD5djiihNosXIpIbSO/OFTi2/MV0urlH0giU4DOs9EXaCKtA== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" - app-builder-bin "3.7.1" + app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "8.9.2" - chalk "^4.1.1" + builder-util-runtime "9.1.2-alpha.1" + chalk "^4.1.2" cross-spawn "^7.0.3" - debug "^4.3.2" - fs-extra "^10.0.0" + debug "^4.3.4" + fs-extra "^10.1.0" http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" is-ci "^3.0.0" js-yaml "^4.1.0" source-map-support "^0.5.19" stat-mode "^1.0.0" temp-file "^3.4.0" -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== +cacache@^16.1.0: + version "16.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" + integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== + dependencies: + "@npmcli/fs" "^2.1.0" + "@npmcli/move-file" "^2.0.0" + chownr "^2.0.0" + fs-minipass "^2.1.0" + glob "^8.0.1" + infer-owner "^1.0.4" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^9.0.0" + tar "^6.1.11" + unique-filename "^2.0.0" + +cacheable-lookup@^5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" + integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== + +cacheable-request@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" + integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" http-cache-semantics "^4.0.0" - keyv "^3.0.0" + keyv "^4.0.0" lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" + normalize-url "^6.0.1" + responselike "^2.0.0" callsites@^3.0.0: version "3.1.0" @@ -1306,10 +1719,10 @@ camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001317: - version "1.0.30001319" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz#eb4da4eb3ecdd409f7ba1907820061d56096e88f" - integrity sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw== +caniuse-lite@^1.0.30001400: + version "1.0.30001441" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e" + integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg== chalk@^2.0.0: version "2.4.2" @@ -1320,7 +1733,7 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -1333,30 +1746,47 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + chromium-pickle-js@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" - integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= - -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== ci-info@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" - integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== + version "3.7.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz#6d01b3696c59915b6ce057e4aa4adfc2fa25f5ef" + integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog== cjs-module-lexer@^1.0.0: version "1.2.2" resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-spinners@^2.5.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" + integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== cli-truncate@^2.1.0: version "2.1.0" @@ -1366,26 +1796,40 @@ cli-truncate@^2.1.0: slice-ansi "^3.0.0" string-width "^4.2.0" -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" + integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== dependencies: mimic-response "^1.0.0" +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== collect-v8-coverage@^1.0.0: version "1.0.1" @@ -1409,17 +1853,22 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + +colorette@^2.0.14: + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== combined-stream@^1.0.8: version "1.0.8" @@ -1428,74 +1877,58 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= - dependencies: - graceful-readlink ">= 1.0.0" +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== commander@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +commander@^9.4.1: + version "9.4.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" + integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw== + compare-version@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" - integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= + integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-stream@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== +config-file-ts@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz#6c0741fbe118a7cf786c65f139030f0448a2cc99" + integrity sha512-cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ== dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" + glob "^7.1.6" + typescript "^4.0.2" -config-chain@^1.1.11: - version "1.1.13" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" - integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" +console-control-strings@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - 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" +convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== crc@^3.8.0: version "3.8.0" @@ -1513,15 +1946,10 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== +cssom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" + integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== cssom@~0.3.6: version "0.3.8" @@ -1535,50 +1963,43 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== +darkreader@4.9.58: + version "4.9.58" + resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.58.tgz#6544d6cb51fa643dc7995d128d32b357e1650e49" + integrity sha512-D/JGoJqW3m2AWBLhO+Pev+eThfs+CwRT4bcLb/1zKjql2yVwG0lx8C2XRDdSVGHw4y11n26W7syWoBpUfuhMqQ== + +data-urls@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" + integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@^2.6.8, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -decimal.js@^10.2.1: - version "10.3.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" - integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== +decimal.js@^10.4.2: + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== dependencies: - mimic-response "^1.0.0" + mimic-response "^3.1.0" dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA== deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" @@ -1590,22 +2011,45 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +defaults@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" + integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== + dependencies: + clone "^1.0.2" + +defer-to-connect@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" + integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" + integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== dependencies: - object-keys "^1.0.12" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + +depd@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + +detect-libc@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== detect-newline@^3.0.0: version "3.1.0" @@ -1617,36 +2061,34 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diff-sequences@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" - integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== +diff-sequences@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e" + integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ== -dir-compare@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" - integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== - dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" - -dmg-builder@22.14.13: - version "22.14.13" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.13.tgz#cc613f3c18e889b8777d525991fd52f50a564f8c" - integrity sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg== - dependencies: - app-builder-lib "22.14.13" - builder-util "22.14.13" - builder-util-runtime "8.9.2" - fs-extra "^10.0.0" +dir-compare@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416" + integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg== + dependencies: + buffer-equal "^1.0.0" + minimatch "^3.0.4" + +dmg-builder@24.0.0-alpha.7: + version "24.0.0-alpha.7" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.7.tgz#03f701547e7e5bf09c2cee3546a87685844efe70" + integrity sha512-5aQvKHvUb3vBjwwRRaYee9kvqKt+LKWFuOh4E750hClRIaYHQBOCxN2Ws0QVUxwZ22kBP+RQ0LS1tfesBGLPsw== + dependencies: + app-builder-lib "24.0.0-alpha.7" + builder-util "24.0.0-alpha.6" + builder-util-runtime "9.1.2-alpha.1" + fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" optionalDependencies: - dmg-license "^1.0.9" + dmg-license "^1.0.11" -dmg-license@^1.0.9: +dmg-license@^1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== @@ -1667,19 +2109,12 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== - dependencies: - webidl-conversions "^5.0.0" - -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== dependencies: - is-obj "^2.0.0" + webidl-conversions "^7.0.0" dotenv-expand@^5.1.0: version "5.1.0" @@ -1691,89 +2126,74 @@ dotenv@^9.0.2: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= - -ejs@^3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" - integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== - dependencies: - jake "^10.6.1" - -electron-builder@22.14.13: - version "22.14.13" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.13.tgz#fd40564685cf5422a8f8d667940af3d3776f4fb8" - integrity sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw== - dependencies: - "@types/yargs" "^17.0.1" - app-builder-lib "22.14.13" - builder-util "22.14.13" - builder-util-runtime "8.9.2" - chalk "^4.1.1" - dmg-builder "22.14.13" - fs-extra "^10.0.0" +ejs@^3.1.8: + version "3.1.8" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" + integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== + dependencies: + jake "^10.8.5" + +electron-builder@24.0.0-alpha.7: + version "24.0.0-alpha.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.7.tgz#1c897b334d3fdaac57365a81cdb899fcca7aa697" + integrity sha512-havD3dI5q9C4eWr+mJg82dKS81kYhcDUgBnRU90wxRdjT8R+cxqJxtgk/poJbMJi/qURza9wedAkgQbk48QQLQ== + dependencies: + "@types/yargs" "^17.0.16" + app-builder-lib "24.0.0-alpha.7" + builder-util "24.0.0-alpha.6" + builder-util-runtime "9.1.2-alpha.1" + chalk "^4.1.2" + dmg-builder "24.0.0-alpha.7" + fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" - read-config-file "6.2.0" - update-notifier "^5.1.0" - yargs "^17.0.1" - -electron-osx-sign@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" - integrity sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ== - 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" + read-config-file "6.3.2" + simple-update-notifier "^1.1.0" + yargs "^17.6.2" -electron-publish@22.14.13: - version "22.14.13" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.13.tgz#8b71e6975af8cc6ac5b21f293ade23f8704047c7" - integrity sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ== +electron-publish@24.0.0-alpha.6: + version "24.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.6.tgz#df6edd7b95eec038b4f287968b9c9af6aaa74cd6" + integrity sha512-ppRriKQuLGK8eZrCveQrf1zB+fV6qcTck6cq4NEC61KyvtQlUdvDV4yGRVmkOO28CYRmhq9w093T93Qc6k/TeQ== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "22.14.13" - builder-util-runtime "8.9.2" - chalk "^4.1.1" - fs-extra "^10.0.0" + builder-util "24.0.0-alpha.6" + builder-util-runtime "9.1.2-alpha.1" + chalk "^4.1.2" + fs-extra "^10.1.0" lazy-val "^1.0.5" mime "^2.5.2" -electron-to-chromium@^1.4.84: - version "1.4.90" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.90.tgz#4a518590f118828d54fff045728f547fef08143f" - integrity sha512-ZwKgSA0mQMyEhz+NR0F8dRzkrCLeHLzLkjx/CWf16+zV85hQ6meXPQbKanvhnpkYb7b2uJNj+enQJ/N877ND4Q== +electron-to-chromium@^1.4.251: + version "1.4.284" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" + integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== -electron@17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.1.tgz#e6c7ad2be26e7be8a5a9bac16b21920ad2671224" - integrity sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA== +electron@22.0.0: + version "22.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz#ef84ab9cf23aa3f8c2f42a1e8e000ad7fd941058" + integrity sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg== dependencies: - "@electron/get" "^1.13.0" - "@types/node" "^14.6.2" - extract-zip "^1.0.3" + "@electron/get" "^2.0.0" + "@types/node" "^16.11.26" + extract-zip "^2.0.1" -emittery@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" - integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== +emittery@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" + integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -encodeurl@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" end-of-stream@^1.1.0: version "1.4.4" @@ -1782,11 +2202,34 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +enhanced-resolve@^5.10.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" + integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +envinfo@^7.7.3: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -1794,6 +2237,11 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +es-module-lexer@^0.9.0: + version "0.9.3" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== + es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1804,15 +2252,10 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escape-string-regexp@^2.0.0: version "2.0.0" @@ -1843,6 +2286,14 @@ eslint-plugin-sort-keys@2.3.5: dependencies: natural-compare "1.4.0" +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + eslint-scope@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" @@ -1868,13 +2319,15 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@8.9.0: - version "8.9.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.9.0.tgz#a2a8227a99599adc4342fd9b854cb8d8d6412fdb" - integrity sha512-PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q== +eslint@8.29.0: + version "8.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87" + integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg== dependencies: - "@eslint/eslintrc" "^1.1.0" - "@humanwhocodes/config-array" "^0.9.2" + "@eslint/eslintrc" "^1.3.3" + "@humanwhocodes/config-array" "^0.11.6" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -1884,38 +2337,40 @@ eslint@8.9.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.1" + espree "^9.4.0" 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.6.0" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.15.0" + grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" - minimatch "^3.0.4" + 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" -espree@^9.3.1: - version "9.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" - integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ== +espree@^9.4.0: + version "9.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" + integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== dependencies: - acorn "^8.7.0" - acorn-jsx "^5.3.1" + acorn "^8.8.0" + acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" esprima@^4.0.0, esprima@^4.0.1: @@ -1937,6 +2392,11 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + estraverse@^5.1.0, estraverse@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" @@ -1947,6 +2407,11 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + execa@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" @@ -1965,27 +2430,29 @@ execa@^5.0.0: exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== -expect@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74" - integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw== - dependencies: - "@jest/types" "^27.5.1" - jest-get-type "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" - -extract-zip@^1.0.3: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== - dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" +expect@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6" + integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA== + dependencies: + "@jest/expect-utils" "^29.3.1" + jest-get-type "^29.2.0" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" + +extract-zip@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" extsprintf@^1.2.0: version "1.4.1" @@ -1997,7 +2464,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-json-stable-stringify@^2.0.0: +fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -2005,26 +2472,31 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-xml-parser@^3.19.0: - version "3.21.1" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz#152a1d51d445380f7046b304672dd55d15c9e736" - integrity sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg== +fastest-levenshtein@^1.0.12: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + +fastq@^1.6.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce" + integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg== dependencies: - strnum "^1.0.4" + reusify "^1.0.4" fb-watchman@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" + integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== dependencies: bser "2.1.1" fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== dependencies: pend "~1.2.0" @@ -2036,11 +2508,11 @@ file-entry-cache@^6.0.1: flat-cache "^3.0.4" filelist@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" - integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== dependencies: - minimatch "^3.0.4" + minimatch "^5.0.1" fill-range@^7.0.1: version "7.0.1" @@ -2057,6 +2529,14 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -2066,18 +2546,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.2.5" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" - integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== - -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" + version "3.2.7" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== form-data@^4.0.0: version "4.0.0" @@ -2088,10 +2559,10 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -fs-extra@^10.0.0: - version "10.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8" - integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag== +fs-extra@^10.0.0, fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -2116,10 +2587,17 @@ fs-extra@^9.0.0, fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^2.0.0" +fs-minipass@^2.0.0, fs-minipass@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@^2.3.2: version "2.3.2" @@ -2131,10 +2609,19 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + 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" gensync@^1.0.0-beta.2: version "1.0.0-beta.2" @@ -2146,18 +2633,20 @@ get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.3" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" @@ -2170,25 +2659,41 @@ get-stream@^6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -glob-parent@^6.0.1: +glob-parent@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: is-glob "^4.0.3" -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-agent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" @@ -2201,83 +2706,78 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== - dependencies: - ini "2.0.0" - -global-tunnel-ng@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" - globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.6.0, globals@^13.9.0: - version "13.13.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b" - integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A== +globals@^13.15.0, globals@^13.19.0: + version "13.19.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" + integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== dependencies: type-fest "^0.20.2" globalthis@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" - integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== dependencies: define-properties "^1.1.3" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - 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" - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= +got@^11.7.0, got@^11.8.5: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== has@^1.0.3: version "1.0.3" @@ -2286,39 +2786,35 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hosted-git-info@^4.0.2: +highlight.js@11.7.0: + version "11.7.0" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.7.0.tgz#3ff0165bc843f8c9bce1fd89e2fda9143d24b11e" + integrity sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ== + +hosted-git-info@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== dependencies: - whatwg-encoding "^1.0.5" + whatwg-encoding "^2.0.0" html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - http-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" @@ -2328,10 +2824,18 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== +http2-wrapper@^1.0.0-beta.5.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + +https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -2341,6 +2845,13 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" + iconv-corefoundation@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" @@ -2349,14 +2860,7 @@ iconv-corefoundation@^1.1.7: cli-truncate "^2.1.0" node-addon-api "^1.6.3" -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.6.2: +iconv-lite@0.6.3, iconv-lite@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -2369,9 +2873,9 @@ ieee754@^1.1.13: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" @@ -2381,11 +2885,6 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= - import-local@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" @@ -2397,42 +2896,45 @@ import-local@^3.0.2: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== -ini@^1.3.4, ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== is-ci@^3.0.0: version "3.0.1" @@ -2441,17 +2943,17 @@ is-ci@^3.0.0: dependencies: ci-info "^3.2.0" -is-core-module@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== +is-core-module@^2.9.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -2470,34 +2972,33 @@ is-glob@^4.0.0, is-glob@^4.0.3: dependencies: is-extglob "^2.1.1" -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-inside@^3.0.2: +is-path-inside@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" @@ -2508,44 +3009,30 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-svg@4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.2.tgz#a119e9932e1af53f6be1969d1790d6cc5fd947d3" - integrity sha512-mM90duy00JGMyjqIVHu9gNTjywdZV+8qNasX8cm/EEYZ53PHDgajvbBwNVvty5dwSAxLUD3p3bdo+7sR/UMrpw== - dependencies: - fast-xml-parser "^3.19.0" - -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isbinaryfile@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" - integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== - dependencies: - buffer-alloc "^1.2.0" +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== isbinaryfile@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" - integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + +isbinaryfile@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234" + integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg== isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: version "3.2.0" @@ -2553,9 +3040,9 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" - integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== + version "5.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" + integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== dependencies: "@babel/core" "^7.12.3" "@babel/parser" "^7.14.7" @@ -2582,411 +3069,379 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" istanbul-reports@^3.1.3: - version "3.1.4" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" - integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== + version "3.1.5" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae" + integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jake@^10.6.1: - version "10.8.4" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz#f6a8b7bf90c6306f768aa82bb7b98bf4ca15e84a" - integrity sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA== +jake@^10.8.5: + version "10.8.5" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" + integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== dependencies: - async "0.9.x" + async "^3.2.3" chalk "^4.0.2" filelist "^1.0.1" minimatch "^3.0.4" -jest-changed-files@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5" - integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw== +jest-changed-files@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289" + integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA== dependencies: - "@jest/types" "^27.5.1" execa "^5.0.0" - throat "^6.0.1" + p-limit "^3.1.0" -jest-circus@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc" - integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw== +jest-circus@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz#177d07c5c0beae8ef2937a67de68f1e17bbf1b4a" + integrity sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg== dependencies: - "@jest/environment" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^29.3.1" + "@jest/expect" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.5.1" is-generator-fn "^2.0.0" - jest-each "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" - jest-runtime "^27.5.1" - jest-snapshot "^27.5.1" - jest-util "^27.5.1" - pretty-format "^27.5.1" + jest-each "^29.3.1" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-runtime "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" + p-limit "^3.1.0" + pretty-format "^29.3.1" slash "^3.0.0" stack-utils "^2.0.3" - throat "^6.0.1" -jest-cli@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145" - integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw== +jest-cli@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz#e89dff427db3b1df50cea9a393ebd8640790416d" + integrity sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ== dependencies: - "@jest/core" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/core" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^27.5.1" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-config "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" prompts "^2.0.1" - yargs "^16.2.0" + yargs "^17.3.1" -jest-config@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41" - integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA== +jest-config@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz#0bc3dcb0959ff8662957f1259947aedaefb7f3c6" + integrity sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg== dependencies: - "@babel/core" "^7.8.0" - "@jest/test-sequencer" "^27.5.1" - "@jest/types" "^27.5.1" - babel-jest "^27.5.1" + "@babel/core" "^7.11.6" + "@jest/test-sequencer" "^29.3.1" + "@jest/types" "^29.3.1" + babel-jest "^29.3.1" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" - glob "^7.1.1" + glob "^7.1.3" graceful-fs "^4.2.9" - jest-circus "^27.5.1" - jest-environment-jsdom "^27.5.1" - jest-environment-node "^27.5.1" - jest-get-type "^27.5.1" - jest-jasmine2 "^27.5.1" - jest-regex-util "^27.5.1" - jest-resolve "^27.5.1" - jest-runner "^27.5.1" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-circus "^29.3.1" + jest-environment-node "^29.3.1" + jest-get-type "^29.2.0" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-runner "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" micromatch "^4.0.4" parse-json "^5.2.0" - pretty-format "^27.5.1" + pretty-format "^29.3.1" slash "^3.0.0" strip-json-comments "^3.1.1" -jest-diff@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def" - integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw== +jest-diff@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527" + integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw== dependencies: chalk "^4.0.0" - diff-sequences "^27.5.1" - jest-get-type "^27.5.1" - pretty-format "^27.5.1" + diff-sequences "^29.3.1" + jest-get-type "^29.2.0" + pretty-format "^29.3.1" -jest-docblock@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0" - integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ== +jest-docblock@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82" + integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A== dependencies: detect-newline "^3.0.0" -jest-each@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e" - integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ== +jest-each@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz#bc375c8734f1bb96625d83d1ca03ef508379e132" + integrity sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" chalk "^4.0.0" - jest-get-type "^27.5.1" - jest-util "^27.5.1" - pretty-format "^27.5.1" - -jest-environment-jsdom@27.5.1, jest-environment-jsdom@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546" - integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw== - dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + jest-get-type "^29.2.0" + jest-util "^29.3.1" + pretty-format "^29.3.1" + +jest-environment-jsdom@29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz#14ca63c3e0ef5c63c5bcb46033e50bc649e3b639" + integrity sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA== + dependencies: + "@jest/environment" "^29.3.1" + "@jest/fake-timers" "^29.3.1" + "@jest/types" "^29.3.1" + "@types/jsdom" "^20.0.0" "@types/node" "*" - jest-mock "^27.5.1" - jest-util "^27.5.1" - jsdom "^16.6.0" - -jest-environment-node@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e" - integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw== - dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + jest-mock "^29.3.1" + jest-util "^29.3.1" + jsdom "^20.0.0" + +jest-environment-node@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz#5023b32472b3fba91db5c799a0d5624ad4803e74" + integrity sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag== + dependencies: + "@jest/environment" "^29.3.1" + "@jest/fake-timers" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" - jest-mock "^27.5.1" - jest-util "^27.5.1" + jest-mock "^29.3.1" + jest-util "^29.3.1" -jest-get-type@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" - integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== +jest-get-type@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408" + integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA== -jest-haste-map@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f" - integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng== +jest-haste-map@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843" + integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A== dependencies: - "@jest/types" "^27.5.1" - "@types/graceful-fs" "^4.1.2" + "@jest/types" "^29.3.1" + "@types/graceful-fs" "^4.1.3" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.9" - jest-regex-util "^27.5.1" - jest-serializer "^27.5.1" - jest-util "^27.5.1" - jest-worker "^27.5.1" + jest-regex-util "^29.2.0" + jest-util "^29.3.1" + jest-worker "^29.3.1" micromatch "^4.0.4" - walker "^1.0.7" + walker "^1.0.8" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4" - integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ== +jest-leak-detector@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz#95336d020170671db0ee166b75cd8ef647265518" + integrity sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA== dependencies: - "@jest/environment" "^27.5.1" - "@jest/source-map" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - expect "^27.5.1" - is-generator-fn "^2.0.0" - jest-each "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" - jest-runtime "^27.5.1" - jest-snapshot "^27.5.1" - jest-util "^27.5.1" - pretty-format "^27.5.1" - throat "^6.0.1" - -jest-leak-detector@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8" - integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ== - dependencies: - jest-get-type "^27.5.1" - pretty-format "^27.5.1" + jest-get-type "^29.2.0" + pretty-format "^29.3.1" -jest-matcher-utils@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab" - integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw== +jest-matcher-utils@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572" + integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ== dependencies: chalk "^4.0.0" - jest-diff "^27.5.1" - jest-get-type "^27.5.1" - pretty-format "^27.5.1" + jest-diff "^29.3.1" + jest-get-type "^29.2.0" + pretty-format "^29.3.1" -jest-message-util@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf" - integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g== +jest-message-util@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb" + integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.9" micromatch "^4.0.4" - pretty-format "^27.5.1" + pretty-format "^29.3.1" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6" - integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og== +jest-mock@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e" + integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" "@types/node" "*" + jest-util "^29.3.1" jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + version "1.2.3" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" + integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== -jest-regex-util@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95" - integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg== +jest-regex-util@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b" + integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA== -jest-resolve-dependencies@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8" - integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg== +jest-resolve-dependencies@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz#a6a329708a128e68d67c49f38678a4a4a914c3bf" + integrity sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA== dependencies: - "@jest/types" "^27.5.1" - jest-regex-util "^27.5.1" - jest-snapshot "^27.5.1" + jest-regex-util "^29.2.0" + jest-snapshot "^29.3.1" -jest-resolve@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384" - integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== +jest-resolve@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz#9a4b6b65387a3141e4a40815535c7f196f1a68a7" + integrity sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw== dependencies: - "@jest/types" "^27.5.1" chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" + jest-haste-map "^29.3.1" jest-pnp-resolver "^1.2.2" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" resolve "^1.20.0" resolve.exports "^1.1.0" slash "^3.0.0" -jest-runner@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5" - integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ== - dependencies: - "@jest/console" "^27.5.1" - "@jest/environment" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" +jest-runner@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz#a92a879a47dd096fea46bb1517b0a99418ee9e2d" + integrity sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA== + dependencies: + "@jest/console" "^29.3.1" + "@jest/environment" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" - emittery "^0.8.1" + emittery "^0.13.1" graceful-fs "^4.2.9" - jest-docblock "^27.5.1" - jest-environment-jsdom "^27.5.1" - jest-environment-node "^27.5.1" - jest-haste-map "^27.5.1" - jest-leak-detector "^27.5.1" - jest-message-util "^27.5.1" - jest-resolve "^27.5.1" - jest-runtime "^27.5.1" - jest-util "^27.5.1" - jest-worker "^27.5.1" - source-map-support "^0.5.6" - throat "^6.0.1" - -jest-runtime@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af" - integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A== - dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/globals" "^27.5.1" - "@jest/source-map" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + jest-docblock "^29.2.0" + jest-environment-node "^29.3.1" + jest-haste-map "^29.3.1" + jest-leak-detector "^29.3.1" + jest-message-util "^29.3.1" + jest-resolve "^29.3.1" + jest-runtime "^29.3.1" + jest-util "^29.3.1" + jest-watcher "^29.3.1" + jest-worker "^29.3.1" + p-limit "^3.1.0" + source-map-support "0.5.13" + +jest-runtime@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz#21efccb1a66911d6d8591276a6182f520b86737a" + integrity sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A== + dependencies: + "@jest/environment" "^29.3.1" + "@jest/fake-timers" "^29.3.1" + "@jest/globals" "^29.3.1" + "@jest/source-map" "^29.2.0" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" + "@types/node" "*" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" - execa "^5.0.0" glob "^7.1.3" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-message-util "^27.5.1" - jest-mock "^27.5.1" - jest-regex-util "^27.5.1" - jest-resolve "^27.5.1" - jest-snapshot "^27.5.1" - jest-util "^27.5.1" + jest-haste-map "^29.3.1" + jest-message-util "^29.3.1" + jest-mock "^29.3.1" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" slash "^3.0.0" strip-bom "^4.0.0" -jest-serializer@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64" - integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w== - dependencies: - "@types/node" "*" - graceful-fs "^4.2.9" - -jest-snapshot@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1" - integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA== +jest-snapshot@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz#17bcef71a453adc059a18a32ccbd594b8cc4e45e" + integrity sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA== dependencies: - "@babel/core" "^7.7.2" + "@babel/core" "^7.11.6" "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-jsx" "^7.7.2" "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" - "@babel/types" "^7.0.0" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" - "@types/babel__traverse" "^7.0.4" + "@babel/types" "^7.3.3" + "@jest/expect-utils" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" + "@types/babel__traverse" "^7.0.6" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.5.1" + expect "^29.3.1" graceful-fs "^4.2.9" - jest-diff "^27.5.1" - jest-get-type "^27.5.1" - jest-haste-map "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" - jest-util "^27.5.1" + jest-diff "^29.3.1" + jest-get-type "^29.2.0" + jest-haste-map "^29.3.1" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" natural-compare "^1.4.0" - pretty-format "^27.5.1" - semver "^7.3.2" + pretty-format "^29.3.1" + semver "^7.3.5" -jest-util@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9" - integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw== +jest-util@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1" + integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" ci-info "^3.2.0" graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-validate@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067" - integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ== +jest-validate@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz#d56fefaa2e7d1fde3ecdc973c7f7f8f25eea704a" + integrity sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.5.1" + jest-get-type "^29.2.0" leven "^3.1.0" - pretty-format "^27.5.1" + pretty-format "^29.3.1" -jest-watcher@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2" - integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw== +jest-watcher@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz#3341547e14fe3c0f79f9c3a4c62dbc3fc977fd4a" + integrity sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg== dependencies: - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.5.1" + emittery "^0.13.1" + jest-util "^29.3.1" string-length "^4.0.1" -jest-worker@^27.5.1: +jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== @@ -2995,14 +3450,30 @@ jest-worker@^27.5.1: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc" - integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== +jest-worker@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b" + integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw== + dependencies: + "@types/node" "*" + jest-util "^29.3.1" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest@29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz#c130c0d551ae6b5459b8963747fed392ddbde122" + integrity sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA== dependencies: - "@jest/core" "^27.5.1" + "@jest/core" "^29.3.1" + "@jest/types" "^29.3.1" import-local "^3.0.2" - jest-cli "^27.5.1" + jest-cli "^29.3.1" + +js-sdsl@^4.1.4: + version "4.2.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0" + integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ== js-tokens@^4.0.0: version "4.0.0" @@ -3024,50 +3495,49 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsdom@^16.6.0: - version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" - integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== +jsdom@20.0.3, jsdom@^20.0.0: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" + integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== dependencies: - abab "^2.0.5" - acorn "^8.2.4" - acorn-globals "^6.0.0" - cssom "^0.4.4" + abab "^2.0.6" + acorn "^8.8.1" + acorn-globals "^7.0.0" + cssom "^0.5.0" cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" + data-urls "^3.0.2" + decimal.js "^10.4.2" + domexception "^4.0.0" escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" + nwsapi "^2.2.2" + parse5 "^7.1.1" + saxes "^6.0.0" symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + ws "^8.11.0" + xml-name-validator "^4.0.0" jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-even-better-errors@^2.3.0: +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -3080,22 +3550,22 @@ json-schema-traverse@^0.4.1: json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json-stringify-safe@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^2.1.2, json5@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +json5@^2.2.0, json5@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== optionalDependencies: graceful-fs "^4.1.6" @@ -3108,25 +3578,23 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== +keyv@^4.0.0: + version "4.5.2" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" + integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== dependencies: - json-buffer "3.0.0" + json-buffer "3.0.1" + +kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== - dependencies: - package-json "^6.3.0" - lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" @@ -3148,7 +3616,7 @@ levn@^0.4.1: levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== dependencies: prelude-ls "~1.1.2" type-check "~0.3.2" @@ -3158,6 +3626,11 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +loader-runner@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" + integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== + locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -3165,26 +3638,43 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash@^4.17.10, lodash@^4.17.15, lodash@^4.7.0: +lodash@^4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== +log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" lowercase-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -3192,6 +3682,20 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.7.1: + version "7.14.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea" + integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA== + +lzma-native@^8.0.5: + version "8.0.6" + resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665" + integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA== + dependencies: + node-addon-api "^3.1.0" + node-gyp-build "^4.2.1" + readable-stream "^3.6.0" + make-dir@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -3199,6 +3703,28 @@ make-dir@^3.0.0: dependencies: semver "^6.0.0" +make-fetch-happen@^10.0.3: + version "10.2.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" + integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== + dependencies: + agentkeepalive "^4.2.1" + cacache "^16.1.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-fetch "^2.0.3" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + promise-retry "^2.0.1" + socks-proxy-agent "^7.0.0" + ssri "^9.0.0" + makeerror@1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" @@ -3206,6 +3732,11 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" +marked@4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz#5a4ce6c7a1ae0c952601fce46376ee4cf1797e1c" + integrity sha512-Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA== + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -3219,19 +3750,19 @@ merge-stream@^2.0.0: integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" mime-db@1.52.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12: +mime-types@^2.1.12, mime-types@^2.1.27: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -3248,84 +3779,197 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-response@^1.0.0, mimic-response@^1.0.1: +mimic-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -minimatch@^3.0.4: +minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minimatch@^5.0.1, minimatch@^5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" + integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== + dependencies: + brace-expansion "^2.0.1" + +minimist@^1.2.6: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== -mkdirp@^0.5.4: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== dependencies: - minimist "^1.2.6" + minipass "^3.0.0" -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +minipass-fetch@^2.0.3: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" + integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== + dependencies: + minipass "^3.1.6" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minipass@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz#7cebb0f9fa7d56f0c5b17853cbe28838a8dbbd3b" + integrity sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw== + dependencies: + yallist "^4.0.0" + +minizlib@^2.1.1, minizlib@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.0.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + natural-compare@1.4.0, natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== + +negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +node-abi@^3.0.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz#d84687ad5d24ca81cdfa912a36f2c5c19b137359" + integrity sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw== + dependencies: + semver "^7.3.5" node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== +node-addon-api@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + +node-api-version@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" + integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== + dependencies: + semver "^7.3.5" + +node-gyp-build@^4.2.1: + version "4.5.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40" + integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg== + +node-gyp@^9.0.0: + version "9.3.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4" + integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^10.0.3" + nopt "^6.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-releases@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" - integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== +node-releases@^2.0.6: + version "2.0.8" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" + integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== + +nopt@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" + integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== + dependencies: + abbrev "^1.0.0" normalize-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== - -npm-conf@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== - dependencies: - config-chain "^1.1.11" - pify "^3.0.0" +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== npm-run-path@^4.0.1: version "4.0.1" @@ -3334,12 +3978,22 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -nwsapi@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" - integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + 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" + +nwsapi@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" + integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== -object-keys@^1.0.12: +object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -3347,11 +4001,11 @@ object-keys@^1.0.12: once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" -onetime@^5.1.2: +onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -3382,10 +4036,25 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +ora@^5.1.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== p-limit@^2.2.0: version "2.3.0" @@ -3394,6 +4063,13 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.2, p-limit@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -3401,21 +4077,25 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== - dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -3433,10 +4113,12 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parse5@^7.0.0, parse5@^7.1.1: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" path-exists@^4.0.0: version "4.0.0" @@ -3446,7 +4128,7 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" @@ -3461,23 +4143,18 @@ path-parse@^1.0.7: pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.3: +picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - pirates@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" @@ -3490,13 +4167,13 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -plist@^3.0.1, plist@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" - integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== +plist@^3.0.4, plist@^3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" + integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA== dependencies: base64-js "^1.5.1" - xmlbuilder "^9.0.7" + xmlbuilder "^15.1.1" prelude-ls@^1.2.1: version "1.2.1" @@ -3506,32 +4183,35 @@ prelude-ls@^1.2.1: prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= - -pretty-format@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" - integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== +pretty-format@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da" + integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg== dependencies: - ansi-regex "^5.0.1" + "@jest/schemas" "^29.0.0" ansi-styles "^5.0.0" - react-is "^17.0.1" - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + react-is "^18.0.0" progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -3540,15 +4220,10 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= - psl@^1.1.33: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== pump@^3.0.0: version "3.0.0" @@ -3563,75 +4238,80 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== - dependencies: - escape-goat "^2.0.0" +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== -rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" + safe-buffer "^5.1.0" -react-is@^17.0.1: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +react-is@^18.0.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -read-config-file@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" - integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== +read-config-file@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411" + integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q== dependencies: + config-file-ts "^0.2.4" dotenv "^9.0.2" dotenv-expand "^5.1.0" js-yaml "^4.1.0" json5 "^2.2.0" lazy-val "^1.0.4" -readable-stream@^2.2.2: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== +readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== 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" + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== + dependencies: + resolve "^1.20.0" regexpp@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== -registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== - dependencies: - rc "^1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +resolve-alpn@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== resolve-cwd@^3.0.0: version "3.0.0" @@ -3656,22 +4336,40 @@ resolve.exports@^1.1.0: integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== resolve@^1.20.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: - is-core-module "^2.8.1" + is-core-module "^2.9.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= +responselike@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" + integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== dependencies: - lowercase-keys "^1.0.0" + lowercase-keys "^2.0.0" -rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -3690,12 +4388,19 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": +"safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -3712,37 +4417,44 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== dependencies: xmlchars "^2.2.0" +schema-utils@^3.1.0, schema-utils@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" + integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== +semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" +semver@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + serialize-error@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" @@ -3750,6 +4462,25 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" +serialize-javascript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -3762,11 +4493,18 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +simple-update-notifier@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" + integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== + dependencies: + semver "~7.0.0" + sisteransi@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" @@ -3786,12 +4524,37 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -smart-buffer@^4.0.2: +smart-buffer@^4.0.2, smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -source-map-support@^0.5.19, source-map-support@^0.5.6: +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + +socks@^2.6.2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + +source-map-support@0.5.13: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@^0.5.19, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -3799,21 +4562,11 @@ source-map-support@^0.5.19, source-map-support@^0.5.6: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@^0.5.0: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - sprintf-js@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" @@ -3822,12 +4575,19 @@ sprintf-js@^1.1.2: sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== + +ssri@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== + dependencies: + minipass "^3.1.1" stack-utils@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" - integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== dependencies: escape-string-regexp "^2.0.0" @@ -3844,7 +4604,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3853,12 +4613,12 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2 is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== dependencies: - safe-buffer "~5.1.0" + safe-buffer "~5.2.0" strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" @@ -3882,16 +4642,6 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -strnum@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" - integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== - sumchecker@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" @@ -3906,7 +4656,7 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^7.0.0, supports-color@^7.1.0: +supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== @@ -3920,14 +4670,6 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" -supports-hyperlinks@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" - integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -3938,6 +4680,23 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== + +tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2: + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^4.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + temp-file@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" @@ -3946,13 +4705,26 @@ temp-file@^3.4.0: async-exit-hook "^2.0.1" fs-extra "^10.0.0" -terminal-link@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== +terser-webpack-plugin@5.3.6, terser-webpack-plugin@^5.1.3: + version "5.3.6" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" + integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" + "@jridgewell/trace-mapping" "^0.3.14" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" + terser "^5.14.1" + +terser@^5.14.1: + version "5.16.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880" + integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw== + dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" + commander "^2.20.0" + source-map-support "~0.5.20" test-exclude@^6.0.0: version "6.0.0" @@ -3966,24 +4738,19 @@ test-exclude@^6.0.0: text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -throat@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" - integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== - -tldts-core@^5.7.72: - version "5.7.72" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.72.tgz#d42d0ba3b0a1c677f7f4fc4581267df90238a14c" - integrity sha512-UVnXJQbM3CGYwXVy16nNJHh/MWr7fcaEyd3DravwgZjWn0pPHuQ/ajtGonzi9F62Ld3d5r6zBlOTI7qLlLJR1Q== +tldts-core@^5.7.103: + version "5.7.103" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.103.tgz#462fd4b60704ddca9b71bd17c2c59504e6985ca5" + integrity sha512-MdSolgnhJwr2SH6a+5KFAYB8znpYdRLoOFTJmrWslsec9Ne/V3DBrw+BbS1YYQJKGTin6U02Y9CSYxnOpg3vwg== tldts-experimental@^5.6.21: - version "5.7.72" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.72.tgz#b0a9b121e542a3b31f2b0dc7b64abc720940fd6a" - integrity sha512-Qg1FOnR8jCXBySOQVSaAmRZ4UiKse60MY7eTdx6oIaQ8ve+xGi+dXybb4+RN4cu9c4M7HOoGYkWERQ5tkBAPbg== + version "5.7.103" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz#a0b15a05c2cec7f0d4935de18dc9ad3fcbe0276f" + integrity sha512-oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ== dependencies: - tldts-core "^5.7.72" + tldts-core "^5.7.103" tmp-promise@^3.0.2: version "3.0.3" @@ -4007,12 +4774,7 @@ tmpl@1.0.5: to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== to-regex-range@^5.0.1: version "5.0.1" @@ -4021,34 +4783,30 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -tough-cookie@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" - integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== +tough-cookie@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== dependencies: psl "^1.1.33" punycode "^2.1.1" - universalify "^0.1.2" + universalify "^0.2.0" + url-parse "^1.5.3" -tr46@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" - integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== +tr46@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" + integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== dependencies: punycode "^2.1.1" truncate-utf8-bytes@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= + integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== dependencies: utf8-byte-length "^1.0.1" -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -4059,7 +4817,7 @@ type-check@^0.4.0, type-check@~0.4.0: type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== dependencies: prelude-ls "~1.1.2" @@ -4083,54 +4841,47 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" +typescript@^4.0.2: + version "4.9.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" + integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg== -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +unique-filename@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" + integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== + dependencies: + unique-slug "^3.0.0" -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== +unique-slug@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" + integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== dependencies: - crypto-random-string "^2.0.0" + imurmurhash "^0.1.4" -universalify@^0.1.0, universalify@^0.1.2: +universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== +update-browserslist-db@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== 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" + escalade "^3.1.1" + picocolors "^1.0.0" uri-js@^4.2.2: version "4.4.1" @@ -4139,36 +4890,32 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: - prepend-http "^2.0.0" + querystringify "^2.1.1" + requires-port "^1.0.0" utf8-byte-length@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= + integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== -util-deprecate@~1.0.1: +util-deprecate@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -v8-compile-cache@^2.0.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -v8-to-istanbul@^8.1.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed" - integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w== +v8-to-istanbul@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" + integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== dependencies: + "@jridgewell/trace-mapping" "^0.3.12" "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" - source-map "^0.7.3" verror@^1.10.0: version "1.10.1" @@ -4179,71 +4926,145 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -w3c-hr-time@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" - integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== - dependencies: - browser-process-hrtime "^1.0.0" - -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== dependencies: - xml-name-validator "^3.0.0" + xml-name-validator "^4.0.0" -walker@^1.0.7: +walker@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== dependencies: makeerror "1.0.12" -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== +watchpack@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" + integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" -webidl-conversions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" - integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== + dependencies: + defaults "^1.0.3" -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +webpack-cli@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a" + integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A== + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^2.0.1" + "@webpack-cli/info" "^2.0.1" + "@webpack-cli/serve" "^2.0.1" + colorette "^2.0.14" + commander "^9.4.1" + cross-spawn "^7.0.3" + envinfo "^7.7.3" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^3.1.1" + rechoir "^0.8.0" + webpack-merge "^5.7.3" + +webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== dependencies: - iconv-lite "0.4.24" + clone-deep "^4.0.1" + wildcard "^2.0.0" -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +webpack-node-externals@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917" + integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ== + +webpack-sources@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" + integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== + +webpack@5.75.0: + version "5.75.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152" + integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ== + dependencies: + "@types/eslint-scope" "^3.7.3" + "@types/estree" "^0.0.51" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/wasm-edit" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + acorn "^8.7.1" + acorn-import-assertions "^1.7.6" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.10.0" + es-module-lexer "^0.9.0" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.9" + json-parse-even-better-errors "^2.3.1" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.1.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.3" + watchpack "^2.4.0" + webpack-sources "^3.2.3" + +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== + dependencies: + iconv-lite "0.6.3" -whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" - integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" + integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== dependencies: - lodash "^4.7.0" - tr46 "^2.1.0" - webidl-conversions "^6.1.0" + tr46 "^3.0.0" + webidl-conversions "^7.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== +wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== dependencies: - string-width "^4.0.0" + string-width "^1.0.2 || 2 || 3 || 4" + +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" @@ -4262,43 +5083,31 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== +write-file-atomic@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" + integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== dependencies: imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" + signal-exit "^3.0.7" -ws@^7.4.6: - version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== +ws@^8.11.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" + integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== -xdg-basedir@^4.0.0: +xml-name-validator@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== - -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== -xmlbuilder@>=11.0.1: +xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== -xmlbuilder@^9.0.7: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= - xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" @@ -4309,51 +5118,43 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@^21.0.0: - version "21.0.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" - integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== +yargs@^17.0.1, yargs@^17.3.1, yargs@^17.6.2: + version "17.6.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^17.0.1: - version "17.4.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz#9fc9efc96bd3aa2c1240446af28499f0e7593d00" - integrity sha512-WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA== - dependencies: - cliui "^7.0.2" + cliui "^8.0.1" 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" + yargs-parser "^21.1.1" yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== dependencies: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index a8a281126a0ea..413a387f14cca 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -10,163 +10,163 @@ }; } { - name = "_ampproject_remapping___remapping_2.1.2.tgz"; + name = "_ampproject_remapping___remapping_2.2.0.tgz"; path = fetchurl { - name = "_ampproject_remapping___remapping_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz"; - sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; + name = "_ampproject_remapping___remapping_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz"; + sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; } { - name = "_babel_code_frame___code_frame_7.16.7.tgz"; + name = "_babel_code_frame___code_frame_7.18.6.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; + name = "_babel_code_frame___code_frame_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; } { - name = "_babel_compat_data___compat_data_7.17.7.tgz"; + name = "_babel_compat_data___compat_data_7.20.5.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.17.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz"; - sha512 = "p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="; + name = "_babel_compat_data___compat_data_7.20.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz"; + sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; }; } { - name = "_babel_core___core_7.17.8.tgz"; + name = "_babel_core___core_7.20.7.tgz"; path = fetchurl { - name = "_babel_core___core_7.17.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz"; - sha512 = "OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ=="; + name = "_babel_core___core_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz"; + sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; }; } { - name = "_babel_generator___generator_7.17.7.tgz"; + name = "_babel_generator___generator_7.20.7.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.17.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz"; - sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; + name = "_babel_generator___generator_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.17.7.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.17.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz"; - sha512 = "UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w=="; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; } { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.9.tgz"; path = fetchurl { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; - sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; + sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; }; } { - name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; - sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; + name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; + sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.18.6.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; - sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.18.6.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; - sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; + name = "_babel_helper_module_imports___helper_module_imports_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; - sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; + sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.17.7.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.20.2.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.17.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz"; - sha512 = "VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw=="; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.20.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; + sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.20.2.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; - sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; + name = "_babel_helper_simple_access___helper_simple_access_7.20.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; + sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.17.7.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.18.6.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.17.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz"; - sha512 = "txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA=="; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; + name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; - sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; + name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; + sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; - sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; + name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; } { - name = "_babel_helpers___helpers_7.17.8.tgz"; + name = "_babel_helpers___helpers_7.20.7.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.17.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz"; - sha512 = "QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw=="; + name = "_babel_helpers___helpers_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz"; + sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; }; } { - name = "_babel_highlight___highlight_7.16.10.tgz"; + name = "_babel_highlight___highlight_7.18.6.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.16.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz"; - sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; + name = "_babel_highlight___highlight_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; } { - name = "_babel_parser___parser_7.17.8.tgz"; + name = "_babel_parser___parser_7.20.7.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.17.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz"; - sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; + name = "_babel_parser___parser_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; } { @@ -210,6 +210,14 @@ }; } { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.18.6.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz"; + sha512 = "6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q=="; + }; + } + { name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; path = fetchurl { name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; @@ -266,35 +274,35 @@ }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.16.7.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz"; - sha512 = "YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A=="; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz"; + sha512 = "rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ=="; }; } { - name = "_babel_template___template_7.16.7.tgz"; + name = "_babel_template___template_7.20.7.tgz"; path = fetchurl { - name = "_babel_template___template_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz"; - sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; + name = "_babel_template___template_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; } { - name = "_babel_traverse___traverse_7.17.3.tgz"; + name = "_babel_traverse___traverse_7.20.7.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.17.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz"; - sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; + name = "_babel_traverse___traverse_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz"; + sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; }; } { - name = "_babel_types___types_7.17.0.tgz"; + name = "_babel_types___types_7.20.7.tgz"; path = fetchurl { - name = "_babel_types___types_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz"; - sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + name = "_babel_types___types_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; } { @@ -306,51 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.23.7.tgz"; - path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.23.7.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.23.7.tgz"; - sha512 = "tgCFcWhBty+WI3ObYBLDk56i1G7nScd5TBAOXlQf2EIbVJ+DC+G0YE91YHhQpzfy4ySI/wRGyEHrKzTRgmkuKQ=="; - }; - } - { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.6.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.25.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.6.tgz"; - sha512 = "xVBrIqfvcuh2Y07ZkEogzgkyqJuZvOqhRoFnuTyW2q97AmWAGLT6IjEGjl/vX7vMP0Y1b8wubdjI3VHnKvNKDg=="; + name = "_cliqz_adblocker_content___adblocker_content_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.1.tgz"; + sha512 = "7gl2VdNPBfj7aPoq34B5miwGcnda/7LCr+BqnpcSOjdLV6jjT2FrNSAKGFvcH23q0HM1IFhYDV6ydTgsdWFCnA=="; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.7.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.7.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.7.tgz"; - sha512 = "bGWf4r5q4savAGs3Kl4aR7XBH4J9AmrErDmcYu+tJk9V3rhTGXUi29kMl0D5x2JimhRmnKOeJ/Q2GJSUjvnmsg=="; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.1.tgz"; + sha512 = "edNVEqGrXqe/Qwi0D9/V8xmtyeJlhNPaelXilYa1ne7jG/OT7pee+7Vi4BWezl0NQ77WF3/mY9Bj4eJkEO0uiQ=="; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.23.6.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.25.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.23.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.23.6.tgz"; - sha512 = "wzkCfBCo5RvRanzsVOu65xHW9GAUDqsg+tP8GYld6/hgMMb96KJZJVpvrvwvsneAm9T55QE4ef1utZbIIwltqA=="; + name = "_cliqz_adblocker_electron___adblocker_electron_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.1.tgz"; + sha512 = "CKStwRTR2L78EjgmuUpLKkV9s/uVnwQNGr7I/hyMkEROXbGdrN7P5LhwO+kkewccZ+3JtE509PBmZAp0EP71dw=="; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.23.7.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.23.7.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.23.7.tgz"; - sha512 = "3y1eeHHZS3qvvv3dDZDjVVr6g03GeUBbDExCW/GOiHdo+qKYmM2K40EaLN+Upzc2ppuum9UKvzsHxG8Hs9R/kQ=="; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.1.tgz"; + sha512 = "4MdMe/YfIok5d8WYVcLR3Ak7vGrmeUV47frgmXEe945luY93vwlzk1NiLYW1JM5Gdm+VePweoS9cJ1/QUTmv+Q=="; }; } { - name = "_cliqz_adblocker___adblocker_1.23.7.tgz"; + name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.23.7.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.23.7.tgz"; - sha512 = "HUvC7CcmNbcIftcRhFeuQhHSpyNdOVdXazXDL0+avvWR0cxlI9zcC8yHMRKjxeY6nsiOXdyEFby+V5KgJvfwaQ=="; + name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.1.tgz"; + sha512 = "1C1/ELI94/XewdUj/o1+Q4ziOigMvTZQA05UERfDoKqpJ+0cbrEF/UImrzpX7n+kYsR7xTJvmf+iNM3zS0tfsg=="; }; } { @@ -362,35 +362,91 @@ }; } { - name = "_electron_get___get_1.14.1.tgz"; + name = "_discoveryjs_json_ext___json_ext_0.5.7.tgz"; path = fetchurl { - name = "_electron_get___get_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz"; - sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; + name = "_discoveryjs_json_ext___json_ext_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; + sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; } { - name = "_electron_universal___universal_1.0.5.tgz"; + name = "_electron_asar___asar_3.2.2.tgz"; path = fetchurl { - name = "_electron_universal___universal_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; - sha512 = "zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag=="; + name = "_electron_asar___asar_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.2.tgz"; + sha512 = "32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w=="; }; } { - name = "_eslint_eslintrc___eslintrc_1.2.1.tgz"; + name = "_electron_get___get_2.0.2.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; - sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; + name = "_electron_get___get_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; + sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; }; } { - name = "_humanwhocodes_config_array___config_array_0.9.5.tgz"; + name = "_electron_notarize___notarize_1.2.3.tgz"; path = fetchurl { - name = "_humanwhocodes_config_array___config_array_0.9.5.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; - sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; + name = "_electron_notarize___notarize_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz"; + sha512 = "9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ=="; + }; + } + { + name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; + path = fetchurl { + name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz"; + sha512 = "xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g=="; + }; + } + { + name = "_electron_rebuild___rebuild_3.2.10.tgz"; + path = fetchurl { + name = "_electron_rebuild___rebuild_3.2.10.tgz"; + url = "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz"; + sha512 = "SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg=="; + }; + } + { + name = "_electron_universal___universal_1.3.4.tgz"; + path = fetchurl { + name = "_electron_universal___universal_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz"; + sha512 = "BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg=="; + }; + } + { + name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; + sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; + }; + } + { + name = "_gar_promisify___promisify_1.1.3.tgz"; + path = fetchurl { + name = "_gar_promisify___promisify_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; + }; + } + { + name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; + path = fetchurl { + name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; + sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; + }; + } + { + name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; + path = fetchurl { + name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"; + sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="; }; } { @@ -418,115 +474,171 @@ }; } { - name = "_jest_console___console_27.5.1.tgz"; + name = "_jest_console___console_29.3.1.tgz"; + path = fetchurl { + name = "_jest_console___console_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz"; + sha512 = "IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg=="; + }; + } + { + name = "_jest_core___core_29.3.1.tgz"; + path = fetchurl { + name = "_jest_core___core_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz"; + sha512 = "0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw=="; + }; + } + { + name = "_jest_environment___environment_29.3.1.tgz"; + path = fetchurl { + name = "_jest_environment___environment_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz"; + sha512 = "pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag=="; + }; + } + { + name = "_jest_expect_utils___expect_utils_29.3.1.tgz"; + path = fetchurl { + name = "_jest_expect_utils___expect_utils_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz"; + sha512 = "wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g=="; + }; + } + { + name = "_jest_expect___expect_29.3.1.tgz"; + path = fetchurl { + name = "_jest_expect___expect_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz"; + sha512 = "QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg=="; + }; + } + { + name = "_jest_fake_timers___fake_timers_29.3.1.tgz"; + path = fetchurl { + name = "_jest_fake_timers___fake_timers_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz"; + sha512 = "iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A=="; + }; + } + { + name = "_jest_globals___globals_29.3.1.tgz"; path = fetchurl { - name = "_jest_console___console_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz"; - sha512 = "kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg=="; + name = "_jest_globals___globals_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz"; + sha512 = "cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q=="; }; } { - name = "_jest_core___core_27.5.1.tgz"; + name = "_jest_reporters___reporters_29.3.1.tgz"; path = fetchurl { - name = "_jest_core___core_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz"; - sha512 = "AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ=="; + name = "_jest_reporters___reporters_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz"; + sha512 = "GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA=="; }; } { - name = "_jest_environment___environment_27.5.1.tgz"; + name = "_jest_schemas___schemas_29.0.0.tgz"; path = fetchurl { - name = "_jest_environment___environment_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz"; - sha512 = "/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA=="; + name = "_jest_schemas___schemas_29.0.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz"; + sha512 = "3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA=="; }; } { - name = "_jest_fake_timers___fake_timers_27.5.1.tgz"; + name = "_jest_source_map___source_map_29.2.0.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz"; - sha512 = "/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ=="; + name = "_jest_source_map___source_map_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz"; + sha512 = "1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ=="; }; } { - name = "_jest_globals___globals_27.5.1.tgz"; + name = "_jest_test_result___test_result_29.3.1.tgz"; path = fetchurl { - name = "_jest_globals___globals_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz"; - sha512 = "ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q=="; + name = "_jest_test_result___test_result_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz"; + sha512 = "qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw=="; }; } { - name = "_jest_reporters___reporters_27.5.1.tgz"; + name = "_jest_test_sequencer___test_sequencer_29.3.1.tgz"; path = fetchurl { - name = "_jest_reporters___reporters_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz"; - sha512 = "cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw=="; + name = "_jest_test_sequencer___test_sequencer_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz"; + sha512 = "IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA=="; }; } { - name = "_jest_source_map___source_map_27.5.1.tgz"; + name = "_jest_transform___transform_29.3.1.tgz"; path = fetchurl { - name = "_jest_source_map___source_map_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz"; - sha512 = "y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg=="; + name = "_jest_transform___transform_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz"; + sha512 = "8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug=="; }; } { - name = "_jest_test_result___test_result_27.5.1.tgz"; + name = "_jest_types___types_29.3.1.tgz"; path = fetchurl { - name = "_jest_test_result___test_result_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz"; - sha512 = "EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag=="; + name = "_jest_types___types_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz"; + sha512 = "d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA=="; }; } { - name = "_jest_test_sequencer___test_sequencer_27.5.1.tgz"; + name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz"; - sha512 = "LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ=="; + name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; }; } { - name = "_jest_transform___transform_27.5.1.tgz"; + name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; path = fetchurl { - name = "_jest_transform___transform_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz"; - sha512 = "ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw=="; + name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; } { - name = "_jest_types___types_27.5.1.tgz"; + name = "_jridgewell_resolve_uri___resolve_uri_3.1.0.tgz"; path = fetchurl { - name = "_jest_types___types_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz"; - sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; + name = "_jridgewell_resolve_uri___resolve_uri_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; }; } { - name = "_jridgewell_resolve_uri___resolve_uri_3.0.5.tgz"; + name = "_jridgewell_set_array___set_array_1.1.2.tgz"; path = fetchurl { - name = "_jridgewell_resolve_uri___resolve_uri_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz"; - sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; + name = "_jridgewell_set_array___set_array_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz"; + sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; } { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.11.tgz"; + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; path = fetchurl { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.11.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz"; - sha512 = "Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="; + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; + sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; }; } { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.4.tgz"; + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; path = fetchurl { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz"; - sha512 = "vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ=="; + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; + }; + } + { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.17.tgz"; + path = fetchurl { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.17.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; + sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; }; } { @@ -538,6 +650,14 @@ }; } { + name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; + path = fetchurl { + name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz"; + sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; + }; + } + { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; path = fetchurl { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; @@ -546,6 +666,54 @@ }; } { + name = "_mozilla_readability___readability_0.4.2.tgz"; + path = fetchurl { + name = "_mozilla_readability___readability_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/@mozilla/readability/-/readability-0.4.2.tgz"; + sha512 = "48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw=="; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; + }; + } + { + name = "_npmcli_fs___fs_2.1.2.tgz"; + path = fetchurl { + name = "_npmcli_fs___fs_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz"; + sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ=="; + }; + } + { + name = "_npmcli_move_file___move_file_2.0.1.tgz"; + path = fetchurl { + name = "_npmcli_move_file___move_file_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz"; + sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ=="; + }; + } + { name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; path = fetchurl { name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; @@ -594,43 +762,43 @@ }; } { - name = "_sindresorhus_is___is_0.14.0.tgz"; + name = "_sinclair_typebox___typebox_0.24.51.tgz"; path = fetchurl { - name = "_sindresorhus_is___is_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + name = "_sinclair_typebox___typebox_0.24.51.tgz"; + url = "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz"; + sha512 = "1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="; }; } { - name = "_sinonjs_commons___commons_1.8.3.tgz"; + name = "_sindresorhus_is___is_4.6.0.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.3.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz"; - sha512 = "xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ=="; + name = "_sindresorhus_is___is_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; } { - name = "_sinonjs_fake_timers___fake_timers_8.1.0.tgz"; + name = "_sinonjs_commons___commons_1.8.6.tgz"; path = fetchurl { - name = "_sinonjs_fake_timers___fake_timers_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz"; - sha512 = "OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg=="; + name = "_sinonjs_commons___commons_1.8.6.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz"; + sha512 = "Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ=="; }; } { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + name = "_sinonjs_fake_timers___fake_timers_9.1.2.tgz"; path = fetchurl { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + name = "_sinonjs_fake_timers___fake_timers_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz"; + sha512 = "BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw=="; }; } { - name = "_tootallnate_once___once_1.1.2.tgz"; + name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; path = fetchurl { - name = "_tootallnate_once___once_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; - sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; + sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; } { @@ -642,11 +810,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.19.tgz"; + name = "_types_babel__core___babel__core_7.1.20.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.19.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz"; - sha512 = "WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw=="; + name = "_types_babel__core___babel__core_7.1.20.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz"; + sha512 = "PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ=="; }; } { @@ -666,19 +834,27 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; + name = "_types_babel__traverse___babel__traverse_7.18.3.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.18.3.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz"; + sha512 = "1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w=="; + }; + } + { + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz"; - sha512 = "K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA=="; + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; + sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; }; } { - name = "_types_chrome___chrome_0.0.180.tgz"; + name = "_types_chrome___chrome_0.0.197.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.180.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.180.tgz"; - sha512 = "A/CuuKAaHq2CHEpYBAtl0lp2ib7TTXK7VjJI4q+c+1U/HDvZLJ8IlsdEDzzHdvkNdh36bGONxrMnO9YZrKqbAw=="; + name = "_types_chrome___chrome_0.0.197.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz"; + sha512 = "m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA=="; }; } { @@ -690,6 +866,38 @@ }; } { + name = "_types_eslint_scope___eslint_scope_3.7.4.tgz"; + path = fetchurl { + name = "_types_eslint_scope___eslint_scope_3.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; + sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; + }; + } + { + name = "_types_eslint___eslint_8.4.10.tgz"; + path = fetchurl { + name = "_types_eslint___eslint_8.4.10.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz"; + sha512 = "Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw=="; + }; + } + { + name = "_types_estree___estree_1.0.0.tgz"; + path = fetchurl { + name = "_types_estree___estree_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz"; + sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; + }; + } + { + name = "_types_estree___estree_0.0.51.tgz"; + path = fetchurl { + name = "_types_estree___estree_0.0.51.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz"; + sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; + }; + } + { name = "_types_filesystem___filesystem_0.0.32.tgz"; path = fetchurl { name = "_types_filesystem___filesystem_0.0.32.tgz"; @@ -738,11 +946,19 @@ }; } { - name = "_types_har_format___har_format_1.2.8.tgz"; + name = "_types_har_format___har_format_1.2.10.tgz"; + path = fetchurl { + name = "_types_har_format___har_format_1.2.10.tgz"; + url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.10.tgz"; + sha512 = "o0J30wqycjF5miWDKYKKzzOU1ZTLuA42HZ4HE7/zqTOc/jTLdQ5NhYWvsRQo45Nfi1KHoRdNhteSI4BAxTF1Pg=="; + }; + } + { + name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; path = fetchurl { - name = "_types_har_format___har_format_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.8.tgz"; - sha512 = "OP6L9VuZNdskgNN3zFQQ54ceYD8OLq5IbqO4VK91ORLfOm7WdT/CiT/pHEBSQEqCInJ2y3O6iCm/zGtPElpgJQ=="; + name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; + sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; } { @@ -770,11 +986,35 @@ }; } { - name = "_types_minimatch___minimatch_3.0.5.tgz"; + name = "_types_jsdom___jsdom_20.0.1.tgz"; + path = fetchurl { + name = "_types_jsdom___jsdom_20.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz"; + sha512 = "d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ=="; + }; + } + { + name = "_types_json_schema___json_schema_7.0.11.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; - sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; + name = "_types_json_schema___json_schema_7.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz"; + sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; + }; + } + { + name = "_types_keyv___keyv_3.1.4.tgz"; + path = fetchurl { + name = "_types_keyv___keyv_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz"; + sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; + }; + } + { + name = "_types_minimatch___minimatch_5.1.2.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; }; } { @@ -786,19 +1026,19 @@ }; } { - name = "_types_node___node_17.0.22.tgz"; + name = "_types_node___node_18.11.17.tgz"; path = fetchurl { - name = "_types_node___node_17.0.22.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.22.tgz"; - sha512 = "8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw=="; + name = "_types_node___node_18.11.17.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz"; + sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="; }; } { - name = "_types_node___node_14.18.12.tgz"; + name = "_types_node___node_16.18.10.tgz"; path = fetchurl { - name = "_types_node___node_14.18.12.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz"; - sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; + name = "_types_node___node_16.18.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz"; + sha512 = "XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w=="; }; } { @@ -810,11 +1050,19 @@ }; } { - name = "_types_prettier___prettier_2.4.4.tgz"; + name = "_types_prettier___prettier_2.7.2.tgz"; + path = fetchurl { + name = "_types_prettier___prettier_2.7.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz"; + sha512 = "KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg=="; + }; + } + { + name = "_types_responselike___responselike_1.0.0.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz"; - sha512 = "ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA=="; + name = "_types_responselike___responselike_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz"; + sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; } { @@ -826,11 +1074,19 @@ }; } { - name = "_types_verror___verror_1.10.5.tgz"; + name = "_types_tough_cookie___tough_cookie_4.0.2.tgz"; path = fetchurl { - name = "_types_verror___verror_1.10.5.tgz"; - url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; - sha512 = "9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw=="; + name = "_types_tough_cookie___tough_cookie_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz"; + sha512 = "Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw=="; + }; + } + { + name = "_types_verror___verror_1.10.6.tgz"; + path = fetchurl { + name = "_types_verror___verror_1.10.6.tgz"; + url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz"; + sha512 = "NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ=="; }; } { @@ -842,67 +1098,235 @@ }; } { - name = "_types_yargs___yargs_16.0.4.tgz"; + name = "_types_yargs___yargs_17.0.17.tgz"; path = fetchurl { - name = "_types_yargs___yargs_16.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz"; - sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; + name = "_types_yargs___yargs_17.0.17.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz"; + sha512 = "72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g=="; }; } { - name = "_types_yargs___yargs_17.0.10.tgz"; + name = "_types_yauzl___yauzl_2.10.0.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.10.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz"; - sha512 = "gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA=="; + name = "_types_yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz"; + sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; }; } { - name = "abab___abab_2.0.5.tgz"; + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; path = fetchurl { - name = "abab___abab_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; - sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz"; + sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw=="; }; } { - name = "acorn_globals___acorn_globals_6.0.0.tgz"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; path = fetchurl { - name = "acorn_globals___acorn_globals_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; - sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; + sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="; }; } { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; + sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; + sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="; + }; + } + { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; + sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ=="; }; } { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; path = fetchurl { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; - sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; + sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="; }; } { - name = "acorn___acorn_7.4.1.tgz"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; + sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg=="; }; } { - name = "acorn___acorn_8.7.0.tgz"; + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; path = fetchurl { - name = "acorn___acorn_8.7.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz"; - sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; + sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ=="; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; + sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw=="; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; + sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; + sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA=="; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; + sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA=="; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; + sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw=="; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; + sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA=="; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; + sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; + }; + } + { + name = "_webpack_cli_configtest___configtest_2.0.1.tgz"; + path = fetchurl { + name = "_webpack_cli_configtest___configtest_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz"; + sha512 = "njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A=="; + }; + } + { + name = "_webpack_cli_info___info_2.0.1.tgz"; + path = fetchurl { + name = "_webpack_cli_info___info_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz"; + sha512 = "fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA=="; + }; + } + { + name = "_webpack_cli_serve___serve_2.0.1.tgz"; + path = fetchurl { + name = "_webpack_cli_serve___serve_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz"; + sha512 = "0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw=="; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + } + { + name = "_xtuc_long___long_4.2.2.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; + }; + } + { + name = "abab___abab_2.0.6.tgz"; + path = fetchurl { + name = "abab___abab_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz"; + sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + } + { + name = "acorn_globals___acorn_globals_7.0.1.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz"; + sha512 = "umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q=="; + }; + } + { + name = "acorn_import_assertions___acorn_import_assertions_1.8.0.tgz"; + path = fetchurl { + name = "acorn_import_assertions___acorn_import_assertions_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"; + sha512 = "m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; + }; + } + { + name = "acorn_walk___acorn_walk_8.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz"; + sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; + }; + } + { + name = "acorn___acorn_8.8.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.8.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz"; + sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; }; } { @@ -914,6 +1338,22 @@ }; } { + name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; + path = fetchurl { + name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + }; + } + { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + } + { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; @@ -930,14 +1370,6 @@ }; } { - name = "ansi_align___ansi_align_3.0.1.tgz"; - path = fetchurl { - name = "ansi_align___ansi_align_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; - }; - } - { name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; @@ -978,27 +1410,43 @@ }; } { - name = "anymatch___anymatch_3.1.2.tgz"; + name = "anymatch___anymatch_3.1.3.tgz"; path = fetchurl { - name = "anymatch___anymatch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + name = "anymatch___anymatch_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz"; + sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; }; } { - name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; + name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz"; - sha512 = "ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw=="; + name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz"; + sha512 = "xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA=="; }; } { - name = "app_builder_lib___app_builder_lib_22.14.13.tgz"; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.14.13.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.13.tgz"; - sha512 = "SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg=="; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.7.tgz"; + sha512 = "kEzDjym0AV9pO4SX8+RaJX9fmxrrKlDzHxqAN7cxSgDM8BUneMJqeWtf9+Hqv6PMXAvpnRsrSHtNaYgDkhQdFA=="; + }; + } + { + name = "aproba___aproba_2.0.0.tgz"; + path = fetchurl { + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; + sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; }; } { @@ -1018,19 +1466,11 @@ }; } { - name = "asar___asar_3.1.0.tgz"; - path = fetchurl { - name = "asar___asar_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; - sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; - }; - } - { name = "assert_plus___assert_plus_1.0.0.tgz"; path = fetchurl { name = "assert_plus___assert_plus_1.0.0.tgz"; url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; + sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; } { @@ -1050,11 +1490,11 @@ }; } { - name = "async___async_0.9.2.tgz"; + name = "async___async_3.2.4.tgz"; path = fetchurl { - name = "async___async_0.9.2.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; - sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; + name = "async___async_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; }; } { @@ -1062,7 +1502,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; + sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; }; } { @@ -1074,11 +1514,11 @@ }; } { - name = "babel_jest___babel_jest_27.5.1.tgz"; + name = "babel_jest___babel_jest_29.3.1.tgz"; path = fetchurl { - name = "babel_jest___babel_jest_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz"; - sha512 = "cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg=="; + name = "babel_jest___babel_jest_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz"; + sha512 = "aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA=="; }; } { @@ -1090,11 +1530,11 @@ }; } { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.5.1.tgz"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.2.0.tgz"; path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz"; - sha512 = "50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ=="; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz"; + sha512 = "TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA=="; }; } { @@ -1106,11 +1546,11 @@ }; } { - name = "babel_preset_jest___babel_preset_jest_27.5.1.tgz"; + name = "babel_preset_jest___babel_preset_jest_29.2.0.tgz"; path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz"; - sha512 = "Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag=="; + name = "babel_preset_jest___babel_preset_jest_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz"; + sha512 = "z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA=="; }; } { @@ -1130,6 +1570,14 @@ }; } { + name = "bl___bl_4.1.0.tgz"; + path = fetchurl { + name = "bl___bl_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + } + { name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; path = fetchurl { name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; @@ -1154,14 +1602,6 @@ }; } { - name = "boxen___boxen_5.1.2.tgz"; - path = fetchurl { - name = "boxen___boxen_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; - }; - } - { name = "brace_expansion___brace_expansion_1.1.11.tgz"; path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; @@ -1170,27 +1610,27 @@ }; } { - name = "braces___braces_3.0.2.tgz"; + name = "brace_expansion___brace_expansion_2.0.1.tgz"; path = fetchurl { - name = "braces___braces_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; }; } { - name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + name = "braces___braces_3.0.2.tgz"; path = fetchurl { - name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; - sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; } { - name = "browserslist___browserslist_4.20.2.tgz"; + name = "browserslist___browserslist_4.21.4.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.20.2.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz"; - sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; + name = "browserslist___browserslist_4.21.4.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz"; + sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; }; } { @@ -1202,43 +1642,19 @@ }; } { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - path = fetchurl { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; - }; - } - { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - path = fetchurl { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; - }; - } - { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; - }; - } - { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha1 = "WWFrSYME1Var1GaWayLu2j7KX74="; + sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; }; } { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; + name = "buffer_equal___buffer_equal_1.0.1.tgz"; path = fetchurl { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha1 = "+PeLdniYiO858gXNY39o5wISKyw="; + name = "buffer_equal___buffer_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz"; + sha512 = "QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg=="; }; } { @@ -1258,27 +1674,43 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.9.2.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.1.2_alpha.1.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_9.1.2_alpha.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.2-alpha.1.tgz"; + sha512 = "4sbKIB0N9J/pvixX9HYUyRtMZT+cN+bgPJ5NqejyqSPxFzj7IFe1A9K14l5nnfpMVxzUSZVQMerniDeGszZ9OA=="; + }; + } + { + name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.9.2.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz"; - sha512 = "rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A=="; + name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.6.tgz"; + sha512 = "vSnVMyuZK0RArELPk1dLUdcunZ2Gj0mpAFat73yD5djiihNosXIpIbSO/OFTi2/MV0urlH0giU4DOs9EXaCKtA=="; }; } { - name = "builder_util___builder_util_22.14.13.tgz"; + name = "cacache___cacache_16.1.3.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.14.13.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.13.tgz"; - sha512 = "oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA=="; + name = "cacache___cacache_16.1.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz"; + sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; }; } { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; + name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; path = fetchurl { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; + sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; + }; + } + { + name = "cacheable_request___cacheable_request_7.0.2.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz"; + sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; }; } { @@ -1306,11 +1738,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001319.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001319.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz"; - sha512 = "xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw=="; + name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; + sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; }; } { @@ -1338,27 +1770,35 @@ }; } { - name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + name = "chownr___chownr_2.0.0.tgz"; path = fetchurl { - name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha1 = "BKEGZywYsIWrd02YPfo+oTjyIgU="; + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; } { - name = "ci_info___ci_info_2.0.0.tgz"; + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; path = fetchurl { - name = "ci_info___ci_info_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; }; } { - name = "ci_info___ci_info_3.3.0.tgz"; + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz"; - sha512 = "riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="; + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha512 = "1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw=="; + }; + } + { + name = "ci_info___ci_info_3.7.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz"; + sha512 = "2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog=="; }; } { @@ -1370,11 +1810,27 @@ }; } { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + } + { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + } + { + name = "cli_spinners___cli_spinners_2.7.0.tgz"; path = fetchurl { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + name = "cli_spinners___cli_spinners_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz"; + sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; }; } { @@ -1386,19 +1842,35 @@ }; } { - name = "cliui___cliui_7.0.4.tgz"; + name = "cliui___cliui_8.0.1.tgz"; + path = fetchurl { + name = "cliui___cliui_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; + }; + } + { + name = "clone_deep___clone_deep_4.0.1.tgz"; path = fetchurl { - name = "cliui___cliui_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; }; } { - name = "clone_response___clone_response_1.0.2.tgz"; + name = "clone_response___clone_response_1.0.3.tgz"; path = fetchurl { - name = "clone_response___clone_response_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; + name = "clone_response___clone_response_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz"; + sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; + }; + } + { + name = "clone___clone_1.0.4.tgz"; + path = fetchurl { + name = "clone___clone_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; + sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; }; } { @@ -1406,7 +1878,7 @@ path = fetchurl { name = "co___co_4.6.0.tgz"; url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; - sha1 = "bqa989hTrlTMuOR7+gvz+QMfsYQ="; + sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; } { @@ -1438,7 +1910,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; } { @@ -1450,11 +1922,19 @@ }; } { - name = "colors___colors_1.0.3.tgz"; + name = "color_support___color_support_1.1.3.tgz"; + path = fetchurl { + name = "color_support___color_support_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; + }; + } + { + name = "colorette___colorette_2.0.19.tgz"; path = fetchurl { - name = "colors___colors_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha1 = "BDP0TYCWgP3rYO0mDxsMJi6CpAs="; + name = "colorette___colorette_2.0.19.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz"; + sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; }; } { @@ -1466,11 +1946,11 @@ }; } { - name = "commander___commander_2.9.0.tgz"; + name = "commander___commander_2.20.3.tgz"; path = fetchurl { - name = "commander___commander_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha1 = "nJkJQXbhIkDLItbFFGCYQA/g99Q="; + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; } { @@ -1482,11 +1962,19 @@ }; } { + name = "commander___commander_9.4.1.tgz"; + path = fetchurl { + name = "commander___commander_9.4.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz"; + sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; + }; + } + { name = "compare_version___compare_version_0.1.2.tgz"; path = fetchurl { name = "compare_version___compare_version_0.1.2.tgz"; url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; - sha1 = "AWLsLZNR9d3VmpICy6k1NmpyUIA="; + sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A=="; }; } { @@ -1494,39 +1982,39 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; } { - name = "concat_stream___concat_stream_1.6.2.tgz"; + name = "config_file_ts___config_file_ts_0.2.4.tgz"; path = fetchurl { - name = "concat_stream___concat_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + name = "config_file_ts___config_file_ts_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz"; + sha512 = "cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ=="; }; } { - name = "config_chain___config_chain_1.1.13.tgz"; + name = "console_control_strings___console_control_strings_1.1.0.tgz"; path = fetchurl { - name = "config_chain___config_chain_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; } { - name = "configstore___configstore_5.0.1.tgz"; + name = "convert_source_map___convert_source_map_1.9.0.tgz"; path = fetchurl { - name = "configstore___configstore_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + name = "convert_source_map___convert_source_map_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz"; + sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; }; } { - name = "convert_source_map___convert_source_map_1.8.0.tgz"; + name = "convert_source_map___convert_source_map_2.0.0.tgz"; path = fetchurl { - name = "convert_source_map___convert_source_map_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; + name = "convert_source_map___convert_source_map_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz"; + sha512 = "Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="; }; } { @@ -1534,15 +2022,7 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; - }; - } - { - name = "core_util_is___core_util_is_1.0.3.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; }; } { @@ -1562,19 +2042,11 @@ }; } { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; - }; - } - { - name = "cssom___cssom_0.4.4.tgz"; + name = "cssom___cssom_0.5.0.tgz"; path = fetchurl { - name = "cssom___cssom_0.4.4.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; - sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; + name = "cssom___cssom_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz"; + sha512 = "iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="; }; } { @@ -1594,43 +2066,43 @@ }; } { - name = "data_urls___data_urls_2.0.0.tgz"; + name = "darkreader___darkreader_4.9.58.tgz"; path = fetchurl { - name = "data_urls___data_urls_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; - sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; + name = "darkreader___darkreader_4.9.58.tgz"; + url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.58.tgz"; + sha512 = "D/JGoJqW3m2AWBLhO+Pev+eThfs+CwRT4bcLb/1zKjql2yVwG0lx8C2XRDdSVGHw4y11n26W7syWoBpUfuhMqQ=="; }; } { - name = "debug___debug_4.3.4.tgz"; + name = "data_urls___data_urls_3.0.2.tgz"; path = fetchurl { - name = "debug___debug_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + name = "data_urls___data_urls_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz"; + sha512 = "Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ=="; }; } { - name = "debug___debug_2.6.9.tgz"; + name = "debug___debug_4.3.4.tgz"; path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + name = "debug___debug_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; } { - name = "decimal.js___decimal.js_10.3.1.tgz"; + name = "decimal.js___decimal.js_10.4.3.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.3.1.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; - sha512 = "V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="; + name = "decimal.js___decimal.js_10.4.3.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz"; + sha512 = "VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="; }; } { - name = "decompress_response___decompress_response_3.3.0.tgz"; + name = "decompress_response___decompress_response_6.0.0.tgz"; path = fetchurl { - name = "decompress_response___decompress_response_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; + name = "decompress_response___decompress_response_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; } { @@ -1638,15 +2110,7 @@ path = fetchurl { name = "dedent___dedent_0.7.0.tgz"; url = "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz"; - sha1 = "JJXduvbrh0q7Dhvp3yLS5aVEMmw="; - }; - } - { - name = "deep_extend___deep_extend_0.6.0.tgz"; - path = fetchurl { - name = "deep_extend___deep_extend_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; }; } { @@ -1666,19 +2130,27 @@ }; } { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + name = "defaults___defaults_1.0.4.tgz"; path = fetchurl { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; + name = "defaults___defaults_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz"; + sha512 = "eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A=="; }; } { - name = "define_properties___define_properties_1.1.3.tgz"; + name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; path = fetchurl { - name = "define_properties___define_properties_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; + sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; + }; + } + { + name = "define_properties___define_properties_1.1.4.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; } { @@ -1686,7 +2158,31 @@ path = fetchurl { name = "delayed_stream___delayed_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; + }; + } + { + name = "detect_libc___detect_libc_2.0.1.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; } { @@ -1706,27 +2202,27 @@ }; } { - name = "diff_sequences___diff_sequences_27.5.1.tgz"; + name = "diff_sequences___diff_sequences_29.3.1.tgz"; path = fetchurl { - name = "diff_sequences___diff_sequences_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz"; - sha512 = "k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="; + name = "diff_sequences___diff_sequences_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz"; + sha512 = "hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ=="; }; } { - name = "dir_compare___dir_compare_2.4.0.tgz"; + name = "dir_compare___dir_compare_3.3.0.tgz"; path = fetchurl { - name = "dir_compare___dir_compare_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; + name = "dir_compare___dir_compare_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz"; + sha512 = "J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg=="; }; } { - name = "dmg_builder___dmg_builder_22.14.13.tgz"; + name = "dmg_builder___dmg_builder_24.0.0_alpha.7.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.14.13.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.13.tgz"; - sha512 = "xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg=="; + name = "dmg_builder___dmg_builder_24.0.0_alpha.7.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.7.tgz"; + sha512 = "5aQvKHvUb3vBjwwRRaYee9kvqKt+LKWFuOh4E750hClRIaYHQBOCxN2Ws0QVUxwZ22kBP+RQ0LS1tfesBGLPsw=="; }; } { @@ -1746,19 +2242,11 @@ }; } { - name = "domexception___domexception_2.0.1.tgz"; + name = "domexception___domexception_4.0.0.tgz"; path = fetchurl { - name = "domexception___domexception_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; - sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; - }; - } - { - name = "dot_prop___dot_prop_5.3.0.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; + name = "domexception___domexception_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz"; + sha512 = "A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw=="; }; } { @@ -1778,67 +2266,51 @@ }; } { - name = "duplexer3___duplexer3_0.1.4.tgz"; + name = "ejs___ejs_3.1.8.tgz"; path = fetchurl { - name = "duplexer3___duplexer3_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; + name = "ejs___ejs_3.1.8.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; + sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; } { - name = "ejs___ejs_3.1.6.tgz"; + name = "electron_builder___electron_builder_24.0.0_alpha.7.tgz"; path = fetchurl { - name = "ejs___ejs_3.1.6.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; - sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; + name = "electron_builder___electron_builder_24.0.0_alpha.7.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.7.tgz"; + sha512 = "havD3dI5q9C4eWr+mJg82dKS81kYhcDUgBnRU90wxRdjT8R+cxqJxtgk/poJbMJi/qURza9wedAkgQbk48QQLQ=="; }; } { - name = "electron_builder___electron_builder_22.14.13.tgz"; + name = "electron_publish___electron_publish_24.0.0_alpha.6.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.14.13.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.13.tgz"; - sha512 = "3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw=="; + name = "electron_publish___electron_publish_24.0.0_alpha.6.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.6.tgz"; + sha512 = "ppRriKQuLGK8eZrCveQrf1zB+fV6qcTck6cq4NEC61KyvtQlUdvDV4yGRVmkOO28CYRmhq9w093T93Qc6k/TeQ=="; }; } { - name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; path = fetchurl { - name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz"; - sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; + name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; + sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; }; } { - name = "electron_publish___electron_publish_22.14.13.tgz"; + name = "electron___electron_22.0.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.14.13.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.13.tgz"; - sha512 = "0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ=="; + name = "electron___electron_22.0.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz"; + sha512 = "cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg=="; }; } { - name = "electron_to_chromium___electron_to_chromium_1.4.90.tgz"; + name = "emittery___emittery_0.13.1.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.4.90.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.90.tgz"; - sha512 = "ZwKgSA0mQMyEhz+NR0F8dRzkrCLeHLzLkjx/CWf16+zV85hQ6meXPQbKanvhnpkYb7b2uJNj+enQJ/N877ND4Q=="; - }; - } - { - name = "electron___electron_17.0.1.tgz"; - path = fetchurl { - name = "electron___electron_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-17.0.1.tgz"; - sha512 = "CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA=="; - }; - } - { - name = "emittery___emittery_0.8.1.tgz"; - path = fetchurl { - name = "emittery___emittery_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz"; - sha512 = "uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="; + name = "emittery___emittery_0.13.1.tgz"; + url = "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz"; + sha512 = "DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ=="; }; } { @@ -1850,11 +2322,11 @@ }; } { - name = "encodeurl___encodeurl_1.0.2.tgz"; + name = "encoding___encoding_0.1.13.tgz"; path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; }; } { @@ -1866,6 +2338,22 @@ }; } { + name = "enhanced_resolve___enhanced_resolve_5.12.0.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"; + sha512 = "QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ=="; + }; + } + { + name = "entities___entities_4.4.0.tgz"; + path = fetchurl { + name = "entities___entities_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz"; + sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; + }; + } + { name = "env_paths___env_paths_2.2.1.tgz"; path = fetchurl { name = "env_paths___env_paths_2.2.1.tgz"; @@ -1874,6 +2362,22 @@ }; } { + name = "envinfo___envinfo_7.8.1.tgz"; + path = fetchurl { + name = "envinfo___envinfo_7.8.1.tgz"; + url = "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz"; + sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; + }; + } + { + name = "err_code___err_code_2.0.3.tgz"; + path = fetchurl { + name = "err_code___err_code_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + } + { name = "error_ex___error_ex_1.3.2.tgz"; path = fetchurl { name = "error_ex___error_ex_1.3.2.tgz"; @@ -1882,6 +2386,14 @@ }; } { + name = "es_module_lexer___es_module_lexer_0.9.3.tgz"; + path = fetchurl { + name = "es_module_lexer___es_module_lexer_0.9.3.tgz"; + url = "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; + sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; + }; + } + { name = "es6_error___es6_error_4.1.1.tgz"; path = fetchurl { name = "es6_error___es6_error_4.1.1.tgz"; @@ -1898,19 +2410,11 @@ }; } { - name = "escape_goat___escape_goat_2.1.1.tgz"; - path = fetchurl { - name = "escape_goat___escape_goat_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; - }; - } - { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; } { @@ -1946,6 +2450,14 @@ }; } { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + } + { name = "eslint_scope___eslint_scope_7.1.1.tgz"; path = fetchurl { name = "eslint_scope___eslint_scope_7.1.1.tgz"; @@ -1978,19 +2490,19 @@ }; } { - name = "eslint___eslint_8.9.0.tgz"; + name = "eslint___eslint_8.29.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.9.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.9.0.tgz"; - sha512 = "PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q=="; + name = "eslint___eslint_8.29.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz"; + sha512 = "isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg=="; }; } { - name = "espree___espree_9.3.1.tgz"; + name = "espree___espree_9.4.1.tgz"; path = fetchurl { - name = "espree___espree_9.3.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz"; - sha512 = "bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ=="; + name = "espree___espree_9.4.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz"; + sha512 = "XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg=="; }; } { @@ -2018,6 +2530,14 @@ }; } { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + } + { name = "estraverse___estraverse_5.3.0.tgz"; path = fetchurl { name = "estraverse___estraverse_5.3.0.tgz"; @@ -2034,6 +2554,14 @@ }; } { + name = "events___events_3.3.0.tgz"; + path = fetchurl { + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; + }; + } + { name = "execa___execa_5.1.1.tgz"; path = fetchurl { name = "execa___execa_5.1.1.tgz"; @@ -2046,23 +2574,23 @@ path = fetchurl { name = "exit___exit_0.1.2.tgz"; url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; - sha1 = "BjJjj42HfMghB9MKD/8aF8uhzQw="; + sha512 = "Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="; }; } { - name = "expect___expect_27.5.1.tgz"; + name = "expect___expect_29.3.1.tgz"; path = fetchurl { - name = "expect___expect_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz"; - sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; + name = "expect___expect_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz"; + sha512 = "gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA=="; }; } { - name = "extract_zip___extract_zip_1.7.0.tgz"; + name = "extract_zip___extract_zip_2.0.1.tgz"; path = fetchurl { - name = "extract_zip___extract_zip_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; - sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; + name = "extract_zip___extract_zip_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; }; } { @@ -2094,23 +2622,31 @@ path = fetchurl { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; + }; + } + { + name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; + path = fetchurl { + name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"; + sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; }; } { - name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; + name = "fastq___fastq_1.14.0.tgz"; path = fetchurl { - name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; - url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz"; - sha512 = "FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg=="; + name = "fastq___fastq_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz"; + sha512 = "eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg=="; }; } { - name = "fb_watchman___fb_watchman_2.0.1.tgz"; + name = "fb_watchman___fb_watchman_2.0.2.tgz"; path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; - sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; + name = "fb_watchman___fb_watchman_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz"; + sha512 = "p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="; }; } { @@ -2118,7 +2654,7 @@ path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; + sha512 = "cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="; }; } { @@ -2130,11 +2666,11 @@ }; } { - name = "filelist___filelist_1.0.2.tgz"; + name = "filelist___filelist_1.0.4.tgz"; path = fetchurl { - name = "filelist___filelist_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; + name = "filelist___filelist_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz"; + sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; }; } { @@ -2154,27 +2690,27 @@ }; } { - name = "flat_cache___flat_cache_3.0.4.tgz"; + name = "find_up___find_up_5.0.0.tgz"; path = fetchurl { - name = "flat_cache___flat_cache_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + name = "find_up___find_up_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; } { - name = "flatted___flatted_3.2.5.tgz"; + name = "flat_cache___flat_cache_3.0.4.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.5.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; } { - name = "form_data___form_data_3.0.1.tgz"; + name = "flatted___flatted_3.2.7.tgz"; path = fetchurl { - name = "form_data___form_data_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; - sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + name = "flatted___flatted_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz"; + sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; }; } { @@ -2186,11 +2722,11 @@ }; } { - name = "fs_extra___fs_extra_10.0.1.tgz"; + name = "fs_extra___fs_extra_10.1.0.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz"; - sha512 = "NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag=="; + name = "fs_extra___fs_extra_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz"; + sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; }; } { @@ -2210,11 +2746,19 @@ }; } { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + } + { name = "fs.realpath___fs.realpath_1.0.0.tgz"; path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; } { @@ -2234,11 +2778,11 @@ }; } { - name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + name = "gauge___gauge_4.0.4.tgz"; path = fetchurl { - name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; + name = "gauge___gauge_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; }; } { @@ -2258,19 +2802,19 @@ }; } { - name = "get_package_type___get_package_type_0.1.0.tgz"; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; path = fetchurl { - name = "get_package_type___get_package_type_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; - sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; } { - name = "get_stream___get_stream_4.1.0.tgz"; + name = "get_package_type___get_package_type_0.1.0.tgz"; path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + name = "get_package_type___get_package_type_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; + sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; } { @@ -2298,35 +2842,35 @@ }; } { - name = "glob___glob_7.2.0.tgz"; + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; path = fetchurl { - name = "glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; } { - name = "global_agent___global_agent_3.0.0.tgz"; + name = "glob___glob_7.2.3.tgz"; path = fetchurl { - name = "global_agent___global_agent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; - sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; + name = "glob___glob_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; } { - name = "global_dirs___global_dirs_3.0.0.tgz"; + name = "glob___glob_8.0.3.tgz"; path = fetchurl { - name = "global_dirs___global_dirs_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; + name = "glob___glob_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz"; + sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; }; } { - name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + name = "global_agent___global_agent_3.0.0.tgz"; path = fetchurl { - name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; + name = "global_agent___global_agent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; + sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } { @@ -2338,43 +2882,43 @@ }; } { - name = "globals___globals_13.13.0.tgz"; + name = "globals___globals_13.19.0.tgz"; path = fetchurl { - name = "globals___globals_13.13.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz"; - sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; + name = "globals___globals_13.19.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz"; + sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; }; } { - name = "globalthis___globalthis_1.0.2.tgz"; + name = "globalthis___globalthis_1.0.3.tgz"; path = fetchurl { - name = "globalthis___globalthis_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; - sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; + name = "globalthis___globalthis_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz"; + sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; } { - name = "got___got_9.6.0.tgz"; + name = "got___got_11.8.6.tgz"; path = fetchurl { - name = "got___got_9.6.0.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + name = "got___got_11.8.6.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz"; + sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; }; } { - name = "graceful_fs___graceful_fs_4.2.9.tgz"; + name = "graceful_fs___graceful_fs_4.2.10.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.9.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + name = "graceful_fs___graceful_fs_4.2.10.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; } { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + name = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; path = fetchurl { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "TK+tdrxi8C+gObL5Tpo906ORpyU="; + name = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; + sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; }; } { @@ -2382,7 +2926,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; } { @@ -2394,11 +2938,27 @@ }; } { - name = "has_yarn___has_yarn_2.1.0.tgz"; + name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; + path = fetchurl { + name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + }; + } + { + name = "has_symbols___has_symbols_1.0.3.tgz"; path = fetchurl { - name = "has_yarn___has_yarn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; + name = "has_symbols___has_symbols_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; } { @@ -2410,6 +2970,14 @@ }; } { + name = "highlight.js___highlight.js_11.7.0.tgz"; + path = fetchurl { + name = "highlight.js___highlight.js_11.7.0.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.7.0.tgz"; + sha512 = "1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ=="; + }; + } + { name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; @@ -2418,11 +2986,11 @@ }; } { - name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; path = fetchurl { - name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; - sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; + name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"; + sha512 = "oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA=="; }; } { @@ -2442,14 +3010,6 @@ }; } { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; - path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; - sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; - }; - } - { name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; path = fetchurl { name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; @@ -2458,11 +3018,19 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; + sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; } { @@ -2474,19 +3042,19 @@ }; } { - name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + name = "humanize_ms___humanize_ms_1.2.1.tgz"; path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; - sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; }; } { - name = "iconv_lite___iconv_lite_0.4.24.tgz"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { - name = "iconv_lite___iconv_lite_0.4.24.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; + sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; }; } { @@ -2506,11 +3074,11 @@ }; } { - name = "ignore___ignore_5.2.0.tgz"; + name = "ignore___ignore_5.2.4.tgz"; path = fetchurl { - name = "ignore___ignore_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; + name = "ignore___ignore_5.2.4.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz"; + sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; }; } { @@ -2522,14 +3090,6 @@ }; } { - name = "import_lazy___import_lazy_2.1.0.tgz"; - path = fetchurl { - name = "import_lazy___import_lazy_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "BWmOPUXIjo1+nZLLBYTnfwlvPkM="; - }; - } - { name = "import_local___import_local_3.1.0.tgz"; path = fetchurl { name = "import_local___import_local_3.1.0.tgz"; @@ -2542,7 +3102,23 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; + }; + } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; } { @@ -2550,7 +3126,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; } { @@ -2562,19 +3138,19 @@ }; } { - name = "ini___ini_2.0.0.tgz"; + name = "interpret___interpret_3.1.1.tgz"; path = fetchurl { - name = "ini___ini_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; + name = "interpret___interpret_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz"; + sha512 = "6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ=="; }; } { - name = "ini___ini_1.3.8.tgz"; + name = "ip___ip_2.0.0.tgz"; path = fetchurl { - name = "ini___ini_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + name = "ip___ip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; }; } { @@ -2582,15 +3158,7 @@ path = fetchurl { name = "is_arrayish___is_arrayish_0.2.1.tgz"; url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; - }; - } - { - name = "is_ci___is_ci_2.0.0.tgz"; - path = fetchurl { - name = "is_ci___is_ci_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; }; } { @@ -2602,11 +3170,11 @@ }; } { - name = "is_core_module___is_core_module_2.8.1.tgz"; + name = "is_core_module___is_core_module_2.11.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.8.1.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz"; - sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; + name = "is_core_module___is_core_module_2.11.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz"; + sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; }; } { @@ -2614,7 +3182,7 @@ path = fetchurl { name = "is_extglob___is_extglob_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; } { @@ -2642,19 +3210,19 @@ }; } { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; + name = "is_interactive___is_interactive_1.0.0.tgz"; path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; + name = "is_interactive___is_interactive_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz"; + sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; }; } { - name = "is_npm___is_npm_5.0.0.tgz"; + name = "is_lambda___is_lambda_1.0.1.tgz"; path = fetchurl { - name = "is_npm___is_npm_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; + name = "is_lambda___is_lambda_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; } { @@ -2666,14 +3234,6 @@ }; } { - name = "is_obj___is_obj_2.0.0.tgz"; - path = fetchurl { - name = "is_obj___is_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; - }; - } - { name = "is_path_inside___is_path_inside_3.0.3.tgz"; path = fetchurl { name = "is_path_inside___is_path_inside_3.0.3.tgz"; @@ -2682,6 +3242,14 @@ }; } { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + } + { name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; path = fetchurl { name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; @@ -2698,59 +3266,43 @@ }; } { - name = "is_svg___is_svg_4.3.2.tgz"; + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; path = fetchurl { - name = "is_svg___is_svg_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.2.tgz"; - sha512 = "mM90duy00JGMyjqIVHu9gNTjywdZV+8qNasX8cm/EEYZ53PHDgajvbBwNVvty5dwSAxLUD3p3bdo+7sR/UMrpw=="; + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; }; } { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; + name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; + name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz"; + sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; } { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + name = "isbinaryfile___isbinaryfile_5.0.0.tgz"; path = fetchurl { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; + name = "isbinaryfile___isbinaryfile_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz"; + sha512 = "UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg=="; }; } { - name = "isarray___isarray_1.0.0.tgz"; - path = fetchurl { - name = "isarray___isarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; - }; - } - { - name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; + name = "isexe___isexe_2.0.0.tgz"; path = fetchurl { - name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; } { - name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + name = "isobject___isobject_3.0.1.tgz"; path = fetchurl { - name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; - sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; - }; - } - { - name = "isexe___isexe_2.0.0.tgz"; - path = fetchurl { - name = "isexe___isexe_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; } { @@ -2762,11 +3314,11 @@ }; } { - name = "istanbul_lib_instrument___istanbul_lib_instrument_5.1.0.tgz"; + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.1.tgz"; path = fetchurl { - name = "istanbul_lib_instrument___istanbul_lib_instrument_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz"; - sha512 = "czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q=="; + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz"; + sha512 = "pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg=="; }; } { @@ -2786,251 +3338,251 @@ }; } { - name = "istanbul_reports___istanbul_reports_3.1.4.tgz"; + name = "istanbul_reports___istanbul_reports_3.1.5.tgz"; path = fetchurl { - name = "istanbul_reports___istanbul_reports_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz"; - sha512 = "r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw=="; + name = "istanbul_reports___istanbul_reports_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz"; + sha512 = "nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w=="; }; } { - name = "jake___jake_10.8.4.tgz"; + name = "jake___jake_10.8.5.tgz"; path = fetchurl { - name = "jake___jake_10.8.4.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz"; - sha512 = "MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA=="; + name = "jake___jake_10.8.5.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; + sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; }; } { - name = "jest_changed_files___jest_changed_files_27.5.1.tgz"; + name = "jest_changed_files___jest_changed_files_29.2.0.tgz"; path = fetchurl { - name = "jest_changed_files___jest_changed_files_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz"; - sha512 = "buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw=="; + name = "jest_changed_files___jest_changed_files_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz"; + sha512 = "qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA=="; }; } { - name = "jest_circus___jest_circus_27.5.1.tgz"; + name = "jest_circus___jest_circus_29.3.1.tgz"; path = fetchurl { - name = "jest_circus___jest_circus_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz"; - sha512 = "D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw=="; + name = "jest_circus___jest_circus_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz"; + sha512 = "wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg=="; }; } { - name = "jest_cli___jest_cli_27.5.1.tgz"; + name = "jest_cli___jest_cli_29.3.1.tgz"; path = fetchurl { - name = "jest_cli___jest_cli_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz"; - sha512 = "Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw=="; + name = "jest_cli___jest_cli_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz"; + sha512 = "TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ=="; }; } { - name = "jest_config___jest_config_27.5.1.tgz"; + name = "jest_config___jest_config_29.3.1.tgz"; path = fetchurl { - name = "jest_config___jest_config_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz"; - sha512 = "5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA=="; + name = "jest_config___jest_config_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz"; + sha512 = "y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg=="; }; } { - name = "jest_diff___jest_diff_27.5.1.tgz"; + name = "jest_diff___jest_diff_29.3.1.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz"; - sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw=="; + name = "jest_diff___jest_diff_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz"; + sha512 = "vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw=="; }; } { - name = "jest_docblock___jest_docblock_27.5.1.tgz"; + name = "jest_docblock___jest_docblock_29.2.0.tgz"; path = fetchurl { - name = "jest_docblock___jest_docblock_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz"; - sha512 = "rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ=="; + name = "jest_docblock___jest_docblock_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz"; + sha512 = "bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A=="; }; } { - name = "jest_each___jest_each_27.5.1.tgz"; + name = "jest_each___jest_each_29.3.1.tgz"; path = fetchurl { - name = "jest_each___jest_each_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz"; - sha512 = "1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ=="; + name = "jest_each___jest_each_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz"; + sha512 = "qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA=="; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.5.1.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_29.3.1.tgz"; path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz"; - sha512 = "TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw=="; + name = "jest_environment_jsdom___jest_environment_jsdom_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz"; + sha512 = "G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA=="; }; } { - name = "jest_environment_node___jest_environment_node_27.5.1.tgz"; + name = "jest_environment_node___jest_environment_node_29.3.1.tgz"; path = fetchurl { - name = "jest_environment_node___jest_environment_node_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz"; - sha512 = "Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw=="; + name = "jest_environment_node___jest_environment_node_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz"; + sha512 = "xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag=="; }; } { - name = "jest_get_type___jest_get_type_27.5.1.tgz"; + name = "jest_get_type___jest_get_type_29.2.0.tgz"; path = fetchurl { - name = "jest_get_type___jest_get_type_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz"; - sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="; + name = "jest_get_type___jest_get_type_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz"; + sha512 = "uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA=="; }; } { - name = "jest_haste_map___jest_haste_map_27.5.1.tgz"; + name = "jest_haste_map___jest_haste_map_29.3.1.tgz"; path = fetchurl { - name = "jest_haste_map___jest_haste_map_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz"; - sha512 = "7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng=="; + name = "jest_haste_map___jest_haste_map_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz"; + sha512 = "/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A=="; }; } { - name = "jest_jasmine2___jest_jasmine2_27.5.1.tgz"; + name = "jest_leak_detector___jest_leak_detector_29.3.1.tgz"; path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz"; - sha512 = "jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ=="; + name = "jest_leak_detector___jest_leak_detector_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz"; + sha512 = "3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA=="; }; } { - name = "jest_leak_detector___jest_leak_detector_27.5.1.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_29.3.1.tgz"; path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz"; - sha512 = "POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ=="; + name = "jest_matcher_utils___jest_matcher_utils_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz"; + sha512 = "fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ=="; }; } { - name = "jest_matcher_utils___jest_matcher_utils_27.5.1.tgz"; + name = "jest_message_util___jest_message_util_29.3.1.tgz"; path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz"; - sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw=="; + name = "jest_message_util___jest_message_util_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz"; + sha512 = "lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA=="; }; } { - name = "jest_message_util___jest_message_util_27.5.1.tgz"; + name = "jest_mock___jest_mock_29.3.1.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz"; - sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g=="; + name = "jest_mock___jest_mock_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz"; + sha512 = "H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA=="; }; } { - name = "jest_mock___jest_mock_27.5.1.tgz"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.3.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz"; - sha512 = "K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og=="; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz"; + sha512 = "+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w=="; }; } { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + name = "jest_regex_util___jest_regex_util_29.2.0.tgz"; path = fetchurl { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; - sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="; + name = "jest_regex_util___jest_regex_util_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz"; + sha512 = "6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA=="; }; } { - name = "jest_regex_util___jest_regex_util_27.5.1.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_29.3.1.tgz"; path = fetchurl { - name = "jest_regex_util___jest_regex_util_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz"; - sha512 = "4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="; + name = "jest_resolve_dependencies___jest_resolve_dependencies_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz"; + sha512 = "Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA=="; }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.5.1.tgz"; + name = "jest_resolve___jest_resolve_29.3.1.tgz"; path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz"; - sha512 = "QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg=="; + name = "jest_resolve___jest_resolve_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz"; + sha512 = "amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw=="; }; } { - name = "jest_resolve___jest_resolve_27.5.1.tgz"; + name = "jest_runner___jest_runner_29.3.1.tgz"; path = fetchurl { - name = "jest_resolve___jest_resolve_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz"; - sha512 = "FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw=="; + name = "jest_runner___jest_runner_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz"; + sha512 = "oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA=="; }; } { - name = "jest_runner___jest_runner_27.5.1.tgz"; + name = "jest_runtime___jest_runtime_29.3.1.tgz"; path = fetchurl { - name = "jest_runner___jest_runner_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz"; - sha512 = "g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ=="; + name = "jest_runtime___jest_runtime_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz"; + sha512 = "jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A=="; }; } { - name = "jest_runtime___jest_runtime_27.5.1.tgz"; + name = "jest_snapshot___jest_snapshot_29.3.1.tgz"; path = fetchurl { - name = "jest_runtime___jest_runtime_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz"; - sha512 = "o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A=="; + name = "jest_snapshot___jest_snapshot_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz"; + sha512 = "+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA=="; }; } { - name = "jest_serializer___jest_serializer_27.5.1.tgz"; + name = "jest_util___jest_util_29.3.1.tgz"; path = fetchurl { - name = "jest_serializer___jest_serializer_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz"; - sha512 = "jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w=="; + name = "jest_util___jest_util_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz"; + sha512 = "7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ=="; }; } { - name = "jest_snapshot___jest_snapshot_27.5.1.tgz"; + name = "jest_validate___jest_validate_29.3.1.tgz"; path = fetchurl { - name = "jest_snapshot___jest_snapshot_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz"; - sha512 = "yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA=="; + name = "jest_validate___jest_validate_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz"; + sha512 = "N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g=="; }; } { - name = "jest_util___jest_util_27.5.1.tgz"; + name = "jest_watcher___jest_watcher_29.3.1.tgz"; path = fetchurl { - name = "jest_util___jest_util_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz"; - sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; + name = "jest_watcher___jest_watcher_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz"; + sha512 = "RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg=="; }; } { - name = "jest_validate___jest_validate_27.5.1.tgz"; + name = "jest_worker___jest_worker_27.5.1.tgz"; path = fetchurl { - name = "jest_validate___jest_validate_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz"; - sha512 = "thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ=="; + name = "jest_worker___jest_worker_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz"; + sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; } { - name = "jest_watcher___jest_watcher_27.5.1.tgz"; + name = "jest_worker___jest_worker_29.3.1.tgz"; path = fetchurl { - name = "jest_watcher___jest_watcher_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz"; - sha512 = "z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw=="; + name = "jest_worker___jest_worker_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz"; + sha512 = "lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw=="; }; } { - name = "jest_worker___jest_worker_27.5.1.tgz"; + name = "jest___jest_29.3.1.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz"; - sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; + name = "jest___jest_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz"; + sha512 = "6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA=="; }; } { - name = "jest___jest_27.5.1.tgz"; + name = "js_sdsl___js_sdsl_4.2.0.tgz"; path = fetchurl { - name = "jest___jest_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz"; - sha512 = "Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ=="; + name = "js_sdsl___js_sdsl_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz"; + sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="; }; } { @@ -3058,11 +3610,11 @@ }; } { - name = "jsdom___jsdom_16.7.0.tgz"; + name = "jsdom___jsdom_20.0.3.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.7.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz"; - sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; + name = "jsdom___jsdom_20.0.3.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz"; + sha512 = "SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ=="; }; } { @@ -3074,11 +3626,11 @@ }; } { - name = "json_buffer___json_buffer_3.0.0.tgz"; + name = "json_buffer___json_buffer_3.0.1.tgz"; path = fetchurl { - name = "json_buffer___json_buffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; + name = "json_buffer___json_buffer_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz"; + sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; } { @@ -3102,7 +3654,7 @@ path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; } { @@ -3110,15 +3662,15 @@ path = fetchurl { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.2.tgz"; path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + name = "json5___json5_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; } { @@ -3126,7 +3678,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; + sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; }; } { @@ -3138,27 +3690,27 @@ }; } { - name = "keyv___keyv_3.1.0.tgz"; + name = "keyv___keyv_4.5.2.tgz"; path = fetchurl { - name = "keyv___keyv_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + name = "keyv___keyv_4.5.2.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz"; + sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; }; } { - name = "kleur___kleur_3.0.3.tgz"; + name = "kind_of___kind_of_6.0.3.tgz"; path = fetchurl { - name = "kleur___kleur_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; - sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; } { - name = "latest_version___latest_version_5.1.0.tgz"; + name = "kleur___kleur_3.0.3.tgz"; path = fetchurl { - name = "latest_version___latest_version_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; + name = "kleur___kleur_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; + sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; } { @@ -3190,7 +3742,7 @@ path = fetchurl { name = "levn___levn_0.3.0.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4="; + sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; }; } { @@ -3202,6 +3754,14 @@ }; } { + name = "loader_runner___loader_runner_4.3.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz"; + sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; + }; + } + { name = "locate_path___locate_path_5.0.0.tgz"; path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; @@ -3210,6 +3770,14 @@ }; } { + name = "locate_path___locate_path_6.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; + }; + } + { name = "lodash.merge___lodash.merge_4.6.2.tgz"; path = fetchurl { name = "lodash.merge___lodash.merge_4.6.2.tgz"; @@ -3226,11 +3794,11 @@ }; } { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + name = "log_symbols___log_symbols_4.1.0.tgz"; path = fetchurl { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + name = "log_symbols___log_symbols_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; } { @@ -3242,6 +3810,14 @@ }; } { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + } + { name = "lru_cache___lru_cache_6.0.0.tgz"; path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; @@ -3250,6 +3826,22 @@ }; } { + name = "lru_cache___lru_cache_7.14.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz"; + sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; + }; + } + { + name = "lzma_native___lzma_native_8.0.6.tgz"; + path = fetchurl { + name = "lzma_native___lzma_native_8.0.6.tgz"; + url = "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz"; + sha512 = "09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA=="; + }; + } + { name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { name = "make_dir___make_dir_3.1.0.tgz"; @@ -3258,6 +3850,14 @@ }; } { + name = "make_fetch_happen___make_fetch_happen_10.2.1.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz"; + sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; + }; + } + { name = "makeerror___makeerror_1.0.12.tgz"; path = fetchurl { name = "makeerror___makeerror_1.0.12.tgz"; @@ -3266,6 +3866,14 @@ }; } { + name = "marked___marked_4.2.4.tgz"; + path = fetchurl { + name = "marked___marked_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz"; + sha512 = "Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA=="; + }; + } + { name = "matcher___matcher_3.0.0.tgz"; path = fetchurl { name = "matcher___matcher_3.0.0.tgz"; @@ -3282,11 +3890,11 @@ }; } { - name = "micromatch___micromatch_4.0.4.tgz"; + name = "micromatch___micromatch_4.0.5.tgz"; path = fetchurl { - name = "micromatch___micromatch_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + name = "micromatch___micromatch_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; } { @@ -3330,11 +3938,11 @@ }; } { - name = "minimatch___minimatch_3.0.4.tgz"; + name = "mimic_response___mimic_response_3.1.0.tgz"; path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + name = "mimic_response___mimic_response_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; }; } { @@ -3346,27 +3954,91 @@ }; } { - name = "minimist___minimist_1.2.6.tgz"; + name = "minimatch___minimatch_5.1.2.tgz"; + path = fetchurl { + name = "minimatch___minimatch_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; + }; + } + { + name = "minimist___minimist_1.2.7.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + }; + } + { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + } + { + name = "minipass_fetch___minipass_fetch_2.1.2.tgz"; + path = fetchurl { + name = "minipass_fetch___minipass_fetch_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz"; + sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + } + { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + path = fetchurl { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + } + { + name = "minipass___minipass_3.3.6.tgz"; + path = fetchurl { + name = "minipass___minipass_3.3.6.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + } + { + name = "minipass___minipass_4.0.0.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + name = "minipass___minipass_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; }; } { - name = "mkdirp___mkdirp_0.5.6.tgz"; + name = "minizlib___minizlib_2.1.2.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.6.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; } { - name = "ms___ms_2.0.0.tgz"; + name = "mkdirp___mkdirp_1.0.4.tgz"; path = fetchurl { - name = "ms___ms_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; } { @@ -3378,11 +4050,43 @@ }; } { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + } + { name = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; + }; + } + { + name = "negotiator___negotiator_0.6.3.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; + }; + } + { + name = "node_abi___node_abi_3.30.0.tgz"; + path = fetchurl { + name = "node_abi___node_abi_3.30.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz"; + sha512 = "qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw=="; }; } { @@ -3394,43 +4098,75 @@ }; } { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; + }; + } + { + name = "node_api_version___node_api_version_0.1.4.tgz"; + path = fetchurl { + name = "node_api_version___node_api_version_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz"; + sha512 = "KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g=="; + }; + } + { + name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; + path = fetchurl { + name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; + sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + }; + } + { + name = "node_gyp___node_gyp_9.3.1.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_9.3.1.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz"; + sha512 = "4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg=="; + }; + } + { name = "node_int64___node_int64_0.4.0.tgz"; path = fetchurl { name = "node_int64___node_int64_0.4.0.tgz"; url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; - sha1 = "h6kGXNs1XTGC2PlM4RGIuCXGijs="; + sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="; }; } { - name = "node_releases___node_releases_2.0.2.tgz"; + name = "node_releases___node_releases_2.0.8.tgz"; path = fetchurl { - name = "node_releases___node_releases_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz"; - sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; + name = "node_releases___node_releases_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz"; + sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; }; } { - name = "normalize_path___normalize_path_3.0.0.tgz"; + name = "nopt___nopt_6.0.0.tgz"; path = fetchurl { - name = "normalize_path___normalize_path_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + name = "nopt___nopt_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz"; + sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; }; } { - name = "normalize_url___normalize_url_4.5.1.tgz"; + name = "normalize_path___normalize_path_3.0.0.tgz"; path = fetchurl { - name = "normalize_url___normalize_url_4.5.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; } { - name = "npm_conf___npm_conf_1.1.3.tgz"; + name = "normalize_url___normalize_url_6.1.0.tgz"; path = fetchurl { - name = "npm_conf___npm_conf_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; + name = "normalize_url___normalize_url_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; + sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; } { @@ -3442,11 +4178,19 @@ }; } { - name = "nwsapi___nwsapi_2.2.0.tgz"; + name = "npmlog___npmlog_6.0.2.tgz"; path = fetchurl { - name = "nwsapi___nwsapi_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; - sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; + name = "npmlog___npmlog_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; + }; + } + { + name = "nwsapi___nwsapi_2.2.2.tgz"; + path = fetchurl { + name = "nwsapi___nwsapi_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz"; + sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; } { @@ -3462,7 +4206,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; } { @@ -3490,11 +4234,19 @@ }; } { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; + name = "ora___ora_5.4.1.tgz"; path = fetchurl { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + name = "ora___ora_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; + }; + } + { + name = "p_cancelable___p_cancelable_2.1.1.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; } { @@ -3506,6 +4258,14 @@ }; } { + name = "p_limit___p_limit_3.1.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + } + { name = "p_locate___p_locate_4.1.0.tgz"; path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; @@ -3514,19 +4274,27 @@ }; } { - name = "p_try___p_try_2.2.0.tgz"; + name = "p_locate___p_locate_5.0.0.tgz"; path = fetchurl { - name = "p_try___p_try_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + name = "p_locate___p_locate_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; + }; + } + { + name = "p_map___p_map_4.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; } { - name = "package_json___package_json_6.5.0.tgz"; + name = "p_try___p_try_2.2.0.tgz"; path = fetchurl { - name = "package_json___package_json_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -3546,11 +4314,11 @@ }; } { - name = "parse5___parse5_6.0.1.tgz"; + name = "parse5___parse5_7.1.2.tgz"; path = fetchurl { - name = "parse5___parse5_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; + name = "parse5___parse5_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz"; + sha512 = "Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw=="; }; } { @@ -3566,7 +4334,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; } { @@ -3590,7 +4358,7 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; + sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; }; } { @@ -3610,14 +4378,6 @@ }; } { - name = "pify___pify_3.0.0.tgz"; - path = fetchurl { - name = "pify___pify_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; - }; - } - { name = "pirates___pirates_4.0.5.tgz"; path = fetchurl { name = "pirates___pirates_4.0.5.tgz"; @@ -3634,11 +4394,11 @@ }; } { - name = "plist___plist_3.0.4.tgz"; + name = "plist___plist_3.0.6.tgz"; path = fetchurl { - name = "plist___plist_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; - sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; + name = "plist___plist_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz"; + sha512 = "WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA=="; }; } { @@ -3654,39 +4414,39 @@ path = fetchurl { name = "prelude_ls___prelude_ls_1.1.2.tgz"; url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="; + sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; } { - name = "prepend_http___prepend_http_2.0.0.tgz"; + name = "pretty_format___pretty_format_29.3.1.tgz"; path = fetchurl { - name = "prepend_http___prepend_http_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; + name = "pretty_format___pretty_format_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz"; + sha512 = "FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg=="; }; } { - name = "pretty_format___pretty_format_27.5.1.tgz"; + name = "progress___progress_2.0.3.tgz"; path = fetchurl { - name = "pretty_format___pretty_format_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz"; - sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + name = "promise_inflight___promise_inflight_1.0.1.tgz"; path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; }; } { - name = "progress___progress_2.0.3.tgz"; + name = "promise_retry___promise_retry_2.0.1.tgz"; path = fetchurl { - name = "progress___progress_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + name = "promise_retry___promise_retry_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; } { @@ -3698,19 +4458,11 @@ }; } { - name = "proto_list___proto_list_1.2.4.tgz"; + name = "psl___psl_1.9.0.tgz"; path = fetchurl { - name = "proto_list___proto_list_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "IS1b/hMYMGpCD2QCuOJv85ZHqEk="; - }; - } - { - name = "psl___psl_1.8.0.tgz"; - path = fetchurl { - name = "psl___psl_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + name = "psl___psl_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; } { @@ -3730,43 +4482,67 @@ }; } { - name = "pupa___pupa_2.1.1.tgz"; + name = "querystringify___querystringify_2.2.0.tgz"; + path = fetchurl { + name = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; + }; + } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + path = fetchurl { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + }; + } + { + name = "quick_lru___quick_lru_5.1.1.tgz"; + path = fetchurl { + name = "quick_lru___quick_lru_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; path = fetchurl { - name = "pupa___pupa_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; } { - name = "rc___rc_1.2.8.tgz"; + name = "react_is___react_is_18.2.0.tgz"; path = fetchurl { - name = "rc___rc_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + name = "react_is___react_is_18.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz"; + sha512 = "xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="; }; } { - name = "react_is___react_is_17.0.2.tgz"; + name = "read_config_file___read_config_file_6.3.2.tgz"; path = fetchurl { - name = "react_is___react_is_17.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; - sha512 = "w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="; + name = "read_config_file___read_config_file_6.3.2.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz"; + sha512 = "M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q=="; }; } { - name = "read_config_file___read_config_file_6.2.0.tgz"; + name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { - name = "read_config_file___read_config_file_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; - sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { - name = "readable_stream___readable_stream_2.3.7.tgz"; + name = "rechoir___rechoir_0.8.0.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_2.3.7.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + name = "rechoir___rechoir_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz"; + sha512 = "/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ=="; }; } { @@ -3778,27 +4554,27 @@ }; } { - name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { - name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; - sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; }; } { - name = "registry_url___registry_url_5.1.0.tgz"; + name = "requires_port___requires_port_1.0.0.tgz"; path = fetchurl { - name = "registry_url___registry_url_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; } { - name = "require_directory___require_directory_2.1.1.tgz"; + name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; path = fetchurl { - name = "require_directory___require_directory_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; + name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; + sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; }; } { @@ -3834,19 +4610,43 @@ }; } { - name = "resolve___resolve_1.22.0.tgz"; + name = "resolve___resolve_1.22.1.tgz"; path = fetchurl { - name = "resolve___resolve_1.22.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; - sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; + name = "resolve___resolve_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; } { - name = "responselike___responselike_1.0.2.tgz"; + name = "responselike___responselike_2.0.1.tgz"; path = fetchurl { - name = "responselike___responselike_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; + name = "responselike___responselike_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; + }; + } + { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; + }; + } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; }; } { @@ -3866,11 +4666,19 @@ }; } { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; + name = "run_parallel___run_parallel_1.2.0.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { @@ -3898,27 +4706,27 @@ }; } { - name = "saxes___saxes_5.0.1.tgz"; + name = "saxes___saxes_6.0.0.tgz"; path = fetchurl { - name = "saxes___saxes_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; - sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; + name = "saxes___saxes_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz"; + sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="; }; } { - name = "semver_compare___semver_compare_1.0.0.tgz"; + name = "schema_utils___schema_utils_3.1.1.tgz"; path = fetchurl { - name = "semver_compare___semver_compare_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; + name = "schema_utils___schema_utils_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; + sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; }; } { - name = "semver_diff___semver_diff_3.1.1.tgz"; + name = "semver_compare___semver_compare_1.0.0.tgz"; path = fetchurl { - name = "semver_diff___semver_diff_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; }; } { @@ -3930,11 +4738,19 @@ }; } { - name = "semver___semver_7.3.5.tgz"; + name = "semver___semver_7.3.8.tgz"; path = fetchurl { - name = "semver___semver_7.3.5.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + name = "semver___semver_7.3.8.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; } { @@ -3946,6 +4762,30 @@ }; } { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; + }; + } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; + }; + } + { name = "shebang_command___shebang_command_2.0.0.tgz"; path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; @@ -3970,6 +4810,14 @@ }; } { + name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; + path = fetchurl { + name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"; + sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="; + }; + } + { name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { name = "sisteransi___sisteransi_1.0.5.tgz"; @@ -4002,35 +4850,43 @@ }; } { - name = "source_map_support___source_map_support_0.5.21.tgz"; + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.21.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; + sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; }; } { - name = "source_map___source_map_0.5.7.tgz"; + name = "socks___socks_2.7.1.tgz"; path = fetchurl { - name = "source_map___source_map_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; + name = "socks___socks_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz"; + sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; }; } { - name = "source_map___source_map_0.6.1.tgz"; + name = "source_map_support___source_map_support_0.5.13.tgz"; path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + name = "source_map_support___source_map_support_0.5.13.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; + sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w=="; }; } { - name = "source_map___source_map_0.7.3.tgz"; + name = "source_map_support___source_map_support_0.5.21.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.21.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; path = fetchurl { - name = "source_map___source_map_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -4046,15 +4902,23 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.0.3.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; + }; + } + { + name = "ssri___ssri_9.0.1.tgz"; + path = fetchurl { + name = "ssri___ssri_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz"; + sha512 = "o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q=="; }; } { - name = "stack_utils___stack_utils_2.0.5.tgz"; + name = "stack_utils___stack_utils_2.0.6.tgz"; path = fetchurl { - name = "stack_utils___stack_utils_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz"; - sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; + name = "stack_utils___stack_utils_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz"; + sha512 = "XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="; }; } { @@ -4082,11 +4946,11 @@ }; } { - name = "string_decoder___string_decoder_1.1.1.tgz"; + name = "string_decoder___string_decoder_1.3.0.tgz"; path = fetchurl { - name = "string_decoder___string_decoder_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -4122,22 +4986,6 @@ }; } { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; - }; - } - { - name = "strnum___strnum_1.0.5.tgz"; - path = fetchurl { - name = "strnum___strnum_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz"; - sha512 = "J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="; - }; - } - { name = "sumchecker___sumchecker_3.0.1.tgz"; path = fetchurl { name = "sumchecker___sumchecker_3.0.1.tgz"; @@ -4170,14 +5018,6 @@ }; } { - name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; - path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; - sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; - }; - } - { name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; path = fetchurl { name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; @@ -4194,6 +5034,22 @@ }; } { + name = "tapable___tapable_2.2.1.tgz"; + path = fetchurl { + name = "tapable___tapable_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz"; + sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; + }; + } + { + name = "tar___tar_6.1.13.tgz"; + path = fetchurl { + name = "tar___tar_6.1.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; + }; + } + { name = "temp_file___temp_file_3.4.0.tgz"; path = fetchurl { name = "temp_file___temp_file_3.4.0.tgz"; @@ -4202,11 +5058,19 @@ }; } { - name = "terminal_link___terminal_link_2.1.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_5.3.6.tgz"; path = fetchurl { - name = "terminal_link___terminal_link_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz"; - sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; + name = "terser_webpack_plugin___terser_webpack_plugin_5.3.6.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz"; + sha512 = "kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ=="; + }; + } + { + name = "terser___terser_5.16.1.tgz"; + path = fetchurl { + name = "terser___terser_5.16.1.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz"; + sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; }; } { @@ -4222,31 +5086,23 @@ path = fetchurl { name = "text_table___text_table_0.2.0.tgz"; url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; } { - name = "throat___throat_6.0.1.tgz"; + name = "tldts_core___tldts_core_5.7.103.tgz"; path = fetchurl { - name = "throat___throat_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz"; - sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="; + name = "tldts_core___tldts_core_5.7.103.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.103.tgz"; + sha512 = "MdSolgnhJwr2SH6a+5KFAYB8znpYdRLoOFTJmrWslsec9Ne/V3DBrw+BbS1YYQJKGTin6U02Y9CSYxnOpg3vwg=="; }; } { - name = "tldts_core___tldts_core_5.7.72.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.103.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.7.72.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.72.tgz"; - sha512 = "UVnXJQbM3CGYwXVy16nNJHh/MWr7fcaEyd3DravwgZjWn0pPHuQ/ajtGonzi9F62Ld3d5r6zBlOTI7qLlLJR1Q=="; - }; - } - { - name = "tldts_experimental___tldts_experimental_5.7.72.tgz"; - path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.72.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.72.tgz"; - sha512 = "Qg1FOnR8jCXBySOQVSaAmRZ4UiKse60MY7eTdx6oIaQ8ve+xGi+dXybb4+RN4cu9c4M7HOoGYkWERQ5tkBAPbg=="; + name = "tldts_experimental___tldts_experimental_5.7.103.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz"; + sha512 = "oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ=="; }; } { @@ -4278,15 +5134,7 @@ path = fetchurl { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; - }; - } - { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - path = fetchurl { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; }; } { @@ -4298,19 +5146,19 @@ }; } { - name = "tough_cookie___tough_cookie_4.0.0.tgz"; + name = "tough_cookie___tough_cookie_4.1.2.tgz"; path = fetchurl { - name = "tough_cookie___tough_cookie_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; - sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; + name = "tough_cookie___tough_cookie_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz"; + sha512 = "G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ=="; }; } { - name = "tr46___tr46_2.1.0.tgz"; + name = "tr46___tr46_3.0.0.tgz"; path = fetchurl { - name = "tr46___tr46_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz"; - sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; + name = "tr46___tr46_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz"; + sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; }; } { @@ -4318,15 +5166,7 @@ path = fetchurl { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha1 = "QFkjkJWS1W94pYGENLC3hInKXys="; - }; - } - { - name = "tunnel___tunnel_0.0.6.tgz"; - path = fetchurl { - name = "tunnel___tunnel_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; + sha512 = "95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ=="; }; } { @@ -4342,7 +5182,7 @@ path = fetchurl { name = "type_check___type_check_0.3.2.tgz"; url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "WITKtRLPHTVeP7eE8wgEsrUg23I="; + sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; }; } { @@ -4378,27 +5218,27 @@ }; } { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + name = "typescript___typescript_4.9.4.tgz"; path = fetchurl { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + name = "typescript___typescript_4.9.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz"; + sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; }; } { - name = "typedarray___typedarray_0.0.6.tgz"; + name = "unique_filename___unique_filename_2.0.1.tgz"; path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; + name = "unique_filename___unique_filename_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz"; + sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A=="; }; } { - name = "unique_string___unique_string_2.0.0.tgz"; + name = "unique_slug___unique_slug_3.0.0.tgz"; path = fetchurl { - name = "unique_string___unique_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; + name = "unique_slug___unique_slug_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz"; + sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w=="; }; } { @@ -4410,6 +5250,14 @@ }; } { + name = "universalify___universalify_0.2.0.tgz"; + path = fetchurl { + name = "universalify___universalify_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz"; + sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; + }; + } + { name = "universalify___universalify_2.0.0.tgz"; path = fetchurl { name = "universalify___universalify_2.0.0.tgz"; @@ -4418,11 +5266,11 @@ }; } { - name = "update_notifier___update_notifier_5.1.0.tgz"; + name = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; path = fetchurl { - name = "update_notifier___update_notifier_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; + name = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; + sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; }; } { @@ -4434,11 +5282,11 @@ }; } { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + name = "url_parse___url_parse_1.5.10.tgz"; path = fetchurl { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; + name = "url_parse___url_parse_1.5.10.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; } { @@ -4446,7 +5294,7 @@ path = fetchurl { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha1 = "9F8VDExm7uloGGUFq5P8u4rWv2E="; + sha512 = "4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA=="; }; } { @@ -4454,23 +5302,15 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; } { - name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_9.0.1.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; - }; - } - { - name = "v8_to_istanbul___v8_to_istanbul_8.1.1.tgz"; - path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_8.1.1.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz"; - sha512 = "FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w=="; + name = "v8_to_istanbul___v8_to_istanbul_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz"; + sha512 = "74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w=="; }; } { @@ -4482,19 +5322,11 @@ }; } { - name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + name = "w3c_xmlserializer___w3c_xmlserializer_4.0.0.tgz"; path = fetchurl { - name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; - sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; - }; - } - { - name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; - path = fetchurl { - name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; - sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; + name = "w3c_xmlserializer___w3c_xmlserializer_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz"; + sha512 = "d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw=="; }; } { @@ -4506,43 +5338,91 @@ }; } { - name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + name = "watchpack___watchpack_2.4.0.tgz"; + path = fetchurl { + name = "watchpack___watchpack_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz"; + sha512 = "Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="; + }; + } + { + name = "wcwidth___wcwidth_1.0.1.tgz"; + path = fetchurl { + name = "wcwidth___wcwidth_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; + sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; + }; + } + { + name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; + sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; + }; + } + { + name = "webpack_cli___webpack_cli_5.0.1.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz"; + sha512 = "S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A=="; + }; + } + { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; + }; + } + { + name = "webpack_node_externals___webpack_node_externals_3.0.0.tgz"; + path = fetchurl { + name = "webpack_node_externals___webpack_node_externals_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz"; + sha512 = "LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ=="; + }; + } + { + name = "webpack_sources___webpack_sources_3.2.3.tgz"; path = fetchurl { - name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; + name = "webpack_sources___webpack_sources_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz"; + sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; }; } { - name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + name = "webpack___webpack_5.75.0.tgz"; path = fetchurl { - name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; - sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; + name = "webpack___webpack_5.75.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz"; + sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; } { - name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; path = fetchurl { - name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; + name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"; + sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; }; } { - name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; path = fetchurl { - name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; - sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; + name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"; + sha512 = "nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="; }; } { - name = "whatwg_url___whatwg_url_8.7.0.tgz"; + name = "whatwg_url___whatwg_url_11.0.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.7.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; - sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="; + name = "whatwg_url___whatwg_url_11.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz"; + sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; }; } { @@ -4554,11 +5434,19 @@ }; } { - name = "widest_line___widest_line_3.1.0.tgz"; + name = "wide_align___wide_align_1.1.5.tgz"; path = fetchurl { - name = "widest_line___widest_line_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; + }; + } + { + name = "wildcard___wildcard_2.0.0.tgz"; + path = fetchurl { + name = "wildcard___wildcard_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; + sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; }; } { @@ -4582,39 +5470,31 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; } { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + name = "write_file_atomic___write_file_atomic_4.0.2.tgz"; path = fetchurl { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; + name = "write_file_atomic___write_file_atomic_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz"; + sha512 = "7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="; }; } { - name = "ws___ws_7.5.7.tgz"; + name = "ws___ws_8.11.0.tgz"; path = fetchurl { - name = "ws___ws_7.5.7.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz"; - sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; + name = "ws___ws_8.11.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz"; + sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; }; } { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; path = fetchurl { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; - }; - } - { - name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; - path = fetchurl { - name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; - sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; + name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; + sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; }; } { @@ -4626,14 +5506,6 @@ }; } { - name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; - path = fetchurl { - name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; - url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "Ey7mPS7FVlxVfiD0wi35rKaGsQ0="; - }; - } - { name = "xmlchars___xmlchars_2.2.0.tgz"; path = fetchurl { name = "xmlchars___xmlchars_2.2.0.tgz"; @@ -4650,51 +5522,51 @@ }; } { - name = "yallist___yallist_4.0.0.tgz"; + name = "yallist___yallist_3.1.1.tgz"; path = fetchurl { - name = "yallist___yallist_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; } { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; + name = "yallist___yallist_4.0.0.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { - name = "yargs_parser___yargs_parser_21.0.1.tgz"; + name = "yargs_parser___yargs_parser_21.1.1.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_21.0.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz"; - sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; + name = "yargs_parser___yargs_parser_21.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz"; + sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; }; } { - name = "yargs___yargs_16.2.0.tgz"; + name = "yargs___yargs_17.6.2.tgz"; path = fetchurl { - name = "yargs___yargs_16.2.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; + name = "yargs___yargs_17.6.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz"; + sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; }; } { - name = "yargs___yargs_17.4.0.tgz"; + name = "yauzl___yauzl_2.10.0.tgz"; path = fetchurl { - name = "yargs___yargs_17.4.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz"; - sha512 = "WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA=="; + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha512 = "p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="; }; } { - name = "yauzl___yauzl_2.10.0.tgz"; + name = "yocto_queue___yocto_queue_0.1.0.tgz"; path = fetchurl { - name = "yauzl___yauzl_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; } ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index df0a3323d72a4..ec1e55e3389de 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva +, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva, libGL , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -8,6 +8,7 @@ , libdrm, mesa , nss, nspr , patchelf, makeWrapper +, wayland, pipewire , isSnapshot ? false , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, vivaldi-widevine ? null @@ -20,11 +21,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.6.2867.36"; + version = "5.6.2867.58"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "sha256-dTXppRn/bl+HYVzqyrKBXb2YAaw0lRJkwAeukalv3a4=d"; + sha256 = "sha256-eRHQaKztf66o9FoCNSRyXS5Ht6d51GTilNO5DxItUCw="; }; unpackPhase = '' @@ -38,9 +39,10 @@ in stdenv.mkDerivation rec { stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd libva - freetype fontconfig libXrender libuuid expat glib nss nspr + freetype fontconfig libXrender libuuid expat glib nss nspr libGL libxml2 pango cairo libdrm mesa + wayland pipewire ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs ++ lib.optional pulseSupport libpulseaudio; @@ -89,6 +91,7 @@ in stdenv.mkDerivation rec { done wrapProgram "$out/bin/vivaldi" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + lib.optionalString enableWidevine '' diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 898c3febc1700..1f53c184b3b0e 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { LIBS = lib.optionalString x11Support "-lX11"; meta = with lib; { - homepage = "http://w3m.sourceforge.net/"; + homepage = "https://w3m.sourceforge.net/"; description = "A text-mode web browser"; maintainers = with maintainers; [ cstrahan anthonyroussel ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix index 7dbb6a3c53887..de3c1cfdcdba8 100644 --- a/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/pkgs/applications/networking/browsers/webmacs/default.nix @@ -27,7 +27,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ python3Packages.pytest #python3Packages.pytest-xvfb #python3Packages.pytest-qt diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index ab81254c710fe..3657a1e38e7f8 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { sofia_sip ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/applications/networking/cloudflare-dyndns/default.nix index c1a9309ca4f70..7f11ec257038b 100644 --- a/pkgs/applications/networking/cloudflare-dyndns/default.nix +++ b/pkgs/applications/networking/cloudflare-dyndns/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index 3c309d8e7ce22..266ec0e6a4574 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-hsUpZrtgjP6FaVhw0ijDTlvfz9Ok+A4nyAwi2VNxvEg="; + sha256 = "sha256-HdYbrcz1uumwfUleDayc7obv4Grpg3TiUxKr8aF5bXM="; }; - vendorSha256 = "sha256-gm96rQdQJGsIcxVgEI7sI7BvEETU/+HsQ6PnDjFXb/0="; + vendorHash = "sha256-ZIFZCMyhpfKK/Irq2/MvkXuXX1jExDaSK/nXZgzCZgU="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index f02b6e416c332..6d13063bd0560 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -12,16 +12,25 @@ let # We build the CLI without the static server for simplicity, but the tool is still required for # compilation to succeed. # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117 - staticfiles = pkgsBuildBuild.buildGoPackage rec { + staticfiles = pkgsBuildBuild.buildGoModule rec { name = "staticfiles"; + src = fetchFromGitHub { owner = "bouk"; repo = "staticfiles"; rev = "827d7f6389cd410d0aa3f3d472a4838557bf53dd"; - sha256 = "0xarhmsqypl8036w96ssdzjv3k098p2d4mkmw5f6hkp1m3j67j61"; + hash = "sha256-wchj5KjhTmhc4XVW0sRFCcyx5W9am8TNAIhej3WFWXU="; }; - goPackagePath = "bou.ke/staticfiles"; + vendorHash = null; + + excludedPackages = [ "./example" ]; + + preBuild = '' + cp ${./staticfiles.go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; }; in buildGoModule rec { @@ -55,7 +64,8 @@ buildGoModule rec { ''; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown" "-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}" "-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}" diff --git a/pkgs/applications/networking/cluster/argo/staticfiles.go.mod b/pkgs/applications/networking/cluster/argo/staticfiles.go.mod new file mode 100644 index 0000000000000..952de850dc72e --- /dev/null +++ b/pkgs/applications/networking/cluster/argo/staticfiles.go.mod @@ -0,0 +1,3 @@ +module bou.ke/staticfiles + +go 1.18 diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index e446773233c83..fedf499d481e4 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.8"; + version = "0.4.10"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-U1gvDv364x7FxuqXIeaiMZMl0324rGjiqs8vtlENAlY="; + sha256 = "sha256-DUWJDWqB+jyp3/2/eFP1ss2grNtrvUuvGWK0FYTXObc="; }; - vendorSha256 = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0="; + vendorHash = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index e0908437803a7..034af9a07e5bc 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.5"; + version = "2.5.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-u9VOkUaKQAdlXhCUUONBws4rW6PvxFSNXbit7gi6/P0="; + sha256 = "sha256-hEfPiDbEdmuD/IHM9Tfy0kUkKDpbTZ0HzMjIt/ifcPk="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorSha256 = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw="; + vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index fe59539efb54d..9b0d76a5ac145 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.52"; + version = "0.8.56"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-fKLvWlGJmhTvjcihJOytPvSNqhWOtJhWxMgw9gpc2M0="; + sha256 = "sha256-iU0/ovnclq/jwhi1d6zY4tz56ZB7FT0Mbpi2tEjb9QI="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-E2b0iJtOcRBOW4PEI/1ECM4fJa+s/LHtmRK/iYvJ358="; + vendorHash = "sha256-DsLW5l7TxlXRFZDhtRfq5YqVT3XR7EZGNIoPiksHNck="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index e76b7fc157546..ba99106c0960b 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.21.0"; + version = "0.22.3"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-wDyRXdlkZEzdqVSGYSzLroqMWZDTpPzsu94Mx7lvh2I="; + sha256 = "sha256-A/FT9t5Z+Iw1mVwS3d5Cc86A9e6jVbEtmEWroVUhhtw="; }; - vendorSha256 = "sha256-I3fKo4lsNGQTTi8a6de85rVGoTEvr8wwE2y4OQHks7o="; + vendorHash = "sha256-KUkh5yx+v5g0N4yIpgpt3i+uCtOtR0Jvf2PFQcGWtm8="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 192899ff1b221..d86af2177f87c 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.24.5"; + version = "3.25.0"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-fB9FHiIqVieVkPfHmBvcaUmUqkT1ZbDT26+DUE9lbdc="; + hash = "sha256-sD79WiGKfwjtoiYlLow4h58skbHpuZyzMQ0VOyBKRnk="; }; - vendorHash = "sha256-ogQ/REf5cngoGAFIBN++txew6UqOw1hqCVsixyuGtug="; + vendorHash = "sha256-p4Ve6qWnYyHUUyKmLfbaZIGGfleLuzz+MZgGRSsBoWM="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index bd3672b997b16..2fbbc9ad1d24f 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.41"; + version = "1.0.45"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-dvbxxW+UyTA+EzBV6g9JRao8D6ZE5hhXLX4q/mmPIQg="; + sha256 = "sha256-wYZC4eEvxvHgtb0l+kpP2msQgt8InJu59lgS5cwGxRI="; }; - vendorSha256 = "sha256-gBVSpjoAfbxlJnlrFrsBupJgVQ59sh1ipOry0Mgppig="; + vendorHash = "sha256-42ZTPl4kI+dgr78s9WvLFchQU9uvkMkkio53REjvpbw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index ba8a98d3400a5..fb755ac679372 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-Qaq0I7ZCXRXIWtUN3fcpoN4SURq/OfH+u73nyWYmJOY="; + sha256 = "sha256-NmTMpTaekUTSMnIFn5e1DnuHehJLM5YToY+QK0hnvXk="; }; - vendorSha256 = "sha256-VDSMXE+Vlgmo7T1b+A7uW9BqSDBDyhrneJX1yH+XfDc="; + vendorSha256 = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 6e0340cc8b974..f17904911ea42 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cmctl"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; - rev = "a96bae172ddb1fcd4b57f1859ab9d1a9e94f7451"; - sha256 = "0wj2fshkfdrqrjyq3khzpdjiw5x3djjw9x7qq8mdgzyj84cmz11w"; + rev = "2a0ef53b06e183356d922cd58af2510d8885bef5"; + sha256 = "0cvsmc06gg8w5j2k1zj4i8qpqlvpjfa6d7wn24v0hs1a1qk8c7a8"; }; - vendorSha256 = "sha256-WPFteR3t9qQiuBcCLqvp8GterqcD2SxJi59Wb7BvDT4="; + vendorSha256 = "sha256-aLEQoNt/5ikMw+wExSUITey/68Gk4+dsRbSydsiEiEg="; subPackages = [ "cmd/ctl" ]; diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index aad583c675c01..b917c6a622490 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-I9OmTO5obTwAj4hkecUfmRYR4Q3rdllMfbpESv66eEQ="; + sha256 = "sha256-p6gvXn8v7KZMiCPj2EQlk/2au1nZ6EJlLxcMZHzlEp8="; }; vendorSha256 = null; @@ -24,6 +24,7 @@ buildGoModule rec { "plugins/ipam/host-local" "plugins/ipam/static" "plugins/main/bridge" + "plugins/main/dummy" "plugins/main/host-device" "plugins/main/ipvlan" "plugins/main/loopback" @@ -38,7 +39,7 @@ buildGoModule rec { "plugins/meta/vrf" ]; - passthru.tests = { inherit (nixosTests) cri-o podman; }; + passthru.tests = { inherit (nixosTests) cri-o; }; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; diff --git a/pkgs/applications/networking/cluster/crc/default.nix b/pkgs/applications/networking/cluster/crc/default.nix index 9710156f11507..ed4e2b0583f80 100644 --- a/pkgs/applications/networking/cluster/crc/default.nix +++ b/pkgs/applications/networking/cluster/crc/default.nix @@ -10,20 +10,22 @@ }: let - openShiftVersion = "4.10.22"; - podmanVersion = "4.1.0"; + openShiftVersion = "4.11.18"; + okdVersion = "4.11.0-0.okd-2022-11-05-030711"; + podmanVersion = "4.2.0"; writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; in buildGoModule rec { - version = "2.6.0"; + version = "2.12.0"; pname = "crc"; - gitCommit = "6b954d40ec3280ca63e825805503d4414a3ff55b"; + gitCommit = "ea98bb41e24ad81a319d0aa6c6e1286bc1334c1b"; + modRoot = "cmd/crc"; src = fetchFromGitHub { - owner = "code-ready"; + owner = "crc-org"; repo = "crc"; rev = "v${version}"; - sha256 = "sha256-4EaonL+7/zPEbuM12jQFx8wLR62iLYZ3LkHAibdGQZc="; + sha256 = "sha256-0e62mQ01pt0kClrEx4ss2T8BN1+0aQiCFPyDg5agbTU"; }; vendorSha256 = null; @@ -41,21 +43,18 @@ buildGoModule rec { tags = [ "containers_image_openpgp" ]; ldflags = [ - "-X github.com/code-ready/crc/pkg/crc/version.crcVersion=${version}" - "-X github.com/code-ready/crc/pkg/crc/version.bundleVersion=${openShiftVersion}" - "-X github.com/code-ready/crc/pkg/crc/version.podmanVersion=${podmanVersion}" - "-X github.com/code-ready/crc/pkg/crc/version.commitSha=${gitCommit}" - "-X github.com/code-ready/crc/pkg/crc/segment.WriteKey=${writeKey}" + "-X github.com/crc-org/crc/pkg/crc/version.crcVersion=${version}" + "-X github.com/crc-org/crc/pkg/crc/version.ocpVersion=${openShiftVersion}" + "-X github.com/crc-org/crc/pkg/crc/version.okdVersion=${okdVersion}" + "-X github.com/crc-org/crc/pkg/crc/version.podmanVersion=${podmanVersion}" + "-X github.com/crc-org/crc/pkg/crc/version.commitSha=${builtins.substring 0 8 gitCommit}" + "-X github.com/crc-org/crc/pkg/crc/segment.WriteKey=${writeKey}" ]; preBuild = '' export HOME=$(mktemp -d) ''; - # tests are currently broken on aarch64-darwin - # https://github.com/code-ready/crc/issues/3237 - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); - checkFlags = [ "-args --crc-binary=$out/bin/crc" ]; passthru.tests.version = testers.testVersion { package = crc; @@ -64,6 +63,7 @@ buildGoModule rec { crc version ''; }; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes"; diff --git a/pkgs/applications/networking/cluster/crc/update.sh b/pkgs/applications/networking/cluster/crc/update.sh index 3ac34c168bacd..93503c6115c6f 100755 --- a/pkgs/applications/networking/cluster/crc/update.sh +++ b/pkgs/applications/networking/cluster/crc/update.sh @@ -14,7 +14,7 @@ cd ${NIXPKGS_CRC_FOLDER} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/code-ready/crc/releases >${LATEST_TAG_RAWFILE} + https://api.github.com/repos/crc-org/crc/releases >${LATEST_TAG_RAWFILE} LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1) @@ -22,15 +22,18 @@ LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | CRC_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/code-ready/crc/tags | + https://api.github.com/repos/crc-org/crc/tags | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") FILE_MAKEFILE=${WORKDIR}/Makefile -curl --silent https://raw.githubusercontent.com/code-ready/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE +curl --silent https://raw.githubusercontent.com/crc-org/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE OPENSHIFT_VERSION=$(grep 'OPENSHIFT_VERSION' ${FILE_MAKEFILE} | head -n1 | awk '{print $3}') +OKD_VERSION=$(grep 'OKD_VERSION' ${FILE_MAKEFILE} | + head -n1 | awk '{print $3}') + PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} | head -n1 | awk '{print $3}') @@ -46,6 +49,9 @@ sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \ sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \ ${NIXPKGS_CRC_FOLDER}/default.nix +sed -i "s|okdVersion = \".*\"|okdVersion = \"${OKD_VERSION:-}\"|" \ + ${NIXPKGS_CRC_FOLDER}/default.nix + sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \ ${NIXPKGS_CRC_FOLDER}/default.nix diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index a0bc37f2cdb84..3a543f40dd49c 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -3,7 +3,6 @@ dnsmasq, fetchFromGitHub, lib, - nixosTests, makeWrapper, }: @@ -28,10 +27,6 @@ buildGoModule rec { doCheck = false; # NOTE: requires root privileges - passthru.tests = { - inherit (nixosTests) podman-dnsname; - }; - meta = with lib; { description = "DNS name resolution for containers"; homepage = "https://github.com/containers/dnsname"; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 0b5f01654c501..97fff7f9bbb3e 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,8 +1,8 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.38.2"; - sha256 = "1fr3jg9j0hrnr55wh40d0lli593pid1vqnbgnw9wxqsv6677dh53"; + version = "0.38.3"; + sha256 = "15sx743gbmlmww7jmi56r5nlajg33xmzacyd69hmp46jjxqdckmh"; manifestsSha256 = "1dmp7gdnwbg4jjc3dq1wp2jn3z3g6lm296b1nf24ndcfmjja58cz"; manifests = fetchzip { @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-aPkuP6FVIkMAJi+wwNfgvxXi+PE1mMUXfxz44/R31KI="; + vendorSha256 = "sha256-IuOivH9K7e5vNpK44NKegzIEVHS+ihkX89++4DJC+8Q="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index de9f2e78f9616..5f8781665f4c1 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.37"; + version = "1.13.3"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-3dm60ySi/IdiAzZ+LWMLwxUJRv2HX0tQR5s+XMFqyGg="; + hash = "sha256-nxClmCY/joLJw87IQx9DvAZLv5LgOLGlp9Unh37OKgg="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-b4Nl6uuZmcbxht4IRupyzQJL/o8nj4fIUuHvlHZWYTU="; + vendorHash = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 609113c72211f..60f6c3ddb5ea2 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.10.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-SUPa6bbops2rrzzzYM5fH0l4DT7/rIkOqc396lTesao="; + sha256 = "sha256-Pes1p7rTO17Bef6qacsQWJkhb1CWilzmVYQe886EepU="; }; - vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM="; + vendorSha256 = "sha256-LRMDrBSl5EGQqQt5FUU4JJHqdwfYt5qsVpe76jUQBVI="; subPackages = [ "cmd/helm" ]; ldflags = [ @@ -37,7 +37,8 @@ buildGoModule rec { postInstall = '' $out/bin/helm completion bash > helm.bash $out/bin/helm completion zsh > helm.zsh - installShellCompletion helm.{bash,zsh} + $out/bin/helm completion fish > helm.fish + installShellCompletion helm.{bash,zsh,fish} ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 4915b2766ee7a..fb268db1810a7 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.15.1"; + version = "3.16.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-LgfYcptC1fcINf80dbOZu8HD5oTrF0tTMQCWdsO3H5U="; + sha256 = "sha256-QhAmedSDBi1aRNmp4LR5Xv4HMzcextzT67g9nxN4eko="; }; - vendorSha256 = "sha256-iEsblhejczTFPL7LvEKHE/T1h2xAt7cdnoR8KIv3Wpo="; + vendorHash = "sha256-bVgYj0e/z57sIvVZXAzLkKqKLa0Pe0CT57Vc7Df1oWE="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index e6e5e6c1ce6cb..a78950dde0a3a 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -39,7 +39,7 @@ buildGoModule rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Network, Service & Security Observability for Kubernetes using eBPF"; license = licenses.asl20; homepage = "https://github.com/cilium/hubble/"; diff --git a/pkgs/applications/networking/cluster/k3s/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/chart-versions.nix new file mode 100644 index 0000000000000..8c40604d0f1c6 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz"; + sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz"; + sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 116fd7de9babc..445992104585b 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -47,31 +47,31 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.25.3+k3s1"; # k3s git tag - k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version - k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms"; - k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; + k3sVersion = "1.26.0+k3s2"; # k3s git tag + k3sCommit = "f0ec6a4c127b2c671b271974a2f21783f0e3c525"; # k3s git commit at the above version + k3sRepoSha256 = "0yc2k45s321hjir3c2wabqihk96wbjxp274dpbh9kv3471j89lkm"; + k3sVendorSha256 = "sha256-ptC39SgzCA4CULA+VmcMGlPG8KsLRbWlVI/jQrrF/RU="; - # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 - # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. - traefikChartVersion = "12.0.0"; - traefikChartSha256 = "1sqmi71fi3ad5dh5fmsp9mv80x6pkgqwi4r9fr8l6i9sdnai6f1a"; + # nix generated by update.sh + # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 + # see also https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/manifests/traefik.yaml#L8 + # At the time of writing, there are two traefik charts, and that's it + charts = import ./chart-versions.nix; # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 - k3sRootVersion = "0.11.0"; - k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4"; # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 k3sCNIVersion = "1.1.1-k3s1"; k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; - # taken from go.mod, the 'github.com/containerd/containerd' line - # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` - containerdVersion = "1.5.13-k3s2"; - containerdSha256 = "1pfr2ji4aij9js90gf4a3hqnhyw5hshcjdccm62l700j68gs5z97"; + # taken from ./scripts/version.sh VERSION_CONTAINERD + containerdVersion = "1.6.14-k3s1"; + containerdSha256 = "01zs2xbpmww6hdh248px4dlh1n7xy9gzj2b8afyfmv3c2m2alf5p"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag - criCtlVersion = "1.25.0-k3s1"; + criCtlVersion = "1.26.0-rc.0-k3s1"; baseMeta = { description = "A lightweight Kubernetes distribution"; @@ -99,10 +99,9 @@ let ]; # bundled into the k3s binary - traefikChart = fetchurl { - url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; - sha256 = traefikChartSha256; - }; + traefikChart = fetchurl charts.traefik; + traefik-crdChart = fetchurl charts.traefik-crd; + # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which @@ -224,10 +223,6 @@ buildGoModule rec { src = k3sRepo; vendorSha256 = k3sVendorSha256; - patches = [ - ./patches/0001-scrips-download-strip-downloading-just-package-CRD.patch - ]; - postPatch = '' # Nix prefers dynamically linked binaries over static binary. @@ -295,11 +290,9 @@ buildGoModule rec { ln -vsf ${k3sContainerd}/bin/* ./bin/ rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ mkdir -p ./build/static/charts - # Note, upstream's chart has a 00 suffix. This seems to not matter though, so we're ignoring that naming detail. - export TRAEFIK_CHART_FILE=${traefikChart} - # place the traefik chart using their code since it's complicated - # We trim the actual download, see patches - ./scripts/download + + cp ${traefikChart} ./build/static/charts + cp ${traefik-crdChart} ./build/static/charts export ARCH=$GOARCH export DRONE_TAG="v${k3sVersion}" diff --git a/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch b/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch deleted file mode 100644 index 115fd6824772b..0000000000000 --- a/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001 -From: Euan Kemp <euank@euank.com> -Date: Thu, 3 Feb 2022 23:50:40 -0800 -Subject: [PATCH 2/2] scrips/download: strip downloading, just package CRD - -The CRD packaging is a complicated set of commands, so let's reuse it. ---- - scripts/download | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/scripts/download b/scripts/download -index 5effc0562a..82361803ee 100755 ---- a/scripts/download -+++ b/scripts/download -@@ -24,12 +24,6 @@ rm -rf ${CONTAINERD_DIR} - mkdir -p ${CHARTS_DIR} - mkdir -p ${DATA_DIR} - --curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - --exclude=bin/socat -- --git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR} -- --git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR} -- - setup_tmp() { - TMP_DIR=$(mktemp -d --tmpdir=${CHARTS_DIR}) - cleanup() { -@@ -44,8 +38,8 @@ setup_tmp() { - - download_and_package_traefik () { - echo "Downloading Traefik Helm chart from ${TRAEFIK_URL}" -- curl -sfL ${TRAEFIK_URL} -o ${TMP_DIR}/${TRAEFIK_FILE} -- code=$? -+ # nixpkgs: copy in our known traefik chart instead -+ cp $TRAEFIK_CHART_FILE ${TMP_DIR}/${TRAEFIK_FILE} - - if [ $code -ne 0 ]; then - echo "Error: Failed to download Traefik Helm chart!" --- -2.34.1 - diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 913be71d0dee5..651d54adc1d5c 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -11,7 +11,7 @@ NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ cd ${NIXPKGS_K3S_PATH} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json -curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ +curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE} LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ @@ -19,27 +19,52 @@ LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') -K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ +K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ https://api.github.com/repos/k3s-io/k3s/tags \ | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz) FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download -curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD +curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh -curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION +curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION -FILE_MANIFESTS_TRAEFIK=${WORKDIR}/manifests-traefik.yaml -curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml > $FILE_MANIFESTS_TRAEFIK +FILE_TRAEFIK_MANIFEST=${WORKDIR}/traefik.yml +curl --silent -f -o "$FILE_TRAEFIK_MANIFEST" https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml + +CHART_FILES=( $(yq eval --no-doc .spec.chart "$FILE_TRAEFIK_MANIFEST" | xargs -n1 basename) ) +# These files are: +# 1. traefik-crd-20.3.1+up20.3.0.tgz +# 2. traefik-20.3.1+up20.3.0.tgz +# at the time of writing + +if [[ "${#CHART_FILES[@]}" != "2" ]]; then + echo "New manifest charts added, the packaging scripts will need to be updated: ${CHART_FILES}" + exit 1 +fi + +CHARTS_URL=https://k3s.io/k3s-charts/assets +# Get metadata for both files +rm -f chart-versions.nix.update +cat > chart-versions.nix.update <<EOF +{ + traefik-crd = { + url = "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}"; + sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}")"; + }; + traefik = { + url = "${CHARTS_URL}/traefik/${CHART_FILES[1]}"; + sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik/${CHART_FILES[1]}")"; + }; +} +EOF +mv chart-versions.nix.update chart-versions.nix FILE_GO_MOD=${WORKDIR}/go.mod curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD -TRAEFIK_CHART_VERSION=$(yq e '.spec.chart' $FILE_MANIFESTS_TRAEFIK | awk 'match($0, /([0-9.]+)([0-9]{2})/, -m) { print m[1]; exit; }') -TRAEFIK_CHART_SHA256=$(nix-prefetch-url --quiet "https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz") K3S_ROOT_VERSION=$(grep 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \ | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') @@ -51,8 +76,8 @@ CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \ CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") -CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \ - | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') +CONTAINERD_VERSION=$(grep 'VERSION_CONTAINERD=' ${FILE_SCRIPTS_VERSION} \ + | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") @@ -67,9 +92,6 @@ setKV k3sVersion ${K3S_VERSION} setKV k3sCommit ${K3S_COMMIT} setKV k3sRepoSha256 ${K3S_REPO_SHA256} -setKV traefikChartVersion ${TRAEFIK_CHART_VERSION} -setKV traefikChartSha256 ${TRAEFIK_CHART_SHA256} - setKV k3sRootVersion ${K3S_ROOT_VERSION} setKV k3sRootSha256 ${K3S_ROOT_SHA256} diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix new file mode 100644 index 0000000000000..bf35eac948d43 --- /dev/null +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -0,0 +1,36 @@ +{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: + +buildGoModule rec { + pname = "karmor"; + version = "0.11.5"; + + src = fetchFromGitHub { + owner = "kubearmor"; + repo = "kubearmor-client"; + rev = "v${version}"; + hash = "sha256-xVYhZT4yqbSmxGH5DaarXzrGYMS1BuTaQ2T+huWYLBw="; + }; + + vendorHash = "sha256-rlvAQ99/3+3VotyYAR2TgWG8ZdTKUT2XRv4hTF+QFpI="; + + nativeBuildInputs = [ installShellFiles ]; + + # integration tests require network access + doCheck = false; + + postInstall = '' + mv $out/bin/{kubearmor-client,karmor} + installShellCompletion --cmd karmor \ + --bash <($out/bin/karmor completion bash) \ + --fish <($out/bin/karmor completion fish) \ + --zsh <($out/bin/karmor completion zsh) + ''; + + meta = with lib; { + description = "A client tool to help manage KubeArmor"; + homepage = "https://kubearmor.io"; + changelog = "https://github.com/kubearmor/kubearmor-client/releases/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index 7b04b085a20d7..aefcef2bacccb 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kluctl"; - version = "2.16.1"; + version = "2.18.4"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-rcwtVhtLc49rD6J3AZFumLQrZuTveE7OY+agufe/4MQ="; + hash = "sha256-nHfJ7Dt9nAY4fY+U7W46cPRwWSgtGvwdbUjQAynOQdw="; }; - vendorHash = "sha256-IC+sjctDqd0lQD5labl+UYWsRiptQKSjSHYf2SGkp14="; + vendorHash = "sha256-ADYXLcCYmlQim9KvqkXGdEXJ9cACBsRCb3emcmrL0kg="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index c7d14748e80f8..7e7bba1d37b39 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-+1qewL8N3WTS7GW6fpL2+RPbFQQ/3DDMgShtBi+lRtg="; + sha256 = "sha256-lNpUOA6O9sOBugYp9fDklKo6U2E0nKz1ORr3qO2tibg="; }; - vendorSha256 = "sha256-sMobdarMMktf34LbQnyZ6sgbfiJhWxWSQR0F+4x5J58="; + vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; meta = with lib; { description = diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 2b88d1ddd24b3..cb349e0c56346 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-router"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J/wQyrEEdBki8bq1Qesgu4Kqj2w33zzvEEOecFdiGak="; + sha256 = "sha256-aO72wvq31kue75IKfEByhKxUwSSGGmPLzHDBSvTChTM="; }; vendorSha256 = "sha256-+3uTIaXuiwbU0fUgn2th4RNDQ5gCDi3ntPMu92S+mXc="; diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 6b3bcf54c2635..492f9bcd51f4f 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kube-score"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - hash = "sha256-dKvPLAT9e8gNJkKDF7dQPGLSkv9QUjQklUX8Dm8i33E="; + hash = "sha256-/aCuPL0bzzoNczvSdLYS8obTu8bZzO5HhBmRZ3/ArAM="; }; vendorHash = "sha256-pcNdszOfsYKiASOUNKflbr89j/wb9ILQvjMJYsiGPWo="; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index df1e6ab788823..c2818505a8099 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-UTzQyr5N8CButeLKYZs9a8hAV/cezVfLLQ7b4YJQzXU="; + hash = "sha256-AT7BrLVe5sSqAnQyhrkDktxVhuh1e0o5eB8oWWVbL8Q="; }; - vendorHash = "sha256-VvCM0aBk0SnnXVPZRvEGcb1Bl4Uunbc4u1KzukYMGqA="; + vendorHash = "sha256-wxKEywUs5ezeOlIRT2k3C4G0XaX6h1ORt9/G6+FzVic="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index b6a96f0675982..1b1dc175d3c41 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.4"; + version = "1.26.0"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Og8ippw9rPH0Ni72mSlCjo4i/cfZXLAjG38jPvfs9ro="; + sha256 = "sha256-A8J381KNhQbWZ+68P8+1xj/lEEc/+YiJ80LqRQatdFQ="; }; subPackages = ["."]; - vendorSha256 = "sha256-E7I8GNcI/QRgbrstc2Ky0q/DPaqNP11BaDzrrfZofLQ="; + vendorSha256 = "sha256-V+O3yFxGJTcFETD2qYOurQUbME5NvRNQTr43OkxXFFE="; # 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 0197fe79c742c..45f0ee66f61e6 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.24"; + version = "0.0.25"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xHMUS08gtfN72sMkGZ+2Cazgkd2HgvHSKqugYg+j1So="; + sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; }; vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix index 5302917cdfff4..bba56a5b058af 100644 --- a/pkgs/applications/networking/cluster/kubent/default.nix +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubent"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "doitintl"; repo = "kube-no-trouble"; rev = "${version}"; - sha256 = "sha256-aXuBYfXQfg6IQE9cFFTBCPNmDg7IZYPAAeuAxCiU0ro="; + sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U="; }; - vendorSha256 = "sha256-WQwWBcwhFZxXPFO6h+5Y8VDM4urJGfZ6AOvhRoaSbpk="; + vendorSha256 = "sha256-XXf6CPPHVvCTZA4Ve5/wmlgXQ/gZZUW0W/jXA0bJgLA="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 94441c960c013..eb098b2c6c78b 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-HJZrE0fHlyOTQF9EqdrtQNmaHlrMA2RwNg4P7B2lYI0="; + sha256 = "sha256-vIqmE9U/0WGIaTpy8NfUadIkaTdN8YKqvRLQ/69NgBE="; }; - vendorSha256 = "sha256-9hWX6INN5HWXyeFQRjkqr+BsGv56lInVYacvT6Imahw="; + vendorHash = "sha256-K/Cw7Sh/2OqTbWQPEsoQbj/ejyaXcLxFT8Rg5Ore5DE="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 5e89ce36d3a48..c1436fbefcc66 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-tdt5F6KCsIPurkwG9acOHvm1tV2ERBNYtcvheJR+wLA="; + sha256 = "sha256-bC2Q4jWBh27bqLGhvG4JcuHIAQmiGz5jDt9Me9qbVpk="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index da452e9769d6b..a97054a9071fc 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-KssClU/jWdBH29TFhCeui6mN6t6IJlIKM3LzaWdPG7Q="; + sha256 = "sha256-okQJBZLIFujHg5Tn/AbCox8mRrump/GjYjyQzkJAtFg="; }; - vendorSha256 = "sha256-58+MJMn687wh9c25qtwGQdy4uGcZN3T2bWK/cvxlLvQ="; + vendorHash = "sha256-Nzef+cfC4Fosm1e1Whpz/BrGqRlcbD0NpyST8V1iwiU="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index ef70e28328005..cd75bad0a0f38 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook }: +{ lib, fetchurl, appimageTools, wrapGAppsHook, makeWrapper }: let pname = "lens"; - version = "5.5.3"; - build = "${version}-latest.20220602.2"; + version = "6.3.0"; + build = "2022.12.221341-latest"; name = "${pname}-${version}"; src = fetchurl { url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - sha256 = "sha256-lwiwyXoO+7KgDnQ2Ly0QK0oEVHR73nsMZMGOd2j48dg="; + sha256 = "sha256-IJkm2Woz362jydFph9ek+5Jh2jtDH8kKvWoLQhTZPvc="; name = "${pname}.AppImage"; }; @@ -23,11 +23,12 @@ appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} - + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Icon=lens' 'Icon=${pname}' \ --replace 'Exec=AppRun' 'Exec=${pname}' @@ -37,7 +38,7 @@ appimageTools.wrapType2 { description = "The Kubernetes IDE"; homepage = "https://k8slens.dev/"; license = licenses.mit; - maintainers = with maintainers; [ dbirks ]; + maintainers = with maintainers; [ dbirks RossComputerGuy ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/applications/networking/cluster/levant/default.nix index afee16bf8f8fe..07d9c360de7e9 100644 --- a/pkgs/applications/networking/cluster/levant/default.nix +++ b/pkgs/applications/networking/cluster/levant/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "levant"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "levant"; rev = "v${version}"; - sha256 = "sha256-ujybD4nSHC/w2Pfu43eSO6rNJjXFAvc81T05icWFvbs="; + sha256 = "sha256-UI8PVvTqk8D4S9kq3sgxrm8dkRokpgkLyTN6pzUXNV0="; }; - vendorSha256 = "sha256-pKxj0qz7adSuPpiXu4+2KBO3JZu8zZ8ycPF5LosF4T8="; + vendorSha256 = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; # The tests try to connect to a Nomad cluster. doCheck = false; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 1ad1a56896b8c..4e31f689dd7de 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "22.8.2"; - sha256 = "114lfq5d5b09zg14iwnmaf0vmm183xr37q7b4bj3m8zbzhpbk7xx"; - vendorSha256 = "sha256-hKdokt5QW50oc2z8UFMq78DRWpwPlL5tSf2F0rQNEQ8="; + version = "23.1.1"; + sha256 = "159myaz0zh0j8vdknxshyvkl1khxbznvls2mk5wyssxqll8b3j32"; + vendorSha256 = "sha256-7+ppFmM+NVnMU6pg2FcaSGqcq429EmrPYgAZfHANtEg="; } diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 5635d6ab2745e..cf306f858b659 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -69,14 +69,6 @@ let }; }) - (self: super: { - certifi = super.certifi.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = [ "CVE-2022-23491" ]; - }; - }); - }) - ]; } ).python; diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 8c47fde8bb7be..e7bd82971014e 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "683baa66c613216a662aad3fd58b0cdc5cd41adb"; - sha256 = "00yyzsybn1fjhkar64albxqp46d1v9c6lf1gd10lh9q72xq979sf"; + rev = "5013072c5ca34247d7dce545c3a7b1954948fd4d"; + sha256 = "0417xq7s0qkh9ali8grlahpxl4sgg4dla302dda4768wbp0wagcz"; }; } ); @@ -75,8 +75,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/lukebfox/nixops-hetznercloud.git"; - rev = "386f8b7cfe724308a9c1e97e76d238498a279495"; - sha256 = "0ig9maxcprxvz0fgriyzgcqz990s1pspizzsqj7x3xg0w0dpx853"; + rev = "c00533400506d40940f7c1f67bf3973db37d9dd9"; + sha256 = "1xfwhiyay7x1r3q6rxn2f3h0llgwf73vl8fxp0ww13rgny2w0dgj"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index 134dec79feb2b..3f7ce6a1a49e8 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -2,14 +2,14 @@ [[package]] name = "apache-libcloud" -version = "3.6.1" +version = "3.7.0" description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" category = "main" optional = false python-versions = ">=3.6, <4" files = [ - {file = "apache-libcloud-3.6.1.tar.gz", hash = "sha256:0facf3206568430c998da40e9bbac6d3a0c4fc80dd51674d9e794b381450120c"}, - {file = "apache_libcloud-3.6.1-py2.py3-none-any.whl", hash = "sha256:d01eee601b6367e711788c47a275ee717f23854f5267d9ba3b3e8ed3bb400e56"}, + {file = "apache-libcloud-3.7.0.tar.gz", hash = "sha256:148a9e50069654432a7d34997954e91434dd38ebf68832eb9c75d442b3e62fad"}, + {file = "apache_libcloud-3.7.0-py2.py3-none-any.whl", hash = "sha256:027a9aff2c01db9c8e6f9f94b6eb44b3153d82702c42bfbe7af5624dabf1f950"}, ] [package.dependencies] @@ -29,18 +29,18 @@ files = [ [[package]] name = "boto3" -version = "1.26.32" +version = "1.26.45" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.7" files = [ - {file = "boto3-1.26.32-py3-none-any.whl", hash = "sha256:672b97a634f3408d455bf94a6dfd59ef0c6150019885bc7107e465f062d58c26"}, - {file = "boto3-1.26.32.tar.gz", hash = "sha256:e0d6215313b03f09a9a38eccc88c1d3ba9868bcaaeb8b20eeb6d88fc3018b94d"}, + {file = "boto3-1.26.45-py3-none-any.whl", hash = "sha256:b1bc7db503dc49bdccf5dada080077056a32af9982afdde84578a109cd741d05"}, + {file = "boto3-1.26.45.tar.gz", hash = "sha256:cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f"}, ] [package.dependencies] -botocore = ">=1.29.32,<1.30.0" +botocore = ">=1.29.45,<1.30.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.6.0,<0.7.0" @@ -49,14 +49,14 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.29.32" +version = "1.29.45" description = "Low-level, data-driven core of boto 3." category = "main" optional = false python-versions = ">= 3.7" files = [ - {file = "botocore-1.29.32-py3-none-any.whl", hash = "sha256:b1a65edca151665a6844bf9f317440e31d8d5e4cbce3477f2661462e20c213b1"}, - {file = "botocore-1.29.32.tar.gz", hash = "sha256:27bc3903f7f8c813efd1605ff13ffdfca2c37dc78cadfa488cfda78fca323deb"}, + {file = "botocore-1.29.45-py3-none-any.whl", hash = "sha256:a5c0e13f266ee9a74335a1e5d3e377f2baae27226ae23d78f023bae0d18f3161"}, + {file = "botocore-1.29.45.tar.gz", hash = "sha256:62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f"}, ] [package.dependencies] @@ -325,7 +325,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "683baa66c613216a662aad3fd58b0cdc5cd41adb" +resolved_reference = "5013072c5ca34247d7dce545c3a7b1954948fd4d" [[package]] name = "nixops-aws" @@ -471,7 +471,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/lukebfox/nixops-hetznercloud.git" reference = "HEAD" -resolved_reference = "386f8b7cfe724308a9c1e97e76d238498a279495" +resolved_reference = "c00533400506d40940f7c1f67bf3973db37d9dd9" [[package]] name = "nixops-virtd" diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index 6329ff9ed11c0..eb185f9743c1f 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -45,7 +45,7 @@ let mv bin/nomad-autoscaler $bin/bin ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler - for d in $outputs; do + for d in $(getAllOutputNames); do mkdir -p ''${!d}/share done rmdir $bin/share diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index 32ce4d74a3d93..10c9c6be689a5 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-JKZij9f6zlBzbYolxz03R5j95zKELVmEhX+QRTxF/cc="; + sha256 = "sha256-gi6uFJFP3hdHJqH9y7Q8tUGRJECPHxbajU5BJeBcJzo="; }; subPackages = "cmd/pinniped"; - vendorSha256 = "sha256-szv/B7LG/In0j6MT6KCnuUfaCnK7RsJOLeuOtJ/ig9w="; + vendorHash = "sha256-4N8HtBeGeu22Go63dV0WBdbheXylButu+M9vZL7qOcU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 8fc55abe92822..c9af58b1a8a85 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-eyJ81i9kTuojBuo/rwfgnl3BRpiTnKst0SnL+oWfSWQ="; + sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; }; - vendorSha256 = "sha256-QH/mKq7QydYvUHZIPjoBWy015Sghh30VdEWu76KZdPE="; + vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index e2426fc7d56d8..877dddfa1e2b2 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "3.72.2"; + version = "3.73.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-qw45Ifp8JcJyKaKL1St0HAQGS7JiUestiPGyZcV3gx8="; + sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs="; }; - vendorSha256 = "sha256-FmpnRgU3w2zthgUJuAG5AqLl2UxMb0yywN5Sk9WoWBI="; + vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index e20a5ebd1af4c..3b25ecaa31012 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.10"; + version = "0.15.11"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SuOfRLCEASgiLsy0xeuA1z55+vSMb4VGZuk+OVLSWJA="; + sha256 = "sha256-HgMGwumLL0z3l1/UEoJleoKsErFvznddFc9mJuco9fA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-uTDeYzq8XyjHHXfPQzN/ipHfqsPweedKhQQ8CkvqKIM="; + vendorSha256 = "sha256-WThZpum6sEYyDkwGKo3onMLy6hpmMJ/o6+5olX5nEjk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 19184ac15ae82..7459bba1697b8 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-+V0mRSjAwhZoiIS/OpZyqa5rvlqU9pGJwmW0QZ3H2g4="; + sha256 = "sha256-xO4I4fNf14ltiSnFnAhM8VYBw4JKB0RSQziSshZOFBo="; }; - vendorSha256 = "sha256-IPHu23/2e6406FELB1Mwegp0C16cFD65mbW5Ah32D4Q="; + vendorSha256 = "sha256-tNx1BvZBblyLavFslhqj9DCyfcgbl6HxlZ7zceK1a0w="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 1186684f0e089..255ec944c8dad 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.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-K5eslPo4Ou/JJoZGASJsZ331Nyc14Dva+cead3ngw0U="; + hash = "sha256-o037LemAZhsHVIfAU0yVoNNbJ6g8ehlA4lFLN78Q8dY="; }; - vendorSha256 = "sha256-N+sFJtC+9VCt3GJoAbRsNl7vCXiFFlewsIkwTdleUhk="; + vendorHash = "sha256-HPuVDfVxbHbNaCRg/D4VeW0finbFB4eageiAzoax1wk="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporalite/default.nix b/pkgs/applications/networking/cluster/temporalite/default.nix index 8a4d53797f5ba..a842a896285a1 100644 --- a/pkgs/applications/networking/cluster/temporalite/default.nix +++ b/pkgs/applications/networking/cluster/temporalite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "temporalite"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "temporalio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rLEkWg5LNVb7i/2IARKGuP9ugaVJA9pwYbKLm0QLmOc="; + sha256 = "sha256-IEB9AFEt8U2zXYfbChfL/UH1rNSLPnfS396/cPE8UdE="; }; - vendorSha256 = "sha256-vjuwh/HRRYfB6J49rfJxif12nYPnbBodWF9hTiGygS8="; + vendorSha256 = "sha256-w86/XCMRGBmXM+oQ5+0qiX0fdwiKXvsmEkApuRLUOiA="; subPackages = [ "cmd/temporalite" ]; diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 590abb80acef0..c10b43e1f8b8e 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { semver ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index d2759931b7edc..07e5b7e3787b1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -77,9 +77,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { - 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"; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c7665ecdca6a6..1f4ce103d858b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,14 +1,14 @@ { "aci": { "deleteVendor": true, - "hash": "sha256-Y2cNp2BuPEH5wAEwaMVSBgKoHrcy6d4eOlsGPqAxmoU=", + "hash": "sha256-vTDuSZjO3ZHCUBaIYB7fvXvBPYywGJy307x2rCejOzk=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.5.2", + "rev": "v2.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=" + "vendorHash": "sha256-dEnQa1GaYrx2jxsRSJWlMmy1hGsXACsp+5PtGmSDL6E=" }, "acme": { "hash": "sha256-fK34A45plTqtOYGbq8CAtFnyMYOvdOKFycY7X5ZlRRY=", @@ -30,13 +30,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-6HZHDqdYeIthzqMwTEpYTyjh624tifhoAFOXIh8xqMg=", + "hash": "sha256-8kTT1tD88UZc/ZbunFDF+SlTYM5E3jyQgaBcRBULYlY=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v3.10.0", + "rev": "v3.11.0", "spdx": "MIT", - "vendorHash": "sha256-J/x5oc4Qr4c/K5RKswFeWgUDE+ns1bUxfpRlj29uCY0=" + "vendorHash": "sha256-pCWrJPW39J2SE1U1nQ61XI8/WtB+hqQGu9wKkRNkS1k=" }, "akamai": { "hash": "sha256-vna0TVanrfhbELwpD3ZidwkBfB20dM+11Gq6qdZ0MmA=", @@ -48,11 +48,11 @@ "vendorHash": "sha256-pz+h8vbdCEgNSH9AoPlIP7zprViAMawXk64SV0wnVPo=" }, "alicloud": { - "hash": "sha256-m5IZ6JiEbyAuNo2LiuuP05yApvoHypjFnGioWJ/4ETQ=", + "hash": "sha256-sG241dMkFL9YllVGuQ7KlZ8Ta3hz9v8VdyOOcjOKie0=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.194.1", + "rev": "v1.197.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -66,29 +66,29 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-EzqsTJwjDQ6pIQxdGPOTbNom0RDurAGT0eJmuwAzO4Y=", + "hash": "sha256-GHHhIfBFlc5LlwsDLvpVhlJd5Fp4X2tU26h9PYjgz4Y=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.2.0", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": null + "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" }, "argocd": { - "hash": "sha256-8gyNJrRmrLev53dmMMjpZ3COTwPg5FYaxYBgkrdAWXo=", + "hash": "sha256-FDI/kmgTWVhxJcy3ss8VABntOXJAIDIcz4cB6WtJd2Y=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v4.2.0", + "rev": "v4.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-U88K2CZcN7xh1rPmkZpbRWgj3+lPKN7hkB9T60jR1JQ=" + "vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ=" }, "auth0": { - "hash": "sha256-87T0ta5xU61COOfIZ1CP3TTWdCyd6RKLJ2hqShq+giM=", + "hash": "sha256-BlMYx6Ockk8YpiA0wCu2tBwhUIznFJ9b4knSeKA6M/g=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v0.41.0", + "rev": "v0.42.0", "spdx": "MPL-2.0", "vendorHash": "sha256-OhtomdRIjKxELnSQGbZvrHAE1ag4VAyuSOMrZvZ5q0s=" }, @@ -103,38 +103,38 @@ "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" }, "aviatrix": { - "hash": "sha256-2KJVXIThZ3g1++y5fhKLQjeXZ9r685B8stmWfs2MAs0=", + "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.0.0", + "rev": "v3.0.1", "spdx": "MPL-2.0", "vendorHash": null }, "aws": { - "hash": "sha256-EN8b2mkGys9td4XmTJ4N/Hi1T3EhLo0nv6Mludu3Mso=", + "hash": "sha256-J+x3D7EpV/Kzp98AuhK8pqR26xhItG+JyfkHKc+2IA0=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.48.0", + "rev": "v4.51.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-BplPkGuyoljbGZnX7uDuEJsWZFWAXKe/asma9/wCGRM=" + "vendorHash": "sha256-iL03vDNHPQTAbTRoEutRtQllFgD1wn7qFleuZ4n99q8=" }, "azuread": { - "hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=", + "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.31.0", + "rev": "v2.33.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-xrP3znKMbS4jwtKxIobo8IIeiDp+clFboPrJY6aVYlA=", + "hash": "sha256-dD2o0b5JQ1bZIBFshe+JkfkO5C0a3OvUwfrO2dgIiO8=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.37.0", + "rev": "v3.40.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -149,13 +149,13 @@ }, "baiducloud": { "deleteVendor": true, - "hash": "sha256-4v9FuM69U+4V2Iy85vc4RP9KgzeME/R8rXxNSMBABdM=", + "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.18.4", + "rev": "v1.19.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=" + "vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY=" }, "bigip": { "hash": "sha256-VntKiBTQxe8lKV8Bb3A0moA/EUzyQQ7CInPjKJL4iBQ=", @@ -167,13 +167,13 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-rE9kEMC/b3J5YjF94HBqUhorjcsMAx40jnxgsShNNUc=", + "hash": "sha256-EsupdOP2aWLGeQrtuTyPg4ppM/j0WT0q/UV60oK732Y=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.27.0", + "rev": "v2.29.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-8/ZEO0cxseXqQHx+/wKjsM0T3l+tBdCTFZqNfjaTOpo=" + "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" }, "brightbox": { "hash": "sha256-ISK6cpE4DVrVzjC0N5BdyR3Z5LfF9qfg/ACTgDP+WqY=", @@ -213,29 +213,29 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-gT6Ik4okCAH8555KSGv0wmca0n0NFumRSkQrSvrGit4=", + "hash": "sha256-S4iXhss4ASM4FJdBgElH/3IwpPFjUMy57BXG7C7p5+0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.21.0", + "rev": "v1.22.1", "spdx": "MPL-2.0", "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" }, "cloudflare": { - "hash": "sha256-0hQpnJU1qLHqk8nUO+Ibvh9y8dpBBoDqQj3wiYWMTbg=", + "hash": "sha256-X7rNVMl5K/Z0w/N6+5fuODjR08gF9s3jQ1HqCo3b1WU=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.31.0", + "rev": "v3.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Y5z0bRiNu1gOm7nIcQieLWll/sOSgBlKrJlqng2kizQ=" + "vendorHash": "sha256-7X2T3C775Nq5jc7n41nBREUsOa+EYmBsfBJM5YIo9xI=" }, "cloudfoundry": { - "hash": "sha256-RIzAUhusyA+lMHkfsWk/27x3ZRGVcAzqgBaoI8erQSY=", + "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=", "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.50.3", + "rev": "v0.50.4", "spdx": "MPL-2.0", "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, @@ -286,13 +286,13 @@ "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { - "hash": "sha256-PSFxY/etCWojqX4Dw4sYjNjYBglT0lw5Qi6OzZtZCP0=", + "hash": "sha256-LZYpKwcNvkmpYfhCuZhxfid42IBhRmzfiHZVYu3XAlA=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.19.1", + "rev": "v3.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+NHssfTu4JM37AYyeaBNzhNrnFGcnpVP2DPZngjKfcg=" + "vendorHash": "sha256-IrSQEu3IDFKM9t+3pkygyrrq8KRI8E0BqTui2TR5nFM=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", @@ -340,11 +340,11 @@ "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" }, "docker": { - "hash": "sha256-+zKOwEMWOZoq4fau/Ieo+s+p+fTb4thMqfhrEnopiVQ=", + "hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=", "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", "repo": "terraform-provider-docker", - "rev": "v2.24.0", + "rev": "v3.0.1", "spdx": "MPL-2.0", "vendorHash": "sha256-OdZQb81d7N1TdbDWEImq2U3kLkCPdhRk38+8T8fu+F4=" }, @@ -368,11 +368,11 @@ "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" }, "exoscale": { - "hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=", + "hash": "sha256-F1tYiEy9eQ7GcgVPNfe6Jy6hXEWdFHGXA6esAnOgiQE=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.41.1", + "rev": "v0.43.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -386,22 +386,22 @@ "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { - "hash": "sha256-AlEO9isKHdOxhI7M7Egxv7lmrQ066s2zcIz9fm5dobM=", + "hash": "sha256-SaihRh+DuMY9Mcx+PBAUPv0vrWeKGqx437ayLT3kdjI=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v3.0.3", + "rev": "v3.0.4", "spdx": "MPL-2.0", "vendorHash": null }, "flexibleengine": { - "hash": "sha256-ie7GbJxkB3wekGqA+S9wBWwRDAYK0RIzbFSG+VmTSjw=", + "hash": "sha256-uT8BmACMMJKVPAhL/7rudCXG9AOb4kS1Lswr5ZxY6M4=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.35.1", + "rev": "v1.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Q9xbrRhrq75yzjSK/LTP47xA9uP7PNBsEjTx3oNEwRY=" + "vendorHash": "sha256-obBN7Q/gKbvERJIUVz+GgPjn7/OKjXCiFI6WuOd0hic=" }, "fortios": { "deleteVendor": true, @@ -415,51 +415,51 @@ "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" }, "gandi": { - "hash": "sha256-dF3YCX3ghjg/OGLQT3Vzs/VLRoiuDXrTo5xP1Y8Jhgw=", + "hash": "sha256-mQ4L2XCudyPGDw21jihF7nkSct7/KWAe/txnbtuJ8Lk=", "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", "repo": "terraform-provider-gandi", - "rev": "v2.2.1", + "rev": "v2.2.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=" + "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-o7Sge0rCfP6Yueq+DP7siBsEinawgGe+nEu0/Olu8uQ=", + "hash": "sha256-o/kJwByQDXgbazZPoYW4YeV7BK4Bb3pwQhnWMhW4klE=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.12.0", + "rev": "v5.16.0", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-RCN4CRFffg1rhyNACo/5ebVzbvsUXf6otDRuxlF8RoM=", + "hash": "sha256-bCF6BLuzjUZToZKerfsGcav4DD6AWwOrlELxQKygHv4=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v15.7.1", + "rev": "v15.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7XiZP51K/S5Al+VNJw4NcqzkMeqs2iSHCOlNAI4+id4=" + "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-eF7y62pHjQ5YBs/M3Fh4h0qHyrTs6FyiPQ2hD+oHaVI=", + "hash": "sha256-/UgxXHucsrt960zLQiPruqJLxjFriTrNKjeI1gNEWys=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.47.0", + "rev": "v4.49.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA=" + "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { - "hash": "sha256-DcqVJ5qZIw/qUsZkbhcPiM2gSRpEOyn1irv9kbG5aCs=", + "hash": "sha256-EGwErLYIL0OEIZJQgQizJqqAsZwn1ewPOqAEyg4tC7Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.47.0", + "rev": "v4.49.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA=" + "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -471,20 +471,20 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-eDrLyLlK/6zigBW7IW+w4FtHP5eW82zo2+Ow55H0SKc=", + "hash": "sha256-K1Pal5Fn6KxIlmcnOW6SNPdOzT9JExwhVRFDVTbaTug=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.32.0", + "rev": "v1.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-s6VwvxHXny5gCrbxiRI3F7w3HR3lq2NeiHZgTiU37m0=" + "vendorHash": "sha256-fTc0cNo/ZWUo2tORzDKSDjFsXYIMz+a2+Zsx4fzd3ic=" }, "gridscale": { - "hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=", + "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.16.2", + "rev": "v1.17.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -507,11 +507,11 @@ "vendorHash": null }, "heroku": { - "hash": "sha256-6SNBi4hSGD6XhUSmIOjmPVzo2HnvRBGFW1jMHJLDhuI=", + "hash": "sha256-UGA01N4ToEb3eSKCI2raI3ZXFeRm0MVVXVWgAc7im9g=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.9", + "rev": "v5.1.10", "spdx": "MPL-2.0", "vendorHash": null }, @@ -544,11 +544,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-3fNNip9KZywpW/0xSQbdtTipHsYwLIUBzKIOdYsm+Bk=", + "hash": "sha256-8H9DgpZukJ6K78H6YITPgWai8lPPb8O1tITRTl/azHw=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.43.0", + "rev": "v1.44.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -571,13 +571,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-XWoEUHGTtQ0MFRs5NbW7nA9gvhrlqh78KNqA6M7s+yE=", + "hash": "sha256-DvJow7KDyv1wGBw0QIQQ4MoLgQIT8+Cf6fjc7w4W7Ds=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.48.0", + "rev": "v1.49.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uzXtXpS2reCJK63vipri8nCyHRCLmQxakFuIoMyl95E=" + "vendorHash": "sha256-Vt1AKXJ8KRoDESFvUeZPTjUFm7gwP/Uji4hyU16GhjY=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -688,13 +688,13 @@ "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { - "hash": "sha256-l9XQpIMMar7ForZuBcGOmqrRuSnthIrilr4CHJ5SiaU=", + "hash": "sha256-7P6p23lQ/2Ko/RKETVe7oSZUDwKeGdznUSvbxPWds+Y=", "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", "repo": "terraform-provider-local", - "rev": "v2.2.3", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=" + "vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug=" }, "lxd": { "hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=", @@ -743,13 +743,13 @@ "vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw=" }, "mongodbatlas": { - "hash": "sha256-QMwsVD1RZwL9DPF0gnio4quqUa1b4G0SK73yd6BYnG4=", + "hash": "sha256-jYEeJoMqYo5BCsr8pZlowwUPdW/QrCoHiSpDrEGK9QQ=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.6.1", + "rev": "v1.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WO8B5tiDYQTbKbqWfjjgyMLCmclhE0r2XNRTQ2uyu7s=" + "vendorHash": "sha256-9m+eukHaSdSstWBtjxpgYkgyQVXx0jmKfEz3D9YROO4=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -770,13 +770,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-vSqVYFC79lR19AydrsEVJj9cPRGD5LmBrjzY/X3w6vk=", + "hash": "sha256-lWjXsIeYpe07+kIHr8qS8SmChs0tnfzxWy/K1KNJ5oo=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.11.0", + "rev": "v3.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-l+N4U5y1SLGiMKHsGkgA40SI+fFR6l2H9p5JqVrxrEI=" + "vendorHash": "sha256-Ptjd4A/P2pZL5wP8IGHN385jngfS56w7FN1g/EpknRw=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -788,13 +788,13 @@ "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { - "hash": "sha256-qHR3KJa1y10B+iQPgH6lTt/JUqTmiK/60rPCa3gQDP8=", + "hash": "sha256-2w9x/FTtieWB88CIEkP7BH5saC6dt4IxdROBucczios=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v1.13.0", + "rev": "v1.13.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=" + "vendorHash": "sha256-/Rgerbd8c6Owo79LrYsR9O0JNBrDOODFD+k1Yd5G6cY=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -816,22 +816,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-xGzttO71GTQ9th8qYhVz5EzRIBIWDjkeMUs/TjkUnKU=", + "hash": "sha256-nky2PxHA9TznFh6IGrx3UvOuwrGPnQID04qlDQ4/rm4=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.102.0", + "rev": "v4.104.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-2AR416LkqgfHdY18m4k/jqSet7G77HwHuGKilvS3Yig=", + "hash": "sha256-+aHlFu49BxdFqrVCEIEqpg+o2i4d5F1uZipc//Qipaw=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.39.0", + "rev": "v3.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=" + "vendorHash": "sha256-XwQTtOsg1rktv/Oc+eTJ+Jr+BJvLEQPCaRSeXdXxWB0=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -861,13 +861,13 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-UCnFMsxYD0eGJCtdbV77T62lpmfUH7OZlfL5YEYwcnA=", + "hash": "sha256-brODSqSwZXy3B/F5jqPz1h5UJ2hNncG7tIpICJjoBW4=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.32.1", + "rev": "v1.32.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-gVkbVF2eG8k9vy4BuuoY+s5Uw1QMJ0Q2BHtHDMRpDvY=" + "vendorHash": "sha256-p01ZIAt8cUv/UklRnMu+TTmfEw8jdde9C4nUJrhA7wE=" }, "opsgenie": { "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=", @@ -879,20 +879,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-vYOL9FeYzUWt09rg2GkLDnOCNp6GPXOFv8OhXtUvRUY=", + "hash": "sha256-LcSrs4FUrtp/4tp1xlBPKkfQ3J8FlZ/peL9NcC7XQy4=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.25.0", + "rev": "v0.26.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-RKIKE+kOe1obxzloFzhPZpEk1kVL8Un+fV3of9/AAxQ=", + "hash": "sha256-0gEuIvgiFntP7dHmpkB3IRGMrAI8JbWG0zxiyNdFAiM=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.8.1", + "rev": "v2.9.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -969,13 +969,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-2991jDjOlyJuVcgzTmfKfMt4NfLc1QP7TY9mw+5Z5aM=", + "hash": "sha256-k02p6eoo152SWalGCX4iXhkE5xN55HpQ9A31j7wuIPE=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.8.0", + "rev": "v2.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-YlZSM3duS2QEZo5j+WvCw5KFPbY+NadYonylpB8Zw+o=" + "vendorHash": "sha256-FbWLXt7MFn/86NlSwCYpSV/6Ft3xRcESoNcVxM1A4ng=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -996,13 +996,13 @@ "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" }, "sentry": { - "hash": "sha256-hzSNgRaAZIClElIdmbhO36jYuDN6YELkHzGyFOrNw3w=", + "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.11.0", + "rev": "v0.11.2", "spdx": "MIT", - "vendorHash": "sha256-//0Ijxgm4+b5TZHgBkLb8l6v1DEgEUJSgwcdVt8ys8o=" + "vendorHash": "sha256-5XAetSjMtRffP/xExRUXfclDutEFV0VL3drusaB4rnM=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", @@ -1014,13 +1014,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-alLC61bEaFiVtoH0Fczj7G0m70ie1RNvTBR+MgYZGkQ=", + "hash": "sha256-qzLP+IGZU5bms8zjtcUg9rApZW2+TCF7KrtqSQvr3lw=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.18.0", + "rev": "v6.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=" + "vendorHash": "sha256-zIF5NA5kHXEr3aUleWrCYg8PZTKnrFubaRlALnbTLHQ=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1032,31 +1032,31 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-2VE4/M50KKNH+ZqZM7C4Ed1H17zauQrJVxF54q1ER2o=", + "hash": "sha256-QikYp81omjlSckr/2oXCmAqiJlcMWuR120z86fP/zkE=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.54.0", + "rev": "v0.55.1", "spdx": "MIT", - "vendorHash": "sha256-bYHvuzj3ShX55cgrYobqADxcRDgese+n24p14z82CLA=" + "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" }, "sops": { - "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", + "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", "repo": "terraform-provider-sops", - "rev": "v0.7.1", + "rev": "v0.7.2", "spdx": "MPL-2.0", "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-OxpXh9wCsIjDSA6kDH9Gapkx0cWH8vFJoCxZu5FRPC8=", + "hash": "sha256-JT+kWE6k22qp905soDbnptr7gJZiZ8uRZ4+ZBw++8Mo=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.90.0", + "rev": "v1.95.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-L5nNi2DdchkjuWFOF7mOIiW3GzhDk6P66RQwyw0PhSM=" + "vendorHash": "sha256-vW+1tH+3bT70RrHOTKemM23e0EoX3AO5AMXOAuyyKPA=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1095,22 +1095,22 @@ "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-mN52iD0HdsfzPxo9hLFlKxiwIm7641cnjUYk8XyRP0s=", + "hash": "sha256-CLXW1takpsySUo8lpDe6DzRFczts1zRriHZge5uCb3A=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.2", + "rev": "v1.79.6", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-y9v+13/u91tpRwyI/oLHsd7oUUj0OGFJkqzbk2z8MxU=", + "hash": "sha256-YhsAKyD3YYYWfxIHcAgMxdQc//0WQvXTsa+fVhSCG6U=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.40.0", + "rev": "v0.41.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Z2pIUAe2Beq5Hi7HBxNenFEtAFhJFMPi3k2qiifN+Jg=" + "vendorHash": "sha256-LgCS7W6mGGlX4vEhlPYL+Wo/urHv7aiopXWEBoEyL1c=" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", @@ -1159,11 +1159,11 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-x1YQYan1W2AVg/L6BP8HfORpR2neoljZkQP3tDBM+MI=", + "hash": "sha256-S0pSri0NfxxaYfifUEUVAoEIRPE8y2/sCNdXCLIDGh0=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.33.0", + "rev": "v1.34.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1177,23 +1177,23 @@ "vendorHash": "sha256-jyGp0HIu+VxZ7n6Cctq6pi6Z7IKZ7W7FeqnGXk9Pt7o=" }, "vault": { - "hash": "sha256-y5pK+sZ1xWnzlhT4sFUy5Mp6sggLLtaY4Cx2OPamDIc=", + "hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.11.0", + "rev": "v3.12.0", "spdx": "MPL-2.0", "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, "vcd": { - "hash": "sha256-Gpib9vgd8t//WJj7tuVEUYGf4HitqE/Kz8RyhMglKsw=", + "hash": "sha256-EG4WSnUZr/QfUT1qqOBOGze5Ztxp0HSB9Q1YYgLXQqk=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.8.1", + "rev": "v3.8.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-UT34mv0QN0Nq2+bRmAqFhslSzNe9iESUKEYLmjq9DRM=" + "vendorHash": "sha256-fDMS1ne6EKAqQjfE4QT1A0ChloXKCrgZPcftxzN/JwU=" }, "venafi": { "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 5630cbe9ed573..aaa8a44d60c0e 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -137,7 +137,7 @@ repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" if [[ ${spdx} == 1 ]]; then - spdx="$(curl -L -s "https://api.github.com/repos/${org}/${repo}/license" | jq -r '.license.spdx_id')" + spdx="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/${org}/${repo}/license" | jq -r '.license.spdx_id')" update_attr spdx "${spdx}" fi diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index fe105fa3b71ab..4865ca4901cb8 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.6"; - sha256 = "sha256-aETsvcHoHSwqWCAdn9JPJLcX1Wi1umUghSjkq37OYDU="; + version = "1.3.7"; + sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ"; 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 60e12f1198c6b..bfe34115719ab 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,23 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "terragrunt"; - version = "0.42.5"; + version = "0.43.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-hF40Tb9NND8az9zOOvh9w/VyjbpVlKqnMT7J9oDJjBM="; + rev = "refs/tags/v${version}"; + hash = "sha256-GOYSFhKfe8+9YBNyfCEUDCMssH9cXZi1S/KJTqPgBhY="; }; - vendorSha256 = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4="; + vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; doCheck = false; - ldflags = [ "-s" "-w" "-X main.VERSION=v${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.VERSION=v${version}" + ]; doInstallCheck = true; + installCheckPhase = '' runHook preInstallCheck $out/bin/terragrunt --help diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/applications/networking/cluster/terraspace/Gemfile new file mode 100644 index 0000000000000..0bf6893eeec1e --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem "terraspace", '~> 2.2.3' diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock new file mode 100644 index 0000000000000..1c7b39767c6e6 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock @@ -0,0 +1,129 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.0.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + aws-eventstream (1.2.0) + aws-partitions (1.689.0) + aws-sdk-core (3.168.4) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.61.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.117.2) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + cli-format (0.2.2) + activesupport + text-table + zeitwerk + concurrent-ruby (1.1.10) + deep_merge (1.2.2) + diff-lcs (1.5.0) + dotenv (2.8.1) + dsl_evaluator (0.3.1) + activesupport + memoist + rainbow + zeitwerk + eventmachine (1.2.7) + eventmachine-tail (0.6.5) + eventmachine + graph (2.11.0) + hcl_parser (0.2.2) + rhcl + i18n (1.12.0) + concurrent-ruby (~> 1.0) + jmespath (1.6.2) + memoist (0.16.2) + minitest (5.17.0) + mini_portile2 (2.8.0) + nokogiri (1.13.9) + racc (~> 1.4) + mini_portile2 (~> 2.8.0) + racc (1.6.2) + rainbow (3.1.1) + render_me_pretty (0.8.4) + activesupport + rainbow + tilt + rexml (3.2.5) + rhcl (0.1.0) + deep_merge + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rspec-terraspace (0.3.2) + activesupport + memoist + rainbow + rspec + zeitwerk + rubyzip (2.3.2) + terraspace (2.2.3) + activesupport + bundler + cli-format + deep_merge + dotenv + dsl_evaluator + eventmachine-tail + graph + hcl_parser + memoist + rainbow + render_me_pretty + rexml + rspec-terraspace (>= 0.3.1) + terraspace-bundler (>= 0.5.0) + thor + tty-tree + zeitwerk + zip_folder + terraspace-bundler (0.5.0) + activesupport + aws-sdk-s3 + dsl_evaluator + memoist + nokogiri + rainbow + rubyzip + thor + zeitwerk + text-table (1.2.4) + thor (1.2.1) + tilt (2.0.11) + tty-tree (0.4.0) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) + zeitwerk (2.6.6) + zip_folder (0.1.0) + rubyzip + +PLATFORMS + x86_64-linux + +DEPENDENCIES + terraspace (~> 2.2.3) + +BUNDLED WITH + 2.3.25 diff --git a/pkgs/applications/networking/cluster/terraspace/default.nix b/pkgs/applications/networking/cluster/terraspace/default.nix new file mode 100644 index 0000000000000..af7c1025356a7 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }: +let + rubyEnv = bundlerEnv { + inherit ruby; + name = "terraspace"; + gemdir = ./.; + }; +in stdenv.mkDerivation { + pname = "terraspace"; + version = (import ./gemset.nix).terraspace.version; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${rubyEnv}/bin/terraspace $out/bin/terraspace + wrapProgram $out/bin/terraspace \ + --prefix PATH : ${lib.makeBinPath [ rubyEnv.ruby ]} + ''; + + passthru.updateScript = bundlerUpdateScript "terraspace"; + + meta = with lib; { + description = "Terraform framework that provides an organized structure, and keeps your code DRY"; + homepage = "https://github.com/boltops-tools/terraspace"; + license = licenses.asl20; + platforms = ruby.meta.platforms; + maintainers = with maintainers; [ mislavzanic ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/applications/networking/cluster/terraspace/gemset.nix new file mode 100644 index 0000000000000..cc5e64e944cfa --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/gemset.nix @@ -0,0 +1,464 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; + type = "gem"; + }; + version = "7.0.4"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06878pd1kxbj54dh6jp11a1460dkyxvk4mzwp480gcdqy5jaqwhw"; + type = "gem"; + }; + version = "1.689.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc"; + type = "gem"; + }; + version = "3.168.4"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy"; + type = "gem"; + }; + version = "1.61.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91"; + type = "gem"; + }; + version = "1.117.2"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; + type = "gem"; + }; + version = "1.5.2"; + }; + cli-format = { + dependencies = ["activesupport" "text-table" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mr8vkw5zwb3flhhf8s923mi7r85g1ky0lmjz4q5xhwb48ji55qf"; + type = "gem"; + }; + version = "0.2.2"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + type = "gem"; + }; + version = "1.1.10"; + }; + deep_merge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3"; + type = "gem"; + }; + version = "1.2.2"; + }; + diff-lcs = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; + type = "gem"; + }; + version = "2.8.1"; + }; + dsl_evaluator = { + dependencies = ["activesupport" "memoist" "rainbow" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mck2j0gr851kj9l7pix97jmmwwazfjq83ryamx5rpdbgv5mrh51"; + type = "gem"; + }; + version = "0.3.1"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + eventmachine-tail = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x5ly7mnfr6gibjyxz6lrxb4jbf05p0r8257qcgkf8rkwg9ynw0c"; + type = "gem"; + }; + version = "0.6.5"; + }; + graph = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10l1bdqc9yzdk6kqwh9vw918lyw846gpqw2z8kfcwl53zdjdzcl9"; + type = "gem"; + }; + version = "2.11.0"; + }; + hcl_parser = { + dependencies = ["rhcl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09d55i9y187xkw0fi0b5aq8wyzvq8w73ryi939dvzdzgss25m7jj"; + type = "gem"; + }; + version = "0.2.2"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + type = "gem"; + }; + version = "1.12.0"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; + memoist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; + type = "gem"; + }; + version = "0.16.2"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + type = "gem"; + }; + version = "5.17.0"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + type = "gem"; + }; + version = "2.8.0"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + type = "gem"; + }; + version = "1.13.9"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + type = "gem"; + }; + version = "1.6.2"; + }; + rainbow = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; + type = "gem"; + }; + version = "3.1.1"; + }; + render_me_pretty = { + dependencies = ["activesupport" "rainbow" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cd64d59jx6jjzhi5xngfa031sfpgs7zyq8bhc9y4smlz121l1ij"; + type = "gem"; + }; + version = "0.8.4"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rhcl = { + dependencies = ["deep_merge"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c7xp9y9438mnqrfrvjp1fwy2lk0b1ixz45qi2g2kbl91ilhn834"; + type = "gem"; + }; + version = "0.1.0"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k64i7ax6sqvh702s0xrll2g8isxx1x4zam95ck7122flsyh7van"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-support = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-terraspace = { + dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16bi6x6aynnkp7yh341fmvpiasm1vg43mxf61ji57akdhx4mam5q"; + type = "gem"; + }; + version = "0.3.2"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + terraspace = { + dependencies = ["activesupport" "cli-format" "deep_merge" "dotenv" "dsl_evaluator" "eventmachine-tail" "graph" "hcl_parser" "memoist" "rainbow" "render_me_pretty" "rexml" "rspec-terraspace" "terraspace-bundler" "thor" "tty-tree" "zeitwerk" "zip_folder"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m38gj4bpcafrbrfdck2pswknm2p6mqfq8mp6k3pkjkmk9p3w9a9"; + type = "gem"; + }; + version = "2.2.3"; + }; + terraspace-bundler = { + dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kn6is7zqlw8l4njj4pjwbdi95w651nz3qvqgc3vw07rchs08nnx"; + type = "gem"; + }; + version = "0.5.0"; + }; + text-table = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06yhlnb49fn0fhkmi6lrziyv2hd42gcm2zi3sggm2qab48qxn94j"; + type = "gem"; + }; + version = "1.2.4"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + type = "gem"; + }; + version = "2.0.11"; + }; + tty-tree = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w3nh9yppb7zaswa7d9hnhf6k64z5d3jd8xvpyg2mjfrzcw9rbgs"; + type = "gem"; + }; + version = "0.4.0"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + type = "gem"; + }; + version = "2.0.5"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + type = "gem"; + }; + version = "2.6.6"; + }; + zip_folder = { + dependencies = ["rubyzip"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1884a1ixy7bzm9yp8cjikhdfcn8205p4fsjq894ilby8i1whl58k"; + type = "gem"; + }; + version = "0.1.0"; + }; +} diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 339564f52a04f..19aaa36c7eb69 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.9"; + version = "0.30.13"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4="; + sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/tubekit/default.nix b/pkgs/applications/networking/cluster/tubekit/default.nix new file mode 100644 index 0000000000000..f4a051c9adb72 --- /dev/null +++ b/pkgs/applications/networking/cluster/tubekit/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tubekit"; + version = "4"; + + src = fetchFromGitHub { + owner = "reconquest"; + repo = "tubekit"; + rev = "refs/tags/v${version}"; + hash = "sha256-sq91uR8ITMOv8hivwKQR02mMlJpjDHw6RxiwVUrpwnY="; + }; + + vendorHash = "sha256-qrGzmr1dZPn5r2WBJA7FT7RTqP2sxnrXgbrnKlnpF0Y="; + + meta = with lib; { + description = "Kubectl alternative with quick context switching"; + homepage = "https://github.com/reconquest/tubekit"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ farcaller ]; + }; +} diff --git a/pkgs/applications/networking/cluster/tubekit/wrapper.nix b/pkgs/applications/networking/cluster/tubekit/wrapper.nix new file mode 100644 index 0000000000000..7cba11c97a3af --- /dev/null +++ b/pkgs/applications/networking/cluster/tubekit/wrapper.nix @@ -0,0 +1,17 @@ +{ lib +, runCommand +, makeWrapper +, tubekit-unwrapped +, pname ? "tubekit" +, version ? tubekit-unwrapped.version +, kubectl +}: +runCommand "${pname}-${version}" +{ + inherit pname version; + inherit (tubekit-unwrapped) src meta; + nativeBuildInputs = [ makeWrapper ]; +} '' + mkdir -p $out/bin + makeWrapper ${tubekit-unwrapped}/bin/tubectl $out/bin/tubectl --set-default TUBEKIT_KUBECTL ${kubectl}/bin/kubectl +'' diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 2d24365466b79..84edb644afde3 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PkayQ1sLjnA+1Xatgs0EvZTCTfWV5uoYYtnKX8OAwYQ="; + sha256 = "sha256-7yyOpF/eIeJinTe0sHPWLLBUbKYDhphmW8qkOdYOdXM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix new file mode 100644 index 0000000000000..a1a72a69885a7 --- /dev/null +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -0,0 +1,67 @@ +{ fetchFromGitHub, + findutils, + gnugrep, + gnused, + iproute2, + iptables, + lib, + nettools, # for hostname + openssh, + openssl, + parted, + procps, # for pidof, + python3, + shadow, # for useradd, usermod + util-linux, # for (u)mount, fdisk, sfdisk, mkswap +}: + +let + inherit (lib) makeBinPath; + +in +python3.pkgs.buildPythonPackage rec { + pname = "waagent"; + version = "2.8.0.11"; + src = fetchFromGitHub { + owner = "Azure"; + repo = "WALinuxAgent"; + rev = "04ded9f0b708cfaf4f9b68eead1aef4cc4f32eeb"; + sha256 = "0fvjanvsz1zyzhbjr2alq5fnld43mdd776r2qid5jy5glzv0xbhf"; + }; + doCheck = false; + + buildInputs = with python3.pkgs; [ distro ]; + runtimeDeps = [ + findutils + gnugrep + gnused + iproute2 + iptables + nettools # for hostname + openssh + openssl + parted + procps # for pidof + shadow # for useradd, usermod + util-linux # for (u)mount, fdisk, sfdisk, mkswap + ]; + + fixupPhase = '' + mkdir -p $out/bin/ + WAAGENT=$(find $out -name waagent | grep sbin) + cp $WAAGENT $out/bin/waagent + wrapProgram "$out/bin/waagent" \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : "${makeBinPath runtimeDeps}" + patchShebangs --build "$out/bin/" + ''; + + meta = { + description = "The Microsoft Azure Linux Agent (waagent) + manages Linux provisioning and VM interaction with the Azure + Fabric Controller"; + homepage = "https://github.com/Azure/WALinuxAgent"; + license = with lib.licenses; [ asl20 ]; + }; + +} diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index b1a7727207750..271d82f4d86cf 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.193"; + version = "1.2.195"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-4q+LtPwJa3gioOY90gUfCL4F/8jmtfkBKxBShg2xQas="; + hash = "sha256-rNhCZO4Axeuc5jEAndjma7/jnst1kDNdtb/h/jD2rtE="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index f13d3d321a150..2229ed38bfc44 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = !stdenv.isDarwin; # check-dnstap.sh failing on Darwin - checkInputs = [ + nativeCheckInputs = [ cbor-diag cddl diffutils diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix new file mode 100644 index 0000000000000..243b0d16a25fa --- /dev/null +++ b/pkgs/applications/networking/coreth/default.nix @@ -0,0 +1,49 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "coreth"; + version = "0.11.6"; + + src = fetchFromGitHub { + owner = "ava-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Me+kmEfvSJs8EPU4D7MwkEyHQuvDmQCSIATxygXws5o="; + }; + + # go mod vendor has a bug, see: golang/go#57529 + proxyVendor = true; + + vendorHash = "sha256-jI01tdAVdJOj/ocpwCiaANdyYKSLw00bV7ZtU7HvslA="; + + ldflags = [ + "-s" + "-w" + "-X github.com/ava-labs/coreth/plugin/evm.Version=${version}" + "-X github.com/ava-labs/coreth/cmd/abigen.gitCommit=${version}" + "-X github.com/ava-labs/coreth/cmd/abigen.gitDate=1970-01-01" + ]; + + subPackages = [ + "cmd/abigen" + "plugin" + ]; + + postInstall = "mv $out/bin/{plugin,evm}"; + + meta = with lib; { + description = "Code and wrapper to extract Ethereum blockchain functionalities without network/consensus, for building custom blockchain services"; + homepage = "https://github.com/ava-labs/coreth"; + changelog = "https://github.com/ava-labs/coreth/releases/tag/v${version}"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ urandom ]; + # In file included from ../go/pkg/mod/github.com/zondax/hid@v0.9.1-0.20220302062450-5552068d2266/hid_enabled.go:38: + # ./hidapi/mac/hid.c:693:34: error: use of undeclared identifier 'kIOMainPortDefault' + # entry = IORegistryEntryFromPath(kIOMainPortDefault, path); + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index a48bd4ae44d55..a45fc62cf1f2a 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -2,30 +2,31 @@ , mkDerivation , fetchurl , libxml2 -, libisds +, libdatovka , qmake , qtbase +, qtwebsockets , qtsvg , pkg-config }: mkDerivation rec { pname = "datovka"; - version = "4.15.6"; + version = "4.21.1"; src = fetchurl { - url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qs1yd9qqsf56jm9w6sffkqb2l8s3i9qgi2q8vd59ss19ym6yky2"; + url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; + sha256 = "sha256-mzCtZE4mira/ZeyfujBh+cONq1YbCyLIypiIX0kTVJg="; }; - buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; + buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Client application for operating Czech government-provided Databox infomation system"; homepage = "https://www.datovka.cz/"; - license = licenses.lgpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.mmahut ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 68a14207e297a..5826c94f4bb8c 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - homepage = "http://davmail.sourceforge.net/"; + homepage = "https://davmail.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 6012ed489ba7b..2a1bb79b655ed 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.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eIFrVeaNJcYSzMHo5I2g0isdkz/VZmw5mPTSBtdUgzM="; + sha256 = "sha256-+fOcFu52f2PiynF0B8r3zAW/ANypXx9inLnf4ZtwI2M="; }; - vendorSha256 = "sha256-fVxzPYyMihxcwWEey5b5mhiRkoSPK4ZOqzYg7zSj0zM="; + vendorSha256 = "sha256-+43UegjFjh86vXjH1A4jbORk8xTDZaJRc41RhFPcESk="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 07854f48fcc6f..5ee8db44cc7cc 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { json-logging setuptools ]; - checkInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; disabledTests = [ # dnswanip connects to an external server to discover the diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 032238d399d1b..54d0b862b891c 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -44,7 +44,7 @@ in python3.pkgs.buildPythonApplication rec { webtest ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock pytestCheckHook ]; diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 946e145a5707a..4c82bcdd31689 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R3ZkGTq0g90DkflLXr2MUBIv5Qspi3OM+sdDGqJYjyw="; + sha256 = "sha256-MD8wdXOZ8Kmun8AYv/zlRKwgAcGu2A349Xr8d7SVX4s="; }; - vendorSha256 = "sha256-iljGBe8c6dqEHRpMN5cz7wmminejoiXXDKuQDazDztA="; + vendorHash = "sha256-BErLmtzgVqDKLFAnKugDBwj3Vgm8rM6BfWcMOhu4SWY="; ldflags = [ "-s" @@ -23,14 +23,15 @@ buildGoModule rec { ]; meta = with lib; { - description = "An alternative to RSS2Email written in golang with many filters."; + description = "An alternative to rss2email written in golang with many filters"; longDescription = '' - Goeland excels at creating beautiful emails from RSS, - tailored for daily or weekly digest. It include a number of + Goeland excels at creating beautiful emails from RSS feeds, + tailored for daily or weekly digest. It includes a number of filters that can transform the RSS content along the way. - It can also consume other sources, such as a Imgur tag. + It can also consume other sources, such as Imgur tags. ''; homepage = "https://github.com/slurdge/goeland"; + changelog = "https://github.com/slurdge/goeland/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = [ maintainers.sweenu ]; }; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 464883ef8fcaf..a93391bbbb1b8 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.29"; + version = "2.30.1"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-/R+ahUOgQR71kTZIpsic1gEYxJzbnY8x6AxtkzYTCDo="; + hash = "sha256-hiZN3wWknshP8MG4ThhbMLyhQkuFozzoETs3mYaMVro="; }; - cargoHash = "sha256-uHhP5XurJHM31fJqsqW9tumPzzMMOEeEWAAsllazcME="; + cargoHash = "sha256-Ap8i8hLqrUi6aSn4wKAdG3Z/5or+bF+epDaWUdWYt78"; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; postBuild = '' - make prefix="$out" + make -j $NIX_BUILD_CORES prefix="$out" ''; # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set @@ -44,12 +44,11 @@ rustPlatform.buildRustPackage rec { doCheck = true; preCheck = '' - make test + make -j $NIX_BUILD_CORES test ''; postInstall = '' - make prefix="$out" install - cp -r contrib $out + make -j $NIX_BUILD_CORES prefix="$out" install '' + lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 5d5e8615a8550..fafda428fe6e3 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -17,23 +17,24 @@ , glib-networking , librsvg , gst_all_1 +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-ms0CVYSYccRuiLBZ+lEEyMH0Zhti5sMM49XuEUe9sKw="; + sha256 = "sha256-civHj8a5LYV3XaAjSJBdn15+8sdO/yLlWBXCNW56plA="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-QbjXjdKMjGwXQ3DoyAJN1SxnHjVeAk140j1me/iWlZQ="; + sha256 = "sha256-vgqyFdc1m53SYqnYE6JLp1/tK7rFrohYOT/BTO6fUI0="; }; patches = [ @@ -87,6 +88,10 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-bad ]); + passthru.updateScript = gitUpdater { + rev-prefix = "v."; + }; + meta = with lib; { description = "A modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 08dcc091b9076..132fe7f627cce 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { version = "3.14"; propagatedBuildInputs = [ feedparser html2text ]; - checkInputs = [ beautifulsoup4 ]; + nativeCheckInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index e94c981e489fc..a5debadc8005f 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.2.4"; + version = "4.2.7"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-6JRANTUbHyMAuA7lhAQtlgJIW6l39XNUtKQMVN6FHJU="; + sha256 = "sha256-X5hZspl9IekhC8XXpZS285cmVZek2oxIV3tYOz/ZBec="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index cd020e2bd7df3..1cd83cda77a96 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ cppcheck ]; + nativeCheckInputs = [ cppcheck ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index f4b7feab5d7f1..b11c3d60c9087 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.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-RdkGwhSx/zluCtBj8hGjkvJ11ZgPRMM9wWoE+/ynnDc="; + sha256 = "sha256-UQ61do0f0bT3VNyZAx2ZuwQ+6SGvKUS6V5Y1B6EpJ5Q="; }; patches = [ diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 008579ea54fae..8da9a49f90a57 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { python.pkgs.pyqt5 python.pkgs.qtpy ]; - checkInputs = [ + nativeCheckInputs = [ python.pkgs.mock xvfb-run ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 665af1cf2eadc..5aadf802e430a 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.13"; + version = "3.5.18"; 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-0yO4prnYJkD7eiyrEOPHlDTsgGgRhQujsp8k2FsLYKI="; + hash = "sha256-gMOpKXLUihiNcpHF6045D1ZcYwTgyjaVIFpDRCln5rI="; }; postPatch = '' diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index a61458155d0cb..81062c1eb7c55 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,12 +1,13 @@ { lib, buildDunePackage, fetchFromGitHub , extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3 , tiny_httpd -, ounit +, ounit2 }: buildDunePackage rec { pname = "google-drive-ocamlfuse"; version = "0.7.30"; + duneVersion = "3"; src = fetchFromGitHub { owner = "astrada"; @@ -16,7 +17,7 @@ buildDunePackage rec { }; doCheck = true; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit2 ]; buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index a150014daa7cd..f402faf965be4 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost166 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost }: stdenv.mkDerivation rec { pname = "SkypeExport"; @@ -11,8 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; }; + patches = [ + (fetchpatch { + name = "boost167.patch"; + url = "https://github.com/Temptin/SkypeExport/commit/ef60f2e4fc9e4a5764c8d083a73b585457bc10b1.patch"; + sha256 = "sha256-t+/v7c66OULmQCD/sNt+iDJeQ/6UG0CJ8uQY2PVSFQo="; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ boost166 ]; + buildInputs = [ boost ]; preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; @@ -21,7 +29,7 @@ stdenv.mkDerivation rec { description = "Export Skype history to HTML"; homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ yana ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index c145174367f63..bfe7ca2fcbd8a 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.0.8"; + version = "3.1.4"; src = let @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - sha256 = "sha256-Lzkh1RDRoZSg5GNYlntROHdKLj12ogCqH+h8l5en9U0="; + sha256 = "sha256-B/zDcW43ChhnAnGL+UEAt/QChxxEpv+yMgO7WsUi84k="; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - sha256 = "sha256-PuQ/zhuv+MA59Cx6QypAmg5Q6zVwfKg+1xKbazb3XM0="; + sha256 = "sha256-cFmxs7HeF+jxtmZ827bQbRyuXhQx++x5iTIefZ55928="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 78178f0021e2e..2e4dc6dbb55ea 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.centerim.org/"; + homepage = "https://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index e98bbeb4d307c..da4e41bed5852 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.7.0_rc4"; + version = "0.7.0_rc5"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-/8Y82PYlR9ucnT7/BsUk+STmsftpUvSNJM3cwG+Iv/A="; + hash = "sha256-5V0ApHxsJaQ0MBhMlv1IxnD9Vq+Yw85jFvlvghhFxNI="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 09e73514ab781..d0679a07e024c 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "cinny-desktop"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-TdKxVvhz6DTJ9ZST/OBc37DcH9lpoKrY5yP8skTO9eQ="; + sha256 = "sha256-siEAIZ9cCIJZTkeZkvT5yrPjRGoOl7vjU98AUrhgJNw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index d5246206e82df..e9ae4556588f8 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-MNmU6MvDwGbFNQt7qe08klXjy1n2LiABlPkARGvjVJU="; + hash = "sha256-Q6f24LRYCxdgAguUVl7jf7srkd2L1IptiBgHJQq2dHE="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index eb4be8d98d279..bd3d75bd66bbf 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -21,17 +21,17 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.104.0"; + version = "1.106.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-+FQ6XE+CtvSNSgpEr8h0mcr9DCC6TvGgLrYGdw0Ve2o="; + hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-c3tt+nYZksI/VhJk4bNHu9ZXeDTaA2aLAQo1BmuF+2g="; + hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; }; }); esbuild' = esbuild.override { @@ -43,21 +43,21 @@ let rev = "v${version}"; hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w="; }; - vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.34.1"; + version = "1.34.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-/F1fU54eTM9mUaQe/Ex9DnTDb+fzl/1HNyYvLWE2BBU="; + hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco="; }; - npmDepsHash = "sha256-3wzN7G27IGTlFZUE9RzQXfApVfaTc92Sbb+jjH/zeoc="; + npmDepsHash = "sha256-ZMXXBDVT5rHTzHOrKAUAezL/1UTMdzbBllG69kxg55M="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7f2e9ccf0062e..a6d7bf7276e38 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.22"; + stable = "0.0.24"; ptb = "0.0.38"; canary = "0.0.145"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c="; + sha256 = "sha256-SG+34ft0mTqtg9rFiI60N6JIONyqF8c8SlnRcn5a4Xc="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix b/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix new file mode 100644 index 0000000000000..c9a143ecb49e6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix @@ -0,0 +1,26 @@ +{ stdenv +, jq +, element-web-unwrapped +, conf ? { } +}: + +if (conf == { }) then element-web-unwrapped else +stdenv.mkDerivation rec { + pname = "${element-web-unwrapped.pname}-wrapped"; + inherit (element-web-unwrapped) version meta; + + dontUnpack = true; + + nativeBuildInputs = [ jq ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ln -s ${element-web-unwrapped}/* $out + rm $out/config.json + jq -s '.[0] * $conf' "${element-web-unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" + + runHook postInstall + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 6af1c2ec738ad..b73fda72174a6 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -9,7 +9,6 @@ , fixup_yarn_lock , nodejs , jitsi-meet -, conf ? { } }: let @@ -17,93 +16,72 @@ let noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; +in +stdenv.mkDerivation rec { + pname = "element-web"; + inherit (pinData) version; + + src = fetchFromGitHub { + owner = "vector-im"; + repo = pname; + rev = "v${version}"; + sha256 = pinData.webSrcHash; + }; - unwrapped = stdenv.mkDerivation rec { - pname = "element-web"; - inherit (pinData) version; - - src = fetchFromGitHub { - owner = "vector-im"; - repo = pname; - rev = "v${version}"; - sha256 = pinData.webSrcHash; - }; - - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = pinData.webYarnHash; - }; - - nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$PWD/tmp - # with the update of openssl3, some key ciphers are not supported anymore - # this flag will allow those codecs again as a workaround - # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 - export NODE_OPTIONS=--openssl-legacy-provider - mkdir -p $HOME - - fixup_yarn_lock yarn.lock - yarn config --offline set yarn-offline-mirror $offlineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = pinData.webYarnHash; + }; - export VERSION=${version} - yarn build:res --offline - yarn build:module_system --offline - yarn build:bundle --offline + nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; - runHook postBuild - ''; + configurePhase = '' + runHook preConfigure - installPhase = '' - runHook preInstall + export HOME=$PWD/tmp + # with the update of openssl3, some key ciphers are not supported anymore + # this flag will allow those codecs again as a workaround + # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 + # and https://github.com/vector-im/element-web/issues/21043 + export NODE_OPTIONS=--openssl-legacy-provider + mkdir -p $HOME - cp -R webapp $out - cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js - echo "${version}" > "$out/version" - jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $offlineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules - runHook postInstall - ''; + runHook postConfigure + ''; - meta = { - description = "A glossy Matrix collaboration client for the web"; - homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; - maintainers = lib.teams.matrix.members; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; - }; -in -if (conf == { }) then unwrapped else -stdenv.mkDerivation rec { - pname = "${unwrapped.pname}-wrapped"; - inherit (unwrapped) version meta; + buildPhase = '' + runHook preBuild - dontUnpack = true; + export VERSION=${version} + yarn build:res --offline + yarn build:module_system --offline + yarn build:bundle --offline - nativeBuildInputs = [ jq ]; + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p $out - ln -s ${unwrapped}/* $out - rm $out/config.json - jq -s '.[0] * $conf' "${unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" + cp -R webapp $out + cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js + echo "${version}" > "$out/version" + jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" runHook postInstall ''; + + meta = { + description = "A glossy Matrix collaboration client for the web"; + homepage = "https://element.io/"; + changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; } diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 64a164c9b01ed..cc0578f71fec9 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.17", - "desktopSrcHash": "VB7p/ThiwphcCd3loSwQ61TthR2ji0nX6l32Jrgv/NE=", - "desktopYarnHash": "15jsznsqxvi1bs26pmb7zfrybl071k3g3g6i0pm34mzs2r9nvrii", - "webSrcHash": "YeXsDyyoQnWNDnfx/7fMHooi48ST+LiA5ACy0gBnQaQ=", - "webYarnHash": "1zniyg869glhajcmcgq34qwmhb4jq2hbjqhhz6a79p892yx97chp" + "version": "1.11.20", + "desktopSrcHash": "mlB2UvRYzaJ6FWGDOqyZY6NTY7QoWCiCvmFDyWTPuMQ=", + "desktopYarnHash": "0ccwsy9ma7sn6d5f9jfv40dhj0y6aax8msx9bihjdmx989nkkh2m", + "webSrcHash": "55oLS89Pmy4d7DhBQc4i6boQIH2LgujE7kl6QwcKltw=", + "webYarnHash": "1aiq5wvb8cz2a5rc0h11s16fnyak0p9zhzbqwhf1rs6c1gav7777" } diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix index 5613fbc899b44..9203850b63882 100644 --- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -67,10 +67,15 @@ stdenv.mkDerivation rec { libshumate ]; + # enables pipewire API deprecated in 0.3.64 + # fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + meta = with lib; { description = "Matrix group messaging app (development version)"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3Plus; maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]); + mainProgram = "fractal"; }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index e8ac07b50cfb5..091bbf66e3d91 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-uIzOKiCbHiSVRlXcpE0B/+Ats3cfw4u7eA+KyPriwhk="; + hash = "sha256-3D87Ou/842WqbaUiJV1hRZFVkZzQ12GXCpRc8F3rKPQ="; }; buildInputs = [ @@ -56,13 +56,13 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ extraPythonPackages python3.pkgs; - checkInputs = [ xvfb-run dbus ]; + nativeCheckInputs = [ xvfb-run dbus ]; checkPhase = '' xvfb-run dbus-run-session \ --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 + ${python3.interpreter} -m unittest discover -s test/gui -v + ${python3.interpreter} -m unittest discover -s test/common -v ''; # necessary for wrapGAppsHook diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 3c43d715c01fd..5bf231ec924b7 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,17 +4,17 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2021-12-28"; + version = "unstable-2022-05-27"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "ca1012098d123c555e9fa5244466d2e009521700"; - sha256 = "1j1azskcdrp4g44rv3a4zylkzbzpcs23zzzrx94llbgssw6cd9ih"; + rev = "d8f7c504027a0dd51966b2b7304d6daad155a05b"; + hash = "sha256-6SWYl2mB0g8JNVHBeTnZEbzOaTmVbsRMMEs+3j/ewwk="; }; nativeBuildInpts = [ @@ -28,20 +28,21 @@ buildDunePackage rec { mirage-crypto-pk x509 domain-name - ocaml_lwt + lwt otr astring ptime notty sexplib hex - uutf uchar - uuseg uucp + uuseg + uutf dns-client cstruct base64 + happy-eyeballs-lwt ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/jami/client.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix index 2ce1aba4af55d..f76d9ee9f12a2 100644 --- a/pkgs/applications/networking/instant-messengers/jami/client.nix +++ b/pkgs/applications/networking/instant-messengers/jami/client.nix @@ -2,7 +2,6 @@ , src , jami-meta , lib -, fetchpatch , stdenv , pkg-config , cmake @@ -31,14 +30,6 @@ stdenv.mkDerivation { 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 = '' echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h ''; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index d4a1e8749ecf4..ea898c0da8c9d 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -3,7 +3,8 @@ , callPackage , fetchFromGitHub , fetchzip -, ffmpeg +, fetchpatch +, ffmpeg_5 , pjsip , opendht , jack @@ -12,11 +13,11 @@ }: let - version = "20221031.1308.130cc26"; + version = "20221220.0956.79e1207"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-+xpSoSsG+G+w8+g0FhXx+6Phroj83ijW8xWvYO+kdqY="; + hash = "sha256-AQgz2GqueFG+yK42zJ9MzvP4BddGt0BFb+cIoA6Fif8="; stripRoot = false; postFetch = '' @@ -40,7 +41,7 @@ let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); in rec { - ffmpeg-jami = (ffmpeg.override rec { + ffmpeg-jami = (ffmpeg_5.override rec { version = "5.0.1"; branch = version; sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; @@ -50,7 +51,14 @@ rec { patch-src = src + "/daemon/contrib/src/ffmpeg/"; in { - patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)); + patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)) ++ + # SDL2 recently changed their versioning + [ + (fetchpatch { + url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba"; + hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0="; + }) + ]; configureFlags = old.configureFlags ++ (readLinesToList ./config/ffmpeg_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) @@ -72,7 +80,20 @@ rec { sha256 = "sha256-N7jn4qen+PgFiVkTFi2HSWhx2QPHwAYMtnrpE/ptDVc="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ + (fetchpatch { + name = "CVE-2022-23537.patch"; + url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; + sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; + }) + (fetchpatch { + name = "CVE-2022-23547.patch"; + url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; + sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; + }) + ]; + + patchFlags = [ "-p1" "-l" ]; configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); @@ -88,6 +109,6 @@ rec { }; jami-client = qt6Packages.callPackage ./client.nix { - inherit version src jami-meta ffmpeg-jami; + inherit version src ffmpeg-jami jami-meta; }; } diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/applications/networking/instant-messengers/keet/default.nix new file mode 100644 index 0000000000000..557078cd8b508 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/keet/default.nix @@ -0,0 +1,32 @@ +{ lib, appimageTools, fetchurl }: + +let + pname = "keet"; + version = "1.2.1"; + + src = fetchurl { + url = "https://keet.io/downloads/${version}/Keet.AppImage"; + sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98"; + }; + + appimageContents = appimageTools.extract { inherit pname version src; }; +in appimageTools.wrapType2 { + inherit src pname version; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Peer-to-Peer Chat"; + homepage = "https://keet.io"; + license = licenses.unfree; + maintainers = with maintainers; [ extends ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 3132faeb630d2..73d386b379d5e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -8,7 +8,7 @@ , liblinphone , mediastreamer , mediastreamer-openh264 -, minizip2 +, minizip-ng , mkDerivation , qtgraphicaleffects , qtquickcontrols2 @@ -70,7 +70,7 @@ mkDerivation rec { mediastreamer mediastreamer-openh264 - minizip2 + minizip-ng qtgraphicaleffects qtquickcontrols2 qttranslations @@ -81,7 +81,7 @@ mkDerivation rec { ]; cmakeFlags = [ - "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" + "-DMINIZIP_INCLUDE_DIRS=${minizip-ng}/include" "-DMINIZIP_LIBRARIES=minizip" # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 50d68eeeba1c7..e6b3d84c7b79d 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -3,83 +3,89 @@ , fetchFromGitHub , cmake , asciidoc +, pkg-config +, boost17x , cmark +, coeurl +, curl +, libevent +, libsecret , lmdb , lmdbxx -, libsecret -, mkDerivation +, mtxclient +, nlohmann_json +, olm , qtbase +, qtgraphicaleffects +, qtimageformats , qtkeychain , qtmacextras , qtmultimedia -, qtimageformats -, qttools , qtquickcontrols2 -, qtgraphicaleffects -, mtxclient -, boost17x +, qttools +, re2 , spdlog -, olm -, pkg-config -, nlohmann_json -, coeurl -, libevent -, curl +, wrapQtAppsHook , voipSupport ? true , gst_all_1 , libnice }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nheko"; - version = "0.10.2"; + version = "0.11.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-gid8XOZ1/hMDGNbse4GYfcAdqHiySWyy4isBgcpekIQ="; + hash = "sha256-2sN5lVjJ/CPH9U6NfZkAYZUTT+YDgPOy9dTVGp0svkg="; }; nativeBuildInputs = [ - lmdbxx + asciidoc cmake + lmdbxx pkg-config - asciidoc + wrapQtAppsHook ]; buildInputs = [ - nlohmann_json - mtxclient - olm boost17x + cmark + coeurl + curl + libevent libsecret lmdb - spdlog - cmark + mtxclient + nlohmann_json + olm qtbase - qtmultimedia - qtimageformats - qttools - qtquickcontrols2 qtgraphicaleffects + qtimageformats qtkeychain - coeurl - libevent - curl + qtmultimedia + qtquickcontrols2 + qttools + re2 + spdlog ] ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optionals voipSupport (with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt5Support = true; }) - gst-plugins-bad - libnice - ]); + ++ lib.optionals voipSupport (with gst_all_1; [ + gstreamer + gst-plugins-base + (gst-plugins-good.override { qt5Support = true; }) + gst-plugins-bad + libnice + ]); cmakeFlags = [ "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + preFixup = lib.optionalString voipSupport '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") @@ -88,11 +94,11 @@ mkDerivation rec { meta = with lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ekleog fpletz ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.targetPlatform.isDarwin; - license = licenses.gpl3Plus; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 49114903a59ac..10d2cb87f8b55 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { pydbus ]; - checkInputs = [ + nativeCheckInputs = [ pytest faker pytest-aiohttp diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index bd8c492ff28fc..7d83dcf2d23c2 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 138e5989d0fed..22638a4c20832 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1642"; + version = "1.5.1644"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-voaGYYt1CZTxiumKvIVupMxdrLKACnfxvtnYfGuya1I="; + sha256 = "sha256-wSfgV0moBar27xa91ywky7Apr5QHISZ27lQlp02J1Mg="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix new file mode 100644 index 0000000000000..bc7b973c7b9bf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -0,0 +1,88 @@ +{ alsa-lib +, cups +, dpkg +, fetchurl +, gjs +, glib +, gtk3 +, lib +, libdrm +, libgcrypt +, libkrb5 +, mesa # for libgbm +, nss +, xorg +, systemd +, stdenv +, at-spi2-core +, autoPatchelfHook +, wrapGAppsHook +}: + +let + version = "3.0.0-571"; + srcs = { + x86_64-linux = fetchurl { + url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb"; + sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ="; + }; + aarch64-linux = fetchurl { + url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb"; + sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation { + pname = "qq"; + inherit version src; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + dpkg + ]; + + buildInputs = [ + alsa-lib + at-spi2-core + cups + gtk3 + glib + libdrm + libgcrypt + libkrb5 + mesa + nss + xorg.libXdamage + ]; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt $out/opt + cp -r usr/share $out/share + substituteInPlace $out/share/applications/qq.desktop \ + --replace "/opt/QQ/qq" "$out/bin/qq" \ + --replace "/usr/share" "$out/share" + ln -s $out/opt/QQ/qq $out/bin/qq + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://im.qq.com/linuxqq/"; + description = "Messaging app"; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ fee1-dead ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 6c7aed47c271f..78ac00d6080c8 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,13 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.1.0"; - hash = "sha256-70IQ/2yjHbez8SpZxqZKa/XWIEYA3cN7JAIM9kgjN30="; + version = "6.2.0"; + hash = "sha256-auOcMlwKPj5rsnlhK34sYe4JxlHCjb3e2ye8Cs12Qtc="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.2.0-beta.2"; - hash = "sha256-NVwX2xG8QGVjENy6fSA13WQyTlYuF5frcS3asDDg4Ik="; + ringrtcPrefix = "@signalapp/"; + version = "6.3.0-beta.1"; + hash = "sha256-cYJWhnyiWULnIZvI2/k1koLCd2zrL4CVMohcnSZa/TY="; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index ee1d6b8aed1f3..c3779fc9f479d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -1,5 +1,6 @@ { pname , dir +, ringrtcPrefix ? "" , version , hash , stdenv @@ -160,7 +161,7 @@ stdenv.mkDerivation rec { --replace "/opt/${dir}/${pname}" $out/bin/${pname} autoPatchelf --no-recurse -- "$out/lib/${dir}/" - patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node" + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/${ringrtcPrefix}ringrtc/build/linux/libringrtc-x64.node" ''; # Tests if the application launches and waits for "Link your phone to Signal Desktop": diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index a4070a2aea3b5..446c483f5bc0d 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 = "20221208"; + version = "20230109-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-GSZy2zW9Ek9nP9zoBfvq3wLghEsaGqmC1f4cs+OVaFE="; + sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix b/pkgs/applications/networking/instant-messengers/signaldctl/default.nix new file mode 100644 index 0000000000000..cb241bac8fc2b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signaldctl/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitLab +, gitUpdater +}: + +buildGoModule rec { + pname = "signaldctl"; + version = "0.6.1"; + src = fetchFromGitLab { + owner = "signald"; + repo = "signald-go"; + rev = "v${version}"; + hash = "sha256-lMJyr4BPZ8V2f//CUkr7CVQ6o8nRyeLBHMDEyLcHSgQ="; + }; + + vendorHash = "sha256-LGIWAVhDJCg6Ox7U4ZK15K8trjsvSZm4/0jNpIDmG7I="; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + # install only the binary and not any intermediate artifacts like + # `generators` which is only used during build + cp "$GOPATH/bin/signaldctl" $out/bin + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = with lib; { + description = "A golang library for communicating with signald"; + homepage = "https://signald.org/signaldctl/"; + license = licenses.gpl3; + maintainers = with maintainers; [ colinsane ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix deleted file mode 100644 index 58335bed4218c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ mkDerivation, lib, fetchurl, pkg-config, qttools, sconsPackages -, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 -, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib -}: - -mkDerivation rec { - pname = "swift-im"; - version = "4.0.2"; - - src = fetchurl { - url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; - sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; - }; - - patches = [ ./qt-5.11.patch ./scons.patch ]; - - nativeBuildInputs = [ pkg-config qttools sconsPackages.scons_3_1_2 ]; - - buildInputs = [ - GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 - lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib - ]; - - propagatedUserEnvPkgs = [ GConf ]; - - NIX_CFLAGS_COMPILE = toString [ - "-I${libxml2.dev}/include/libxml2" - "-I${miniupnpc}/include/miniupnpc" - "-I${qtwebkit.dev}/include/QtWebKit" - "-I${qtwebkit.dev}/include/QtWebKitWidgets" - "-fpermissive" - ]; - - installTargets = [ (placeholder "out") ]; - installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://swift.im/"; - description = "Qt XMPP client"; - license = licenses.gpl3; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch deleted file mode 100644 index 911e7570427f4..0000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h -+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h -@@ -8,6 +8,7 @@ - - #include <set> - -+#include <QAbstractItemModel> - #include <QWizard> - - #include <Swiften/Base/Override.h> diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch deleted file mode 100644 index c63b05d7acb1a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot -index 40f242513..53e1ff26a 100644 ---- a/BuildTools/SCons/SConscript.boot -+++ b/BuildTools/SCons/SConscript.boot -@@ -508,6 +508,7 @@ if env.get("distcc", False) : - if var.startswith("DISTCC_") : - env["ENV"][var] = os.environ[var] - -+env["ENV"] = os.environ - conf_env = env.Clone() - - Export("env") -diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct -index 70bffbcfe..fef281899 100644 ---- a/BuildTools/SCons/SConstruct -+++ b/BuildTools/SCons/SConstruct -@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] - gconf_env = conf_env.Clone() - conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) - if conf.CheckPKG("gconf-2.0") : -- gconf_bare_env = Environment() -+ gconf_bare_env = Environment(ENV = os.environ) - gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') - if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) : - gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]] -@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags) - env["HAVE_HUNSPELL"] = 0; - if env.get("hunspell_enable", False) : - hunspell_conf = Configure(hunspell_env) -- if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") : -+ if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") : - env["HAVE_HUNSPELL"] = 1 -- hunspell_flags["LIBS"] = ["hunspell"] -+ hunspell_flags["LIBS"] = ["hunspell-1.6"] - env["HUNSPELL_FLAGS"] = hunspell_flags - hunspell_conf.Finish() - -diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py -index 89f8963dc..b8559f7a6 100644 ---- a/BuildTools/SCons/Tools/textfile.py -+++ b/BuildTools/SCons/Tools/textfile.py -@@ -113,7 +113,10 @@ def _action(target, source, env): - lsep = None - for s in source: - if lsep: fd.write(lsep) -- fd.write(_do_subst(s, subs)) -+ b = _do_subst(s, subs) -+ if isinstance(b, unicode): -+ b = b.encode('UTF-8') -+ fd.write(b) - lsep = linesep - fd.close() - diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index 7cb9798517dbf..6f9b7269bf9ba 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -1,22 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, appstream-glib, desktop-file-utils, gdk-pixbuf -, gettext, gjs, glib, gobject-introspection, gsettings-desktop-schemas, gtk3 -, hicolor-icon-theme, meson, ninja, pkg-config, python3, webkitgtk, wrapGAppsHook +{ stdenv +, lib +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gdk-pixbuf +, gettext +, gjs +, glib +, glib-networking +, gobject-introspection +, gsettings-desktop-schemas +, gtk4 +, libadwaita +, gst_all_1 +, hicolor-icon-theme +, meson +, ninja +, pkg-config +, python3 +, webkitgtk_5_0 +, blueprint-compiler +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "tangram"; - version = "1.3.2"; + version = "2.0"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Tangram"; rev = "v${version}"; - sha256 = "sha256-WI0H3bforQ6Jc/+TWFT1zUs4KRtWwvXY2/va+Fnd+iU="; + hash = "sha256-ocHE8IztiNm9A1hbzzHXstWpPaOau/IrQ44ccxbsGb0="; fetchSubmodules = true; }; - buildInputs = [ gdk-pixbuf gjs glib gsettings-desktop-schemas gtk3 webkitgtk ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -27,23 +45,39 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + blueprint-compiler wrapGAppsHook ]; - dontWrapGApps = true; + buildInputs = [ + gdk-pixbuf + gjs + glib + glib-networking + gsettings-desktop-schemas + gtk4 + libadwaita + webkitgtk_5_0 + ] ++ (with gst_all_1; [ + gstreamer + gst-libav + gst-plugins-base + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-bad + ]); + + dontPatchShebangs = true; - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py + substituteInPlace src/meson.build --replace "/app/bin/blueprint-compiler" "blueprint-compiler" + substituteInPlace {src/,}re.sonny.Tangram troll/gjspack/bin/gjspack \ + --replace "#!/usr/bin/env -S gjs -m" "#!${gjs}/bin/gjs -m" ''; - postFixup = '' - for file in $out/bin/re.sonny.Tangram; do - sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ - -i $file - wrapGApp "$file" - done + # https://github.com/NixOS/nixpkgs/issues/31168#issuecomment-341793501 + preFixup = '' + sed -e '2iimports.package._findEffectiveEntryPointName = () => "re.sonny.Tangram"' \ + -i $out/bin/re.sonny.Tangram ''; meta = with lib; { @@ -51,6 +85,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sonnyp/Tangram"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ austinbutler ]; + maintainers = with maintainers; [ austinbutler chuangzhu ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 3a6c97073ab6b..51a127446d92b 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -9,6 +9,8 @@ , nodejs , fetchYarnDeps , electron +, libpulseaudio +, pipewire }: stdenv.mkDerivation rec { @@ -66,6 +68,7 @@ stdenv.mkDerivation rec { popd makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \ --add-flags "$out/share/teams-for-linux/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 11ce5854dc2fd..58c6501a1ffb5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -69,14 +69,11 @@ with lib; let tg_owt = callPackage ./tg_owt.nix { - abseil-cpp = (abseil-cpp.override { + abseil-cpp = abseil-cpp.override { # abseil-cpp should use the same compiler inherit stdenv; cxxStandard = "20"; - }).overrideAttrs (_: { - # https://github.com/NixOS/nixpkgs/issues/130963 - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; - }); + }; # tg_owt should use the same compiler inherit stdenv; @@ -100,8 +97,6 @@ stdenv.mkDerivation rec { patches = [ ./kf594.patch ./shortcuts-binary-path.patch - # let it build with nixpkgs 10.12 sdk - ./kotato-10.12-sdk.patch ]; postPatch = optionalString stdenv.isLinux '' @@ -112,6 +107,7 @@ stdenv.mkDerivation rec { substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' '' + optionalString stdenv.isDarwin '' + sed -i "13i#import <CoreAudio/CoreAudio.h>" Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm substituteInPlace Telegram/CMakeLists.txt \ --replace 'COMMAND iconutil' 'COMMAND png2icns' \ --replace '--convert icns' "" \ @@ -189,9 +185,6 @@ stdenv.mkDerivation rec { libicns ]; - # https://github.com/NixOS/nixpkgs/issues/130963 - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; - enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch deleted file mode 100644 index 8c80cafc6dad5..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch +++ /dev/null @@ -1,424 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -index 9e9a1744b..ae55f873f 100644 ---- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include <Cocoa/Cocoa.h> - #include <CoreFoundation/CFURL.h> -+#undef check - - namespace Platform { - namespace { -diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm -index 1d68457bb..ac8c4e0ab 100644 ---- a/Telegram/SourceFiles/platform/mac/specific_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm -@@ -118,6 +118,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { - switch (type) { - case PermissionType::Microphone: - case PermissionType::Camera: -+#if 0 - const auto nativeType = (type == PermissionType::Microphone) - ? AVMediaTypeAudio - : AVMediaTypeVideo; -@@ -132,6 +133,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { - return PermissionStatus::Denied; - } - } -+#endif - break; - } - return PermissionStatus::Granted; -@@ -141,6 +143,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal - switch (type) { - case PermissionType::Microphone: - case PermissionType::Camera: -+#if 0 - const auto nativeType = (type == PermissionType::Microphone) - ? AVMediaTypeAudio - : AVMediaTypeVideo; -@@ -151,6 +154,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal - }); - }]; - } -+#endif - break; - } - resultCallback(PermissionStatus::Granted); -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h -index a537929c8..82ef2b837 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h -@@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #import <AppKit/NSPopoverTouchBarItem.h> - #import <AppKit/NSTouchBar.h> -+#undef check - --API_AVAILABLE(macos(10.12.2)) - @interface TextFormatPopover : NSPopoverTouchBarItem - - (id)init:(NSTouchBarItemIdentifier)identifier; - @end -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h -index c6a4b886f..d2e0936c0 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h -@@ -8,12 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #include <AppKit/NSImageView.h> -+#undef check - - namespace Main { - class Session; - } // namespace Main - --API_AVAILABLE(macos(10.12.2)) - @interface PinnedDialogsPanel : NSImageView - - (id)init:(not_null<Main::Session*>)session - destroyEvent:(rpl::producer<>)touchBarSwitches; -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h -index 27b04467c..b1a7dfbd9 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h -@@ -9,12 +9,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #import <AppKit/NSPopoverTouchBarItem.h> - #import <AppKit/NSTouchBar.h> -+#undef check - - namespace Window { - class Controller; - } // namespace Window - --API_AVAILABLE(macos(10.12.2)) - @interface StickerEmojiPopover : NSPopoverTouchBarItem<NSTouchBarDelegate> - - (id)init:(not_null<Window::Controller*>)controller - identifier:(NSTouchBarItemIdentifier)identifier; -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h -index ec4596c67..972461aef 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h -@@ -8,8 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #import <AppKit/NSTouchBar.h> -+#undef check - --API_AVAILABLE(macos(10.12.2)) - @interface TouchBarAudioPlayer : NSTouchBar<NSTouchBarDelegate> - - (rpl::producer<>)closeRequests; - @end -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h -index 52b54de12..ac3857f9b 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h -@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #import <AppKit/NSImage.h> - #import <Foundation/Foundation.h> -+#undef check - - namespace TouchBar { - -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h -index 1cc8c832f..c2178c975 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h -@@ -20,19 +20,19 @@ struct TrackState; - - namespace TouchBar { - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSButton *CreateTouchBarButton( - NSImage *image, - rpl::lifetime &lifetime, - Fn<void()> callback); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSButton *CreateTouchBarButton( - const style::icon &icon, - rpl::lifetime &lifetime, - Fn<void()> callback); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSButton *CreateTouchBarButtonWithTwoStates( - NSImage *icon1, - NSImage *icon2, -@@ -41,7 +41,7 @@ NSButton *CreateTouchBarButtonWithTwoStates( - bool firstState, - rpl::producer<bool> stateChanged = rpl::never<bool>()); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSButton *CreateTouchBarButtonWithTwoStates( - const style::icon &icon1, - const style::icon &icon2, -@@ -50,14 +50,14 @@ NSButton *CreateTouchBarButtonWithTwoStates( - bool firstState, - rpl::producer<bool> stateChanged = rpl::never<bool>()); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSSliderTouchBarItem *CreateTouchBarSlider( - NSString *itemId, - rpl::lifetime &lifetime, - Fn<void(bool, double, double)> callback, - rpl::producer<Media::Player::TrackState> stateChanged); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSCustomTouchBarItem *CreateTouchBarTrackPosition( - NSString *itemId, - rpl::producer<Media::Player::TrackState> stateChanged); -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h -index f03546eaf..bc8c63678 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h -@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #import <AppKit/NSTouchBar.h> -+#undef check - - namespace Window { - class Controller; -@@ -21,7 +22,6 @@ const auto kPopoverPickerItemIdentifier = @"pickerButtons"; - - } // namespace TouchBar::Main - --API_AVAILABLE(macos(10.12.2)) - @interface TouchBarMain : NSTouchBar - - (id)init:(not_null<Window::Controller*>)controller - touchBarSwitches:(rpl::producer<>)touchBarSwitches; -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h -index 464f87c9c..9a008c75e 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h -@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #import <AppKit/NSTouchBar.h> -+#undef check - - namespace Main { - class Domain; -@@ -17,7 +18,6 @@ namespace Window { - class Controller; - } // namespace Window - --API_AVAILABLE(macos(10.12.2)) - @interface RootTouchBar : NSTouchBar<NSTouchBarDelegate> - - (id)init:(rpl::producer<bool>)canApplyMarkdown - controller:(not_null<Window::Controller*>)controller -Submodule Telegram/ThirdParty/tgcalls contains modified content -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm -index b280c1b..a1ed0d2 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm -@@ -71,7 +71,7 @@ - if (@available(iOS 11.0, *)) { - [result addObject:h265Info]; - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - [result addObject:h265Info]; - } -@@ -101,7 +101,7 @@ - return [[TGRTCVideoDecoderH265 alloc] init]; - } - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { - return [[TGRTCVideoDecoderH265 alloc] init]; -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -index 9960607..f3659b3 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -@@ -89,7 +89,7 @@ - [result addObject:h265Info]; - } - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - if ([[AVAssetExportSession allExportPresets] containsObject:AVAssetExportPresetHEVCHighestQuality]) { - [result addObject:h265Info]; -@@ -129,7 +129,7 @@ - return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; - } - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { - return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm -index bf99063..b717645 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm -@@ -507,8 +507,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref - - (void)captureOutput:(AVCaptureOutput *)captureOutput - didDropSampleBuffer:(CMSampleBufferRef)sampleBuffer - fromConnection:(AVCaptureConnection *)connection { -- NSString *droppedReason = -- (__bridge NSString *)CMGetAttachment(sampleBuffer, kCMSampleBufferAttachmentKey_DroppedFrameReason, nil); -+ NSString *droppedReason = nil; - RTCLogError(@"Dropped sample buffer. Reason: %@", droppedReason); - } - -@@ -682,7 +681,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref - int closest = -1; - CMTime result; - for (int i = 0; i < format.videoSupportedFrameRateRanges.count; i++) { -- const auto rateRange = format.videoSupportedFrameRateRanges[i]; -+ const AVFrameRateRange *rateRange = format.videoSupportedFrameRateRanges[i]; - int gap = abs(rateRange.minFrameRate - target); - if (gap <= closest || closest == -1) { - closest = gap; -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -index 4ef8630..3fc753c 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -@@ -243,9 +243,11 @@ private: - layer.framebufferOnly = true; - layer.opaque = false; - // layer.cornerRadius = 4; -+#if 0 - if (@available(macOS 10.13, *)) { - layer.displaySyncEnabled = NO; - } -+#endif - // layer.presentsWithTransaction = YES; - layer.backgroundColor = [NSColor clearColor].CGColor; - layer.contentsGravity = kCAGravityResizeAspectFill; -@@ -332,9 +334,7 @@ private: - - (RTCVideoRotation)rtcFrameRotation { - if (_rotationOverride) { - RTCVideoRotation rotation; -- if (@available(macOS 10.13, *)) { -- [_rotationOverride getValue:&rotation size:sizeof(rotation)]; -- } else { -+ { - [_rotationOverride getValue:&rotation]; - } - return rotation; -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm b/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm -index 5491702..32befc6 100644 ---- a/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm -@@ -128,6 +128,7 @@ bool Available() { - } - - bool Allowed() { -+#if 0 - if (@available(macOS 10.15, *)) { - // Input Monitoring is required on macOS 10.15 an later. - // Even if user grants access, restart is required. -@@ -141,6 +142,7 @@ bool Allowed() { - return AXIsProcessTrustedWithOptions( - (__bridge CFDictionaryRef)options); - } -+#endif - return true; - } - -diff --git a/Telegram/lib_base/base/platform/mac/base_info_mac.mm b/Telegram/lib_base/base/platform/mac/base_info_mac.mm -index f1f259a..6629eb6 100644 ---- a/Telegram/lib_base/base/platform/mac/base_info_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_info_mac.mm -@@ -226,16 +226,20 @@ void Finish() { - } - - void OpenInputMonitoringPrivacySettings() { -+#if 0 - if (@available(macOS 10.15, *)) { - IOHIDRequestAccess(kIOHIDRequestTypeListenEvent); - } -+#endif - [[NSWorkspace sharedWorkspace] openURL:PrivacySettingsUrl("Privacy_ListenEvent")]; - } - - void OpenDesktopCapturePrivacySettings() { -+#if 0 - if (@available(macOS 11.0, *)) { - CGRequestScreenCaptureAccess(); - } -+#endif - [[NSWorkspace sharedWorkspace] openURL:PrivacySettingsUrl("Privacy_ScreenCapture")]; - } - -diff --git a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm -index 6102705..8981239 100644 ---- a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm -@@ -277,6 +277,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { - if (thumbnail.isNull()) { - return; - } -+#if 0 - if (@available(macOS 10.13.2, *)) { - const auto copy = thumbnail; - [_private->info -@@ -290,6 +291,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { - forKey:MPMediaItemPropertyArtwork]; - updateDisplay(); - } -+#endif - } - - void SystemMediaControls::setDuration(int duration) { -@@ -308,10 +310,12 @@ void SystemMediaControls::setVolume(float64 volume) { - } - - void SystemMediaControls::clearThumbnail() { -+#if 0 - if (@available(macOS 10.13.2, *)) { - [_private->info removeObjectForKey:MPMediaItemPropertyArtwork]; - updateDisplay(); - } -+#endif - } - - void SystemMediaControls::clearMetadata() { -@@ -373,9 +377,11 @@ bool SystemMediaControls::volumeSupported() const { - } - - bool SystemMediaControls::Supported() { -+#if 0 - if (@available(macOS 10.12.2, *)) { - return true; - } -+#endif - return false; - } - -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm b/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm -index 21e93f7..10a3890 100644 ---- a/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm -@@ -397,6 +397,7 @@ void MacMediaDevices::videoInputRefreshed() { - } - - bool MacDesktopCaptureAllowed() { -+#if 0 - if (@available(macOS 11.0, *)) { - // Screen Recording is required on macOS 10.15 an later. - // Even if user grants access, restart is required. -@@ -421,6 +422,7 @@ bool MacDesktopCaptureAllowed() { - CFRelease(stream); - return true; - } -+#endif - return true; - } - diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch deleted file mode 100644 index af1d47a3b44e6..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/src/rtc_base/async_resolver.cc b/src/rtc_base/async_resolver.cc -index ad1598f2..fe9c3832 100644 ---- a/src/rtc_base/async_resolver.cc -+++ b/src/rtc_base/async_resolver.cc -@@ -57,7 +57,7 @@ void GlobalGcdRunTask(void* context) { - - // Post a task into the system-defined global concurrent queue. - void PostTaskToGlobalQueue(std::unique_ptr<webrtc::QueuedTask> task) { -- dispatch_queue_global_t global_queue = -+ dispatch_queue_t global_queue = - dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - webrtc::QueuedTask* context = task.release(); - dispatch_async_f(global_queue, context, &GlobalGcdRunTask); -diff --git a/src/rtc_base/system/gcd_helpers.m b/src/rtc_base/system/gcd_helpers.m -index fd9a361f..3a63be6d 100644 ---- a/src/rtc_base/system/gcd_helpers.m -+++ b/src/rtc_base/system/gcd_helpers.m -@@ -13,9 +13,6 @@ - dispatch_queue_t RTCDispatchQueueCreateWithTarget(const char *label, - dispatch_queue_attr_t attr, - dispatch_queue_t target) { -- if (@available(iOS 10, macOS 10.12, tvOS 10, watchOS 3, *)) { -- return dispatch_queue_create_with_target(label, attr, target); -- } - dispatch_queue_t queue = dispatch_queue_create(label, attr); - dispatch_set_target_queue(queue, target); - return queue; -diff --git a/src/sdk/objc/components/video_codec/nalu_rewriter.cc b/src/sdk/objc/components/video_codec/nalu_rewriter.cc -index 1121c921..f21926b0 100644 ---- a/src/sdk/objc/components/video_codec/nalu_rewriter.cc -+++ b/src/sdk/objc/components/video_codec/nalu_rewriter.cc -@@ -242,10 +242,7 @@ bool H265CMSampleBufferToAnnexBBuffer( - int nalu_header_size = 0; - size_t param_set_count = 0; - OSStatus status = noErr; -- if (__builtin_available(macOS 10.13, *)) { -- status = CMVideoFormatDescriptionGetHEVCParameterSetAtIndex( -- description, 0, nullptr, nullptr, ¶m_set_count, &nalu_header_size); -- } else { -+ { - RTC_LOG(LS_ERROR) << "Not supported."; - return false; - } -@@ -268,10 +265,7 @@ bool H265CMSampleBufferToAnnexBBuffer( - size_t param_set_size = 0; - const uint8_t* param_set = nullptr; - for (size_t i = 0; i < param_set_count; ++i) { -- if (__builtin_available(macOS 10.13, *)) { -- status = CMVideoFormatDescriptionGetHEVCParameterSetAtIndex( -- description, i, ¶m_set, ¶m_set_size, nullptr, nullptr); -- } else { -+ { - RTC_LOG(LS_ERROR) << "Not supported."; - return false; - } -@@ -501,11 +495,7 @@ CMVideoFormatDescriptionRef CreateH265VideoFormatDescription( - // Parse the SPS and PPS into a CMVideoFormatDescription. - CMVideoFormatDescriptionRef description = nullptr; - OSStatus status = noErr; -- if (__builtin_available(macOS 10.13, *)) { -- status = CMVideoFormatDescriptionCreateFromHEVCParameterSets( -- kCFAllocatorDefault, 3, param_set_ptrs, param_set_sizes, 4, nullptr, -- &description); -- } else { -+ { - RTC_LOG(LS_ERROR) << "Not supported."; - return nullptr; - } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index e171622616ae2..bd2f9e4b3f5ec 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -6,7 +6,7 @@ , ninja , yasm , libjpeg -, openssl +, openssl_1_1 , libopus , ffmpeg_4 , protobuf @@ -56,11 +56,6 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ - # let it build with nixpkgs 10.12 sdk - ./tg_owt-10.12-sdk.patch - ]; - postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ @@ -75,7 +70,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libjpeg - openssl + openssl_1_1 libopus ffmpeg_4 protobuf @@ -115,9 +110,6 @@ stdenv.mkDerivation { ApplicationServices ]; - # https://github.com/NixOS/nixpkgs/issues/130963 - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc++abi"; - enableParallelBuilding = true; meta.license = lib.licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1df0aee842195..a62bf67790bcd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -67,7 +67,7 @@ let tg_owt = callPackage ./tg_owt.nix { abseil-cpp = abseil-cpp.override { - cxxStandard = "17"; + cxxStandard = "20"; }; }; # Aarch64 default gcc9 will cause ICE. For reference #108305 @@ -75,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.4.1"; + version = "4.5.3"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -84,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0c30kxgp48ha1xv3l59ry21n2c536ax8a15cfk2n1r5n1ns2pfq0"; + sha256 = "060ajv9dd87qs202jr09i842vww1x25mg7vriyvmyw6rz0qf0d8l"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index ec6c1352016b4..e80ccd2105aa5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-09-14"; + version = "unstable-2023-01-05"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "621f3da55331733bf0d1b223786b96b68c03dca1"; - sha256 = "0xh4mm8lpiyj3c62iarsld8q82a1w81x3dxdlcwq8s6sg3r04fns"; + rev = "5098730b9eb6173f0b52068fe2555b7c1015123a"; + sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 343e9069bcaf0..a8b762ab7eabb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libxslt python3 ]; buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ]; - checkInputs = [ dbus ]; + nativeCheckInputs = [ dbus ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index c368c049daf02..cb6e8152ca2ca 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { future ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ mock pytest coverage diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 1d9febd9a6426..6c95c7557eb46 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -9,23 +9,31 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "1.6.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-144yn/QQPIZJOgqKFUWjB7KCmEKfNpj6XjMGhTpQdEQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-4gEE2JCYNxPOV47w/wMRvYn5YJdgvlYl+fkk6qcXLr8="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + cargoHash = "sha256-IYk01mueNZu791LPdkB79VaxsFXZbqEFDbpw1ckYTMo="; - cargoHash = "sha256-zUeI01EyXsuoKzHbpVu3jyA3H2aBk6wMY+GW3h3v8vc="; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "Twitch chat in the terminal"; homepage = "https://github.com/Xithrius/twitch-tui"; + changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.taha ]; }; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 4392f5879954c..7fee1f5c3a83f 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; meta = with lib; { description = "Lightweight Tox client"; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 10f06393bfc54..af321660676bc 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,6 +30,7 @@ , libxkbcommon , udev , zlib +, krb5 # Runtime , coreutils , pciutils @@ -47,23 +48,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.9.13190"; - versions.x86_64-darwin = "5.12.9.13190"; - versions.x86_64-linux = "5.12.9.367"; + versions.aarch64-darwin = "5.13.6.14918"; + versions.x86_64-darwin = "5.13.6.14918"; + versions.x86_64-linux = "5.13.5.431"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-Htug/hmp0OjysUY4q8RO1oqjSsa2sgpqiAERr6ahBuw="; + hash = "sha256-QY9z1bTKtL32HE4XWnBIvCNmDF+3x5N9BdfqJA+24fA="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-nl+hrAZECaC5uceK8OZ/em3rY9pK4VrtezT6qCNmbCA="; + hash = "sha256-eSPKzxDPXCbME0eTTDlfsI5KM5qRm79JTtnGJvpiS98="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-7B9wS0myf6QkDq4ooqWen03s/36BeF7cSsOzjDdIw8g="; + hash = "sha256-R0IMV/+R7AGFy/ZvNyyvIBv10t1x1U1X6jdHoo6UHKY="; }; }; @@ -106,6 +107,7 @@ let xorg.libXtst udev zlib + krb5 ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index cf48ba4420e65..931f951583549 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { zulip ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales ] ++ (with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index c56e78b9f9452..241828fdfc3c4 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,24 +5,23 @@ let pname = "zulip"; - version = "5.9.3"; - name = "${pname}-${version}"; + version = "5.9.4"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-Hws9vENGzCLQqav4uXtbbI0iNoS3JozC5m2DG38+3Fk="; + hash = "sha256-gbusyhMgoaQmeWm6dB6pc3kSykD4T97VQcJgcF5KbzM="; name="${pname}-${version}.AppImage"; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ $out/share/icons/hicolor/512x512/apps/zulip.png diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 30aac1cb11787..051a872151a75 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -29,7 +29,7 @@ perlPackages.buildPerlPackage rec { propagatedBuildInputs = [ openssl ]; - checkInputs = with perlPackages; [ TestDeep ]; + nativeCheckInputs = with perlPackages; [ TestDeep ]; postPatch = '' patchShebangs script/convos diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix index 71bd96d3b70e5..b0e771a80f4e2 100644 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-bLBrkbW/Iv1v9z5NOiMAA/dH5/9FlqusRV5rSqjdlPw="; + hash = "sha256-SXPtSFjGPLgORG9OCSCEStzNzdGZFzCx72YOrW288MU="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index 28d51650b263c..e00a177b673e4 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-12-02"; + version = "unstable-2023-01-03"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "870e2e51feb2186bcb4c719e17967eb1311678a3"; - sha256 = "sha256-YWEgA1KAa1cj2YaqOXVVBw70gSxK7WEMNDyGJOFq4DQ="; + rev = "5414edb01f30ad9480e211030db1bcd858e5f741"; + sha256 = "sha256-GsdU+IBuHhwt8n4SEMCUSUzLQezwVtZ9L/0uF5aculA="; }; - vendorSha256 = "sha256-+78Ln8179MfDKSfT/jnN9Y5CIbpdq28XMDHsIu+4f4c="; + vendorSha256 = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; subPackages = [ "cmd/senpai" diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 0739b6f576452..478b28190ae69 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.8"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - hash = "sha256-ZtJi1NhE1agZWnAv6FCUeO1GDtuQnLTraA5nkwWiCqs="; + hash = "sha256-objxAUGvBhTkbQl4GshDP3RsCkAW4z917L9WyaVoYj4="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 935c4ae571efb..22cacdd01ca14 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; #NoClassDefFoundError: org/apache/logging/log4j/Level for tests - checkInputs = [ coreutils ]; + nativeCheckInputs = [ coreutils ]; installCheckPhase = '' $out/bin/jmeter --version 2>&1 | grep -q "${version}" diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index ea4d27c6b412a..673b864630d47 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1l031ys833gch600g9g3lvbsr4nysx6glbbj4lwvx3ywl0jr6l9k"; + sha256 = "sha256-4XcAo5StyYIfe9wD0cPHKFZalMcBAuiVV2qFZ126KT8="; }; nativeBuildInputs = [ automake diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index d0050f73759d9..bc27b91a97da9 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { python3Packages.setuptools python3Packages.notmuch chardet dkimpy ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ freezegun notmuch ]; diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 889b893ea9cff..471b603f26a16 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -47,7 +47,7 @@ with python3.pkgs; buildPythonApplication rec { urwidtrees ]; - checkInputs = [ + nativeCheckInputs = [ future gawk gnupg diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 78a647bf0152b..8033a734b981a 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.46.2"; + version = "3.46.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6spQz4oq6sFT2bCmaixVJDbTw1wM3LQFmg3E1trZ30E="; + sha256 = "BFnqQFY2OKWllPQt3BzHGRotOCLCEcz/+82LNtMmQCU="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 0c7f5a4175363..a5ed92f519e3b 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.46.2"; + version = "3.46.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cks7uFOapRxpJsPxfTO7zjWpnBbqY7gJCzRsWr9ol30="; + sha256 = "riIQdCXTDRejo0w1bNpfQKrXhG12vbYINEUYtdQpwfM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index e9e5fb5f70e95..43590c9d3361c 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple command line tool to check for new messages"; - homepage = "http://mailcheck.sourceforge.net/"; + homepage = "https://mailcheck.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ kovirobi ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 9e5dab9374763..6e694d01b4664 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-r/xutH3BLYCsFmmYJ1hdphLLktCzdAeM1Uwp1l1C1LQ="; + sha256 = "sha256-aXpPn6tpSOwWL/34qlpJ+on/H+X7303J1jwvwcVOTNs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index e3da77531a114..285fbdf357075 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; - checkInputs = [ file ]; + nativeCheckInputs = [ file ]; buildFeatures = lib.optionals withNotmuch [ "notmuch" ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index e2dfcdc3184ee..d7de9e971ea3e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); checkTarget = "test"; - checkInputs = [ + nativeCheckInputs = [ which dtach openssl bash gdb man emacs ]; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 3be569082d0a6..1e2d5c031d64b 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null -, gpgSupport ? true, sslSupport ? true, fetchpatch }: +, gpgSupport ? true, sslSupport ? true, fetchpatch, Foundation }: assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; @@ -34,18 +34,20 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 ] ++ optionals gpgSupport [ gpgme ] - ++ optionals sslSupport [ openssl ]; + ++ optionals sslSupport [ openssl ] + ++ optionals stdenv.isDarwin [ Foundation ]; configureFlags = optional gpgSupport "--enable-gpgme" ++ optional sslSupport "--enable-ssl"; + # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation"; + meta = { homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ff2467167dab1..ed5c9843f2813 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.6.0"; + version = "102.6.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/af/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/af/thunderbird-102.6.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ddc531e03819b6f1407dd8c91c65216bd85c977d217bd459f410a66ad586ba16"; + sha256 = "417eb44163275bceea7251e544499f56056a16aa3defe97f9f26df0abaa8fe8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ar/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ar/thunderbird-102.6.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "144a7ef7722ff71c30eaa8fc55bcca548863dfb33198da57a47709cb5415666f"; + sha256 = "9717df3c3020d2b6814eb8ce99eafa62f71f56cbe0d7515044b7ff88c763cf44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ast/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ast/thunderbird-102.6.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f10c3787459c203ae60fdc1a3390a29be22634c42b8a9a67743fa87824f16e98"; + sha256 = "b6984f90666a29a922e098635504786716c38c0cafe243b5a1d43b64af64d0ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/be/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/be/thunderbird-102.6.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e7ffc96e12f3edad721e9349606ccbdd38364a91833541f15d38d2437e8c6a2a"; + sha256 = "d9060ad38fc5da77c9c709dbc498ce656d20668b16d2c811dc400bf9170aceee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/bg/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/bg/thunderbird-102.6.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0afd93bc311d2069ca0cf87779e525ee735821f7e28791210bd169393eb69331"; + sha256 = "936c52b46c7671a3328e6ebdd9d0ff0e61e761efc0210f0c470893072d04d7a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/br/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/br/thunderbird-102.6.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "cf0ebba13d341a56e455308ac856c8f67d2aee5b566dd4f6534e0c7c298c5b7e"; + sha256 = "5c82a79835dd1f94b54113c9982e01c1a5cbce09c89a8ca5783407669de35665"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ca/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ca/thunderbird-102.6.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6034897c6ca24a27caf91671851a1e022d807eb4e0bfe747f79e8d56a7f29f68"; + sha256 = "4461d13cef193613c490eb3194e4a49c8273cd18a6802450c1bec7a239ff3236"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cak/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cak/thunderbird-102.6.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cceb7e008a4db037430fb14c2530f81acf406214c84f053872f36ce7ce632919"; + sha256 = "3382850dab21c32bf31b1ba10474a2cb017c16af5d3fc3697fe15dc39ccd9b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cs/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cs/thunderbird-102.6.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a02cef9419a94aec3aac68f484ff042344b9c714d5443d8017e517e6a36315f7"; + sha256 = "1d9f24e160547e4af0d6420b443e2c36762a13bfe7a0c552162fac05c08d8b1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cy/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cy/thunderbird-102.6.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "91088a138f0d66d4cc9cf7cccfd1668d744de0d6e9199ed74d7139aec20e95a8"; + sha256 = "dcb3a9894021d08f31dc9b5eb14bff17bd4e0ae8009c9f65b444c1ff0aca4d91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/da/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/da/thunderbird-102.6.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3d610380be8097f949f9c7baa83d4b4c8514065bc0b5d18b3a2b979931b1f5c3"; + sha256 = "0fed9e8faebbeadbeae53aa06a773b412d45adafde237742b93dfd9196c9e9e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/de/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/de/thunderbird-102.6.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c9fb5d6952bf580f0a83667d8111ee0bf7a0f424d70d678bdc4551a7314784b5"; + sha256 = "dd9a22884495c0d1ebb18fd7721688a2e14917684bc176c90578c8008d3836e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/dsb/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/dsb/thunderbird-102.6.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "aebb4617fbee83e88873b49726c63adbff9613628dc5c0115da6eea16f2f15e2"; + sha256 = "2a84bf4e6862346bd03a05be6fdbeeb79347890294ec6f93809bedfa089005dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/el/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/el/thunderbird-102.6.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "20cd55bfb8608ba906ab72536f1beae8c1b04efc1bc8608c898e6a7c45c3d7d4"; + sha256 = "f758bd822941145ba0da6e296f12264329a30c3f1cb5b8ce16f9887ad89caf8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-CA/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-CA/thunderbird-102.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "80240a7fd45975fb05387eb5b6c17073b4d5b152907273a2e6c54e690b42e285"; + sha256 = "4f0edd405507b23fac31461f9511f35aacd096d92a4b598801f021ac5d3021a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-GB/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-GB/thunderbird-102.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "efc3fc6e571b21ddbd2fefc04adc1a646c667531f6a04366a1f08fb442c3252d"; + sha256 = "15443e7ed39849346c562a67a673fb4bd39e05f8bf616fd7170e9352ea4b5404"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-US/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-US/thunderbird-102.6.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6c889cf71cf02cc703f9c6d20278b5f2394669c7f6dbf86d1cd8413c46ea0dfa"; + sha256 = "501c5f0c97e89d5b5fb066b5f480cc3598a1bdc86dfc32482d3bf2c453ed29c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-AR/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-AR/thunderbird-102.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "fa9dd4eb3895c4507ef064e0aced1b0259f50e4dacc63d3f1fb9b45926be3e6d"; + sha256 = "c228716b6c6bf78efdbfe877a01d98a697c048ba36b5b692d4a9e4f35c5c8359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-ES/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-ES/thunderbird-102.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "85bff3585cb72f8b2aeebb0fe987e73bbdadc8b30b1e745a48663f7d81a3f533"; + sha256 = "35ff4ab3acdacaa17c31577f34e791f805f039fff636f696f483e0e77a13cdce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-MX/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-MX/thunderbird-102.6.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "981f4e582b42a2b3c5bb04554fe333ed7b46e3741248c73f33a1bd6da41e1b01"; + sha256 = "da0dac340fe0467d48c75ca25a0f0c6ca40e7904969aff5efac7d14b8e2a790e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/et/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/et/thunderbird-102.6.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cc43f9a48515ebb7e5f5dc3a98f09889222c7403fd3a7a678825cf70cf52b496"; + sha256 = "840bef653741da3b19b85c645fed1375ba706dee4bf2e6c8684b9f50a2d54a35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/eu/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/eu/thunderbird-102.6.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2a1ad9ff0a1b129cc1553c5324d1a20bcf7a2f07fdfff1b73deb7be7b1c8aa7c"; + sha256 = "397a1a04b45f4035338328a52baa2bfc30be9f48fcc76137122d18e0a350fcd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fi/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fi/thunderbird-102.6.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "58b0dbc3f5a108bb17d447b3de43281f96ec2c402eb95494fbd80202f414bc56"; + sha256 = "9af605e6b57db7d2c661ecd95f422b613f1819110bd9ceee7b8d4da546fbe069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fr/thunderbird-102.6.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8a23d307f6092dd319c0c406ac75bf60a98c000a233e59f7126552e98b335579"; + sha256 = "44c4a26ba5da3ddd8fb5368529279a50ffc3593f3b7cef35eb903d915d7720c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fy-NL/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fy-NL/thunderbird-102.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "de1a19d8a0e0058470e5aca0261737ec640386fe776a9f388f88eff4244f17fd"; + sha256 = "74023e7e027554a79362cdaeb8921393e55d902c10653221c7edc9c245646f99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ga-IE/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ga-IE/thunderbird-102.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "76887469f4f639db0d1a4c30ac7b362482c9aaae1e6de061c266977d1ab2c2ff"; + sha256 = "04f6ea825e23b89ea5f55d5fdf86c11ed7c4f224df2f5fbcb1b800a5f45b22f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/gd/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gd/thunderbird-102.6.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "9ad8fcf191ea18e7b6bcefe87f68cc508b01f7f412f60345a3430ab65b03b468"; + sha256 = "fb428e74e80863cc6a69b2f9ede1694daa490637c166c5aacc041fa70943b5b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/gl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gl/thunderbird-102.6.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "070160bd3423f38790210120d34dc6be5173fbf5277c1f274309d36045dd565b"; + sha256 = "c548d0f51b881b220dbc8c93a69add3f1b19579236b3e47d0bb3cccdb7d8647d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/he/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/he/thunderbird-102.6.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d49d7d5460a7d26abf6da98e4dcb892318555cd240c9b5af0882da03cde6a81f"; + sha256 = "b22faa9d7646eb8efa3fc0e15c966f7286b53c12d72baa534a92ba20432ff8b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hr/thunderbird-102.6.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ac786d73b7b532f2173e45cffd19f2f6fba69be7d75bbda4a2b1a3504a03f425"; + sha256 = "05571451a11e827ba451354f97695e449afe85d7c7dcd2c0ff3aea24727272c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hsb/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hsb/thunderbird-102.6.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e58b0dd020e85badaae1121e4bae2e7863f96faadc70aa5571f6b4eaea4c325e"; + sha256 = "a3c0f43e1db05456aea23dc1f17b1057eb86124cc14a1ca5e80b71b1518a1fda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hu/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hu/thunderbird-102.6.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4e593b2a9356260208f97a7900745e56183d57d0aa0a1c496e010bc833a12d23"; + sha256 = "6b0f9ac8947699adc325435be839cb0c08052db330d0d2c8327fce5f4cc2eb22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hy-AM/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hy-AM/thunderbird-102.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "eca558fec17b96795eb21c53c62c59bf5a523bb60ef4c893569b2feb8255945e"; + sha256 = "0150496630287f01ed05dcf9e3dda88a923936e77cac41e2df856d8f4298f240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/id/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/id/thunderbird-102.6.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5d85920ab3def7b3cb72f12bff40c39ae59df39a03b86e245e7c07fa298b7dd8"; + sha256 = "0a2946beef4068a760f139f32782cea1f7ed20d8d577448bed785146394094ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/is/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/is/thunderbird-102.6.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "024af862706817bfd66ccdf0f9e86196a08cdd21fb6b7cee095dd6a52170c35c"; + sha256 = "9e876cd8b01e9ec4c77311c325b807d3318a17c7d4943a42dd1faf6500f222fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/it/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/it/thunderbird-102.6.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "eb928588955c211ee43b784205653608aa6a7566d16ac698cab0f95849d7cab7"; + sha256 = "92a90f181df2b5ef167a0b2fcbc5169615a39287b75a7428650bc679e211c755"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ja/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ja/thunderbird-102.6.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "289741d28748595dd3d4cf3a02cecbd90c4e362384e413a8fa29ffd712ac43c6"; + sha256 = "a90c125ee302827c11ba1ec41f6548c7c42c88041713747aa7ecfdb84b307d92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ka/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ka/thunderbird-102.6.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5fada9a77a88fe4fd26d264f0a67e4f63ec8879a11fa56a3ff2f5e3bce9f29a1"; + sha256 = "a26c7070396101c94c35a35aada3869309d19e060f8c4e44ffa77a9cb6d291e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/kab/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kab/thunderbird-102.6.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9961ea98641b279f09bb6bf45c9ff3f85eeec29673ea8227c23f95dbc8329d01"; + sha256 = "4596eec5222f4fc3c9f27c3af1426880ec3846b981b5719bf97decde06f14580"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/kk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kk/thunderbird-102.6.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e0f18494421c61f61b47b33a30101a63925e093e24d89aeb8e295ea5457057e7"; + sha256 = "957df20187a944e587f16426b975e0b25dc274ac6ff0112f8ad96f7b520f35f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ko/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ko/thunderbird-102.6.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "01b452e1b2f980228a72c3529e89db3c5357a1b5603e5578af1e32c3a3a52307"; + sha256 = "77cb35952ebd1b14e661d6c67933fe5c28e5670e2a08399227e90e0d1665a149"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/lt/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lt/thunderbird-102.6.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "96cf9f188946695becc4022f3ebbe04138259d878a3702c8dac260daa2e41b87"; + sha256 = "fda5d9ee40b2a9266a14969187fe54f5dfa97b3029cd23bb4f74dba31139cb9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/lv/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lv/thunderbird-102.6.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4504a245d791c6cc5c5f372fad8f208846ae697e32dd9462b2c1a539ebea1a00"; + sha256 = "088a7b5746926614ce27ec42ac8e50dfa573006e76bc2cb2cab8d94b820ed3db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ms/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ms/thunderbird-102.6.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "23e14058f426497aebfe4ee38ba627b485012271c018b4a2c86ec9cda4a41c94"; + sha256 = "827c08cdc65fbd81bdd326b2036071d2174d469c72224929af899c3af90cbb1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nb-NO/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nb-NO/thunderbird-102.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "93c7b7084ebd270a2e1f85d60d0a9f59afe8cf29c364eb99ca0c658520d6f9f3"; + sha256 = "f049be571b8d9b39dae313d370e2510251a0521ab64cb82cb432843fb26c407b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nl/thunderbird-102.6.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7ad0aee2c5b35953edcb8dc0f1b90e55bba13e03e47b7504b320bf4d706b9066"; + sha256 = "26fb69eceb626eb7482f67ef0043dd9fa58003b534bf4066aef3d51792ea1834"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nn-NO/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nn-NO/thunderbird-102.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3cd1127e6eff5462716812d06b36ee5ba4ea8ac78608ac5aaf806f8561d3244d"; + sha256 = "4e586bda023baecaee92853a4e6e993e35ce193ca2770071bc22ba2006109898"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pa-IN/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pa-IN/thunderbird-102.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "72aabe72bd1bffb4cd8666296a7069ba91ffbe89ac753e52645957352cd679eb"; + sha256 = "8fad3effac8d00d5a07466b94b8d51ad6ecc23552ffec658fef6d127b0b80e4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pl/thunderbird-102.6.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "64bd01b72b38eb81025425a64495aeb1405e6c75c6a140ee75cb2a433f09b73d"; + sha256 = "7dc544a10b244425e76e341fc1164b52e915fb5e6c12fc755bcca173810827b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pt-BR/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-BR/thunderbird-102.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "98af0995d54f5ec6acf67b5cd7542f96778bfe8a28f2092d90033196bf5c7bc3"; + sha256 = "7b38735922511f3a03febc10e98fced7880a8874ccb53c3c946d4db225d02823"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pt-PT/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-PT/thunderbird-102.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "df9930a733b6a29cf9043241322469fbbf07b3c36c933b1f1ed2caa31ac64369"; + sha256 = "4baa786ae442af119a3c9d794a31aedee06839b8dc9551b46028a4578c4086bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/rm/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/rm/thunderbird-102.6.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a7f6ca7d64d4eb821d070753662928b7f830ba53ac5c05d5cc973d74d71bc833"; + sha256 = "087b4ecbbf95853ca6937a828f4f806d32f8c56d0feaf0f5e05628e2ca2e3ace"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ro/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ro/thunderbird-102.6.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9e4f65dca7ce9cfd42fff95a6cff6f094f43bd4a0dacd6fe0ad2645d162140e1"; + sha256 = "d3324a4fc7ab8e00d35fb7d1a4c6567a3a3f1b4c50590ca206eb6d5a6b950842"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ru/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ru/thunderbird-102.6.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d71164338b7b42f31b4af3fb8b29253353d215c5bbb25622b0626d28ce31f4e1"; + sha256 = "6a2d2daf0f325f8f033869b3fe4e644ba5022244bff1031b35a439e43999cf44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sk/thunderbird-102.6.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bc785d8712dbb1539cf7be4ec04c928e8565f36154702f97628dd6f61db9f2ac"; + sha256 = "275785c953e5c88adf3b234c604ded4b04a087f28f32bfbf39e0b3a8e1e64c82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sl/thunderbird-102.6.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d19966328e1e1205cdf1bd104361325e988e3a0e5ba0d9780f7b32cd9b76f296"; + sha256 = "398725e455f26782f3d44a8165897bc375a9d0b7544e1ee37f70b77898ee4ff9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sq/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sq/thunderbird-102.6.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bbe4c32736b85079d8f1615861500c51ef4b03a88d729064a2f10dba7ce3480b"; + sha256 = "cd2c03610f93518a95bd75cc0c7fc867b3922aaaf7e891d67dd6562aa4bc3064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sr/thunderbird-102.6.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ee6e9940fe94a8518c001caff24aeaa7de87802a6969af2013f92326d7dd4304"; + sha256 = "bf380394a724353bf91fae056a00e1e8238a14bd1d221bb47cc2ad6247ec721f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sv-SE/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sv-SE/thunderbird-102.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "51a16521bc656b71831ab1cfdfa3a477c6c991182d83aff9dfc479d0f8e64db3"; + sha256 = "8b57f7ed92a353a970c063c9374303c273a190fcc04045a7fb9ed7774a2bbfb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/th/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/th/thunderbird-102.6.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3d7e5bdbe8e4cf0cf24dc2dbff38eee869ed102ffcd6f5656bacf79047ff4ef0"; + sha256 = "99abebff09161c06c5985e74e5e1337153d99d13fa8661abf8e4f1895c12d1ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/tr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/tr/thunderbird-102.6.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a6abcf600cf36226bdddda04d082a0501afa44032f14d73e33a6534b24309afe"; + sha256 = "b17a54aab88fc7c13c3e5551f9b9a14153e124b19d58fef3da28392dd1a18157"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/uk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uk/thunderbird-102.6.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "48b179d8039612f3609c0245d7911727118c31f2b4bbe9954f04a7ea36410d2b"; + sha256 = "63565388a50fe92887ec6adbbcb9a2ee9835873fbaee782901b7f7fd8e35500f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/uz/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uz/thunderbird-102.6.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "62857d7add0bc98051360c59ba8eccd469523d54c5435bc35ec5d73831323354"; + sha256 = "ad501a7dd6f98f5b263fd7c71572632088a4801b52ccb6ee37ebf235162fddb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/vi/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/vi/thunderbird-102.6.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ec10fa8d9aad1682a63e2a7aaf67ab7b3e07a67d3723fe28b4e07a8e4d8a7b92"; + sha256 = "fd5d17c2965a94fcc0e2d167d5f202a67a024c0797afcc92481a3413d6445ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/zh-CN/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-CN/thunderbird-102.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9e61c0470df8111a51cd89039ad552bd02918a072064d71417ab83e9fff98d4e"; + sha256 = "e666ac3bd0f75b3f7915bfade39b044b69af7f3d5901c0f48311ff614f4d710b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/zh-TW/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-TW/thunderbird-102.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b613f0257d6856b3ead2bc20a21b9e0d392f5640d8c3a90b398dd526edb1bb19"; + sha256 = "5c85008c1974b961e08065976a28b0897ff9d5199bc69e1c3c403a10d546156b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/af/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/af/thunderbird-102.6.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "fba04abef7dc96e031a41f468b92655c1c1a623f50413c2b7005497bae60b882"; + sha256 = "e8c7b235b856b7c3ff1859acf856c8917d5a1dfc7e4a6d2b9d4736b3709f9150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ar/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ar/thunderbird-102.6.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1ac92219e3158d2740347c5446d2ff3d1c7cfa0076793a3942e219df7827c37d"; + sha256 = "8594ee599a9bcd600b679e762956042e71cfcc60d6942f22ec9c3a25a0790f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ast/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ast/thunderbird-102.6.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "18b3131e47297d5bc6dc8cc686702a8b2cbcafa7453ce3ad04423516b5f9c338"; + sha256 = "15d81d66cee46104d0ba9af9dd6704b1dfde2c3720a68fd23fe5181b56b2942d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/be/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/be/thunderbird-102.6.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "2a39fa0aa407865e1e071ba265bc67a7ac1cbcc177ec03fbc57a55e29ea6c6e6"; + sha256 = "07bc7abcc461b68d4bd7015518a4ab0f00486c3104ff04fb195244af826ce99e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/bg/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/bg/thunderbird-102.6.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "eaea602188d3cb3b5d6d9527ee4e4941693cf8ac88be7385226e29074c399a20"; + sha256 = "3c3995a3c75d7100d3b5a37de7d96032b41365cc27337af3f90bc01c318c621b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/br/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/br/thunderbird-102.6.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "48e6754fd590cf9a49e13e7bf5b3d608b62e0b62c9ee574a4642ddd57e1ed2d3"; + sha256 = "a390683e704cafa6b594028c02db0729519688b14284cbf4e23af06d797030b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ca/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ca/thunderbird-102.6.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ba3ae39cb7817a87f478167739de71b6195852d91b501a55a5185812a0bce3bf"; + sha256 = "bae799d097b2a072b4f8ecee6dd18b91a07d08f070da39a22dbd669bffa9cb33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cak/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cak/thunderbird-102.6.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "7e18692b7b408fd0ccb35595423da99ffd2bcccb112fe8cfa5c120f2d696fb08"; + sha256 = "68af639a2d228cc8925702ab32c8f7e6fd9ed48c83111325d93b477811177f80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cs/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cs/thunderbird-102.6.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "31037a48c2646569f4b0d160dbd84d9db541f59b78545c52c4c4a4f5c961532f"; + sha256 = "191ec59655ec025ca02360710b180899bb3486910b5c6721165b4cc8ec78f9b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cy/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cy/thunderbird-102.6.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a309dc3c9b7717433af192b3ac41ade7882f7422bd875ae85837b9a66d75a31c"; + sha256 = "a65d91c31430b9b0b138014135d23d56e4ecd849aec398539c6dadb63fdbf03c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/da/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/da/thunderbird-102.6.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5b42f683b415c4235d216d35cc0489bd38087bf59d0bf8bedbf3980dd5460767"; + sha256 = "9306558c123903497e2e5ad7968aa69e94b9c4e809f6f5b4d35b9aafcbc75ed0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/de/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/de/thunderbird-102.6.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "90e11c7e2be2a1137c6db78e9bf3da6c3d09a41f3b0bf40338ddc8b64432fef2"; + sha256 = "ab06a47e5472db33702187a88bd8a794632809977632bf129f3d980b8a06ceb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/dsb/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/dsb/thunderbird-102.6.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c5f61a10c59ff0b4d65e60b83a6f0fb11ed3045b40ca4bdc583a7de04ceb5108"; + sha256 = "05adea0c112d5d481990a7960de93c7a61d055f8268cbf617b295f86daaeb5b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/el/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/el/thunderbird-102.6.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "31f20c16f2d9d430615058b2fc7f1f49e0c39fcec71429d179f583750d3bb316"; + sha256 = "6d4d1913ae19fa528aa6986c617226d30cd46099825afb2bae83b052f5aac490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-CA/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-CA/thunderbird-102.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dd1bdc4cd28ddced917ffde9f598ff33760a148126e262127084732d0d50b4df"; + sha256 = "9919702fe73038c05cbcdf747126b22b7b4fd62549ad4d1361ef85fe6aa92f71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-GB/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-GB/thunderbird-102.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7248388e91e24538e5bd8c3d877711e4f8794bd4ad2ab8f5eb71c31fa0d7423d"; + sha256 = "5d8b8bcf27c67d6a0c70bb6754167474e9bd9fb7489f1fd21f3754d27d872326"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-US/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-US/thunderbird-102.6.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "754f3e6bebc1f36bf76d0cecb08bcd9a7dc4d43bb2467c69d3f4611b79358131"; + sha256 = "b24ea963c7e09d1f69b1297a6f86a7d0462403a9172d81ef47c375141d54cce9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-AR/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-AR/thunderbird-102.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "bf6852b5e907117b60cd5325f8571e8b287a1ddf6a5ec7f93cc667adec647969"; + sha256 = "1617dc229307d42e1a60ea44f359a62f042f53064360dac7ffd59b6a7c90da41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-ES/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-ES/thunderbird-102.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9df45a34e94952bac3b84eb633177e88a420863a8049b7f417db539114ab9bdf"; + sha256 = "9f19e6654ff4e2eab1d9f7ee555da87c270e60cffb820b000b7892583f4faf6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-MX/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-MX/thunderbird-102.6.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "da66de3a423965bae1825bf863864d3bad4b91759ab4392f825586ec9abfe00e"; + sha256 = "7b055cfb21573399df99e4d6884cb4c61ce2221ac8ea463d1d2b7115d97ece2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/et/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/et/thunderbird-102.6.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c1954615d54c66e20687485ad3eb68aee68559670ac84f37ad83169dd5c6ea0f"; + sha256 = "cbeef98898969cd7b858bb127c6ca8b6b9888cda0e230e303a8c4c777a30d151"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/eu/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/eu/thunderbird-102.6.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "02e4f09053b0af0f16b573539cff6fb4a0670e8c63413d34b13bfbaa1ccc1851"; + sha256 = "5e8160115595350cf5b0a44e71c09d32fbac65ffda9ac6f22cb5e910d18462c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fi/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fi/thunderbird-102.6.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0687aa8b0c694de151bea3cbb669a3e9e492ce7e35ae15f284a3612ccf3a1274"; + sha256 = "291883c64f376bad4b6345864d10f0e067123589a2b30f38dc24a99b25854949"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fr/thunderbird-102.6.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "06469b90502e9779c71785c0296f16dc8ef53d7a7dfb44acfab106d6a492d657"; + sha256 = "7b57f6a1f499a009176cd894df6fa9fd151b707b63aec8dfb62e426a294c53d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fy-NL/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fy-NL/thunderbird-102.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0f9d43cc9415f7e56c110e555f8bb07a0fccc1b470b3e580213f813ef612c36b"; + sha256 = "6e355a646c8dd77c72fe16c896c25572c9b87c4806364836b3681407bf7941b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ga-IE/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ga-IE/thunderbird-102.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e8d61bea673be01ff4ee5dca08aa323815f768ea5b7aa7039943ff0d9a07c750"; + sha256 = "fc2b1fbfc5aeb15082e656c01a71943045233ee593c3e1710440a79f50d4c0cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/gd/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gd/thunderbird-102.6.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "a39df1bfef807166c8df652e307a57007b1605bc3a4c8322bb012b05dc64d994"; + sha256 = "e8be8dba1751fb4633dc5bef4a047b3ff85ed9e799b89669f26f8e0e3125e30a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/gl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gl/thunderbird-102.6.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a40c0ea5adac744b654ba6af033b9319dd3d9e8d7741e93a641d30254bacef16"; + sha256 = "78ffb29b73629b7d319bf752471608e3d44624b5b99b6eaea7f241901d623a05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/he/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/he/thunderbird-102.6.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4279dedfd093231c88cfb716d22c1977e20b067d00327777d90cf862fc8a2ba7"; + sha256 = "3bb4469702756c39cb70b0639b825e922d769a9aae7e78f296d8188b039499b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hr/thunderbird-102.6.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ca0b0d3f5dddbfbe3a08ab2e1a0db1e04f86ec96d3666f93e6bf03ea2186c045"; + sha256 = "acd95b3717e6b617212c75be3b9e0b193f33cf5e5636d2ea535a720006f7cfe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hsb/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hsb/thunderbird-102.6.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "dc03a363f9740fb0d2aadc916d2145261ecb10969fd2d2fc0135e03f30a2c2a2"; + sha256 = "7c65d7f28c713723c58ed62715404224b8f4163a1915f702d125f827e642b509"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hu/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hu/thunderbird-102.6.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "24db5084de2564550f2053e676d51251a98de4c6c580daca27490e6474614fcc"; + sha256 = "6d206289e4e8ef8db85c29ec001b91add5eac67bca3d7f5eb42099cdc9934c6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hy-AM/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hy-AM/thunderbird-102.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9f8688668f29e7016a2ec3a076c3dbe8ff69f36abfd4e071dcdf896a8b108801"; + sha256 = "8823ea085d97bedddb4ea16517626dae9747db2450900eaa102139121eacc5fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/id/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/id/thunderbird-102.6.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a7c2d0baac5cfade4c1d1f3988af42d4082030297dd4a6f6d31d08effee9b533"; + sha256 = "e6fc35cb393f7a0cd63625700e11c313124a2542cebd431159e065c826581176"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/is/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/is/thunderbird-102.6.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3328640fc5a720928e6ac9fa0dfa8b62df2a395e542e36dbd1f4a07155a6607c"; + sha256 = "f92db50f2f743436373da51e2f3b9bba7c4f6943254a70e7459ebb7d90dba3a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/it/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/it/thunderbird-102.6.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "881b13cab011b635f78ff748066b2efe187ef2bf71303630fc10aa01a057ddb0"; + sha256 = "9cbf3eeb035ddd0f60c3404efc79faccb454fe406467a3c66d71b6ad4e87389e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ja/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ja/thunderbird-102.6.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "64abc0dcec7166e70f40e33c4fbd7bf36f65996494f0f73928a6fcc097fa73b0"; + sha256 = "38c5621f8b32d55b67a79103704541b14599bc67090216a9561ac1cb4c311bd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ka/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ka/thunderbird-102.6.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "04aa0ef70410afba51d380389a77edb0fe3f2701a78c4c70c972c57cefea81d1"; + sha256 = "05b906fba741580368f52b7ddbc4772181f4d1fb4ecca20c94bfa0d41364383b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/kab/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kab/thunderbird-102.6.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f86ba0cf6a1c8f046bb6af07e969ef8252afafde7e44e8fc3417099b681d7cd4"; + sha256 = "a225ab4d086e1b21afa6d0d1d8b33434832f37c7bfc4982d2024783111cd7d01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/kk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kk/thunderbird-102.6.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0486501081c34771d4a0a5743409493031be5a9b72ab660b280f1e5478f0c253"; + sha256 = "38f0349f890702adf3f6854893e3a8bec5d6244ecbd69b86fa839f417a9e86c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ko/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ko/thunderbird-102.6.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f02ae10df782f6a0c31e6ae72f59d0a8a0f9399cc631188ed0840eed99059ef1"; + sha256 = "d838976ac2902cd6cd055480a1f4b7510abb83cb2448b64fb36d600525a90a88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/lt/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lt/thunderbird-102.6.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "aa07291e95cab61e73bf763f4f76578b662e6114dd0b2e5f950bcb2dd1c06dee"; + sha256 = "14e66fca1018cdc74b7bb50c46def97b0c6f25d667f869fc0c17d8ac16d7cc5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/lv/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lv/thunderbird-102.6.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "03b9cbe138ec34997a35fd4b948cf0e3a2e171b1d05615835604c448284f4d2b"; + sha256 = "6b7fa2d6c712b373f5013f3acf875f8ea8b8fdb582b6759e96469094b375540f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ms/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ms/thunderbird-102.6.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e435619639653789ddac471343008a21b09a7dcd70af4997566b820f3b93b16b"; + sha256 = "fc42cae3d6ba0910df7aaa2c1df8391e70da60a093aaff60287503feaae37260"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nb-NO/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nb-NO/thunderbird-102.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b23fdc44c0aab4ff6656898e4134c3d05c8b612174acff0ac09dc4dbe2599240"; + sha256 = "0ffb1b18c916f9c27e5ba3ab8bb5ee3107e37f983c2645a1955e9a4904cd8c47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nl/thunderbird-102.6.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ef56023d4cf3fd8b1aa8f325782d32123715a544c43a0369d6f002ad257af639"; + sha256 = "fcd3a85abbff759ed27c314f0b9d47d1a216ebe9bdaa3926885be81b31fdcc5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nn-NO/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nn-NO/thunderbird-102.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6667688821f43d9a1e3984479abb286b56c9ba42a25785231f4832ed232cd6aa"; + sha256 = "affde5a378f0ac70d48d7e4c75f6b2f680517cb2106a28aa4a53e376349b43d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pa-IN/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pa-IN/thunderbird-102.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ceafa5a4b290ae439eb65cc409dcfa67606d71e9a66b0ea968845ed965d7d850"; + sha256 = "81984847af5c43eeb35870d39eb6e006d8b9df35b5e03135670973ae6f5f7d1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pl/thunderbird-102.6.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "dab264929f800384c4e44daf5a3bf0dddcdb5786ad8bff0fb68683bb5cc1929b"; + sha256 = "4710f6042126da09159cb5d465909bea3dff62753b6c5811f8920ca7782bcf73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pt-BR/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-BR/thunderbird-102.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0d2bd65dd8551e72e7b0d905450596d9fd35eb7f72478f7dc7ac7e44d1cca9e4"; + sha256 = "92c564bb0623a9a258fefdacd7a76a3e636ca5211f962c3b3a68cfb16cc5217a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pt-PT/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-PT/thunderbird-102.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e4310e455f2843a2ef23dd2be75bc43babdfb82b222b0f7e7c04648f0dc7ef45"; + sha256 = "37fb096c984cd78174def41da70d0c352536b1780a817731759f35ac3554e330"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/rm/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/rm/thunderbird-102.6.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fce4a2d49f35d18a68fb59a7ca65550d09267919218281d9a26f5272a7cb5fbe"; + sha256 = "b72355afb5333ef44336d4686141a44b4f291edf110c75168070959380bbac58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ro/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ro/thunderbird-102.6.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "41c342b6148eb75608c4d5a8e38ef1e4522a5fd755d1aeda0f59e038ce596d3a"; + sha256 = "8536fa781ea743fce1379137da66394ce1f79ccce4daf4f9d5e2c28432c94466"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ru/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ru/thunderbird-102.6.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "5804852fae2c30d9f19418cf4138c0ebcf66effae30db3af5ad96b8554b768ce"; + sha256 = "69b0d192d7cb04aedff4f356e9520ef6ce5f8125fc2309c60a1e6073dee64cc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sk/thunderbird-102.6.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5a5ed95e6ce2a8f37580177813d0e3586ba71bbb8a52cf242b8f83f6ce236565"; + sha256 = "0a1c3955f1ccd027a45249b7d0d44f40fa8a47c680dcd0411d04cf8dacfacad2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sl/thunderbird-102.6.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "93c06443cb2df81f62fb43347a7b023c7122914a733e9e9f3d267f325c8ab7e7"; + sha256 = "e9659cb2099dd02c1a990914383f75569b01a1f39f1f79c1dd60b24129c0986c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sq/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sq/thunderbird-102.6.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "91e395232f22abf530b729347798544feeeca02fad6ccc36cfad827ab7393c60"; + sha256 = "080493bf33a13e2e705d8200f8b6edf4f85ba292881d71df4dd38600fee105da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sr/thunderbird-102.6.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d5e2bcfe948a1cac8df11905a57fa6706a7e8e85d7be12d3bcb7f7b54e53f2ec"; + sha256 = "dd1efccc8bfba45aef4e25d872652b39a05de669e57aa30827b09574968f4ab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sv-SE/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sv-SE/thunderbird-102.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "96e07de3298723d7cab43b804aabe6187c15ea89252d1344abf4bbd25cb9b9f2"; + sha256 = "f04fee4bbcdcf35c18be80c3a0d5cfde8cd3c918854c254f775272a3a005e2e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/th/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/th/thunderbird-102.6.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "67cce516f665cfd559867e5e00931ba540ad63f2906ec511d8c855806fe3ab01"; + sha256 = "841d28387ddcc3fdbaec217a8bc987bbed43a735b1d0ffe2eeb8b6fa58458f47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/tr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/tr/thunderbird-102.6.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c1de3a1814d76a4c8d72b6f3df2a9e601e07b0cdbdcc4813a20c97c1874a712a"; + sha256 = "e4d793ff7e738389aabc7ec9d6893e2e4162e63996c36341f64af570b26f5f6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/uk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uk/thunderbird-102.6.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "308bbd7f01a30f9663d5cd68dfbf167395fcfafe24ea400033bed4f7e96328d6"; + sha256 = "03fecaf497d2a4188474e4ee6a0fcf084a32d0903fa041cbe39eab29421f7276"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/uz/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uz/thunderbird-102.6.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "858c07c3f2c1ce396d9ab11a4081e35f878deb24b3e6acd9ca1e29bf011f8140"; + sha256 = "d463b9108838a61c153ae4a8fc69fb805881589b441206c08e583289ef18c314"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/vi/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/vi/thunderbird-102.6.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d7897016c1ad4cd7f7f97953dd5cfd752c035d1047fe769cb9ad40a3d37cb9b9"; + sha256 = "8f7cb20aa60e27c1b776ea03842f38629044b6ee1c3c49df172c774cc387f409"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/zh-CN/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-CN/thunderbird-102.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "aea218e4dedca2ffa80b9003c50e018e40675c9cce5d2d3cebef31ff82a789d6"; + sha256 = "90d52ae6329d04ddfa8f37d5f54f98ee0893ece5a7c73c550fbea568538c7485"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/zh-TW/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-TW/thunderbird-102.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "942333eec6039114389721fc0681f9f11f6958b6e3dea9a3ab914f09fee50a7a"; + sha256 = "35b625402841a21a128eaf7c92ff277c996d6ff07f269fdf92f0d6cb3e04876c"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index fabf52f8c68fa..49985ac7bdb25 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.6.0"; + version = "102.6.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "34f79068685ace75ca65141d8165138d25326e9d0a1c25b0463ea69c64a7240dd19c6c894c875c5429cf7b40344fbd32b1ba0412bf8893c4bb744c83f8bc25ad"; + sha512 = "06ea2fce76c08609d638435869fddc1c4d7f4b748951ebfb2476b4dba9f1f76d3de2c11e5f62540f297a5d30bb0fc637852d8e57f4fadc2c905f299757949d83"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 283091ccc57d2..a2972f9bfb961 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.105.9"; + version = "3.106.4"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-PkAxtpyL4rXJfz+YgbVteOP1V0hlF25htvOCkEGFq4k="; + sha256 = "sha256-RU2JEFtYOpxqA02YDuB/V4t/ZZ608EHGMPpwxVOzRz4="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeWrapper ${electron}/bin/electron \ $out/bin/tutanota-desktop \ --add-flags $out/share/tutanota-desktop/resources/app.asar \ - --run "mkdir /tmp/tutanota" \ + --run "mkdir -p /tmp/tutanota" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]} runHook postInstall diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index df5c1354562c2..479d0980919c5 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -17,7 +17,7 @@ , Security , withKeyring ? true , libsecret -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: @@ -128,4 +128,5 @@ symlinkJoin { name = "msmtp-${version}"; inherit version meta; paths = [ binaries scripts ]; + passthru = { inherit binaries scripts; }; } diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 9b1a609d83253..15dc909aa6466 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + wrapProgram $out/bin/mullvad-daemon \ + --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop runHook postInstall diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 03bc81c8b543e..a9289e0a8a555 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -6,6 +6,7 @@ , pkg-config , protobuf , makeWrapper +, git , dbus , libnftnl , libmnl @@ -30,6 +31,7 @@ rustPlatform.buildRustPackage rec { pkg-config protobuf makeWrapper + git ]; buildInputs = [ diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index cdaf4286f93c5..4592d17d348fb 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -15,12 +15,16 @@ nodePackages.n8n.override { pkgs.postgresql ]; + # Patch minified source with changes from https://github.com/n8n-io/n8n/pull/5052 + preRebuild = '' + patch -p1 -i ${./fix-permissions.diff} + '' + # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. # This can supposedly be fixed by building a custom copy of the module from source, but that's way # too much complexity for a setup no one would ever actually run. # # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. - preRebuild = lib.optionalString stdenv.isAarch64 '' + lib.optionalString stdenv.isAarch64 '' rm -rf node_modules/oracledb ''; @@ -32,7 +36,7 @@ nodePackages.n8n.override { }; meta = with lib; { - description = "Free and open fair-code licensed node based Workflow Automation Tool"; + description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services."; maintainers = with maintainers; [ freezeboy k900 ]; license = { fullName = "Sustainable Use License"; diff --git a/pkgs/applications/networking/n8n/fix-permissions.diff b/pkgs/applications/networking/n8n/fix-permissions.diff new file mode 100644 index 0000000000000..81a5a4ee6465d --- /dev/null +++ b/pkgs/applications/networking/n8n/fix-permissions.diff @@ -0,0 +1,28 @@ +--- a/dist/LoadNodesAndCredentials.js ++++ b/dist/LoadNodesAndCredentials.js +@@ -216,6 +216,7 @@ + const { types } = loader; + this.types.nodes = this.types.nodes.concat(types.nodes); + this.types.credentials = this.types.credentials.concat(types.credentials); ++ let seen = new Set(); + const iconPromises = Object.entries(types).flatMap(([typeName, typesArr]) => typesArr.map((type) => { + var _a; + if (!((_a = type.icon) === null || _a === void 0 ? void 0 : _a.startsWith('file:'))) +@@ -226,7 +227,16 @@ + type.iconUrl = iconUrl; + const source = path_1.default.join(dir, icon); + const destination = path_1.default.join(constants_1.GENERATED_STATIC_DIR, iconUrl); +- return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => (0, promises_1.copyFile)(source, destination)); ++ if (!seen.has(destination)) { ++ seen.add(destination); ++ return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => { ++ await (0, promises_1.copyFile)(source, destination); ++ await (0, promises_1.chmod)(destination, 0o644); ++ }); ++ } ++ else { ++ return Promise.resolve(); ++ } + })); + await Promise.all(iconPromises); + for (const nodeTypeName in loader.nodeTypes) { diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 6836e00c7e01b..9919937769534 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -4,6 +4,15 @@ let sources = { + "@acuminous/bitsyntax-0.1.2" = { + name = "_at_acuminous_slash_bitsyntax"; + packageName = "@acuminous/bitsyntax"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@acuminous/bitsyntax/-/bitsyntax-0.1.2.tgz"; + sha512 = "29lUK80d1muEQqiUsSo+3A0yP6CdspgC95EnKBMi22Xlwt79i/En4Vr67+cXhU+cZjbti3TgGGC5wy1stIywVQ=="; + }; + }; "@apidevtools/json-schema-ref-parser-9.0.9" = { name = "_at_apidevtools_slash_json-schema-ref-parser"; packageName = "@apidevtools/json-schema-ref-parser"; @@ -31,22 +40,22 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.6.1" = { + "@azure/core-client-1.7.0" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz"; - sha512 = "mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz"; + sha512 = "fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw=="; }; }; - "@azure/core-http-2.2.7" = { + "@azure/core-http-2.3.1" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.2.7"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.7.tgz"; - sha512 = "TyGMeDm90mkRS8XzSQbSMD+TqnWL1XKGCh0x0QVGMD8COH2yU0q5SaHm/IBEBkzcq0u73NhS/p57T3KVSgUFqQ=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.3.1.tgz"; + sha512 = "cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q=="; }; }; "@azure/core-http-compat-1.3.0" = { @@ -58,31 +67,40 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.4.0" = { + "@azure/core-lro-2.5.0" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz"; - sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz"; + sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ=="; }; }; - "@azure/core-paging-1.3.0" = { + "@azure/core-paging-1.4.0" = { name = "_at_azure_slash_core-paging"; packageName = "@azure/core-paging"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.3.0.tgz"; - sha512 = "H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg=="; + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz"; + sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw=="; }; }; - "@azure/core-rest-pipeline-1.9.2" = { + "@azure/core-rest-pipeline-1.10.1" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.9.2"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; + sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + }; + }; + "@azure/core-tracing-1.0.0-preview.12" = { + name = "_at_azure_slash_core-tracing"; + packageName = "@azure/core-tracing"; + version = "1.0.0-preview.12"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.2.tgz"; - sha512 = "8rXI6ircjenaLp+PkOFpo37tQ1PQfztZkfVj97BIF3RPxHAsoVSgkJtu3IK/bUEWcb7HzXSoyBe06M7ODRkRyw=="; + url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.12.tgz"; + sha512 = "nvo2Wc4EKZGN6eFu9n3U7OXmASmL8VxoPIH7xaD6OlQqi44bouF0YIi9ID5rEsKLiAU59IYx6M297nqWVMWPDg=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -112,6 +130,15 @@ let sha512 = "A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog=="; }; }; + "@azure/identity-1.5.2" = { + name = "_at_azure_slash_identity"; + packageName = "@azure/identity"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/identity/-/identity-1.5.2.tgz"; + sha512 = "vqyeRbd2i0h9F4mqW5JbkP1xfabqKQ21l/81osKhpOQ2LtwaJW6nw4+0PsVYnxcbPHFCIZt6EWAk74a3OGYZJA=="; + }; + }; "@azure/identity-2.1.0" = { name = "_at_azure_slash_identity"; packageName = "@azure/identity"; @@ -148,13 +175,13 @@ let sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; }; }; - "@azure/ms-rest-js-2.6.2" = { + "@azure/ms-rest-js-2.6.4" = { name = "_at_azure_slash_ms-rest-js"; packageName = "@azure/ms-rest-js"; - version = "2.6.2"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.2.tgz"; - sha512 = "0/8rOxAoR9M3qKUdbGOIYtHtQkm4m5jdoDNdxTU0DkOr84KwyAdJuW/RfjJinGyig4h73DNF0rdCl6XowgCYcg=="; + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.4.tgz"; + sha512 = "2sbOpGhlBfv9itWdF7Qlk0CmoQCARxe5unwjNOprU7OdgEgabQncZ35L5u1A+zgdkVtNYF9Eo6XAhXzTweIhag=="; }; }; "@azure/ms-rest-nodeauth-3.1.1" = { @@ -166,13 +193,22 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/msal-browser-2.30.0" = { + "@azure/msal-browser-2.32.2" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.30.0"; + version = "2.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.30.0.tgz"; - sha512 = "4Y9+rjJiTFP7KEmuq1btmIrBgk0ImNyKsXj6A6NHZALd1X0M6W7L7kxpH6F+d1tEkMv8bYnZdn7IcauXbL8Llw=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; + sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; + }; + }; + "@azure/msal-common-4.5.1" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-4.5.1.tgz"; + sha512 = "/i5dXM+QAtO+6atYd5oHGBAx48EGSISkXNXViheliOQe+SIFMDo3gSq3lL54W0suOSAsVPws3XnTaIHlla0PIQ=="; }; }; "@azure/msal-common-7.6.0" = { @@ -184,13 +220,31 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.14.2" = { + "@azure/msal-common-9.0.2" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz"; + sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w=="; + }; + }; + "@azure/msal-node-1.0.0-beta.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.2"; + version = "1.0.0-beta.6"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.2.tgz"; - sha512 = "t3whVhhLdZVVeDEtUPD2Wqfa8BDi3EDMnpWp8dbuRW0GhUpikBfs4AQU0Fe6P9zS87n9LpmUTLrIcPEEuzkvfA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.0.0-beta.6.tgz"; + sha512 = "ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ=="; + }; + }; + "@azure/msal-node-1.14.6" = { + name = "_at_azure_slash_msal-node"; + packageName = "@azure/msal-node"; + version = "1.14.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; + sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; }; }; "@azure/storage-blob-12.12.0" = { @@ -202,85 +256,85 @@ let sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; }; }; - "@babel/parser-7.20.0" = { + "@babel/parser-7.20.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.0"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz"; - sha512 = "G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; }; - "@babel/runtime-7.20.0" = { + "@babel/runtime-7.20.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.0"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.0.tgz"; - sha512 = "NDYdls71fTXoU8TZHfbBWg7DiZfNzClcKui/+kyi6ppD2L1qnWW3VV6CjtaBXSUGGhiTWJ6ereOIkUvenif66Q=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; + sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; }; }; - "@codemirror/autocomplete-6.3.0" = { + "@codemirror/autocomplete-6.4.0" = { name = "_at_codemirror_slash_autocomplete"; packageName = "@codemirror/autocomplete"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.3.0.tgz"; - sha512 = "4jEvh3AjJZTDKazd10J6ZsCIqaYxDMCeua5ouQxY8hlFIml+nr7le0SgBhT3SIytFBmdzPK3AUhXGuW3T79nVg=="; + url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.0.tgz"; + sha512 = "HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA=="; }; }; - "@codemirror/commands-6.1.2" = { + "@codemirror/commands-6.1.3" = { name = "_at_codemirror_slash_commands"; packageName = "@codemirror/commands"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.2.tgz"; - sha512 = "sO3jdX1s0pam6lIdeSJLMN3DQ6mPEbM4yLvyKkdqtmd/UDwhXA5+AwFJ89rRXm6vTeOXBsE5cAmlos/t7MJdgg=="; + url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.3.tgz"; + sha512 = "wUw1+vb34Ultv0Q9m/OVB7yizGXgtoDbkI5f5ErM8bebwLyUYjicdhJTKhTvPTpgkv8dq/BK0lQ3K5pRf2DAJw=="; }; }; - "@codemirror/lang-javascript-6.1.1" = { + "@codemirror/lang-javascript-6.1.2" = { name = "_at_codemirror_slash_lang-javascript"; packageName = "@codemirror/lang-javascript"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.1.tgz"; - sha512 = "F4+kiuC5d5dUSJmff96tJQwpEXs/tX/4bapMRnZWW6bHKK1Fx6MunTzopkCUWRa9bF87GPmb9m7Qtg7Yv8f3uQ=="; + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.2.tgz"; + sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ=="; }; }; - "@codemirror/language-6.3.0" = { + "@codemirror/language-6.4.0" = { name = "_at_codemirror_slash_language"; packageName = "@codemirror/language"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.3.0.tgz"; - sha512 = "6jOE5DEt6sKD46SXhn3xPbBehn+l48ACcA6Uxs2k+E2YNH9XGF5WdGMTYr2DlggfK4h0QZBK6zEb5S7lkTriWA=="; + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz"; + sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q=="; }; }; - "@codemirror/lint-6.0.0" = { + "@codemirror/lint-6.1.0" = { name = "_at_codemirror_slash_lint"; packageName = "@codemirror/lint"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.0.0.tgz"; - sha512 = "nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA=="; + url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.1.0.tgz"; + sha512 = "mdvDQrjRmYPvQ3WrzF6Ewaao+NWERYtpthJvoQ3tK3t/44Ynhk8ZGjTSL9jMEv8CgSMogmt75X8ceOZRDSXHtQ=="; }; }; - "@codemirror/state-6.1.2" = { + "@codemirror/state-6.2.0" = { name = "_at_codemirror_slash_state"; packageName = "@codemirror/state"; - version = "6.1.2"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/state/-/state-6.1.2.tgz"; - sha512 = "Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA=="; + url = "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz"; + sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; }; }; - "@codemirror/view-6.4.0" = { + "@codemirror/view-6.7.3" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.4.0"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.4.0.tgz"; - sha512 = "Kv32b6Tn7QVwFbj/EDswTLSocjk5kgggF6zzBFAL4o4hZ/vmtFD155+EjH1pVlbfoDyVC2M6SedPsMrwYscgNg=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz"; + sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw=="; }; }; "@colors/colors-1.5.0" = { @@ -292,6 +346,15 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; + "@cspotcode/source-map-support-0.8.1" = { + name = "_at_cspotcode_slash_source-map-support"; + packageName = "@cspotcode/source-map-support"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"; + sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; + }; + }; "@curlconverter/yargs-0.0.2" = { name = "_at_curlconverter_slash_yargs"; packageName = "@curlconverter/yargs"; @@ -346,13 +409,13 @@ let sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.0" = { + "@fortawesome/fontawesome-common-types-6.2.1" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"; - sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; + sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; }; }; "@fortawesome/fontawesome-svg-core-1.3.0" = { @@ -364,13 +427,13 @@ let sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; }; }; - "@fortawesome/free-regular-svg-icons-6.2.0" = { + "@fortawesome/free-regular-svg-icons-6.2.1" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.0.tgz"; - sha512 = "M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ=="; + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz"; + sha512 = "wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA=="; }; }; "@fortawesome/free-solid-svg-icons-5.15.4" = { @@ -382,13 +445,13 @@ let sha512 = "JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w=="; }; }; - "@fortawesome/vue-fontawesome-2.0.8" = { + "@fortawesome/vue-fontawesome-2.0.9" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz"; - sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz"; + sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw=="; }; }; "@gar/promisify-1.1.3" = { @@ -400,6 +463,78 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; + "@google-cloud/common-3.10.0" = { + name = "_at_google-cloud_slash_common"; + packageName = "@google-cloud/common"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/common/-/common-3.10.0.tgz"; + sha512 = "XMbJYMh/ZSaZnbnrrOFfR/oQrb0SxG4qh6hDisWCoEbFcBHV0qHQo4uXfeMCzolx2Mfkh6VDaOGg+hyJsmxrlw=="; + }; + }; + "@google-cloud/precise-date-2.0.4" = { + name = "_at_google-cloud_slash_precise-date"; + packageName = "@google-cloud/precise-date"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-2.0.4.tgz"; + sha512 = "nOB+mZdevI/1Si0QAfxWfzzIqFdc7wrO+DYePFvgbOoMtvX+XfFTINNt7e9Zg66AbDbWCPRnikU+6f5LTm9Wyg=="; + }; + }; + "@google-cloud/projectify-2.1.1" = { + name = "_at_google-cloud_slash_projectify"; + packageName = "@google-cloud/projectify"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz"; + sha512 = "+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="; + }; + }; + "@google-cloud/promisify-2.0.4" = { + name = "_at_google-cloud_slash_promisify"; + packageName = "@google-cloud/promisify"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz"; + sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; + }; + }; + "@google-cloud/spanner-5.18.0" = { + name = "_at_google-cloud_slash_spanner"; + packageName = "@google-cloud/spanner"; + version = "5.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/spanner/-/spanner-5.18.0.tgz"; + sha512 = "KcfepoEuGsjqjeI8cVWfJ9yPdYJFPnpMzdZg3FX2W4MzNOzeNrJEB/EfD/epOOZ/fNhRlUTl+tLFN3WjVxcWlw=="; + }; + }; + "@grpc/grpc-js-1.6.12" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.12.tgz"; + sha512 = "JmvQ03OTSpVd9JTlj/K3IWHSz4Gk/JMLUTtW7Zb0KvO1LcOYGATh5cNuRYzCAeDR3O8wq+q8FZe97eO9MBrkUw=="; + }; + }; + "@grpc/proto-loader-0.6.13" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz"; + sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; + }; + }; + "@grpc/proto-loader-0.7.4" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz"; + sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; + }; + }; "@icetee/ftp-0.3.15" = { name = "_at_icetee_slash_ftp"; packageName = "@icetee/ftp"; @@ -409,13 +544,58 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@js-joda/core-5.4.2" = { + "@ioredis/commands-1.2.0" = { + name = "_at_ioredis_slash_commands"; + packageName = "@ioredis/commands"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"; + sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg=="; + }; + }; + "@jridgewell/resolve-uri-3.1.0" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.14" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; + }; + }; + "@jridgewell/trace-mapping-0.3.9" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"; + sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; + }; + }; + "@js-joda/core-3.2.0" = { + name = "_at_js-joda_slash_core"; + packageName = "@js-joda/core"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@js-joda/core/-/core-3.2.0.tgz"; + sha512 = "PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg=="; + }; + }; + "@js-joda/core-5.5.2" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.4.2"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.2.tgz"; - sha512 = "QIDIZ9a0NfDStgD47VaTgwiPjlw1p4QPLwjOB/9+/DqIztoQopPNNAd+HdtQMHgE+ibP3dJacd8/TVL/A1RaaA=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.2.tgz"; + sha512 = "retLUN4TwCJ0QJDi9OCJwYVaXAz93NeOkEtEQL98M2bykBOxmURlP0YlfsuE46kItOOVZIWRYC3KsSLhQ1R2Qw=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -454,40 +634,40 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; - "@lezer/common-1.0.1" = { + "@lezer/common-1.0.2" = { name = "_at_lezer_slash_common"; packageName = "@lezer/common"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/common/-/common-1.0.1.tgz"; - sha512 = "8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw=="; + url = "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz"; + sha512 = "SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="; }; }; - "@lezer/highlight-1.1.2" = { + "@lezer/highlight-1.1.3" = { name = "_at_lezer_slash_highlight"; packageName = "@lezer/highlight"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.2.tgz"; - sha512 = "CAun1WR1glxG9ZdOokTZwXbcwB7PXkIEyZRUMFBVwSrhTcogWq634/ByNImrkUnQhjju6xsIaOBIxvcRJtplXQ=="; + url = "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz"; + sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; }; }; - "@lezer/javascript-1.0.2" = { + "@lezer/javascript-1.4.1" = { name = "_at_lezer_slash_javascript"; packageName = "@lezer/javascript"; - version = "1.0.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.0.2.tgz"; - sha512 = "IjOVeIRhM8IuafWNnk+UzRz7p4/JSOKBNINLYLsdSGuJS9Ju7vFdc82AlTt0jgtV5D8eBZf4g0vK4d3ttBNz7A=="; + url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz"; + sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA=="; }; }; - "@lezer/lr-1.2.3" = { + "@lezer/lr-1.3.1" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.2.3"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.3.tgz"; - sha512 = "qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.1.tgz"; + sha512 = "+GymJB/+3gThkk2zHwseaJTI5oa4AuOuj1I2LCslAVq1dFZLSX8SAe4ZlJq1TjezteDXtF/+d4qeWz9JvnrG9Q=="; }; }; "@mapbox/node-pre-gyp-1.0.10" = { @@ -499,13 +679,22 @@ let sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; }; }; - "@n8n_io/riot-tmpl-1.0.1" = { + "@n8n_io/license-sdk-1.8.0" = { + name = "_at_n8n_io_slash_license-sdk"; + packageName = "@n8n_io/license-sdk"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-1.8.0.tgz"; + sha512 = "dSBD6EHTu6kWWz1ILxtCcaQqVZu+p/8J0eQ2ntx7Jk8BYSvn5Hh4Oz5M81ut9Pz+2uak+GnIuI6KeYUe1QBXIQ=="; + }; + }; + "@n8n_io/riot-tmpl-2.0.0" = { name = "_at_n8n_io_slash_riot-tmpl"; packageName = "@n8n_io/riot-tmpl"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n_io/riot-tmpl/-/riot-tmpl-1.0.1.tgz"; - sha512 = "+ig7/rafN3LGthGEi8fs1N5XxPndmRq5YAX92DWOar9mrMDrYyIjK5XAQaTnTMDQgmKKllrAl+bVRmQXKcLFuw=="; + url = "https://registry.npmjs.org/@n8n_io/riot-tmpl/-/riot-tmpl-2.0.0.tgz"; + sha512 = "gQNJYlek30YIWLru2CdyFgU/0uvPAbbQwt2G5EN0PDxXD1rGAYWZsd2c94bW3YlvXT6V2GEd7Bt/gT6QUwhzfQ=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -553,31 +742,31 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@oclif/command-1.8.18" = { + "@oclif/command-1.8.21" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.18"; + version = "1.8.21"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.18.tgz"; - sha512 = "qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.21.tgz"; + sha512 = "kIDrRIbAcicVl+CWMzXeZkg5dRNuF1VI7koyFTAQMNYwRNZpeya5x7XDPr+fh7rDiBL7psnxc3B1+zoOWj96lQ=="; }; }; - "@oclif/config-1.18.5" = { + "@oclif/config-1.18.6" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.18.5"; + version = "1.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.5.tgz"; - sha512 = "R6dBedaUVn5jtAh79aaRm7jezx4l3V7Im9NORlLmudz5BL1foMeuXEvnqm+bMiejyexVA+oi9mto6YKZPzo/5Q=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.6.tgz"; + sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; - "@oclif/core-1.19.2" = { + "@oclif/core-1.24.0" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.19.2"; + version = "1.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.19.2.tgz"; - sha512 = "n5ni/NNR6+I0IQXVGoLKdrdw6IS3WH/R/hw6WX8ERfLMZACrNSuJFD9EmBZkztyRkmiQ2L06ULazW5bJn5Shog=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.24.0.tgz"; + sha512 = "J41suyV4fLfLcRRySZdtgFYSjIlpYqD90SY01Fm4+ZJUMcfDh/eQAD4sogyYOsIT0bfEzYOyYCjmfHmgcoX5aA=="; }; }; "@oclif/errors-1.3.6" = { @@ -589,13 +778,13 @@ let sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; }; }; - "@oclif/help-1.0.3" = { + "@oclif/help-1.0.5" = { name = "_at_oclif_slash_help"; packageName = "@oclif/help"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.3.tgz"; - sha512 = "AjjhSWFQkRb9rChEH+IRUmp0CxEacYpUbh+kQqtdCR9CDSsj2a3ibWjtMtJb4lFGAle6kVKfaal/juYe+6P5TQ=="; + url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.5.tgz"; + sha512 = "77ZXqVXcd+bQ6EafN56KbL4PbNtZM/Lq4GQElekNav+CPIgPNKT3AtMTQrc0fWke6bb/BTLB+1Fu1gWgx643jQ=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -607,31 +796,121 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.8" = { + "@oclif/parser-3.8.9" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.8"; + version = "3.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.8.tgz"; - sha512 = "OgqQAtpyq1XFJG3dvLl9aqiO+F5pubkzt7AivUDkNoa6/hNgVZ79vvTO8sqo5XAAhOm/fcTSerZ35OTnTJb1ng=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.9.tgz"; + sha512 = "1j/kThdse7yHQz6+c3v8RA1I3gD6+SGt2O7IAb/MAMoxqyBrFQDabQHH2UU4eVFGMLN7U91AiYJp11zJ9LcQAg=="; }; }; - "@oclif/screen-3.0.2" = { + "@oclif/screen-3.0.4" = { name = "_at_oclif_slash_screen"; packageName = "@oclif/screen"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.2.tgz"; - sha512 = "S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ=="; + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.4.tgz"; + sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA=="; }; }; - "@opentelemetry/api-1.2.0" = { + "@opentelemetry/api-1.4.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.2.0"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz"; + sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g=="; + }; + }; + "@protobufjs/aspromise-1.1.2" = { + name = "_at_protobufjs_slash_aspromise"; + packageName = "@protobufjs/aspromise"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz"; - sha512 = "0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g=="; + url = "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"; + sha512 = "j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="; + }; + }; + "@protobufjs/base64-1.1.2" = { + name = "_at_protobufjs_slash_base64"; + packageName = "@protobufjs/base64"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"; + sha512 = "AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="; + }; + }; + "@protobufjs/codegen-2.0.4" = { + name = "_at_protobufjs_slash_codegen"; + packageName = "@protobufjs/codegen"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"; + sha512 = "YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="; + }; + }; + "@protobufjs/eventemitter-1.1.0" = { + name = "_at_protobufjs_slash_eventemitter"; + packageName = "@protobufjs/eventemitter"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"; + sha512 = "j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="; + }; + }; + "@protobufjs/fetch-1.1.0" = { + name = "_at_protobufjs_slash_fetch"; + packageName = "@protobufjs/fetch"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"; + sha512 = "lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ=="; + }; + }; + "@protobufjs/float-1.0.2" = { + name = "_at_protobufjs_slash_float"; + packageName = "@protobufjs/float"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"; + sha512 = "Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="; + }; + }; + "@protobufjs/inquire-1.1.0" = { + name = "_at_protobufjs_slash_inquire"; + packageName = "@protobufjs/inquire"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"; + sha512 = "kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="; + }; + }; + "@protobufjs/path-1.1.2" = { + name = "_at_protobufjs_slash_path"; + packageName = "@protobufjs/path"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"; + sha512 = "6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="; + }; + }; + "@protobufjs/pool-1.1.0" = { + name = "_at_protobufjs_slash_pool"; + packageName = "@protobufjs/pool"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"; + sha512 = "0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="; + }; + }; + "@protobufjs/utf8-1.1.0" = { + name = "_at_protobufjs_slash_utf8"; + packageName = "@protobufjs/utf8"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"; + sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -643,13 +922,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.14.22" = { + "@sap/hana-client-2.15.19" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.14.22"; + version = "2.15.19"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.14.22.tgz"; - sha512 = "Do1VnybxssI5kAg/ti4GoEOhgU7p7R9T9/v9amzDNZMg7rC7C4LVno+x++ERTWv81pzSaSrYKkr2O/MP7OE1hA=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.19.tgz"; + sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -661,13 +940,58 @@ let sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; }; }; - "@selderee/plugin-htmlparser2-0.6.0" = { + "@selderee/plugin-htmlparser2-0.10.0" = { name = "_at_selderee_slash_plugin-htmlparser2"; packageName = "@selderee/plugin-htmlparser2"; - version = "0.6.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz"; - sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; + url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.10.0.tgz"; + sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; + }; + }; + "@sentry/core-7.31.0" = { + name = "_at_sentry_slash_core"; + packageName = "@sentry/core"; + version = "7.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/core/-/core-7.31.0.tgz"; + sha512 = "IZS1MZznyBOPw7UEpZwq3t3aaaVhFB+r3KM4JYFSJRr7Ky9TjldXA3hadNUTztjYGgEC3u8kB9jXoRvNXM2hqA=="; + }; + }; + "@sentry/integrations-7.31.0" = { + name = "_at_sentry_slash_integrations"; + packageName = "@sentry/integrations"; + version = "7.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.31.0.tgz"; + sha512 = "pZyxY2t92gWmqULXsSEAjy5LMUyFWTA4f5AL+2gB5xmUjYXSaKT37R7sX5IQ2MVbCyrpJZERklx2LLhCrKtigw=="; + }; + }; + "@sentry/node-7.31.0" = { + name = "_at_sentry_slash_node"; + packageName = "@sentry/node"; + version = "7.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/node/-/node-7.31.0.tgz"; + sha512 = "DBjPfThZ5CIC2G9/CVFRlSOP/QqF1IoZXNpTUPZkhQ1cjShJeERT64jMkTdk+RAStSTpEfF6J0rUy1NIyHHEoQ=="; + }; + }; + "@sentry/types-7.31.0" = { + name = "_at_sentry_slash_types"; + packageName = "@sentry/types"; + version = "7.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/types/-/types-7.31.0.tgz"; + sha512 = "nFqo7wyMnapdSEdw1MD+cavDtD9x5QQmh/bwLEOb/euM0cHFJHYyD7CveY/mQng4HyEVWY+DCtX/7E3GcQ7Bdw=="; + }; + }; + "@sentry/utils-7.31.0" = { + name = "_at_sentry_slash_utils"; + packageName = "@sentry/utils"; + version = "7.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.31.0.tgz"; + sha512 = "B1KkvdfwlaqM7sDp3/yk2No7WsbMuLEywGRVOLzXeTqTLSBRBWyyYIudqPtx2LDds9anlUHj21zs9FKY+S3eiA=="; }; }; "@servie/events-1.0.0" = { @@ -688,6 +1012,24 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; + "@swc/core-1.3.27" = { + name = "_at_swc_slash_core"; + packageName = "@swc/core"; + version = "1.3.27"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.27.tgz"; + sha512 = "praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w=="; + }; + }; + "@swc/wasm-1.3.27" = { + name = "_at_swc_slash_wasm"; + packageName = "@swc/wasm"; + version = "1.3.27"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.27.tgz"; + sha512 = "bSFeKxGU2zY/xC3K7Y4sjdtHMgbv6gM2Z01PTMGoC8b2PVubPKeW+BYmprZFSf2eCOsNLZaVzVufdVTQB/ORfg=="; + }; + }; "@techteamer/ocsp-1.0.0" = { name = "_at_techteamer_slash_ocsp"; packageName = "@techteamer/ocsp"; @@ -733,6 +1075,51 @@ let sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; }; + "@tsconfig/node10-1.0.9" = { + name = "_at_tsconfig_slash_node10"; + packageName = "@tsconfig/node10"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz"; + sha512 = "jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA=="; + }; + }; + "@tsconfig/node12-1.0.11" = { + name = "_at_tsconfig_slash_node12"; + packageName = "@tsconfig/node12"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz"; + sha512 = "cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="; + }; + }; + "@tsconfig/node14-1.0.3" = { + name = "_at_tsconfig_slash_node14"; + packageName = "@tsconfig/node14"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz"; + sha512 = "ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow=="; + }; + }; + "@tsconfig/node16-1.0.3" = { + name = "_at_tsconfig_slash_node16"; + packageName = "@tsconfig/node16"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz"; + sha512 = "yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ=="; + }; + }; + "@types/big.js-6.1.6" = { + name = "_at_types_slash_big.js"; + packageName = "@types/big.js"; + version = "6.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/big.js/-/big.js-6.1.6.tgz"; + sha512 = "0r9J+Zz9rYm2hOTwiMAVkm3XFQ4u5uTK37xrQMhc9bysn/sf/okzovWMYYIBMFTn/yrEZ11pusgLEaoarTlQbA=="; + }; + }; "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -751,6 +1138,15 @@ let sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; + "@types/duplexify-3.6.1" = { + name = "_at_types_slash_duplexify"; + packageName = "@types/duplexify"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.1.tgz"; + sha512 = "n0zoEj/fMdMOvqbHxmqnza/kXyoGgJmEpsXjpP+gEqE1Ye4yNqc7xWipKnUoMpWhMuzJQSfK2gMrwlElly7OGQ=="; + }; + }; "@types/es-aggregate-error-1.0.2" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; @@ -760,13 +1156,13 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.14" = { + "@types/express-4.17.15" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.14"; + version = "4.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz"; + sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; }; }; "@types/express-jwt-0.0.42" = { @@ -778,13 +1174,13 @@ let sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; }; }; - "@types/express-serve-static-core-4.17.31" = { + "@types/express-serve-static-core-4.17.32" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.31"; + version = "4.17.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; + sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; }; }; "@types/express-unless-2.0.1" = { @@ -814,13 +1210,22 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; - "@types/lodash-4.14.186" = { + "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.186"; + version = "4.14.191"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"; + sha512 = "BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="; + }; + }; + "@types/long-4.0.2" = { + name = "_at_types_slash_long"; + packageName = "@types/long"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz"; - sha512 = "eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw=="; + url = "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz"; + sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; }; }; "@types/mime-3.0.1" = { @@ -841,22 +1246,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-12.20.55" = { + "@types/node-18.11.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.55"; + version = "18.11.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz"; - sha512 = "J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="; - }; - }; - "@types/node-18.11.7" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.11.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz"; - sha512 = "LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; + sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; "@types/node-fetch-2.6.2" = { @@ -868,6 +1264,15 @@ let sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; + "@types/pumpify-1.4.1" = { + name = "_at_types_slash_pumpify"; + packageName = "@types/pumpify"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pumpify/-/pumpify-1.4.1.tgz"; + sha512 = "l7u/Dnh1OG9T7VH6TvulR0g8oE8hgIW5409mSUKi8Vxw2+JV18aTa06Sv5bvNjrD0zbsB/cuZ/iTFQgFNfzIuw=="; + }; + }; "@types/qs-6.9.7" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; @@ -886,15 +1291,6 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/readable-stream-2.3.14" = { - name = "_at_types_slash_readable-stream"; - packageName = "@types/readable-stream"; - version = "2.3.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.14.tgz"; - sha512 = "8jQ5Mp7bsDJEnW/69i6nAaQMoLwAVJVc7ZRAVTrdh/o6XueQsX38TEvKuYyoQj76/mg7WdlRfMrtl9pDLCJWsg=="; - }; - }; "@types/serve-static-1.15.0" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; @@ -904,6 +1300,24 @@ let sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; }; }; + "@types/stack-trace-0.0.29" = { + name = "_at_types_slash_stack-trace"; + packageName = "@types/stack-trace"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz"; + sha512 = "TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g=="; + }; + }; + "@types/stoppable-1.1.1" = { + name = "_at_types_slash_stoppable"; + packageName = "@types/stoppable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/stoppable/-/stoppable-1.1.1.tgz"; + sha512 = "b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw=="; + }; + }; "@types/tough-cookie-2.3.8" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; @@ -922,6 +1336,15 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; + "@types/validator-13.7.10" = { + name = "_at_types_slash_validator"; + packageName = "@types/validator"; + version = "13.7.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.10.tgz"; + sha512 = "t1yxFAR2n0+VO6hd/FJ9F2uezAZVWHLmpmlJzm1eX03+H7+HsuTAp7L8QJs+2pQCfWkP1+EXsGK9Z9v7o/qPVQ=="; + }; + }; "@types/webidl-conversions-7.0.0" = { name = "_at_types_slash_webidl-conversions"; packageName = "@types/webidl-conversions"; @@ -940,22 +1363,40 @@ let sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; - "@vue/compiler-sfc-2.7.13" = { + "@vue/compiler-sfc-2.7.14" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz"; - sha512 = "zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"; + sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; }; }; - "@xmldom/xmldom-0.7.6" = { + "@vue/composition-api-1.7.1" = { + name = "_at_vue_slash_composition-api"; + packageName = "@vue/composition-api"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.7.1.tgz"; + sha512 = "xDWoEtxGXhH9Ku3ROYX/rzhcpt4v31hpPU5zF3UeVC/qxA3dChmqU8zvTUYoKh3j7rzpNsoFOwqsWG7XPMlaFA=="; + }; + }; + "@vue/devtools-api-6.4.5" = { + name = "_at_vue_slash_devtools-api"; + packageName = "@vue/devtools-api"; + version = "6.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz"; + sha512 = "JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="; + }; + }; + "@xmldom/xmldom-0.8.6" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.7.6"; + version = "0.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz"; - sha512 = "HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.6.tgz"; + sha512 = "uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg=="; }; }; "a-sync-waterfall-1.0.1" = { @@ -994,15 +1435,6 @@ let sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; - "access-control-1.0.1" = { - name = "access-control"; - packageName = "access-control"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/access-control/-/access-control-1.0.1.tgz"; - sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; - }; - }; "acorn-8.8.1" = { name = "acorn"; packageName = "acorn"; @@ -1021,13 +1453,13 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; - "adal-node-0.2.3" = { + "adal-node-0.2.4" = { name = "adal-node"; packageName = "adal-node"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz"; - sha512 = "gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ=="; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.4.tgz"; + sha512 = "zIcvbwQFKMUtKxxj8YMHeTT1o/TPXfVNsTXVgXD8sxwV6h4AFQgK77dRciGhuEF9/Sdm3UQPJVPc/6XxrccSeA=="; }; }; "adler-32-1.2.0" = { @@ -1084,13 +1516,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "amqplib-0.8.0" = { + "amqplib-0.10.3" = { name = "amqplib"; packageName = "amqplib"; - version = "0.8.0"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/amqplib/-/amqplib-0.8.0.tgz"; - sha512 = "icU+a4kkq4Y1PS4NNi+YPDMwdlbFcZ1EZTQT2nigW3fvOb6AOgUQ9+Mk4ue0Zu5cBg/XpDzB40oH10ysrk2dmA=="; + url = "https://registry.npmjs.org/amqplib/-/amqplib-0.10.3.tgz"; + sha512 = "UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw=="; }; }; "ansi-escapes-3.2.0" = { @@ -1147,13 +1579,13 @@ let sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; }; }; - "anymatch-3.1.2" = { + "anymatch-3.1.3" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"; + sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; }; }; "app-root-path-3.1.0" = { @@ -1201,6 +1633,15 @@ let sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; }; }; + "arg-4.1.3" = { + name = "arg"; + packageName = "arg"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; + sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; + }; + }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -1255,13 +1696,22 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "array.prototype.reduce-1.0.4" = { + "array.prototype.reduce-1.0.5" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.4"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"; + sha512 = "kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="; + }; + }; + "arrify-2.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz"; - sha512 = "WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw=="; + url = "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"; + sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; }; }; "asap-2.0.6" = { @@ -1309,13 +1759,13 @@ let sha512 = "Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg=="; }; }; - "assert-options-0.7.0" = { + "assert-options-0.8.0" = { name = "assert-options"; packageName = "assert-options"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz"; - sha512 = "7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ=="; + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.8.0.tgz"; + sha512 = "qSELrEaEz4sGwTs4Qh+swQkjiHAysC4rot21+jzXU86dJzNG+FDqBzyS3ohSoTRf4ZLA3FSwxQdiuNl5NXUtvA=="; }; }; "assert-plus-1.0.0" = { @@ -1336,6 +1786,15 @@ let sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; }; + "ast-types-0.15.2" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz"; + sha512 = "c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg=="; + }; + }; "async-2.6.4" = { name = "async"; packageName = "async"; @@ -1399,22 +1858,22 @@ let sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; }; }; - "avsc-5.7.6" = { + "avsc-5.7.7" = { name = "avsc"; packageName = "avsc"; - version = "5.7.6"; + version = "5.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/avsc/-/avsc-5.7.6.tgz"; - sha512 = "jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA=="; + url = "https://registry.npmjs.org/avsc/-/avsc-5.7.7.tgz"; + sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1242.0" = { + "aws-sdk-2.1295.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1242.0"; + version = "2.1295.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1242.0.tgz"; - sha512 = "qVpaMafIHw3Mn3Mo7zTY4Xq8lHkTxIRQJFV5ronsi4lTLqhqF1rANoPKSlVWxUPRyG5so/we+ZUIog5wpjSgiw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1295.0.tgz"; + sha512 = "HVYoFCyfiL8gzL/c0lSRTg8tWBLfqAEDfwzGe338ww/LahpmC6C07S71SBBIvtGq3dpd7IwEobAbubZDijrA0Q=="; }; }; "aws-sign2-0.7.0" = { @@ -1426,13 +1885,13 @@ let sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; - "aws4-1.11.0" = { + "aws4-1.12.0" = { name = "aws4"; packageName = "aws4"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; - sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; + sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; }; }; "axios-0.21.4" = { @@ -1444,22 +1903,22 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.24.0" = { + "axios-0.27.2" = { name = "axios"; packageName = "axios"; - version = "0.24.0"; + version = "0.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; + sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-0.27.2" = { + "axios-1.1.3" = { name = "axios"; packageName = "axios"; - version = "0.27.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; + url = "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz"; + sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; }; }; "axios-retry-3.3.1" = { @@ -1534,13 +1993,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-7.6.2" = { + "better-sqlite3-8.0.1" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "7.6.2"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.6.2.tgz"; - sha512 = "S5zIU1Hink2AH4xPsN0W43T1/AJ5jrPh7Oy07ocuW/AKYYY02GWzz9NH0nbSMn/gw6fDZ5jZ1QsHt1BXAwJ6Lg=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz"; + sha512 = "JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg=="; }; }; "big-integer-1.6.51" = { @@ -1552,6 +2011,15 @@ let sha512 = "GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="; }; }; + "big.js-6.2.1" = { + name = "big.js"; + packageName = "big.js"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-6.2.1.tgz"; + sha512 = "bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ=="; + }; + }; "bignumber.js-2.4.0" = { name = "bignumber.js"; packageName = "bignumber.js"; @@ -1561,6 +2029,15 @@ let sha512 = "uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ=="; }; }; + "bignumber.js-9.1.1" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz"; + sha512 = "pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="; + }; + }; "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -1597,15 +2074,6 @@ let sha512 = "VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="; }; }; - "bitsyntax-0.1.0" = { - name = "bitsyntax"; - packageName = "bitsyntax"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz"; - sha512 = "ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q=="; - }; - }; "bl-2.2.1" = { name = "bl"; packageName = "bl"; @@ -1615,15 +2083,6 @@ let sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; }; }; - "bl-3.0.1" = { - name = "bl"; - packageName = "bl"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz"; - sha512 = "jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ=="; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -1651,15 +2110,6 @@ let sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="; }; }; - "bluebird-3.7.2" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - }; "bn.js-4.12.0" = { name = "bn.js"; packageName = "bn.js"; @@ -1741,13 +2191,13 @@ let sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="; }; }; - "bson-4.7.0" = { + "bson-4.7.2" = { name = "bson"; packageName = "bson"; - version = "4.7.0"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.7.0.tgz"; - sha512 = "VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA=="; + url = "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz"; + sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ=="; }; }; "buffer-4.9.2" = { @@ -1831,6 +2281,15 @@ let sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; }; }; + "bull-4.10.2" = { + name = "bull"; + packageName = "bull"; + version = "4.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bull/-/bull-4.10.2.tgz"; + sha512 = "xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ=="; + }; + }; "busboy-1.6.0" = { name = "busboy"; packageName = "busboy"; @@ -1885,13 +2344,13 @@ let sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; - "call-me-maybe-1.0.1" = { + "call-me-maybe-1.0.2" = { name = "call-me-maybe"; packageName = "call-me-maybe"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; - sha512 = "wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw=="; + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz"; + sha512 = "HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ=="; }; }; "callback-stream-1.1.0" = { @@ -1993,6 +2452,15 @@ let sha512 = "yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="; }; }; + "checkpoint-stream-0.1.2" = { + name = "checkpoint-stream"; + packageName = "checkpoint-stream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/checkpoint-stream/-/checkpoint-stream-0.1.2.tgz"; + sha512 = "eYXIcydL3mPjjEVLxHdi1ISgTwmxGJZ8vyJ3lYVvFTDRyTOZMTbKZdRJqiA7Gi1rPcwOyyzcrZmGLL8ff7e69w=="; + }; + }; "cheerio-1.0.0-rc.6" = { name = "cheerio"; packageName = "cheerio"; @@ -2056,13 +2524,13 @@ let sha512 = "kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="; }; }; - "class-validator-0.13.2" = { + "class-validator-0.14.0" = { name = "class-validator"; packageName = "class-validator"; - version = "0.13.2"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/class-validator/-/class-validator-0.13.2.tgz"; - sha512 = "yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw=="; + url = "https://registry.npmjs.org/class-validator/-/class-validator-0.14.0.tgz"; + sha512 = "ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A=="; }; }; "clean-stack-2.2.0" = { @@ -2146,22 +2614,31 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; - "clone-2.1.2" = { - name = "clone"; - packageName = "clone"; - version = "2.1.2"; + "cliui-8.0.1" = { + name = "cliui"; + packageName = "cliui"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; - sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; + url = "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; }; - "cluster-key-slot-1.1.1" = { + "cluster-key-slot-1.1.2" = { name = "cluster-key-slot"; packageName = "cluster-key-slot"; - version = "1.1.1"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz"; + sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="; + }; + }; + "codemirror-lang-n8n-expression-0.1.0" = { + name = "codemirror-lang-n8n-expression"; + packageName = "codemirror-lang-n8n-expression"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"; - sha512 = "rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw=="; + url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.1.0.tgz"; + sha512 = "20ss5p0koTu5bfivr1sBHYs7cpjWT2JhVB5gn7TX9WWPt+v/9p9tEcYSOyL/sm+OFuWh698Cgnmrba4efQnMCQ=="; }; }; "codepage-1.15.0" = { @@ -2236,15 +2713,6 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "colornames-1.1.1" = { - name = "colornames"; - packageName = "colornames"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; - sha512 = "/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="; - }; - }; "colorspace-1.1.4" = { name = "colorspace"; packageName = "colorspace"; @@ -2281,13 +2749,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-9.4.1" = { + "commander-9.5.0" = { name = "commander"; packageName = "commander"; - version = "9.4.1"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz"; - sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; }; }; "commist-1.1.0" = { @@ -2416,13 +2884,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convict-6.2.3" = { + "convict-6.2.4" = { name = "convict"; packageName = "convict"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.3.tgz"; - sha512 = "mTY04Qr7WrqiXifdeUYXr4/+Te4hPFWDvz6J2FVIKCLc2XBhq63VOSSYAKJ+unhZAYOAjmEdNswTOeHt7s++pQ=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.4.tgz"; + sha512 = "qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ=="; }; }; "cookie-0.4.1" = { @@ -2434,6 +2902,15 @@ let sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; + "cookie-0.4.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + }; + }; "cookie-0.5.0" = { name = "cookie"; packageName = "cookie"; @@ -2479,13 +2956,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.26.0" = { + "core-js-3.27.1" = { name = "core-js"; packageName = "core-js"; - version = "3.26.0"; + version = "3.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz"; - sha512 = "+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.27.1.tgz"; + sha512 = "GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww=="; }; }; "core-util-is-1.0.2" = { @@ -2515,6 +2992,15 @@ let sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; }; }; + "create-require-1.1.1" = { + name = "create-require"; + packageName = "create-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"; + sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; + }; + }; "crelt-1.0.5" = { name = "crelt"; packageName = "crelt"; @@ -2542,6 +3028,15 @@ let sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; }; }; + "cron-parser-4.7.1" = { + name = "cron-parser"; + packageName = "cron-parser"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"; + sha512 = "WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA=="; + }; + }; "cross-spawn-4.0.2" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -2677,6 +3172,15 @@ let sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; }; }; + "date-fns-2.29.3" = { + name = "date-fns"; + packageName = "date-fns"; + version = "2.29.3"; + src = fetchurl { + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz"; + sha512 = "dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="; + }; + }; "date-utils-1.2.21" = { name = "date-utils"; packageName = "date-utils"; @@ -2758,13 +3262,13 @@ let sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw=="; }; }; - "decode-uri-component-0.2.0" = { + "decode-uri-component-0.2.2" = { name = "decode-uri-component"; packageName = "decode-uri-component"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; + sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; }; }; "decompress-response-6.0.0" = { @@ -2776,24 +3280,6 @@ let sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; }; - "deep-equal-1.1.1" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; - }; - }; - "deep-equal-2.0.5" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz"; - sha512 = "nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw=="; - }; - }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -2938,13 +3424,13 @@ let sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; }; - "diagnostics-1.1.1" = { - name = "diagnostics"; - packageName = "diagnostics"; - version = "1.1.1"; + "diff-4.0.2" = { + name = "diff"; + packageName = "diff"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; - sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; + url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; "difflib-0.2.4" = { @@ -2974,15 +3460,6 @@ let sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; - "discontinuous-range-1.0.0" = { - name = "discontinuous-range"; - packageName = "discontinuous-range"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; - sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; - }; - }; "dom-iterator-1.0.0" = { name = "dom-iterator"; packageName = "dom-iterator"; @@ -3064,6 +3541,15 @@ let sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; }; }; + "dotenv-16.0.3" = { + name = "dotenv"; + packageName = "dotenv"; + version = "16.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz"; + sha512 = "7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ=="; + }; + }; "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; @@ -3091,6 +3577,15 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; + "duplexify-4.1.2" = { + name = "duplexify"; + packageName = "duplexify"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz"; + sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -3127,13 +3622,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "element-ui-2.15.10" = { + "element-ui-2.15.12" = { name = "element-ui"; packageName = "element-ui"; - version = "2.15.10"; + version = "2.15.12"; src = fetchurl { - url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.10.tgz"; - sha512 = "jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw=="; + url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.12.tgz"; + sha512 = "Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg=="; }; }; "emoji-regex-8.0.0" = { @@ -3145,15 +3640,6 @@ let sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; - "enabled-1.0.2" = { - name = "enabled"; - packageName = "enabled"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; - sha512 = "nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA=="; - }; - }; "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; @@ -3199,6 +3685,24 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; + "ent-2.2.0" = { + name = "ent"; + packageName = "ent"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"; + sha512 = "GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="; + }; + }; + "entities-2.1.0" = { + name = "entities"; + packageName = "entities"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + }; + }; "entities-2.2.0" = { name = "entities"; packageName = "entities"; @@ -3226,15 +3730,6 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; - "env-variable-0.0.6" = { - name = "env-variable"; - packageName = "env-variable"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz"; - sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; - }; - }; "err-code-2.0.3" = { name = "err-code"; packageName = "err-code"; @@ -3244,22 +3739,22 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.20.4" = { + "es-abstract-1.21.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.4"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; + sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; }; }; - "es-aggregate-error-1.0.8" = { + "es-aggregate-error-1.0.9" = { name = "es-aggregate-error"; packageName = "es-aggregate-error"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.8.tgz"; - sha512 = "AKUb5MKLWMozPlFRHOKqWD7yta5uaEhH21qwtnf6FlKjNjTJOoqFi0/G14+FfSkIQhhu6X68Af4xgRC6y8qG4A=="; + url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.9.tgz"; + sha512 = "fvnX40sb538wdU6r4s35cq4EY6Lr09Upj40BEVem4LEsuW8XgQep9yD5Q1U2KftokNp1rWODFJ2qwZSsAjFpbg=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -3271,13 +3766,13 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; - "es-get-iterator-1.1.2" = { - name = "es-get-iterator"; - packageName = "es-get-iterator"; - version = "1.1.2"; + "es-set-tostringtag-2.0.1" = { + name = "es-set-tostringtag"; + packageName = "es-set-tostringtag"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz"; - sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; + sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; }; }; "es-to-primitive-1.2.1" = { @@ -3370,6 +3865,15 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; + "esprima-next-5.8.4" = { + name = "esprima-next"; + packageName = "esprima-next"; + version = "5.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima-next/-/esprima-next-5.8.4.tgz"; + sha512 = "8nYVZ4ioIH4Msjb/XmhnBdz5WRRBaYqevKa1cv9nGJdCehMbzZCPNEEnqfLCZVetUVrUPEcb5IYyu1GG4hFqgg=="; + }; + }; "estraverse-4.3.0" = { name = "estraverse"; packageName = "estraverse"; @@ -3433,6 +3937,15 @@ let sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; }; }; + "events-intercept-2.0.0" = { + name = "events-intercept"; + packageName = "events-intercept"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events-intercept/-/events-intercept-2.0.0.tgz"; + sha512 = "blk1va0zol9QOrdZt0rFXo5KMkNPVSp92Eju/Qz8THwKWKRKeE0T8Br/1aW6+Edkyq9xHYgYxn2QtOnUKPUp+Q=="; + }; + }; "eventsource-2.0.2" = { name = "eventsource"; packageName = "eventsource"; @@ -3541,15 +4054,6 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-diff-1.2.0" = { - name = "fast-diff"; - packageName = "fast-diff"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; - sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; - }; - }; "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; @@ -3577,13 +4081,22 @@ let sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; }; - "fastq-1.13.0" = { + "fast-text-encoding-1.0.6" = { + name = "fast-text-encoding"; + packageName = "fast-text-encoding"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz"; + sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="; + }; + }; + "fastq-1.15.0" = { name = "fastq"; packageName = "fastq"; - version = "1.13.0"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; - sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"; + sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; }; }; "fecha-4.2.3" = { @@ -3919,6 +4432,24 @@ let sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; }; }; + "gaxios-4.3.3" = { + name = "gaxios"; + packageName = "gaxios"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.3.tgz"; + sha512 = "gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA=="; + }; + }; + "gcp-metadata-4.3.1" = { + name = "gcp-metadata"; + packageName = "gcp-metadata"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz"; + sha512 = "x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A=="; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -4090,6 +4621,33 @@ let sha512 = "4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw=="; }; }; + "google-auth-library-7.14.1" = { + name = "google-auth-library"; + packageName = "google-auth-library"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.1.tgz"; + sha512 = "5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA=="; + }; + }; + "google-gax-2.30.5" = { + name = "google-gax"; + packageName = "google-gax"; + version = "2.30.5"; + src = fetchurl { + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.30.5.tgz"; + sha512 = "Jey13YrAN2hfpozHzbtrwEfEHdStJh1GwaQ2+Akh1k0Tv/EuNVSuBtHZoKSBm5wBMvNsxTsEIZ/152NrYyZgxQ=="; + }; + }; + "google-p12-pem-3.1.4" = { + name = "google-p12-pem"; + packageName = "google-p12-pem"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz"; + sha512 = "HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg=="; + }; + }; "google-timezones-json-1.0.2" = { name = "google-timezones-json"; packageName = "google-timezones-json"; @@ -4099,6 +4657,15 @@ let sha512 = "UWXQ7BpSCW8erDespU2I4cri22xsKgwOCyhsJal0OJhi2tFpwJpsYNJt4vCiFPL1p2HzCGiS713LKpNR25n9Kg=="; }; }; + "gopd-1.0.1" = { + name = "gopd"; + packageName = "gopd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"; + sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; + }; + }; "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -4108,6 +4675,24 @@ let sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; + "grpc-gcp-0.3.3" = { + name = "grpc-gcp"; + packageName = "grpc-gcp"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/grpc-gcp/-/grpc-gcp-0.3.3.tgz"; + sha512 = "GuIoDnxuSDZoB5DEuuNh8SNB2vk+ZGPoY0+tXQ53TcLTyeY3X0xmkF2v6f9+HAS70TzJ6biyug8Eq9t4HIqpbQ=="; + }; + }; + "gtoken-5.3.2" = { + name = "gtoken"; + packageName = "gtoken"; + version = "5.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.2.tgz"; + sha512 = "gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ=="; + }; + }; "handlebars-4.7.7" = { name = "handlebars"; packageName = "handlebars"; @@ -4171,6 +4756,15 @@ let sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; }; }; + "has-proto-1.0.1" = { + name = "has-proto"; + packageName = "has-proto"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; + sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; + }; + }; "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; @@ -4261,13 +4855,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "html-to-text-8.2.0" = { + "html-to-text-9.0.3" = { name = "html-to-text"; packageName = "html-to-text"; - version = "8.2.0"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.2.0.tgz"; - sha512 = "CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.3.tgz"; + sha512 = "hxDF1kVCF2uw4VUJ3vr2doc91pXf2D5ngKcNviSitNkhP9OMOaJkDrFIFL6RMvko7NisWTEiqGpQ9LAxcVok1w=="; }; }; "htmlparser2-6.1.0" = { @@ -4279,6 +4873,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "htmlparser2-8.0.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz"; + sha512 = "4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA=="; + }; + }; "http-cache-semantics-4.1.0" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -4360,15 +4963,6 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; - "iconv-lite-0.5.2" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; - sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; - }; - }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -4405,13 +4999,13 @@ let sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; - "ignore-5.2.0" = { + "ignore-5.2.4" = { name = "ignore"; packageName = "ignore"; - version = "5.2.0"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"; + sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; }; }; "imap-0.8.19" = { @@ -4432,6 +5026,15 @@ let sha512 = "SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ=="; }; }; + "immediate-3.0.6" = { + name = "immediate"; + packageName = "immediate"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; + sha512 = "XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="; + }; + }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -4495,13 +5098,13 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "internal-slot-1.0.3" = { + "internal-slot-1.0.4" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; }; "interpret-1.4.0" = { @@ -4522,6 +5125,15 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; + "ioredis-5.2.5" = { + name = "ioredis"; + packageName = "ioredis"; + version = "5.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.2.5.tgz"; + sha512 = "7HKo/ClM2DGLRXdFq8ruS3Uuadensz4A76wPOU0adqlOqd1qkhoLPDaBhmVhUhNGpB+J65/bhLmNB8DDY99HJQ=="; + }; + }; "ip-1.1.8" = { name = "ip"; packageName = "ip"; @@ -4558,6 +5170,15 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; + "is-3.3.0" = { + name = "is"; + packageName = "is"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-3.3.0.tgz"; + sha512 = "nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg=="; + }; + }; "is-absolute-1.0.0" = { name = "is-absolute"; packageName = "is-absolute"; @@ -4576,6 +5197,15 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; + "is-array-buffer-3.0.1" = { + name = "is-array-buffer"; + packageName = "is-array-buffer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; + sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + }; + }; "is-arrayish-0.3.2" = { name = "is-arrayish"; packageName = "is-arrayish"; @@ -4720,15 +5350,6 @@ let sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; }; - "is-map-2.0.2" = { - name = "is-map"; - packageName = "is-map"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; - sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; - }; - }; "is-nan-1.3.2" = { name = "is-nan"; packageName = "is-nan"; @@ -4828,15 +5449,6 @@ let sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; }; }; - "is-set-2.0.2" = { - name = "is-set"; - packageName = "is-set"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; - sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; - }; - }; "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; @@ -4855,6 +5467,15 @@ let sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; + "is-stream-ended-0.1.4" = { + name = "is-stream-ended"; + packageName = "is-stream-ended"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz"; + sha512 = "xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="; + }; + }; "is-string-1.0.7" = { name = "is-string"; packageName = "is-string"; @@ -4873,13 +5494,13 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; - "is-typed-array-1.1.9" = { + "is-typed-array-1.1.10" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz"; - sha512 = "kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"; + sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; }; }; "is-typedarray-1.0.0" = { @@ -4900,15 +5521,6 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; - "is-weakmap-2.0.1" = { - name = "is-weakmap"; - packageName = "is-weakmap"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; - sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; - }; - }; "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; @@ -4918,15 +5530,6 @@ let sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; - "is-weakset-2.0.2" = { - name = "is-weakset"; - packageName = "is-weakset"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"; - sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; - }; - }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -4963,22 +5566,13 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isarray-2.0.5" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; - sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; - }; - }; - "isbot-3.6.2" = { + "isbot-3.6.5" = { name = "isbot"; packageName = "isbot"; - version = "3.6.2"; + version = "3.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.6.2.tgz"; - sha512 = "jk8IRbrvyTJC2f4VpxXQ4ff+xVJgsXHygtpc5Sl6m9PWuF8oXVcpEmcZKR88j5WOoqpHTxrOKccCpxdAgW7Afw=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.6.5.tgz"; + sha512 = "BchONELXt6yMad++BwGpa0oQxo/uD0keL7N15cYVf0A1oMIoNQ79OqeYdPMFWDrNhCqCbRuw9Y9F3QBjvAxZ5g=="; }; }; "isexe-2.0.0" = { @@ -5035,13 +5629,22 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "jquery-3.6.1" = { + "jquery-3.6.3" = { name = "jquery"; packageName = "jquery"; - version = "3.6.1"; + version = "3.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz"; + sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; + }; + }; + "js-base64-3.7.4" = { + name = "js-base64"; + packageName = "js-base64"; + version = "3.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz"; - sha512 = "opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz"; + sha512 = "wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ=="; }; }; "js-md4-0.3.2" = { @@ -5116,6 +5719,15 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; + "json-bigint-1.0.0" = { + name = "json-bigint"; + packageName = "json-bigint"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz"; + sha512 = "SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ=="; + }; + }; "json-diff-0.5.5" = { name = "json-diff"; packageName = "json-diff"; @@ -5215,6 +5827,15 @@ let sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; }; }; + "jsonwebtoken-9.0.0" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; + sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; + }; + }; "jsplumb-2.15.4" = { name = "jsplumb"; packageName = "jsplumb"; @@ -5287,15 +5908,6 @@ let sha512 = "+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg=="; }; }; - "kuler-1.0.1" = { - name = "kuler"; - packageName = "kuler"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; - sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; - }; - }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -5305,6 +5917,15 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; + "leac-0.6.0" = { + name = "leac"; + packageName = "leac"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz"; + sha512 = "y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg=="; + }; + }; "leven-2.1.0" = { name = "leven"; packageName = "leven"; @@ -5332,22 +5953,22 @@ let sha512 = "l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew=="; }; }; - "libmime-5.1.0" = { + "libmime-5.2.0" = { name = "libmime"; packageName = "libmime"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-5.1.0.tgz"; - sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; + url = "https://registry.npmjs.org/libmime/-/libmime-5.2.0.tgz"; + sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; }; }; - "libphonenumber-js-1.10.14" = { + "libphonenumber-js-1.10.18" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.14"; + version = "1.10.18"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.14.tgz"; - sha512 = "McGS7GV/WjJ2KjfOGhJU1oJn29RYeo7Q+RpANRbUNMQ9gj5XArpbjurSuyYPTejFwbaUojstQ4XyWCrAzGOUXw=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz"; + sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og=="; }; }; "libpq-1.8.12" = { @@ -5359,13 +5980,22 @@ let sha512 = "4lUY9BD9suz76mVS0kH4rRgRy620g/c9YZH5GYC3smfIpjtj6KiPuQ4IwQSHSZMMMhMM3tBFrYUrw8mHOOZVeg=="; }; }; - "libqp-1.1.0" = { + "libqp-2.0.1" = { name = "libqp"; packageName = "libqp"; - version = "1.1.0"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/libqp/-/libqp-2.0.1.tgz"; + sha512 = "Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg=="; + }; + }; + "lie-3.1.1" = { + name = "lie"; + packageName = "lie"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; - sha512 = "4Rgfa0hZpG++t1Vi2IiqXG9Ad1ig4QTmtuZF946QJP4bPqOYC78ixUXgz5TW/wE7lNaNKlplSYTxQ+fR2KZ0EA=="; + url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; + sha512 = "RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw=="; }; }; "limiter-1.1.5" = { @@ -5377,13 +6007,31 @@ let sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; }; }; - "linkify-it-4.0.0" = { + "linkify-it-3.0.3" = { name = "linkify-it"; packageName = "linkify-it"; - version = "4.0.0"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz"; + sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; + }; + }; + "linkify-it-4.0.1" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.0.tgz"; - sha512 = "QAxkXyzT/TXgwGyY4rTgC95Ex6/lZ5/lYTV9nug6eJt93BCBQGOE47D/g2+/m5J1MrVLr2ot97OXkBZ9bBpR4A=="; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz"; + sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw=="; + }; + }; + "localforage-1.10.0" = { + name = "localforage"; + packageName = "localforage"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz"; + sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; }; }; "localtunnel-2.0.2" = { @@ -5548,6 +6196,15 @@ let sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; }; }; + "lodash.iteratee-4.7.0" = { + name = "lodash.iteratee"; + packageName = "lodash.iteratee"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.iteratee/-/lodash.iteratee-4.7.0.tgz"; + sha512 = "yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q=="; + }; + }; "lodash.merge-4.6.2" = { name = "lodash.merge"; packageName = "lodash.merge"; @@ -5593,6 +6250,15 @@ let sha512 = "hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="; }; }; + "lodash.remove-4.7.0" = { + name = "lodash.remove"; + packageName = "lodash.remove"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.remove/-/lodash.remove-4.7.0.tgz"; + sha512 = "GnwkSsEXGXirSxh3YI+jc/qvptE2DV8ZjA4liK0NT1MJ3mNDMFhX3bY+4Wr8onlNItYuPp7/4u19Fi55mvzkTw=="; + }; + }; "lodash.set-4.3.2" = { name = "lodash.set"; packageName = "lodash.set"; @@ -5602,6 +6268,15 @@ let sha512 = "4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="; }; }; + "lodash.snakecase-4.1.1" = { + name = "lodash.snakecase"; + packageName = "lodash.snakecase"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; + sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; + }; + }; "lodash.split-4.4.2" = { name = "lodash.split"; packageName = "lodash.split"; @@ -5620,6 +6295,15 @@ let sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; }; }; + "lodash.unionby-4.8.0" = { + name = "lodash.unionby"; + packageName = "lodash.unionby"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.unionby/-/lodash.unionby-4.8.0.tgz"; + sha512 = "e60kn4GJIunNkw6v9MxRnUuLYI/Tyuanch7ozoCtk/1irJTYBj+qNTxr5B3qVflmJhwStJBv387Cb+9VOfABMg=="; + }; + }; "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; @@ -5674,6 +6358,15 @@ let sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; }; + "long-5.2.1" = { + name = "long"; + packageName = "long"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-5.2.1.tgz"; + sha512 = "GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A=="; + }; + }; "lossless-json-1.0.5" = { name = "lossless-json"; packageName = "lossless-json"; @@ -5701,15 +6394,6 @@ let sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw=="; }; }; - "lru-cache-4.1.5" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; - }; - }; "lru-cache-5.1.1" = { name = "lru-cache"; packageName = "lru-cache"; @@ -5728,6 +6412,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lru-cache-7.14.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"; + sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; + }; + }; "lru-memoizer-2.1.4" = { name = "lru-memoizer"; packageName = "lru-memoizer"; @@ -5737,6 +6430,15 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; + "lru_map-0.3.3" = { + name = "lru_map"; + packageName = "lru_map"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz"; + sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; + }; + }; "luxon-2.3.2" = { name = "luxon"; packageName = "luxon"; @@ -5746,22 +6448,40 @@ let sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; }; }; - "mailparser-3.5.0" = { + "luxon-2.5.2" = { + name = "luxon"; + packageName = "luxon"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz"; + sha512 = "Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA=="; + }; + }; + "luxon-3.2.1" = { + name = "luxon"; + packageName = "luxon"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"; + sha512 = "QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg=="; + }; + }; + "mailparser-3.6.3" = { name = "mailparser"; packageName = "mailparser"; - version = "3.5.0"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-3.5.0.tgz"; - sha512 = "mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg=="; + url = "https://registry.npmjs.org/mailparser/-/mailparser-3.6.3.tgz"; + sha512 = "Yi6poKSsZsmjEcUexv3H4w4+TIeyN9u3+TCdC43VK7fe4rUOGDJ3wL4kMhNLiTOScCA1Rpzldv1hcf6g1MLtZQ=="; }; }; - "mailsplit-5.3.2" = { + "mailsplit-5.4.0" = { name = "mailsplit"; packageName = "mailsplit"; - version = "5.3.2"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.2.tgz"; - sha512 = "coES12hhKqagkuBTJoqERX+y9bXNpxbxw3Esd07auuwKYmcagouVlgucyIVRp48fnswMKxcUtLoFn/L1a75ynQ=="; + url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.0.tgz"; + sha512 = "wnYxX5D5qymGIPYLwnp6h8n1+6P6vz/MJn5AzGjZ8pwICWssL+CCQjWBIToOVHASmATot4ktvlLo6CyLfOXWYA=="; }; }; "make-dir-3.1.0" = { @@ -5800,13 +6520,49 @@ let sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; }; }; - "mappersmith-2.40.0" = { + "mappersmith-2.41.0" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.40.0"; + version = "2.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.40.0.tgz"; - sha512 = "Es99fy0E52fxmhRvCyed7WVlSyuz6ME/wOsRpSmi0GcbMEZ6y5D2GL4+qNGPCc2P270J5yw8L2zg+K4BWACcHg=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.41.0.tgz"; + sha512 = "kg2PXCFiM0WBMKZSgkvVBhF6SV7vdDEUsql5+DGdEHYZx9cwK+2QCSnsZ2EI4oyIWHMdIN/l+4yiyXJTsH7PcQ=="; + }; + }; + "markdown-it-12.3.2" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "12.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz"; + sha512 = "TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg=="; + }; + }; + "markdown-it-emoji-2.0.2" = { + name = "markdown-it-emoji"; + packageName = "markdown-it-emoji"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz"; + sha512 = "zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ=="; + }; + }; + "markdown-it-link-attributes-4.0.1" = { + name = "markdown-it-link-attributes"; + packageName = "markdown-it-link-attributes"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-4.0.1.tgz"; + sha512 = "pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ=="; + }; + }; + "markdown-it-task-lists-2.1.1" = { + name = "markdown-it-task-lists"; + packageName = "markdown-it-task-lists"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-task-lists/-/markdown-it-task-lists-2.1.1.tgz"; + sha512 = "TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA=="; }; }; "material-colors-1.2.6" = { @@ -5827,6 +6583,15 @@ let sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; }; }; + "mdurl-1.0.1" = { + name = "mdurl"; + packageName = "mdurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; + sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; + }; + }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -5854,6 +6619,15 @@ let sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; + "merge-stream-2.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + }; "merge2-1.4.1" = { name = "merge2"; packageName = "merge2"; @@ -5881,15 +6655,6 @@ let sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; }; - "millisecond-0.1.2" = { - name = "millisecond"; - packageName = "millisecond"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/millisecond/-/millisecond-0.1.2.tgz"; - sha512 = "BJ8XtxY+woL+5TkP6uS6XvOArm0JVrX2otkgtWZseHpIax0oOOPW3cnwhOjRqbEJg7YRO/BDF7fO/PTWNT3T9Q=="; - }; - }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -5962,13 +6727,13 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimatch-5.1.0" = { + "minimatch-5.1.4" = { name = "minimatch"; packageName = "minimatch"; - version = "5.1.0"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz"; + sha512 = "U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw=="; }; }; "minimist-1.2.7" = { @@ -5980,13 +6745,22 @@ let sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; - "minipass-3.3.5" = { + "minipass-3.3.6" = { + name = "minipass"; + packageName = "minipass"; + version = "3.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + }; + "minipass-4.0.0" = { name = "minipass"; packageName = "minipass"; - version = "3.3.5"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; - sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; }; }; "minipass-collect-1.0.2" = { @@ -6088,22 +6862,22 @@ let sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; - "moment-timezone-0.5.38" = { + "moment-timezone-0.5.40" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.38"; + version = "0.5.40"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.38.tgz"; - sha512 = "nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz"; + sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; }; }; - "monaco-editor-0.30.1" = { + "monaco-editor-0.33.0" = { name = "monaco-editor"; packageName = "monaco-editor"; - version = "0.30.1"; + version = "0.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz"; - sha512 = "B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg=="; + url = "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz"; + sha512 = "VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="; }; }; "mongodb-3.7.3" = { @@ -6115,31 +6889,22 @@ let sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; }; }; - "mongodb-4.11.0" = { + "mongodb-4.13.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.11.0"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.11.0.tgz"; - sha512 = "9l9n4Nk2BYZzljW3vHah3Z0rfS5npKw6ktnkmFgTcnzaXH1DRm3pDl6VMHu84EVb1lzmSaJC4OzWZqTkB5i2wg=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.13.0.tgz"; + sha512 = "+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw=="; }; }; - "mongodb-connection-string-url-2.5.4" = { + "mongodb-connection-string-url-2.6.0" = { name = "mongodb-connection-string-url"; packageName = "mongodb-connection-string-url"; - version = "2.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.4.tgz"; - sha512 = "SeAxuWs0ez3iI3vvmLk/j2y+zHwigTDKQhtdxTgt5ZCOQQS5+HW4g45/Xw5vzzbn7oQXCNQ24Z40AkJsizEy7w=="; - }; - }; - "moo-0.5.2" = { - name = "moo"; - packageName = "moo"; - version = "0.5.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz"; - sha512 = "iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="; + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz"; + sha512 = "WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ=="; }; }; "mqtt-4.2.6" = { @@ -6187,13 +6952,31 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-6.4.1" = { + "msal-1.4.17" = { + name = "msal"; + packageName = "msal"; + version = "1.4.17"; + src = fetchurl { + url = "https://registry.npmjs.org/msal/-/msal-1.4.17.tgz"; + sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; + }; + }; + "msgpackr-1.8.1" = { + name = "msgpackr"; + packageName = "msgpackr"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.1.tgz"; + sha512 = "05fT4J8ZqjYlR4QcRDIhLCYKUOHXk7C/xa62GzMKj74l3up9k2QZ3LgFc6qWdsPHl91QA2WLWqWc8b8t7GLNNw=="; + }; + }; + "mssql-7.3.5" = { name = "mssql"; packageName = "mssql"; - version = "6.4.1"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz"; - sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; + url = "https://registry.npmjs.org/mssql/-/mssql-7.3.5.tgz"; + sha512 = "LTOSQ3k8yZTBfO/5XwH7zC6fDPBx1sYgMXZyP/k+ErWrhZN8faAvDq+/gMlm9DaFG9yaOipHedF5JSPV17EHNw=="; }; }; "mssql-8.1.4" = { @@ -6241,58 +7024,58 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.140.1" = { + "n8n-core-0.151.1" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.140.1"; + version = "0.151.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.140.1.tgz"; - sha512 = "a0fNyYhL8VsxQPUz0Jya0OOFy0eIFkiK40405XkAkonah+wBBBA01g46QSDdBCn3UMeDZ/LkfY+pzypkrmjMQQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.151.1.tgz"; + sha512 = "tEPdPaJVJ+Vy87UD0XXAq7yhTPYl+WuBABtS2u9mxKtfu4XyOepK6M34XJV5gJtgBXxIPy8+sNCKVaugUvSGAA=="; }; }; - "n8n-design-system-0.40.0" = { + "n8n-design-system-0.51.1" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.40.0"; + version = "0.51.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.40.0.tgz"; - sha512 = "P9ZubxZzNNMiXC58L2fyAAm4R4L3dJPZ+NMjKEZbu9+11XMX9SVX1+5t2NEWz1MsgVHGRLfc3mjPr7mnn05BQQ=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.51.1.tgz"; + sha512 = "zK4UI/LkdRzAGZfL9K7/tZSLjxXTIKgt/72LrgEJ8CGNxYPavk0f7eYTH9Q8tbcLAaMLDjUcbcdzVEWh5YZofA=="; }; }; - "n8n-editor-ui-0.166.1" = { + "n8n-editor-ui-0.177.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.166.1"; + version = "0.177.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.166.1.tgz"; - sha512 = "AxGb+Rkq/TTytKjef60Q7Tmtyu+I4l0639aMrxg7ObqurqCjGL0WkJXaoGrb1H6pBHRSL3jU7ZuD/QfiGN93IQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.177.1.tgz"; + sha512 = "h9TnC1mKjXyBXe2V6/Yzy81KzDvll6wlBugqnFGpTAs2IwjPDZ3WGwp94mCWwM7WDE9m2Ub9LX88ajj5WG8RyQ=="; }; }; - "n8n-nodes-base-0.198.1" = { + "n8n-nodes-base-0.209.1" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.198.1"; + version = "0.209.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.198.1.tgz"; - sha512 = "kM5L/zib1Db5LG1qIYQeEDUM05kd/pQXvxxClCs+qs8RuCMVLnjWDua48NbpiINcnpEY0GI5Hzd0mDHCMjirpA=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.209.1.tgz"; + sha512 = "Ewpk1zuH1W3SZlsb1YRQJ5yOZUTD3m/VdKJE1UTTu2lwDqk+h8DhxmrLDY4AEcwm6Teyq8hjj0l1awCa1+Ppzg=="; }; }; - "n8n-workflow-0.122.1" = { + "n8n-workflow-0.133.1" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.122.1"; + version = "0.133.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.122.1.tgz"; - sha512 = "8lJuN5AFBEhIBcS8MRt0XuwZ4KXbRGwOA9InlnBoYWFloBdDh+1zDOIxiKJH94xjtihLU9tk3c9mnYPEJqnvDQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.133.1.tgz"; + sha512 = "T3Es12JyM50FpJFogz0wKbzPOUC2iCDoL8/2br3oNU1Q53i4MfGAE2Ftf9hHOMF8pU9SN+m/D5WR3ELysI0PSQ=="; }; }; - "named-placeholders-1.1.2" = { + "named-placeholders-1.1.3" = { name = "named-placeholders"; packageName = "named-placeholders"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz"; - sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; + url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz"; + sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w=="; }; }; "nan-2.17.0" = { @@ -6349,15 +7132,6 @@ let sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; - "nearley-2.20.1" = { - name = "nearley"; - packageName = "nearley"; - version = "2.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz"; - sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; - }; - }; "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; @@ -6403,13 +7177,22 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.28.0" = { + "node-abi-3.31.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.28.0"; + version = "3.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; + sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; + }; + }; + "node-abort-controller-2.0.0" = { + name = "node-abort-controller"; + packageName = "node-abort-controller"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz"; - sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A=="; + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-2.0.0.tgz"; + sha512 = "L8RfEgjBTHAISTuagw51PprVAqNZoG6KSB6LQ6H1bskMVkFs5E71IyjauLBv3XbuomJlguWF/VnRHdJ1gqiAqA=="; }; }; "node-abort-controller-3.0.1" = { @@ -6439,13 +7222,22 @@ let sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw=="; }; }; - "node-fetch-2.6.7" = { + "node-fetch-2.6.8" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.7"; + version = "2.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz"; + sha512 = "RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg=="; + }; + }; + "node-forge-1.3.1" = { + name = "node-forge"; + packageName = "node-forge"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; + url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"; + sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; }; }; "node-gyp-8.4.1" = { @@ -6457,31 +7249,49 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; - "node-gyp-build-4.5.0" = { + "node-gyp-build-4.6.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; - sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; }; }; - "node-html-markdown-1.2.2" = { + "node-html-markdown-1.3.0" = { name = "node-html-markdown"; packageName = "node-html-markdown"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.2.2.tgz"; - sha512 = "VkiTJ2Y9BWscRY0yLm9OYTREvXobmlK7YehdDwIYfDj9VW6MefaFNaQkMTk94U0zyAuCsfLdBsOld54fsNhP9A=="; + url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.3.0.tgz"; + sha512 = "OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g=="; }; }; - "node-html-parser-6.1.1" = { + "node-html-parser-6.1.4" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "6.1.1"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.4.tgz"; + sha512 = "3muP9Uy/Pz7bQa9TNYVQzWJhNZMqyCx7xJle8kz2/y1UgzAUyXXShc1IcPaJy6u07CE3K5rQcRwlvHzmlySRjg=="; + }; + }; + "node-machine-id-1.1.12" = { + name = "node-machine-id"; + packageName = "node-machine-id"; + version = "1.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz"; + sha512 = "QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="; + }; + }; + "node-rsa-1.1.1" = { + name = "node-rsa"; + packageName = "node-rsa"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.1.tgz"; - sha512 = "eYYblUeoMg0nR6cYGM4GRb1XncNa9FXEftuKAU1qyMIr6rXVtNyUKduvzZtkqFqSHVByq2lLjC7WO8tz7VDmnA=="; + url = "https://registry.npmjs.org/node-rsa/-/node-rsa-1.1.1.tgz"; + sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; "node-ssh-12.0.5" = { @@ -6502,22 +7312,22 @@ let sha512 = "n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw=="; }; }; - "nodemailer-6.7.3" = { + "nodemailer-6.8.0" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz"; - sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz"; + sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; }; }; - "nodemailer-6.8.0" = { + "nodemailer-6.9.0" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.8.0"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz"; - sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.0.tgz"; + sha512 = "jFaCEGTeT3E/m/5R2MHWiyQH3pSARECRUDM+1hokOYc3lQAAG7ASuy+2jIsYVf+RVa9zePopSQwKNVFH8DKUpA=="; }; }; "nopt-5.0.0" = { @@ -6628,22 +7438,22 @@ let sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; }; - "object-inspect-1.12.2" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.2"; + "object-hash-3.0.0" = { + name = "object-hash"; + packageName = "object-hash"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; + url = "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz"; + sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; }; }; - "object-is-1.1.5" = { - name = "object-is"; - packageName = "object-is"; - version = "1.1.5"; + "object-inspect-1.12.3" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; + sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; }; }; "object-keys-1.1.1" = { @@ -6673,13 +7483,13 @@ let sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; - "object.getownpropertydescriptors-2.1.4" = { + "object.getownpropertydescriptors-2.1.5" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz"; - sha512 = "sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz"; + sha512 = "yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw=="; }; }; "on-finished-2.4.1" = { @@ -6871,6 +7681,15 @@ let sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; }; + "p-queue-6.6.2" = { + name = "p-queue"; + packageName = "p-queue"; + version = "6.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"; + sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; + }; + }; "p-timeout-3.2.0" = { name = "p-timeout"; packageName = "p-timeout"; @@ -6916,15 +7735,6 @@ let sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; }; }; - "parchment-2.0.0-dev.2" = { - name = "parchment"; - packageName = "parchment"; - version = "2.0.0-dev.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parchment/-/parchment-2.0.0-dev.2.tgz"; - sha512 = "4fgRny4pPISoML08Zp7poi52Dff3E2G1ORTi2D/acJ/RiROdDAMDB6VcQNfBcmehrX5Wixp6dxh6JjLyE5yUNQ=="; - }; - }; "parse-github-url-1.0.2" = { name = "parse-github-url"; packageName = "parse-github-url"; @@ -6979,13 +7789,13 @@ let sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; }; }; - "parseley-0.7.0" = { + "parseley-0.11.0" = { name = "parseley"; packageName = "parseley"; - version = "0.7.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/parseley/-/parseley-0.7.0.tgz"; - sha512 = "xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw=="; + url = "https://registry.npmjs.org/parseley/-/parseley-0.11.0.tgz"; + sha512 = "VfcwXlBWgTF+unPcr7yu3HSSA6QUdDaDnrHcytVfj5Z8azAyKBDrYnSIfeSxlrEayndNcLmrXzg+Vxbo6DWRXQ=="; }; }; "parseurl-1.3.3" = { @@ -7024,13 +7834,13 @@ let sha512 = "8a6foX2bbGoJzup0RAiNcC2tTqzYS46RQEK3Z4u8p86wesPUjgDaji3C7+5j4TGyCq4ZoOV+3YLw1Hy6cV6kyw=="; }; }; - "passport-jwt-4.0.0" = { + "passport-jwt-4.0.1" = { name = "passport-jwt"; packageName = "passport-jwt"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz"; - sha512 = "BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg=="; + url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.1.tgz"; + sha512 = "UCKMDYhNuGOBE9/9Ycuoyh7vP6jpeTp/+sfMJl7nLff/t6dps+iaeE0hhNkKN8/HZHcJ7lCdOyDxHdDoxoSvdQ=="; }; }; "passport-strategy-1.0.0" = { @@ -7150,6 +7960,15 @@ let sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A=="; }; }; + "peberminta-0.8.0" = { + name = "peberminta"; + packageName = "peberminta"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peberminta/-/peberminta-0.8.0.tgz"; + sha512 = "YYEs+eauIjDH5nUEGi18EohWE0nV2QbGTqmxQcqgZ/0g+laPCQmuIqq7EBLVi9uim9zMgfJv0QBZEnQ3uHw/Tw=="; + }; + }; "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -7231,13 +8050,13 @@ let sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; }; }; - "pg-promise-10.12.1" = { + "pg-promise-10.15.4" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.12.1"; + version = "10.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.12.1.tgz"; - sha512 = "SiJkBUDGq7PNfJFJbWferodsSH+vLrhte0Q0kVgQbwlNYeKmp9Hhkr+357+5DWEuBGOHhSu1UQffSSf5HVqRtA=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.15.4.tgz"; + sha512 = "BKlHCMCdNUmF6gagVbehRWSEiVcZzPVltEx14OJExR9Iz9/1R6KETDWLLGv2l6yRqYFnEZZy1VDjRhArzeIGrw=="; }; }; "pg-protocol-1.5.0" = { @@ -7303,6 +8122,15 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; + "pinia-2.0.29" = { + name = "pinia"; + packageName = "pinia"; + version = "2.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/pinia/-/pinia-2.0.29.tgz"; + sha512 = "5z/KpFecq/cIgfeTnulJXldiLcTITRkTe3N58RKYSj0Pc1EdR6oyCdnf5A9jLoVwBqX5LtHhd0kGlpzWvk9oiQ=="; + }; + }; "popsicle-12.1.0" = { name = "popsicle"; packageName = "popsicle"; @@ -7366,13 +8194,13 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; - "postcss-8.4.18" = { + "postcss-8.4.21" = { name = "postcss"; packageName = "postcss"; - version = "8.4.18"; + version = "8.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz"; - sha512 = "Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"; + sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; }; }; "postgres-array-1.0.3" = { @@ -7420,13 +8248,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-1.3.0" = { + "posthog-node-2.2.3" = { name = "posthog-node"; packageName = "posthog-node"; - version = "1.3.0"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-1.3.0.tgz"; - sha512 = "2+VhqiY/rKIqKIXyvemBFHbeijHE25sP7eKltnqcFqAssUE6+sX6vusN9A4luzToOqHQkUZexiCKxvuGagh7JA=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.2.3.tgz"; + sha512 = "dYlLZhrDus+uRov/Hh+EiRlMoMhRKchNjNa7mNE2iWmKg/ryOTipf0XYKS9UKdki7aU1NzWFhnLe11HF615XuA=="; }; }; "prebuild-install-7.1.1" = { @@ -7447,6 +8275,15 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; + "pretty-bytes-5.6.0" = { + name = "pretty-bytes"; + packageName = "pretty-bytes"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; + }; + }; "printj-1.1.2" = { name = "printj"; packageName = "printj"; @@ -7537,13 +8374,13 @@ let sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; }; - "promise.prototype.finally-3.1.3" = { + "promise.prototype.finally-3.1.4" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz"; - sha512 = "EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ=="; + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz"; + sha512 = "nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng=="; }; }; "property-expr-2.0.5" = { @@ -7555,6 +8392,33 @@ let sha512 = "IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="; }; }; + "proto3-json-serializer-0.1.9" = { + name = "proto3-json-serializer"; + packageName = "proto3-json-serializer"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.9.tgz"; + sha512 = "A60IisqvnuI45qNRygJjrnNjX2TMdQGMY+57tR3nul3ZgO2zXkR9OGR8AXxJhkqx84g0FTnrfi3D5fWMSdANdQ=="; + }; + }; + "protobufjs-6.11.3" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "6.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz"; + sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; + }; + }; + "protobufjs-7.1.2" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.2.tgz"; + sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; + }; + }; "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; @@ -7636,13 +8500,13 @@ let sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; }; - "punycode-2.1.1" = { + "punycode-2.2.0" = { name = "punycode"; packageName = "punycode"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz"; + sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw=="; }; }; "python-struct-1.1.3" = { @@ -7672,13 +8536,13 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "query-string-7.1.1" = { + "query-string-7.1.3" = { name = "query-string"; packageName = "query-string"; - version = "7.1.1"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz"; - sha512 = "MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w=="; + url = "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz"; + sha512 = "hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg=="; }; }; "querystring-0.2.0" = { @@ -7708,33 +8572,6 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; - "quill-2.0.0-dev.4" = { - name = "quill"; - packageName = "quill"; - version = "2.0.0-dev.4"; - src = fetchurl { - url = "https://registry.npmjs.org/quill/-/quill-2.0.0-dev.4.tgz"; - sha512 = "9WmMVCEIhf3lDdhzl+i+GBDeDl0BFi65waC4Im8Y4HudEJ9kEEb1lciAz9A8pcDmLMjiMbvz84lNt/U5OBS8Vg=="; - }; - }; - "quill-autoformat-0.1.2" = { - name = "quill-autoformat"; - packageName = "quill-autoformat"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/quill-autoformat/-/quill-autoformat-0.1.2.tgz"; - sha512 = "kRe2rTSmcBDg/oCxhzbjmXXOpQUl0Gak6ZCQshxek/RLvdR8o715qC0WcBRUozqaYbR6PJ+0Z/piINqlYStxWw=="; - }; - }; - "quill-delta-4.2.1" = { - name = "quill-delta"; - packageName = "quill-delta"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/quill-delta/-/quill-delta-4.2.1.tgz"; - sha512 = "Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA=="; - }; - }; "quoted-printable-1.0.1" = { name = "quoted-printable"; packageName = "quoted-printable"; @@ -7744,24 +8581,6 @@ let sha512 = "cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g=="; }; }; - "railroad-diagrams-1.0.0" = { - name = "railroad-diagrams"; - packageName = "railroad-diagrams"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; - }; - }; - "randexp-0.4.6" = { - name = "randexp"; - packageName = "randexp"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz"; - sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; - }; - }; "random-bytes-1.0.0" = { name = "random-bytes"; packageName = "random-bytes"; @@ -7861,6 +8680,15 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "recast-0.21.5" = { + name = "recast"; + packageName = "recast"; + version = "0.21.5"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz"; + sha512 = "hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg=="; + }; + }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -7933,13 +8761,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.10" = { + "regenerator-runtime-0.13.11" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.10"; + version = "0.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz"; - sha512 = "KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"; + sha512 = "kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="; }; }; "regexp.prototype.flags-1.4.3" = { @@ -7978,6 +8806,15 @@ let sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="; }; }; + "replacestream-4.0.3" = { + name = "replacestream"; + packageName = "replacestream"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz"; + sha512 = "AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA=="; + }; + }; "request-2.88.2" = { name = "request"; packageName = "request"; @@ -8059,15 +8896,6 @@ let sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; }; - "ret-0.1.15" = { - name = "ret"; - packageName = "ret"; - version = "0.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; - }; - }; "retry-0.12.0" = { name = "retry"; packageName = "retry"; @@ -8077,6 +8905,15 @@ let sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; }; + "retry-request-4.2.2" = { + name = "retry-request"; + packageName = "retry-request"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz"; + sha512 = "xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg=="; + }; + }; "reusify-1.0.4" = { name = "reusify"; packageName = "reusify"; @@ -8185,13 +9022,13 @@ let sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; }; }; - "safe-stable-stringify-2.4.1" = { + "safe-stable-stringify-2.4.2" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz"; - sha512 = "dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA=="; + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"; + sha512 = "gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA=="; }; }; "safer-buffer-2.1.2" = { @@ -8248,13 +9085,13 @@ let sha512 = "70BVm2xz9jn94zSQdpvYrEG101/UV9TVGcfWr9T5iob3QhCK4lYXeculfBqPGFv3XTeKgx4dpWyYIDeZUqo4kg=="; }; }; - "selderee-0.6.0" = { + "selderee-0.10.0" = { name = "selderee"; packageName = "selderee"; - version = "0.6.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/selderee/-/selderee-0.6.0.tgz"; - sha512 = "ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg=="; + url = "https://registry.npmjs.org/selderee/-/selderee-0.10.0.tgz"; + sha512 = "DEL/RW/f4qLw/NrVg97xKaEBC8IpzIG2fvxnzCp3Z4yk4jQ3MXom+Imav9wApjxX2dfS3eW7x0DXafJr85i39A=="; }; }; "semver-5.3.0" = { @@ -8356,15 +9193,6 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "setheader-1.0.2" = { - name = "setheader"; - packageName = "setheader"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/setheader/-/setheader-1.0.2.tgz"; - sha512 = "A704nIwzqGed0CnJZIqDE+0udMPS839ocgf1R9OJ8aq8vw4U980HWeNaD9ec8VnmBni9lyGEWDedOWXT/C5kxA=="; - }; - }; "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -8464,13 +9292,13 @@ let sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; - "simple-git-3.14.1" = { + "simple-git-3.16.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.14.1"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.14.1.tgz"; - sha512 = "1ThF4PamK9wBORVGMK9HK5si4zoGS2GpRO7tkAFObA4FZv6dKaCVHLQT+8zlgiBm6K2h+wEU9yOaFCu/SR3OyA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.16.0.tgz"; + sha512 = "zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw=="; }; }; "simple-lru-cache-0.0.2" = { @@ -8518,13 +9346,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.14" = { + "snowflake-sdk-1.6.17" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.14"; + version = "1.6.17"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.14.tgz"; - sha512 = "sKg17Yz1/aydKxlA4unlprH+uw9ZsvRezdUmamLjNlvsXQsw+pok4PoMeCKtWs2OSVFnX0VO3eSacCPglQrAQA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.17.tgz"; + sha512 = "ui2zRPbXIK3qaW8zuQCy+mHTieN6U5yeoJmKkyhdnh/8qKOqfR9Csj5nv+bXm8Y64kG24sybtIfCzf8C9abUMQ=="; }; }; "socks-2.7.1" = { @@ -8572,6 +9400,15 @@ let sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; + "source-map-support-0.5.21" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.21"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; + }; + }; "spex-3.2.0" = { name = "spex"; packageName = "spex"; @@ -8581,6 +9418,24 @@ let sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="; }; }; + "split-array-stream-1.0.3" = { + name = "split-array-stream"; + packageName = "split-array-stream"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz"; + sha512 = "yGY35QmZFzZkWZ0eHE06RPBi63umym8m+pdtuC/dlO1ADhdKSfCj0uNn87BYCXBBDFxyTq4oTw0BgLYT0K5z/A=="; + }; + }; + "split-array-stream-2.0.0" = { + name = "split-array-stream"; + packageName = "split-array-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz"; + sha512 = "hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg=="; + }; + }; "split-on-first-1.1.0" = { name = "split-on-first"; packageName = "split-on-first"; @@ -8635,13 +9490,13 @@ let sha512 = "3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw=="; }; }; - "sqlite3-5.1.2" = { + "sqlite3-5.1.4" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.1.2"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.2.tgz"; - sha512 = "D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz"; + sha512 = "i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA=="; }; }; "sqlstring-2.3.3" = { @@ -8653,13 +9508,13 @@ let sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="; }; }; - "sse-channel-3.1.1" = { + "sse-channel-4.0.0" = { name = "sse-channel"; packageName = "sse-channel"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sse-channel/-/sse-channel-3.1.1.tgz"; - sha512 = "vgf4QFh60vlAMX0vGJpn6S+7gTO3ckRn7xq4DOgQGcgDs7ULBkaQFQxy4b3vj/umyk0ydhGu7i4A1nHQc5HcYw=="; + url = "https://registry.npmjs.org/sse-channel/-/sse-channel-4.0.0.tgz"; + sha512 = "I539Tc0gyDTQ2QCSg4v78Flxo/UbqR9x7JoyPcqaPtwo+qzeOw/fF+aPSbk0xTvBQAAAZk7Dlkc8K1bum5GUnw=="; }; }; "ssf-0.11.2" = { @@ -8770,6 +9625,15 @@ let sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; }; }; + "stream-events-1.0.5" = { + name = "stream-events"; + packageName = "stream-events"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz"; + sha512 = "E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg=="; + }; + }; "stream-shift-1.0.1" = { name = "stream-shift"; packageName = "stream-shift"; @@ -8824,22 +9688,22 @@ let sha512 = "VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg=="; }; }; - "string.prototype.trimend-1.0.5" = { + "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; + sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; }; }; - "string.prototype.trimstart-1.0.5" = { + "string.prototype.trimstart-1.0.6" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; + sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; }; }; "string_decoder-0.10.31" = { @@ -8887,6 +9751,15 @@ let sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; + "stubs-3.0.0" = { + name = "stubs"; + packageName = "stubs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz"; + sha512 = "PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="; + }; + }; "style-mod-4.0.0" = { name = "style-mod"; packageName = "style-mod"; @@ -8932,31 +9805,40 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.15.2" = { + "swagger-ui-dist-4.15.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.15.2"; + version = "4.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.2.tgz"; - sha512 = "sanLAioshpa+Q0PpPxD86uo4labSqeIxtjLoC7xoce3HTnECPoQwY7PUVOiGMZ4dnEnROZPLUTloCEM86jZc1Q=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.5.tgz"; + sha512 = "V3eIa28lwB6gg7/wfNvAbjwJYmDXy1Jo1POjyTzlB6wPcHiGlRxq39TSjYGVjQrUSAzpv+a7nzp7mDxgNy57xA=="; }; }; - "swagger-ui-express-4.5.0" = { + "swagger-ui-express-4.6.0" = { name = "swagger-ui-express"; packageName = "swagger-ui-express"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.5.0.tgz"; - sha512 = "DHk3zFvsxrkcnurGvQlAcLuTDacAVN1JHKDgcba/gr2NFRE4HGwP1YeHIXMiGznkWR4AeS7X5vEblNn4QljuNA=="; + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.0.tgz"; + sha512 = "ZxpQFp1JR2RF8Ar++CyJzEDdvufa08ujNUJgMVTMWPi86CuQeVdBtvaeO/ysrz6dJAYXf9kbVNhWD7JWocwqsA=="; }; }; - "tar-6.1.11" = { + "syslog-client-1.1.1" = { + name = "syslog-client"; + packageName = "syslog-client"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/syslog-client/-/syslog-client-1.1.1.tgz"; + sha512 = "c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw=="; + }; + }; + "tar-6.1.13" = { name = "tar"; packageName = "tar"; - version = "6.1.11"; + version = "6.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; }; "tar-fs-2.1.1" = { @@ -8977,15 +9859,6 @@ let sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; }; - "tarn-1.1.5" = { - name = "tarn"; - packageName = "tarn"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz"; - sha512 = "PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g=="; - }; - }; "tarn-3.0.2" = { name = "tarn"; packageName = "tarn"; @@ -9004,6 +9877,15 @@ let sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; }; }; + "tedious-11.8.0" = { + name = "tedious"; + packageName = "tedious"; + version = "11.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tedious/-/tedious-11.8.0.tgz"; + sha512 = "GtFrO694x/7CRiUBt0AI4jrMtrkXV+ywifiOrDy4K0ufJLeKB4rgmPjy5Ws366fCaBaKlqQ9RnJ+sCJ1Jbd1lw=="; + }; + }; "tedious-14.7.0" = { name = "tedious"; packageName = "tedious"; @@ -9013,13 +9895,13 @@ let sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w=="; }; }; - "tedious-6.7.1" = { - name = "tedious"; - packageName = "tedious"; - version = "6.7.1"; + "teeny-request-7.2.0" = { + name = "teeny-request"; + packageName = "teeny-request"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-6.7.1.tgz"; - sha512 = "61eg/mvUa5vIqZcRizcqw/82dY65kR2uTll1TaUFh0aJ45XOrgbc8axiVR48dva8BahIAlJByaHNfAJ/KmPV0g=="; + url = "https://registry.npmjs.org/teeny-request/-/teeny-request-7.2.0.tgz"; + sha512 = "SyY0pek1zWsi0LRVAALem+avzMLc33MKW/JLLakdP4s9+D7+jHcy5x6P+h94g2QNZsAqQNfX5lsbd3WSeJXrrw=="; }; }; "test-console-2.0.0" = { @@ -9085,6 +9967,15 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; + "through2-4.0.2" = { + name = "through2"; + packageName = "through2"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"; + sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; + }; + }; "through2-filter-3.0.0" = { name = "through2-filter"; packageName = "through2-filter"; @@ -9112,22 +10003,22 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; - "tinycolor2-1.4.2" = { + "tinycolor2-1.5.2" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.4.2"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; - sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; + sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; }; }; - "tlds-1.231.0" = { + "tlds-1.236.0" = { name = "tlds"; packageName = "tlds"; - version = "1.231.0"; + version = "1.236.0"; src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.231.0.tgz"; - sha512 = "L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw=="; + url = "https://registry.npmjs.org/tlds/-/tlds-1.236.0.tgz"; + sha512 = "oP2PZ3KeGlgpHgsEfrtva3/K9kzsJUNliQSbCfrJ7JMCWFoCdtG+9YMq/g2AnADQ1v5tVlbtvKJZ4KLpy/P6MA=="; }; }; "tmp-0.0.33" = { @@ -9247,6 +10138,15 @@ let sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; }; }; + "transliteration-2.3.5" = { + name = "transliteration"; + packageName = "transliteration"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/transliteration/-/transliteration-2.3.5.tgz"; + sha512 = "HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw=="; + }; + }; "triple-beam-1.3.0" = { name = "triple-beam"; packageName = "triple-beam"; @@ -9265,6 +10165,15 @@ let sha512 = "e4g0EJtAjk64xgnFPD6kTBUtpnMVzDrMb12N1YZV0VvSlhnVT3SGxiYTLdGy8Q5cYHOIC/FAHmZ10eGrAguicQ=="; }; }; + "ts-node-10.9.1" = { + name = "ts-node"; + packageName = "ts-node"; + version = "10.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"; + sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; + }; + }; "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; @@ -9274,13 +10183,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.4.0" = { + "tslib-2.4.1" = { name = "tslib"; packageName = "tslib"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"; + sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; }; }; "tsscmp-1.0.6" = { @@ -9346,6 +10255,15 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; + "typed-array-length-1.0.4" = { + name = "typed-array-length"; + packageName = "typed-array-length"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; + sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; + }; + }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -9355,13 +10273,13 @@ let sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; - "typeorm-0.2.45" = { + "typeorm-0.3.11" = { name = "typeorm"; packageName = "typeorm"; - version = "0.2.45"; + version = "0.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.45.tgz"; - sha512 = "c0rCO8VMJ3ER7JQ73xfk0zDnVv0WDjpsP6Q1m6CVKul7DB9iVdWLRjPzc8v2eaeBuomsbZ2+gTaYr8k1gm3bYA=="; + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.11.tgz"; + sha512 = "pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg=="; }; }; "typeorm-aurora-data-api-driver-2.4.4" = { @@ -9373,6 +10291,15 @@ let sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; }; }; + "typescript-4.9.4" = { + name = "typescript"; + packageName = "typescript"; + version = "4.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; + sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -9661,6 +10588,15 @@ let sha512 = "QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w=="; }; }; + "v8-compile-cache-lib-3.0.1" = { + name = "v8-compile-cache-lib"; + packageName = "v8-compile-cache-lib"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"; + sha512 = "wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="; + }; + }; "validator-13.7.0" = { name = "validator"; packageName = "validator"; @@ -9688,22 +10624,31 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vm2-3.9.11" = { + "vm2-3.9.13" = { name = "vm2"; packageName = "vm2"; - version = "3.9.11"; + version = "3.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz"; - sha512 = "PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; + sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; }; }; - "vue-2.7.13" = { + "vue-2.6.14" = { name = "vue"; packageName = "vue"; - version = "2.7.13"; + version = "2.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz"; - sha512 = "QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + }; + }; + "vue-2.7.14" = { + name = "vue"; + packageName = "vue"; + version = "2.7.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"; + sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="; }; }; "vue-agile-2.0.0" = { @@ -9724,6 +10669,15 @@ let sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw=="; }; }; + "vue-demi-0.13.11" = { + name = "vue-demi"; + packageName = "vue-demi"; + version = "0.13.11"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz"; + sha512 = "IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="; + }; + }; "vue-fragment-1.5.1" = { name = "vue-fragment"; packageName = "vue-fragment"; @@ -9733,22 +10687,22 @@ let sha512 = "ig6eES6TcMBbANW71ylB+AJgRN+Zksb3f50AxjGpAk6hMzqmeuD80qeh4LJP0jVw2dMBMjgRUfIkrvxygoRgtQ=="; }; }; - "vue-i18n-8.27.2" = { + "vue-i18n-8.28.2" = { name = "vue-i18n"; packageName = "vue-i18n"; - version = "8.27.2"; + version = "8.28.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.2.tgz"; - sha512 = "QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg=="; + url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz"; + sha512 = "C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="; }; }; - "vue-json-pretty-1.9.2" = { + "vue-json-pretty-1.9.3" = { name = "vue-json-pretty"; packageName = "vue-json-pretty"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-1.9.2.tgz"; - sha512 = "FHAYmZAazhVC6Wi+Zi9DVYha+oZb9uylJPGkl/yTYLxlqLMxmnaVC2R8ZwaYzt6TBGvkLe3Y2D2vgyJCDBJy1w=="; + url = "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-1.9.3.tgz"; + sha512 = "b13DP1WGQ+ACUU2K5hmwFfHrHnydCFSTerE7fppeYMojSWN/5EOPODQECfIIRaJ7zzHtPW9OifkThFGPyY0xRg=="; }; }; "vue-prism-editor-0.3.0" = { @@ -9769,13 +10723,13 @@ let sha512 = "VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="; }; }; - "vue-template-compiler-2.7.13" = { + "vue-template-compiler-2.7.14" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz"; - sha512 = "jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; + sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; }; }; "vue-typed-mixins-0.2.0" = { @@ -9814,15 +10768,6 @@ let sha512 = "rGV8jxgOQEJYkJCp7uOBe3hjvmG1arThrq1wGtJHwJTgi65+P2a+0l4CYcQO/U1ZFqTq2/TT2+oTE6H7Y+6Eog=="; }; }; - "vuex-3.6.2" = { - name = "vuex"; - packageName = "vuex"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz"; - sha512 = "ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="; - }; - }; "w3c-keyname-2.2.6" = { name = "w3c-keyname"; packageName = "w3c-keyname"; @@ -9895,22 +10840,13 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; - "which-collection-1.0.1" = { - name = "which-collection"; - packageName = "which-collection"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"; - sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; - }; - }; - "which-typed-array-1.1.8" = { + "which-typed-array-1.1.9" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz"; - sha512 = "Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"; + sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; }; }; "wide-align-1.1.5" = { @@ -10174,6 +11110,15 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; + "yargs-17.6.2" = { + name = "yargs"; + packageName = "yargs"; + version = "17.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz"; + sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; + }; + }; "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -10183,31 +11128,31 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "yup-0.32.11" = { - name = "yup"; - packageName = "yup"; - version = "0.32.11"; + "yargs-parser-21.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "21.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz"; - sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"; + sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; }; }; - "zen-observable-0.8.15" = { - name = "zen-observable"; - packageName = "zen-observable"; - version = "0.8.15"; + "yn-3.1.1" = { + name = "yn"; + packageName = "yn"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz"; - sha512 = "PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="; + url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; + sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; - "zen-observable-ts-1.2.5" = { - name = "zen-observable-ts"; - packageName = "zen-observable-ts"; - version = "1.2.5"; + "yup-0.32.11" = { + name = "yup"; + packageName = "yup"; + version = "0.32.11"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz"; - sha512 = "QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg=="; + url = "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz"; + sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg=="; }; }; }; @@ -10216,12 +11161,17 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.200.1"; + version = "0.211.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.200.1.tgz"; - sha512 = "g6RFonJAuvaNyQ6t3DfDHnV4T5NT4obfkRzELJ4S0DnT5jq68n1UsYmbPII8rhmdZJsK+d67prGlKUsnyZ3VxQ=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.211.1.tgz"; + sha512 = "hD3AnzqByEYy6GMgjk//81JFdaM8UEnklcYo8Sjm4LKlDtOnjFIUFpN78KUkLVjM4WEPWkLczITFPhHuYcHCXA=="; }; dependencies = [ + (sources."@acuminous/bitsyntax-0.1.2" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { dependencies = [ sources."argparse-2.0.1" @@ -10230,53 +11180,53 @@ in }) (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) (sources."@azure/core-auth-1.4.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) - (sources."@azure/core-client-1.6.1" // { + (sources."@azure/core-client-1.7.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) - (sources."@azure/core-http-2.2.7" // { + (sources."@azure/core-http-2.3.1" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tough-cookie-4.1.2" - sources."tslib-2.4.0" + sources."tslib-2.4.1" sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.4.0" // { + (sources."@azure/core-lro-2.5.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) - (sources."@azure/core-paging-1.3.0" // { + (sources."@azure/core-paging-1.4.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) - (sources."@azure/core-rest-pipeline-1.9.2" // { + (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) (sources."@azure/core-tracing-1.0.1" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) (sources."@azure/core-util-1.1.1" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) (sources."@azure/identity-2.1.0" // { @@ -10284,59 +11234,63 @@ in sources."jwa-2.0.0" sources."jws-4.0.0" sources."open-8.4.0" - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) (sources."@azure/keyvault-keys-4.6.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) (sources."@azure/logger-1.0.3" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."@azure/ms-rest-azure-env-2.0.0" - (sources."@azure/ms-rest-js-2.6.2" // { + (sources."@azure/ms-rest-js-2.6.4" // { dependencies = [ sources."form-data-2.5.1" ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - sources."@azure/msal-browser-2.30.0" + (sources."@azure/msal-browser-2.32.2" // { + dependencies = [ + sources."@azure/msal-common-9.0.2" + ]; + }) sources."@azure/msal-common-7.6.0" - sources."@azure/msal-node-1.14.2" + (sources."@azure/msal-node-1.14.6" // { + dependencies = [ + sources."@azure/msal-common-9.0.2" + ]; + }) (sources."@azure/storage-blob-12.12.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.4.0" - ]; - }) - sources."@babel/parser-7.20.0" - sources."@babel/runtime-7.20.0" - sources."@codemirror/autocomplete-6.3.0" - sources."@codemirror/commands-6.1.2" - sources."@codemirror/lang-javascript-6.1.1" - sources."@codemirror/language-6.3.0" - sources."@codemirror/lint-6.0.0" - sources."@codemirror/state-6.1.2" - sources."@codemirror/view-6.4.0" + sources."tslib-2.4.1" + ]; + }) + sources."@babel/parser-7.20.7" + sources."@babel/runtime-7.20.7" + sources."@codemirror/autocomplete-6.4.0" + sources."@codemirror/commands-6.1.3" + sources."@codemirror/lang-javascript-6.1.2" + sources."@codemirror/language-6.4.0" + sources."@codemirror/lint-6.1.0" + sources."@codemirror/state-6.2.0" + sources."@codemirror/view-6.7.3" sources."@colors/colors-1.5.0" + sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" sources."@curlconverter/yargs-parser-0.0.1" - (sources."@dabh/diagnostics-2.0.3" // { - dependencies = [ - sources."enabled-2.0.0" - sources."kuler-2.0.0" - ]; - }) + sources."@dabh/diagnostics-2.0.3" sources."@fontsource/open-sans-4.5.13" sources."@fortawesome/fontawesome-common-types-0.3.0" sources."@fortawesome/fontawesome-svg-core-1.3.0" - (sources."@fortawesome/free-regular-svg-icons-6.2.0" // { + (sources."@fortawesome/free-regular-svg-icons-6.2.1" // { dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.2.0" + sources."@fortawesome/fontawesome-common-types-6.2.1" ]; }) (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { @@ -10344,8 +11298,36 @@ in sources."@fortawesome/fontawesome-common-types-0.2.36" ]; }) - sources."@fortawesome/vue-fontawesome-2.0.8" + sources."@fortawesome/vue-fontawesome-2.0.9" sources."@gar/promisify-1.1.3" + (sources."@google-cloud/common-3.10.0" // { + dependencies = [ + sources."duplexify-4.1.2" + sources."readable-stream-3.6.0" + ]; + }) + sources."@google-cloud/precise-date-2.0.4" + sources."@google-cloud/projectify-2.1.1" + sources."@google-cloud/promisify-2.0.4" + (sources."@google-cloud/spanner-5.18.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."through2-4.0.2" + ]; + }) + (sources."@grpc/grpc-js-1.6.12" // { + dependencies = [ + sources."@grpc/proto-loader-0.7.4" + sources."long-5.2.1" + sources."protobufjs-7.1.2" + sources."yargs-16.2.0" + ]; + }) + (sources."@grpc/proto-loader-0.6.13" // { + dependencies = [ + sources."yargs-16.2.0" + ]; + }) (sources."@icetee/ftp-0.3.15" // { dependencies = [ sources."isarray-0.0.1" @@ -10353,17 +11335,26 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@js-joda/core-5.4.2" + sources."@ioredis/commands-1.2.0" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.9" + sources."@js-joda/core-5.5.2" sources."@jsdevtools/ono-7.1.3" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" - sources."@lezer/common-1.0.1" - sources."@lezer/highlight-1.1.2" - sources."@lezer/javascript-1.0.2" - sources."@lezer/lr-1.2.3" + sources."@lezer/common-1.0.2" + sources."@lezer/highlight-1.1.3" + sources."@lezer/javascript-1.4.1" + sources."@lezer/lr-1.3.1" sources."@mapbox/node-pre-gyp-1.0.10" - sources."@n8n_io/riot-tmpl-1.0.1" + (sources."@n8n_io/license-sdk-1.8.0" // { + dependencies = [ + sources."axios-1.1.3" + ]; + }) + sources."@n8n_io/riot-tmpl-2.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -10373,16 +11364,16 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@oclif/command-1.8.18" - (sources."@oclif/config-1.18.5" // { + sources."@oclif/command-1.8.21" + (sources."@oclif/config-1.18.6" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) - (sources."@oclif/core-1.19.2" // { + (sources."@oclif/core-1.24.0" // { dependencies = [ sources."supports-color-8.1.1" - sources."tslib-2.4.0" + sources."tslib-2.4.1" sources."wrap-ansi-7.0.0" ]; }) @@ -10394,66 +11385,107 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/help-1.0.3" + sources."@oclif/help-1.0.5" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.8" // { + (sources."@oclif/parser-3.8.9" // { + dependencies = [ + sources."tslib-2.4.1" + ]; + }) + sources."@oclif/screen-3.0.4" + sources."@opentelemetry/api-1.4.0" + sources."@protobufjs/aspromise-1.1.2" + sources."@protobufjs/base64-1.1.2" + sources."@protobufjs/codegen-2.0.4" + sources."@protobufjs/eventemitter-1.1.0" + sources."@protobufjs/fetch-1.1.0" + sources."@protobufjs/float-1.0.2" + sources."@protobufjs/inquire-1.1.0" + sources."@protobufjs/path-1.1.2" + sources."@protobufjs/pool-1.1.0" + sources."@protobufjs/utf8-1.1.0" + (sources."@rudderstack/rudder-sdk-node-1.0.6" // { dependencies = [ - sources."tslib-2.4.0" + sources."bull-3.29.3" + sources."ioredis-4.28.5" ]; }) - sources."@oclif/screen-3.0.2" - sources."@opentelemetry/api-1.2.0" - sources."@rudderstack/rudder-sdk-node-1.0.6" - (sources."@sap/hana-client-2.14.22" // { + (sources."@sap/hana-client-2.15.19" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" ]; }) sources."@segment/loosely-validate-event-2.0.0" - sources."@selderee/plugin-htmlparser2-0.6.0" + (sources."@selderee/plugin-htmlparser2-0.10.0" // { + dependencies = [ + sources."domhandler-5.0.3" + ]; + }) + sources."@sentry/core-7.31.0" + sources."@sentry/integrations-7.31.0" + sources."@sentry/node-7.31.0" + sources."@sentry/types-7.31.0" + sources."@sentry/utils-7.31.0" sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" + sources."@swc/core-1.3.27" + sources."@swc/wasm-1.3.27" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" + sources."@tsconfig/node10-1.0.9" + sources."@tsconfig/node12-1.0.11" + sources."@tsconfig/node14-1.0.3" + sources."@tsconfig/node16-1.0.3" + sources."@types/big.js-6.1.6" sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" + sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.14" + sources."@types/express-4.17.15" sources."@types/express-jwt-0.0.42" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-serve-static-core-4.17.32" sources."@types/express-unless-2.0.1" sources."@types/js-nacl-1.3.1" sources."@types/json-schema-7.0.11" - sources."@types/lodash-4.14.186" + sources."@types/lodash-4.14.191" + sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.11.7" + sources."@types/node-18.11.18" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" ]; }) + sources."@types/pumpify-1.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/readable-stream-2.3.14" sources."@types/serve-static-1.15.0" + sources."@types/stack-trace-0.0.29" + sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" + sources."@types/validator-13.7.10" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" - sources."@vue/compiler-sfc-2.7.13" - sources."@xmldom/xmldom-0.7.6" + sources."@vue/compiler-sfc-2.7.14" + (sources."@vue/composition-api-1.7.1" // { + dependencies = [ + sources."vue-2.6.14" + ]; + }) + sources."@vue/devtools-api-6.4.5" + sources."@xmldom/xmldom-0.8.6" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."access-control-1.0.1" sources."acorn-8.8.1" sources."acorn-walk-8.2.0" - (sources."adal-node-0.2.3" // { + (sources."adal-node-0.2.4" // { dependencies = [ sources."async-2.6.4" sources."uuid-3.4.0" @@ -10472,7 +11504,7 @@ in ]; }) sources."ajv-6.12.6" - (sources."amqplib-0.8.0" // { + (sources."amqplib-0.10.3" // { dependencies = [ sources."isarray-0.0.1" sources."readable-stream-1.1.14" @@ -10484,7 +11516,7 @@ in sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."any-promise-1.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."app-root-path-3.1.0" sources."append-field-1.0.0" sources."aproba-2.0.0" @@ -10493,22 +11525,24 @@ in sources."readable-stream-3.6.0" ]; }) + sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-parallel-0.1.3" sources."array-series-0.1.5" sources."array-union-2.1.0" - sources."array.prototype.reduce-1.0.4" + sources."array.prototype.reduce-1.0.5" + sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.6" sources."asn1.js-5.4.1" sources."asn1.js-rfc2560-5.0.1" sources."asn1.js-rfc5280-3.0.0" - sources."assert-options-0.7.0" + sources."assert-options-0.8.0" sources."assert-plus-1.0.0" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."async-3.2.4" @@ -10521,8 +11555,8 @@ in ]; }) sources."available-typed-arrays-1.0.5" - sources."avsc-5.7.6" - (sources."aws-sdk-2.1242.0" // { + sources."avsc-5.7.7" + (sources."aws-sdk-2.1295.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -10534,7 +11568,7 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.21.4" sources."axios-retry-3.3.1" sources."babel-helper-vue-jsx-merge-props-2.0.3" @@ -10553,8 +11587,9 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."better-sqlite3-7.6.2" + sources."better-sqlite3-8.0.1" sources."big-integer-1.6.51" + sources."big.js-6.2.1" sources."bignumber.js-2.4.0" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" @@ -10564,19 +11599,12 @@ in ]; }) sources."bintrees-1.0.2" - (sources."bitsyntax-0.1.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; }) - sources."bluebird-3.7.2" + sources."bluebird-2.11.0" sources."bn.js-4.12.0" (sources."body-parser-1.20.1" // { dependencies = [ @@ -10590,35 +11618,42 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-request-0.3.3" - sources."bson-4.7.0" + sources."bson-4.7.2" sources."buffer-5.7.1" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."bufferutil-4.0.7" - sources."bull-3.29.3" + (sources."bull-4.10.2" // { + dependencies = [ + sources."cron-parser-4.7.1" + ]; + }) sources."busboy-1.6.0" sources."byte-length-1.0.2" sources."bytes-3.1.2" (sources."cacache-15.3.0" // { dependencies = [ + sources."lru-cache-6.0.0" + sources."minipass-3.3.6" sources."mkdirp-1.0.4" sources."p-map-4.0.0" + sources."yallist-4.0.0" ]; }) sources."call-bind-1.0.2" - sources."call-me-maybe-1.0.1" + sources."call-me-maybe-1.0.2" sources."callback-stream-1.1.0" sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) (sources."capital-case-1.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."cardinal-2.1.1" @@ -10631,17 +11666,23 @@ in sources."chalk-4.1.2" (sources."change-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."chardet-0.7.0" sources."charenc-0.0.2" + (sources."checkpoint-stream-0.1.2" // { + dependencies = [ + sources."async-2.6.4" + sources."split-array-stream-1.0.3" + ]; + }) sources."cheerio-1.0.0-rc.6" sources."cheerio-select-1.6.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clamp-1.0.1" - sources."class-validator-0.13.2" + sources."class-validator-0.14.0" sources."clean-stack-3.0.1" sources."cli-color-0.1.7" sources."cli-cursor-3.1.0" @@ -10659,8 +11700,8 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."clone-2.1.2" - sources."cluster-key-slot-1.1.1" + sources."cluster-key-slot-1.1.2" + sources."codemirror-lang-n8n-expression-0.1.0" sources."codepage-1.15.0" (sources."color-3.2.1" // { dependencies = [ @@ -10672,7 +11713,6 @@ in sources."color-name-1.1.4" sources."color-string-1.9.1" sources."color-support-1.1.3" - sources."colornames-1.1.1" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" sources."commander-5.1.0" @@ -10695,19 +11735,24 @@ in sources."console-control-strings-1.1.0" (sources."constant-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."convict-6.2.3" - sources."cookie-0.4.1" - sources."cookie-parser-1.4.6" + sources."convict-6.2.4" + sources."cookie-0.4.2" + (sources."cookie-parser-1.4.6" // { + dependencies = [ + sources."cookie-0.4.1" + ]; + }) sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.26.0" + sources."core-js-3.27.1" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" + sources."create-require-1.1.1" sources."crelt-1.0.5" sources."cron-1.7.2" sources."cron-parser-2.18.0" @@ -10728,18 +11773,14 @@ in sources."dashdash-1.14.1" sources."data-api-client-1.3.0" sources."data-uri-to-buffer-3.0.1" + sources."date-fns-2.29.3" sources."date-utils-1.2.21" sources."dateformat-3.0.3" sources."de-indent-1.0.2" sources."debug-4.3.4" sources."debuglog-1.0.1" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-response-6.0.0" - (sources."deep-equal-2.0.5" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-1.5.2" @@ -10753,11 +11794,10 @@ in sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-libc-2.0.1" - sources."diagnostics-1.1.1" + sources."diff-4.0.2" sources."difflib-0.2.4" sources."digest-header-1.0.0" sources."dir-glob-3.0.1" - sources."discontinuous-range-1.0.0" sources."dom-iterator-1.0.0" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" @@ -10765,7 +11805,7 @@ in sources."domutils-2.8.0" (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."dotenv-8.6.0" @@ -10775,25 +11815,21 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."element-ui-2.15.10" + sources."element-ui-2.15.12" sources."emoji-regex-8.0.0" - sources."enabled-1.0.2" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" + sources."ent-2.2.0" sources."entities-2.2.0" sources."env-paths-2.2.1" - sources."env-variable-0.0.6" sources."err-code-2.0.3" - sources."es-abstract-1.20.4" - sources."es-aggregate-error-1.0.8" + sources."es-abstract-1.21.1" + sources."es-aggregate-error-1.0.9" sources."es-array-method-boxes-properly-1.0.0" - (sources."es-get-iterator-1.1.2" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" sources."escalade-3.1.1" @@ -10802,12 +11838,14 @@ in sources."escodegen-1.14.3" sources."eslint-config-riot-1.0.0" sources."esprima-4.0.1" + sources."esprima-next-5.8.4" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-target-shim-5.0.1" sources."eventemitter3-4.0.7" sources."events-3.3.0" + sources."events-intercept-2.0.0" sources."eventsource-2.0.2" sources."exit-on-epipe-1.0.1" sources."expand-template-2.0.3" @@ -10835,11 +11873,11 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-diff-1.2.0" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fast-text-encoding-1.0.6" + sources."fastq-1.15.0" sources."fecha-4.2.3" sources."fflate-0.7.4" (sources."figures-3.2.0" // { @@ -10852,7 +11890,7 @@ in sources."file-uri-to-path-2.0.0" (sources."filelist-1.0.4" // { dependencies = [ - sources."minimatch-5.1.0" + sources."minimatch-5.1.4" ]; }) sources."fill-range-7.0.1" @@ -10881,7 +11919,12 @@ in sources."fresh-0.5.2" sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ @@ -10894,6 +11937,8 @@ in sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."gauge-3.0.2" + sources."gaxios-4.3.3" + sources."gcp-metadata-4.3.1" sources."generate-function-2.3.1" sources."generic-pool-3.9.0" sources."get-caller-file-2.0.5" @@ -10925,12 +11970,33 @@ in dependencies = [ sources."cross-spawn-4.0.2" sources."debug-3.2.7" - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" ]; }) + (sources."google-auth-library-7.14.1" // { + dependencies = [ + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) + (sources."google-gax-2.30.5" // { + dependencies = [ + sources."duplexify-4.1.2" + sources."readable-stream-3.6.0" + ]; + }) + sources."google-p12-pem-3.1.4" sources."google-timezones-json-1.0.2" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" + sources."grpc-gcp-0.3.3" + (sources."gtoken-5.3.2" // { + dependencies = [ + sources."jwa-2.0.0" + sources."jws-4.0.0" + ]; + }) sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -10938,6 +12004,7 @@ in sources."has-bigints-1.0.2" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -10945,16 +12012,21 @@ in sources."he-1.2.0" (sources."header-case-2.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."heap-0.2.7" sources."help-me-1.1.0" sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" - (sources."html-to-text-8.2.0" // { + (sources."html-to-text-9.0.3" // { dependencies = [ sources."deepmerge-4.2.2" + sources."dom-serializer-2.0.0" + sources."domhandler-5.0.3" + sources."domutils-3.0.1" + sources."entities-4.4.0" + sources."htmlparser2-8.0.1" ]; }) sources."htmlparser2-6.1.0" @@ -10968,7 +12040,7 @@ in sources."iconv-lite-0.6.3" sources."ics-2.41.0" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" (sources."imap-0.8.19" // { dependencies = [ sources."isarray-0.0.1" @@ -10981,6 +12053,7 @@ in sources."iconv-lite-0.4.24" ]; }) + sources."immediate-3.0.6" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" @@ -10988,14 +12061,20 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-7.3.3" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."interpret-1.4.0" - sources."ioredis-4.28.5" + (sources."ioredis-5.2.5" // { + dependencies = [ + sources."denque-2.1.0" + ]; + }) sources."ip-2.0.0" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" + sources."is-3.3.0" sources."is-absolute-1.0.0" sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -11011,7 +12090,6 @@ in sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-lambda-1.0.1" - sources."is-map-2.0.2" sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" sources."is-negative-zero-2.0.2" @@ -11023,34 +12101,38 @@ in sources."is-regex-1.1.4" sources."is-relative-1.0.0" sources."is-retry-allowed-2.2.0" - sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" + sources."is-stream-ended-0.1.4" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.9" + sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" - sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" - sources."is-weakset-2.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbot-3.6.2" + sources."isbot-3.6.5" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" - sources."jquery-3.6.1" + sources."jquery-3.6.3" + sources."js-base64-3.7.4" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" sources."jsbi-4.3.0" sources."jsbn-0.1.1" sources."jsesc-3.0.2" + (sources."json-bigint-1.0.0" // { + dependencies = [ + sources."bignumber.js-9.1.1" + ]; + }) sources."json-diff-0.5.5" sources."json-schema-0.4.0" sources."json-schema-ref-parser-9.0.9" @@ -11064,27 +12146,31 @@ in ]; }) sources."jsonschema-1.4.1" - (sources."jsonwebtoken-8.5.1" // { + sources."jsonwebtoken-9.0.0" + sources."jsplumb-2.15.4" + sources."jsprim-1.4.2" + sources."jwa-1.4.1" + (sources."jwks-rsa-1.12.3" // { dependencies = [ + sources."jsonwebtoken-8.5.1" sources."semver-5.7.1" ]; }) - sources."jsplumb-2.15.4" - sources."jsprim-1.4.2" - sources."jwa-1.4.1" - sources."jwks-rsa-1.12.3" sources."jws-3.2.2" sources."kafkajs-1.16.0" - sources."kuler-1.0.1" + sources."kuler-2.0.0" + sources."leac-0.6.0" sources."leven-2.1.0" sources."levn-0.3.0" sources."libbase64-1.2.1" - sources."libmime-5.1.0" - sources."libphonenumber-js-1.10.14" + sources."libmime-5.2.0" + sources."libphonenumber-js-1.10.18" sources."libpq-1.8.12" - sources."libqp-1.1.0" + sources."libqp-2.0.1" + sources."lie-3.1.1" sources."limiter-1.1.5" - sources."linkify-it-4.0.0" + sources."linkify-it-3.0.3" + sources."localforage-1.10.0" (sources."localtunnel-2.0.2" // { dependencies = [ sources."debug-4.3.2" @@ -11107,14 +12193,18 @@ in sources."lodash.isnumber-3.0.3" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" + sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.once-4.1.1" sources."lodash.orderby-4.6.0" sources."lodash.pick-4.4.0" + sources."lodash.remove-4.7.0" sources."lodash.set-4.3.2" + sources."lodash.snakecase-4.1.1" sources."lodash.split-4.4.2" sources."lodash.throttle-4.1.1" + sources."lodash.unionby-4.8.0" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" @@ -11124,23 +12214,20 @@ in sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."lru-cache-6.0.0" - (sources."lru-memoizer-2.1.4" // { - dependencies = [ - sources."lru-cache-4.0.2" - sources."yallist-2.1.2" + sources."tslib-2.4.1" ]; }) - sources."luxon-2.3.2" - (sources."mailparser-3.5.0" // { + sources."lru-cache-4.0.2" + sources."lru-memoizer-2.1.4" + sources."lru_map-0.3.3" + sources."luxon-3.2.1" + (sources."mailparser-3.6.3" // { dependencies = [ - sources."nodemailer-6.7.3" + sources."linkify-it-4.0.1" + sources."nodemailer-6.8.0" ]; }) - sources."mailsplit-5.3.2" + sources."mailsplit-5.4.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -11150,18 +12237,31 @@ in sources."make-error-cause-2.3.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ + sources."lru-cache-6.0.0" + sources."minipass-3.3.6" sources."socks-proxy-agent-6.2.1" + sources."yallist-4.0.0" ]; }) - sources."mappersmith-2.40.0" + sources."mappersmith-2.41.0" + (sources."markdown-it-12.3.2" // { + dependencies = [ + sources."argparse-2.0.1" + sources."entities-2.1.0" + ]; + }) + sources."markdown-it-emoji-2.0.2" + sources."markdown-it-link-attributes-4.0.1" + sources."markdown-it-task-lists-2.1.1" sources."material-colors-1.2.6" sources."md5-2.3.0" + sources."mdurl-1.0.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.5" - sources."millisecond-0.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -11174,13 +12274,47 @@ in ]; }) sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" - sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.4" - sources."minipass-sized-1.0.3" - sources."minizlib-2.1.2" + (sources."minipass-4.0.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-fetch-1.4.1" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-flush-1.0.5" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-pipeline-1.2.4" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-sized-1.0.3" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" (sources."mock-require-3.0.3" // { @@ -11190,21 +12324,16 @@ in ]; }) sources."moment-2.29.4" - sources."moment-timezone-0.5.38" - sources."monaco-editor-0.30.1" - (sources."mongodb-4.11.0" // { - dependencies = [ - sources."denque-2.1.0" - ]; - }) - (sources."mongodb-connection-string-url-2.5.4" // { + sources."moment-timezone-0.5.40" + sources."monaco-editor-0.33.0" + sources."mongodb-4.13.0" + (sources."mongodb-connection-string-url-2.6.0" // { dependencies = [ sources."tr46-3.0.0" sources."webidl-conversions-7.0.0" sources."whatwg-url-11.0.0" ]; }) - sources."moo-0.5.2" (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" @@ -11213,9 +12342,11 @@ in }) sources."mqtt-packet-6.10.0" sources."ms-2.1.2" + sources."msal-1.4.17" + sources."msgpackr-1.8.1" (sources."mssql-8.1.4" // { dependencies = [ - sources."commander-9.4.1" + sources."commander-9.5.0" ]; }) sources."multer-1.4.5-lts.1" @@ -11223,22 +12354,37 @@ in (sources."mysql2-2.3.3" // { dependencies = [ sources."denque-2.1.0" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" ]; }) sources."mz-2.7.0" - sources."n8n-core-0.140.1" - sources."n8n-design-system-0.40.0" - sources."n8n-editor-ui-0.166.1" - (sources."n8n-nodes-base-0.198.1" // { + (sources."n8n-core-0.151.1" // { + dependencies = [ + sources."concat-stream-2.0.0" + sources."readable-stream-3.6.0" + ]; + }) + sources."n8n-design-system-0.51.1" + (sources."n8n-editor-ui-0.177.1" // { + dependencies = [ + sources."luxon-2.5.2" + ]; + }) + (sources."n8n-nodes-base-0.209.1" // { dependencies = [ sources."chokidar-3.5.2" + sources."luxon-2.3.2" ]; }) - sources."n8n-workflow-0.122.1" - (sources."named-placeholders-1.1.2" // { + (sources."n8n-workflow-0.133.1" // { dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" + sources."luxon-2.3.2" + ]; + }) + (sources."named-placeholders-1.1.3" // { + dependencies = [ + sources."lru-cache-7.14.1" ]; }) sources."nan-2.17.0" @@ -11247,25 +12393,21 @@ in sources."napi-build-utils-1.0.2" sources."native-duplexpair-1.0.0" sources."natural-orderby-2.0.3" - (sources."nearley-2.20.1" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."netmask-2.0.2" sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) - sources."node-abi-3.28.0" + sources."node-abi-3.31.0" sources."node-abort-controller-3.0.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" + sources."node-forge-1.3.1" (sources."node-gyp-8.4.1" // { dependencies = [ sources."are-we-there-yet-3.0.1" @@ -11275,9 +12417,9 @@ in sources."which-2.0.2" ]; }) - sources."node-gyp-build-4.5.0" - sources."node-html-markdown-1.2.2" - (sources."node-html-parser-6.1.1" // { + sources."node-gyp-build-4.6.0" + sources."node-html-markdown-1.3.0" + (sources."node-html-parser-6.1.4" // { dependencies = [ sources."css-select-5.1.0" sources."dom-serializer-2.0.0" @@ -11286,9 +12428,11 @@ in sources."entities-4.4.0" ]; }) + sources."node-machine-id-1.1.12" + sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.8.0" + sources."nodemailer-6.9.0" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -11299,12 +12443,12 @@ in sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" - sources."object-is-1.1.5" + sources."object-hash-3.0.0" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.4" + sources."object.getownpropertydescriptors-2.1.5" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -11324,6 +12468,7 @@ in sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-map-2.1.0" + sources."p-queue-6.6.2" sources."p-timeout-3.2.0" sources."pac-proxy-agent-5.0.0" (sources."pac-resolver-5.0.1" // { @@ -11334,25 +12479,24 @@ in sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) - sources."parchment-2.0.0-dev.2" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" - sources."parseley-0.7.0" + sources."parseley-0.11.0" sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."passport-0.6.0" sources."passport-cookie-1.0.9" - sources."passport-jwt-4.0.0" + sources."passport-jwt-4.0.1" sources."passport-strategy-1.0.0" (sources."password-prompt-1.1.2" // { dependencies = [ @@ -11361,7 +12505,7 @@ in }) (sources."path-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."path-dirname-1.0.2" @@ -11377,6 +12521,7 @@ in sources."debug-3.2.7" ]; }) + sources."peberminta-0.8.0" sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pg-8.8.0" @@ -11394,7 +12539,7 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-promise-10.12.1" + sources."pg-promise-10.15.4" sources."pg-protocol-1.5.0" sources."pg-query-stream-4.2.4" sources."pg-types-2.2.0" @@ -11405,6 +12550,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" + sources."pinia-2.0.29" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" @@ -11412,35 +12558,33 @@ in sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - (sources."posthog-node-1.3.0" // { + (sources."posthog-node-2.2.3" // { dependencies = [ - sources."axios-0.24.0" - sources."ms-2.1.3" + sources."axios-0.27.2" ]; }) sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" + sources."pretty-bytes-5.6.0" sources."printj-1.1.2" sources."prismjs-1.29.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prom-client-13.2.0" sources."promise-1.3.0" - (sources."promise-ftp-1.3.5" // { - dependencies = [ - sources."bluebird-2.11.0" - ]; - }) + sources."promise-ftp-1.3.5" sources."promise-ftp-common-1.1.5" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."promise.prototype.finally-3.1.3" + sources."promise.prototype.finally-3.1.4" sources."property-expr-2.0.5" + sources."proto3-json-serializer-0.1.9" + sources."protobufjs-6.11.3" sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { dependencies = [ @@ -11457,23 +12601,14 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.2.0" sources."python-struct-1.1.3" sources."qs-6.11.0" - sources."query-string-7.1.1" + sources."query-string-7.1.3" sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" - sources."quill-2.0.0-dev.4" - sources."quill-autoformat-0.1.2" - (sources."quill-delta-4.2.1" // { - dependencies = [ - sources."deep-equal-1.1.1" - ]; - }) sources."quoted-printable-1.0.1" - sources."railroad-diagrams-1.0.0" - sources."randexp-0.4.6" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -11494,6 +12629,12 @@ in ]; }) sources."readdirp-3.6.0" + (sources."recast-0.21.5" // { + dependencies = [ + sources."ast-types-0.15.2" + sources."tslib-2.4.1" + ]; + }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" sources."redis-3.1.2" @@ -11501,11 +12642,16 @@ in sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" + (sources."replacestream-4.0.3" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" @@ -11526,8 +12672,8 @@ in sources."resize-observer-polyfill-1.5.1" sources."resolve-1.22.1" sources."restore-cursor-3.1.0" - sources."ret-0.1.15" sources."retry-0.12.0" + sources."retry-request-4.2.2" sources."reusify-1.0.4" sources."rfdc-1.3.0" (sources."rhea-1.0.24" // { @@ -11543,7 +12689,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" (sources."sanitize-html-2.7.0" // { dependencies = [ @@ -11553,8 +12699,13 @@ in sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" - sources."selderee-0.6.0" - sources."semver-7.3.8" + sources."selderee-0.10.0" + (sources."semver-7.3.8" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -11567,7 +12718,7 @@ in }) (sources."sentence-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."seq-queue-0.0.5" @@ -11575,7 +12726,6 @@ in sources."serve-static-1.15.0" sources."servie-4.3.3" sources."set-blocking-2.0.0" - sources."setheader-1.0.2" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shebang-command-1.2.0" @@ -11584,28 +12734,30 @@ in sources."shelljs-0.8.5" (sources."showdown-2.1.0" // { dependencies = [ - sources."commander-9.4.1" + sources."commander-9.5.0" ]; }) sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" - sources."simple-git-3.14.1" + sources."simple-git-3.16.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."smart-buffer-4.2.0" (sources."snake-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) - (sources."snowflake-sdk-1.6.14" // { + (sources."snowflake-sdk-1.6.17" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" + sources."jsonwebtoken-8.5.1" sources."mkdirp-1.0.4" + sources."semver-5.7.1" sources."tmp-0.2.1" sources."uuid-3.4.0" ]; @@ -11614,7 +12766,9 @@ in sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" sources."spex-3.2.0" + sources."split-array-stream-2.0.0" sources."split-on-first-1.1.0" (sources."split2-3.2.2" // { dependencies = [ @@ -11623,9 +12777,9 @@ in }) sources."sprintf-js-1.0.3" sources."sql.js-1.8.0" - sources."sqlite3-5.1.2" + sources."sqlite3-5.1.4" sources."sqlstring-2.3.3" - sources."sse-channel-3.1.1" + sources."sse-channel-4.0.0" sources."ssf-0.11.2" sources."ssh2-1.11.0" (sources."ssh2-sftp-client-7.2.3" // { @@ -11635,21 +12789,27 @@ in ]; }) sources."sshpk-1.17.0" - sources."ssri-8.0.1" + (sources."ssri-8.0.1" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" sources."static-eval-2.0.2" sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stoppable-1.1.0" + sources."stream-events-1.0.5" sources."stream-shift-1.0.1" sources."streamsearch-1.1.0" sources."strict-uri-encode-2.0.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" sources."string.prototype.startswith-1.0.0" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -11658,15 +12818,18 @@ in sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."strtok3-6.3.0" + sources."stubs-3.0.0" sources."style-mod-4.0.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.15.2" - sources."swagger-ui-express-4.5.0" - (sources."tar-6.1.11" // { + sources."swagger-ui-dist-4.15.5" + sources."swagger-ui-express-4.6.0" + sources."syslog-client-1.1.1" + (sources."tar-6.1.13" // { dependencies = [ sources."mkdirp-1.0.4" + sources."yallist-4.0.0" ]; }) (sources."tar-fs-2.1.1" // { @@ -11689,6 +12852,12 @@ in sources."sprintf-js-1.1.2" ]; }) + (sources."teeny-request-7.2.0" // { + dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" + ]; + }) sources."test-console-2.0.0" sources."text-hex-1.0.0" sources."thenify-3.3.1" @@ -11699,8 +12868,8 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" - sources."tinycolor2-1.4.2" - sources."tlds-1.231.0" + sources."tinycolor2-1.5.2" + sources."tlds-1.236.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { dependencies = [ @@ -11714,8 +12883,17 @@ in sources."toposort-2.0.2" sources."tough-cookie-3.0.1" sources."tr46-0.0.3" + (sources."transliteration-2.3.5" // { + dependencies = [ + sources."cliui-8.0.1" + sources."wrap-ansi-7.0.0" + sources."yargs-17.6.2" + sources."yargs-parser-21.1.1" + ]; + }) sources."triple-beam-1.3.0" sources."ts-expect-1.3.0" + sources."ts-node-10.9.1" sources."tslib-1.14.1" sources."tsscmp-1.0.6" sources."tunnel-0.0.6" @@ -11724,32 +12902,50 @@ in sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."type-is-1.6.18" + sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" - (sources."typeorm-0.2.45" // { + (sources."typeorm-0.3.11" // { dependencies = [ - sources."@types/node-12.20.55" + sources."@azure/core-tracing-1.0.0-preview.12" + sources."@azure/identity-1.5.2" + sources."@azure/msal-common-4.5.1" + sources."@azure/msal-node-1.0.0-beta.6" + sources."@js-joda/core-3.2.0" sources."argparse-2.0.1" sources."bl-2.2.1" sources."bson-1.1.6" sources."buffer-6.0.3" - sources."iconv-lite-0.5.2" + sources."cliui-8.0.1" + sources."dotenv-16.0.3" sources."js-yaml-4.1.0" sources."jsbi-3.2.5" + (sources."jsonwebtoken-8.5.1" // { + dependencies = [ + sources."jws-3.2.2" + ]; + }) + sources."jwa-2.0.0" + sources."jws-4.0.0" sources."mkdirp-1.0.4" sources."mongodb-3.7.3" - sources."mssql-6.4.1" + sources."mssql-7.3.5" + sources."node-abort-controller-2.0.0" sources."readable-stream-3.6.0" + sources."semver-5.7.1" sources."sprintf-js-1.1.2" - sources."tarn-1.1.5" - (sources."tedious-6.7.1" // { + (sources."tedious-11.8.0" // { dependencies = [ - sources."bl-3.0.1" + sources."bl-5.1.0" ]; }) - sources."tslib-2.4.0" + sources."tslib-2.4.1" + sources."wrap-ansi-7.0.0" + sources."yargs-17.6.2" + sources."yargs-parser-21.1.1" ]; }) sources."typeorm-aurora-data-api-driver-2.4.4" + sources."typescript-4.9.4" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" @@ -11763,12 +12959,12 @@ in sources."unpipe-1.0.0" (sources."upper-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) (sources."upper-case-first-2.0.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.4.1" ]; }) sources."uri-js-4.4.1" @@ -11802,6 +12998,7 @@ in sources."uuencode-0.0.4" sources."uuid-8.3.2" sources."v-click-outside-3.2.0" + sources."v8-compile-cache-lib-3.0.1" sources."validator-13.7.0" sources."vary-1.1.2" (sources."verror-1.10.0" // { @@ -11809,28 +13006,27 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.11" - sources."vue-2.7.13" + sources."vm2-3.9.13" + sources."vue-2.7.14" sources."vue-agile-2.0.0" sources."vue-color-2.8.1" + sources."vue-demi-0.13.11" sources."vue-fragment-1.5.1" - sources."vue-i18n-8.27.2" - sources."vue-json-pretty-1.9.2" + sources."vue-i18n-8.28.2" + sources."vue-json-pretty-1.9.3" sources."vue-prism-editor-0.3.0" sources."vue-router-3.6.5" - sources."vue-template-compiler-2.7.13" + sources."vue-template-compiler-2.7.14" sources."vue-typed-mixins-0.2.0" sources."vue2-boring-avatars-0.3.4" sources."vue2-teleport-1.0.1" sources."vue2-touch-events-3.2.2" - sources."vuex-3.6.2" sources."w3c-keyname-2.2.6" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" - sources."which-collection-1.0.1" - sources."which-typed-array-1.1.8" + sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" sources."widest-line-3.1.0" (sources."win-release-1.1.1" // { @@ -11867,13 +13063,12 @@ in }) sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" + sources."yallist-2.1.2" sources."yamljs-0.3.0" sources."yargs-17.1.1" sources."yargs-parser-20.2.9" + sources."yn-3.1.1" sources."yup-0.32.11" - sources."zen-observable-0.8.15" - sources."zen-observable-ts-1.2.5" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix new file mode 100644 index 0000000000000..4268191b42ffb --- /dev/null +++ b/pkgs/applications/networking/netmaker/default.nix @@ -0,0 +1,44 @@ +{ buildGoModule +, fetchFromGitHub +, installShellFiles +, lib +, libglvnd +, pkg-config +, subPackages ? ["." "netclient"] +, xorg +}: + +buildGoModule rec { + pname = "netmaker"; + version = "0.17.1"; + + src = fetchFromGitHub { + owner = "gravitl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-8uxPPhy1/FqPGouqzUxY2lGnO/giqH9bJbAqQ9rZI0g="; + }; + + vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI="; + + inherit subPackages; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libglvnd + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXrandr + ]; + + meta = with lib; { + description = "WireGuard automation from homelab to enterprise"; + homepage = "https://netmaker.io"; + changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}"; + license = licenses.sspl; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 362cdbbb0c30f..24500423829f1 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.14-RC3"; + version = "1.14.0"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "28xEGjzOKdrTlGF4OBEoDue9VVLrbiVgnoTKICfDp4M="; + sha256 = "uC3ksJ4nNXBjQYqNOS4qK6aCK6/Wzf27YXHbM73TpdU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix index 360a93b5eddd0..4cfcfabe3d8f7 100644 --- a/pkgs/applications/networking/newsreaders/raven-reader/default.nix +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -2,10 +2,10 @@ let pname = "raven-reader"; - version = "1.0.74"; + version = "1.0.78"; src = fetchurl { url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; - sha256 = "sha256-BwJK0V19aLpTRa/7wzlWdALiJrOhfejCkKCGrZyA5EQ="; + sha256 = "sha256-H9V2zTD80fBuIuNZnGDR21IYAAl/b6iYrde5rfsMECQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index e49ffe15ee28a..b1fb3b2054f5f 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The slrn (S-Lang read news) newsreader"; - homepage = "http://slrn.sourceforge.net/index.html"; + homepage = "https://slrn.sourceforge.net/index.html"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index f2d368af612f4..e409551f1232d 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.4"; + version = "3.6.6"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-ZtDgm9xlBQflVXsxjt4bFmRby6ni0wjaGYaoiEWH9Q0="; + sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc="; }; patches = [ diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 2d23ece5e45c0..49193a384a637 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -94,7 +94,7 @@ rec { obfs4 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index b5bb12da0ec55..507d2a282e4bc 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -57,7 +57,7 @@ let wrapGAppsHook ]; - checkInputs = with pypkgs; [ + nativeCheckInputs = with pypkgs; [ pytestCheckHook pytest-twisted pytest-cov diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index df314b6591c20..91a078590bf24 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index ac7e15b6a2e5b..7acfee3671dac 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD ''; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 6c5ebdb913352..fda9d87681a95 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ygrek/mldonkey/pull/66/commits/20ff84c185396f3d759cf4ef46b9f0bd33a51060.patch"; hash = "sha256-MCqx0jVfOaLkZhhv0b1cTdO6BK2/f6TxTWmx+NZjXME="; }) + # Fixes OCaml 4.12 compat + (fetchpatch { + url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch"; + hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8="; + }) ]; preConfigure = '' diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 1b4f12874dbda..76fc70b3bad0f 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config +{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config , boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -42,12 +42,18 @@ mkDerivation rec { qtWrapperArgs = optional trackerSearch "--prefix PATH : ${makeBinPath [ python3 ]}"; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -R src/qbittorrent.app $out/Applications + makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent + ''; + meta = { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; }; } diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index dce6baa438fb8..21c59e84a4458 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { setproctitle ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ asynctest pytestCheckHook ]; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 2bb2967ec745e..8d605877a62ea 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchurl , cmake , pkg-config , openssl @@ -25,7 +24,7 @@ , enableQt ? false , qt5 , nixosTests -, enableSystemd ? stdenv.isLinux +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , enableDaemon ? true , enableCli ? true , installLib ? false @@ -47,14 +46,6 @@ in stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ - # fix build with openssl 3.0 - (fetchurl { - url = "https://salsa.debian.org/debian/transmission/-/raw/debian/3.00-2.1/debian/patches/openssl3-compat.patch"; - hash = "sha256-v+SDTW/lCtc8B3TuhQB1pmjW/QRAGLtYncaImNNwpes="; - }) - ]; - outputs = [ "out" "apparmor" ]; cmakeFlags = diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/applications/networking/p2p/xd/default.nix index 779de53d3c5d9..b73c962240fc7 100644 --- a/pkgs/applications/networking/p2p/xd/default.nix +++ b/pkgs/applications/networking/p2p/xd/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-mJZRk3p+D3tCKIYggD5jVBXcKqJotEexljDzLKpn4/E="; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; postInstall = '' ln -s $out/bin/XD $out/bin/XD-CLI diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 96d0c60df1469..eae9a8a3d87a0 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openssl +, libsamplerate +, alsa-lib +, AppKit +}: stdenv.mkDerivation rec { pname = "pjsip"; @@ -13,6 +21,16 @@ stdenv.mkDerivation rec { patches = [ ./fix-aarch64.patch + (fetchpatch { + name = "CVE-2022-23537.patch"; + url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; + sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; + }) + (fetchpatch { + name = "CVE-2022-23547.patch"; + url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; + sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; + }) ]; buildInputs = [ openssl libsamplerate ] diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index a7954bcc575e2..bdf75f6440e2e 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "2.1.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "sha256-+XeNhjwtH1T5p8iydMQk22nXztyamSn6yY56/qqvkmk="; + sha256 = "sha256-7p+Q6/BphE/dxNQe+gfcIty6TAWHUcPpvSJWfmf4OQg="; }; - vendorSha256 = "sha256-YTGjiteYfuRkDC4M9c/JKqURq4WiC5n9pFRqRVYhyxU="; + vendorSha256 = "sha256-dhrn6xQ0IJzBYeO6ko2PUCO+idopC2An0ylqCnx5jKg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 58c22375af47c..a35e5b03f4a9d 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -2,23 +2,29 @@ , lib , fetchFromGitHub , cmake +, docbook-xsl-nons +, libxslt , pkg-config , alsa-lib +, faac +, faad2 , ffmpeg , glib +, openh264 , openssl -, pcre +, pcre2 , zlib , libX11 , libXcursor , libXdamage +, libXdmcp , libXext , libXi , libXinerama , libXrandr , libXrender -, libXv , libXtst +, libXv , libxkbcommon , libxkbfile , wayland @@ -27,7 +33,6 @@ , gst-plugins-good , libunwind , orc -, libxslt , cairo , libusb1 , libpulseaudio @@ -42,6 +47,7 @@ , Carbon , Cocoa , CoreMedia +, withUnfree ? false }: let @@ -59,6 +65,8 @@ let } ]; + inherit (lib) optionals; + in stdenv.mkDerivation rec { pname = "freerdp"; @@ -97,6 +105,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo cups + faad2 ffmpeg glib gst-plugins-base @@ -105,6 +114,7 @@ stdenv.mkDerivation rec { libX11 libXcursor libXdamage + libXdmcp libXext libXi libXinerama @@ -118,41 +128,50 @@ stdenv.mkDerivation rec { libusb1 libxkbcommon libxkbfile - libxslt + openh264 openssl orc - pcre + pcre2 pcsclite zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ alsa-lib systemd wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isDarwin [ AudioToolbox AVFoundation Carbon Cocoa CoreMedia + ] + ++ optionals withUnfree [ + faac ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake libxslt docbook-xsl-nons pkg-config ]; doCheck = true; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ] - ++ lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") { - BUILD_TESTING = doCheck; - WITH_CUNIT = doCheck; + # https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746 + cmakeFlags = [ + "-Wno-dev" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook" + ] + ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") { + BUILD_TESTING = false; # false is recommended by upstream + WITH_CAIRO = (cairo != null); WITH_CUPS = (cups != null); + WITH_FAAC = (withUnfree && faac != null); + WITH_FAAD2 = (faad2 != null); + WITH_JPEG = (libjpeg_turbo != null); + WITH_OPENH264 = (openh264 != null); WITH_OSS = false; WITH_PCSC = (pcsclite != null); WITH_PULSE = (libpulseaudio != null); WITH_SERVER = buildServer; - WITH_SSE2 = stdenv.isx86_64; - WITH_VAAPI = true; - WITH_JPEG = (libjpeg_turbo != null); - WITH_CAIRO = (cairo != null); + WITH_VAAPI = false; # false is recommended by upstream WITH_X11 = true; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index ce64ec0d65ef5..f1abf58348371 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.28"; + version = "1.4.29"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-w0z7teful/sdp7/f4X8eqF9Ny3bhP542V0tutQi/yXI="; + sha256 = "sha256-8B19rqbOYY+lS3Q/vh3Eu696KW03SOvlP9dgXPYYDiU="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index feb8252c7edae..b7c51d70dfecb 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; - version = "0.2.9"; + version = "0.9.19"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr"; + hash = "sha256-WI1KyJDQkmNHwweZMbNd2KUfawaieoGMDMQfeD12cZs="; }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; @@ -34,21 +34,23 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.9"; + version = "0.9.21.1"; pname = "xrdp"; src = fetchFromGitHub { - owner = "volth"; + owner = "neutrinolabs"; repo = "xrdp"; - rev = "refs/tags/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already + rev = "v${version}"; fetchSubmodules = true; - sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z"; + hash = "sha256-/o052ij+Tpcw5/k1UyP6OGOzrtBwh3jRkftStIEhUF0="; }; - nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; + patches = [ ./dynamic_config.patch ]; + postPatch = '' substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" ''; @@ -58,23 +60,23 @@ let ./bootstrap ''; dontDisableStatic = true; - configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; + configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" "--enable-pam-config=unix" ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; postInstall = '' - # remove generated keys (as non-determenistic) and upstart script - rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh} + # remove generated keys (as non-deterministic) + rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem} cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse # remove all session types except Xorg (they are not supported by this setup) - ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini + perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini # remove all session types and then add Xorg - ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini + perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini cat >> $out/etc/xrdp/sesman.ini <<EOF @@ -98,7 +100,7 @@ let description = "An open source RDP server"; homepage = "https://github.com/neutrinolabs/xrdp"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ chvp ]; platforms = platforms.linux; }; }; diff --git a/pkgs/applications/networking/remote/xrdp/dynamic_config.patch b/pkgs/applications/networking/remote/xrdp/dynamic_config.patch new file mode 100644 index 0000000000000..5c97beeb67018 --- /dev/null +++ b/pkgs/applications/networking/remote/xrdp/dynamic_config.patch @@ -0,0 +1,376 @@ +diff --git a/common/xrdp_client_info.h b/common/xrdp_client_info.h +index f45195e8..b87ae64e 100644 +--- a/common/xrdp_client_info.h ++++ b/common/xrdp_client_info.h +@@ -148,6 +148,9 @@ struct xrdp_client_info + + char certificate[1024]; + char key_file[1024]; ++ char rsakeys_ini_file[256]; ++ char xrdp_keyboard_ini_file[256]; ++ char keymaps_path[256]; + + /* X11 keyboard layout - inferred from keyboard type/subtype */ + char model[16]; +diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c +index d08f068a..cc7a173d 100644 +--- a/libxrdp/xrdp_rdp.c ++++ b/libxrdp/xrdp_rdp.c +@@ -27,6 +27,7 @@ + #include "log.h" + #include "ssl_calls.h" + #include "string_calls.h" ++#include <string.h> + + #if defined(XRDP_NEUTRINORDP) + #include <freerdp/codec/rfx.h> +@@ -46,10 +47,21 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + struct list *values = (struct list *)NULL; + char *item = NULL; + char *value = NULL; ++ char cfg_dir[256]; + int pos; + char *tmp = NULL; + int tmp_length = 0; + ++ g_strncpy(cfg_dir, xrdp_ini, 255); ++ *(strrchr(cfg_dir, '/')) = 0; ++ ++ /* default location is next to xrdp.ini */ ++ g_snprintf(client_info->certificate, 1023, "%s/cert.pem", cfg_dir); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); ++ g_snprintf(client_info->xrdp_keyboard_ini_file, 255, "%s/xrdp_keyboard.ini", cfg_dir); ++ g_snprintf(client_info->rsakeys_ini_file, 255, "%s/rsakeys.ini", cfg_dir); ++ g_snprintf(client_info->keymaps_path, 255, "%s", cfg_dir); ++ + client_info->xrdp_keyboard_overrides.type = -1; + client_info->xrdp_keyboard_overrides.subtype = -1; + client_info->xrdp_keyboard_overrides.layout = -1; +@@ -253,14 +265,14 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + if (g_strlen(value) == 0) + { + /* default key_file path */ +- g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); + LOG(LOG_LEVEL_INFO, "Using default X.509 key file: %s", + client_info->key_file); + } + else if (value[0] != '/') + { + /* default key_file path */ +- g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); + LOG(LOG_LEVEL_WARNING, + "X.509 key file should use absolute path, using " + "default instead: %s", client_info->key_file); +@@ -277,6 +289,51 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + client_info->key_file, g_get_strerror()); + } + } ++ else if (g_strcasecmp(item, "rsakeys_ini") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->rsakeys_ini_file, 255, "%s/rsakeys.ini", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "rsakeys.ini file should use absolute path, using " ++ "default instead: %s", client_info->rsakeys_ini_file); ++ } ++ else ++ { ++ /* use user defined rsakeys.ini */ ++ g_strncpy(client_info->rsakeys_ini_file, value, 255); ++ } ++ } ++ else if (g_strcasecmp(item, "xrdp_keyboard_ini") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->xrdp_keyboard_ini_file, 255, "%s/xrdp_keyboard.ini", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "xrdp_keyboard.ini file should use absolute path, using " ++ "default instead: %s", client_info->xrdp_keyboard_ini_file); ++ } ++ else ++ { ++ /* use user defined xrdp_keyboard.ini */ ++ g_strncpy(client_info->xrdp_keyboard_ini_file, value, 255); ++ } ++ } ++ else if (g_strcasecmp(item, "keymaps_path") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->keymaps_path, 255, "%s", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "keymaps_path should use absolute path, using " ++ "default instead: %s", client_info->keymaps_path); ++ } ++ else ++ { ++ /* use user defined xrdp_keyboard.ini */ ++ g_strncpy(client_info->keymaps_path, value, 255); ++ } ++ } + else if (g_strcasecmp(item, "domain_user_separator") == 0 + && g_strlen(value) > 0) + { +diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c +index 8fa34aea..da94cf95 100644 +--- a/libxrdp/xrdp_sec.c ++++ b/libxrdp/xrdp_sec.c +@@ -371,7 +371,6 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + char *item = (char *)NULL; + char *value = (char *)NULL; + char *q = (char *)NULL; +- char keyboard_cfg_file[256] = { 0 }; + char rdp_layout[256] = { 0 }; + + const struct xrdp_keyboard_overrides *ko = +@@ -419,10 +418,9 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + client_info->keyboard_subtype = 1; + } + +- g_snprintf(keyboard_cfg_file, 255, "%s/xrdp_keyboard.ini", XRDP_CFG_PATH); +- LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", keyboard_cfg_file); ++ LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", client_info->xrdp_keyboard_ini_file); + +- fd = g_file_open(keyboard_cfg_file); ++ fd = g_file_open(client_info->xrdp_keyboard_ini_file); + + if (fd >= 0) + { +@@ -594,7 +592,7 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + else + { + LOG(LOG_LEVEL_ERROR, "xrdp_load_keyboard_layout: error opening %s", +- keyboard_cfg_file); ++ client_info->xrdp_keyboard_ini_file); + } + } + +@@ -2759,7 +2757,6 @@ xrdp_sec_incoming(struct xrdp_sec *self) + int index = 0; + char *item = NULL; + char *value = NULL; +- char key_file[256]; + + iso = self->mcs_layer->iso_layer; + +@@ -2805,19 +2802,17 @@ xrdp_sec_incoming(struct xrdp_sec *self) + LOG(LOG_LEVEL_DEBUG, "Using RDP security, and " + "reading the server configuration"); + +- g_memset(key_file, 0, sizeof(char) * 256); + g_random(self->server_random, 32); + items = list_create(); + items->auto_free = 1; + values = list_create(); + values->auto_free = 1; +- g_snprintf(key_file, 255, "%s/rsakeys.ini", XRDP_CFG_PATH); + +- if (file_by_name_read_section(key_file, "keys", items, values) != 0) ++ if (file_by_name_read_section(self->rdp_layer->client_info.rsakeys_ini_file, "keys", items, values) != 0) + { + /* this is a show stopper */ + LOG(LOG_LEVEL_ERROR, "XRDP cannot read file: %s " +- "(check permissions)", key_file); ++ "(check permissions)", self->rdp_layer->client_info.rsakeys_ini_file); + list_delete(items); + list_delete(values); + return 1; +diff --git a/sesman/config.c b/sesman/config.c +index 61e9e403..0466f61a 100644 +--- a/sesman/config.c ++++ b/sesman/config.c +@@ -34,6 +34,7 @@ + #include "sesman.h" + #include "log.h" + #include "string_calls.h" ++#include <string.h> + #include "chansrv/chansrv_common.h" + + /***************************************************************************//** +@@ -47,11 +48,10 @@ + * + */ + static int +-config_read_globals(int file, struct config_sesman *cf, struct list *param_n, ++config_read_globals(const char *base_dir, int file, struct config_sesman *cf, struct list *param_n, + struct list *param_v) + { + int i; +- int length; + char *buf; + + list_clear(param_v); +@@ -127,13 +127,12 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + g_free(cf->default_wm); + cf->default_wm = g_strdup("startwm.sh"); + } +- /* if default_wm doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ ++ /* if default_wm doesn't begin with '/', it's a relative path to base_dir */ + if (cf->default_wm[0] != '/') + { + /* sizeof operator returns string length including null terminator */ +- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->default_wm) + 1; /* '/' */ +- buf = (char *)g_malloc(length, 0); +- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->default_wm); ++ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->default_wm) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->default_wm); + g_free(cf->default_wm); + cf->default_wm = g_strdup(buf); + g_free(buf); +@@ -151,10 +150,8 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + /* if reconnect_sh doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ + if (cf->reconnect_sh[0] != '/') + { +- /* sizeof operator returns string length including null terminator */ +- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->reconnect_sh) + 1; /* '/' */ +- buf = (char *)g_malloc(length, 0); +- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->reconnect_sh); ++ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->reconnect_sh) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->reconnect_sh); + g_free(cf->reconnect_sh); + cf->reconnect_sh = g_strdup(buf); + g_free(buf); +@@ -511,6 +508,7 @@ struct config_sesman * + config_read(const char *sesman_ini) + { + struct config_sesman *cfg; ++ char cfg_dir[256]; + int all_ok = 0; + + if ((cfg = g_new0(struct config_sesman, 1)) != NULL) +@@ -532,8 +530,10 @@ config_read(const char *sesman_ini) + param_v->auto_free = 1; + + /* read global config */ +- config_read_globals(fd, cfg, param_n, param_v); +- ++ g_strcpy(cfg_dir, sesman_ini); ++ *(strrchr(cfg_dir, '/')) = 0; // cfg_file validated to contain '/' ++ ++ config_read_globals(cfg_dir, fd, cfg, param_n, param_v); + /* read Xvnc/X11rdp/Xorg parameter list */ + config_read_vnc_params(fd, cfg, param_n, param_v); + config_read_rdp_params(fd, cfg, param_n, param_v); +diff --git a/xrdp/lang.c b/xrdp/lang.c +index e4c18077..06f92997 100644 +--- a/xrdp/lang.c ++++ b/xrdp/lang.c +@@ -229,7 +229,7 @@ km_read_section(int fd, const char *section_name, struct xrdp_key_info *keymap) + + /*****************************************************************************/ + int +-get_keymaps(int keylayout, struct xrdp_keymap *keymap) ++get_keymaps(const char* keymaps_path, int keylayout, struct xrdp_keymap *keymap) + { + int fd; + int basic_key_layout = keylayout & 0x0000ffff; +@@ -239,21 +239,21 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap) + filename = (char *)g_malloc(256, 0); + + /* check if there is a keymap file e.g. km-e00100411.ini */ +- g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, keylayout); ++ g_snprintf(filename, 255, "%s/km-%08x.ini", keymaps_path, keylayout); + + /* if the file does not exist, use only lower 16 bits instead */ + if (!g_file_exist(filename)) + { + LOG(LOG_LEVEL_WARNING, "Cannot find keymap file %s", filename); + /* e.g. km-00000411.ini */ +- g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, basic_key_layout); ++ g_snprintf(filename, 255, "%s/km-%08x.ini", keymaps_path, basic_key_layout); + } + + /* finally, use 'en-us' */ + if (!g_file_exist(filename)) + { + LOG(LOG_LEVEL_WARNING, "Cannot find keymap file %s", filename); +- g_snprintf(filename, 255, "%s/km-00000409.ini", XRDP_CFG_PATH); ++ g_snprintf(filename, 255, "%s/km-00000409.ini", keymaps_path); + } + + if (g_file_exist(filename)) +diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c +index e91672fb..37cef0c0 100644 +--- a/xrdp/xrdp.c ++++ b/xrdp/xrdp.c +@@ -384,7 +384,6 @@ xrdp_sanity_check(void) + { + int intval = 1; + int host_be; +- const char *key_file = XRDP_CFG_PATH "/rsakeys.ini"; + + /* check compiled endian with actual endian */ + host_be = !((int)(*(unsigned char *)(&intval))); +@@ -429,12 +428,6 @@ xrdp_sanity_check(void) + return 1; + } + +- if (!g_file_exist(key_file)) +- { +- g_writeln("File %s is missing, create it using xrdp-keygen", key_file); +- return 1; +- } +- + return 0; + } + +diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h +index 36d8f87a..687b9dd5 100644 +--- a/xrdp/xrdp.h ++++ b/xrdp/xrdp.h +@@ -380,7 +380,7 @@ get_char_from_scan_code(int device_flags, int scan_code, int *keys, + int caps_lock, int num_lock, int scroll_lock, + struct xrdp_keymap *keymap); + int +-get_keymaps(int keylayout, struct xrdp_keymap *keymap); ++get_keymaps(const char* keymaps_path, int keylayout, struct xrdp_keymap *keymap); + + /* xrdp_login_wnd.c */ + int +diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in +index 3b6340f8..c05e2930 100644 +--- a/xrdp/xrdp.ini.in ++++ b/xrdp/xrdp.ini.in +@@ -52,6 +52,12 @@ crypt_level=high + ; openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365 + certificate= + key_file= ++;directory with km-*.ini files; default is the directory of xrdp.ini ++#keymaps_path= ++;location of xrdp_keyboard_ini; default next to xrdp.ini ++#xrdp_keyboard_ini= ++;location of rsakeys.ini; default next to xrdp.ini ++#rsakeys_ini= + + ; set SSL protocols + ; can be comma separated list of 'SSLv3', 'TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3' +diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c +index 94691582..602b3ca6 100644 +--- a/xrdp/xrdp_wm.c ++++ b/xrdp/xrdp_wm.c +@@ -64,7 +64,7 @@ xrdp_wm_create(struct xrdp_process *owner, + self->mm = xrdp_mm_create(self); + self->default_font = xrdp_font_create(self); + /* this will use built in keymap or load from file */ +- get_keymaps(self->session->client_info->keylayout, &(self->keymap)); ++ get_keymaps(client_info->keymaps_path, self->session->client_info->keylayout, &(self->keymap)); + xrdp_wm_set_login_state(self, WMLS_RESET); + self->target_surface = self->screen; + self->current_surface_index = 0xffff; /* screen */ +diff --git a/xup/xup.c b/xup/xup.c +index e67d9477..8bc718a0 100644 +--- a/xup/xup.c ++++ b/xup/xup.c +@@ -318,7 +318,7 @@ lib_mod_event(struct mod *mod, int msg, tbus param1, tbus param2, + msg param1 param2 param3 param4 + 15 0 65507 29 0 + 16 0 65507 29 49152 */ +- init_stream(s, 8192); ++ init_stream(s, (int)sizeof(mod->client_info) < 8192 ? 8192 : (int)sizeof(mod->client_info)); + s_push_layer(s, iso_hdr, 4); + out_uint16_le(s, 103); + out_uint32_le(s, 16); /* key up */ diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index cf23d22087396..f51c8d051a51f 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.34"; + version = "3.40"; src = fetchFromGitHub { - owner = "chrislusf"; + owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-lOCZHkLJCDvaT3CcHUBbsybdy0H6BfKKGpd/73cxcWA="; + hash = "sha256-eU1RnLjPSAdtv+EqVnIpOLsDfBjx4WHFnHHkGZfr130="; }; - vendorHash = "sha256-1RUWONkXArXYg8gQogKUhMSGdIYyT3lq5qWuUQBsFig="; + vendorHash = "sha256-tKq5QEd7f4q7q2EDNjNrlatQ7+lXF9ya9L0iTP/AXSo="; subPackages = [ "weed" ]; @@ -49,7 +49,7 @@ buildGoModule rec { meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = with maintainers; [ azahi cmacrae ]; + maintainers = with maintainers; [ azahi cmacrae wozeparrot ]; mainProgram = "weed"; license = licenses.asl20; }; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 08f9bc0b8af2b..fbb8842393f52 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -11,7 +11,7 @@ assert withQt -> qt5 != null; with lib; let - version = "4.0.1"; + version = "4.0.2"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-s7AC+Z0Tu/R/ntO+frNyywwkVL0PrqKadWgZzgGf/cI="; + sha256 = "sha256-81kVaZ8vmyjdshEgLUDsiYTlg008kRSDFEpJhLpEQR0="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index f3c8301a69b61..fc515590f37ae 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "soapui"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; - sha256 = "0vmj11fswja0ddnbc4vb7gj1al8km7ilma9bv1waaj8h5c8qpayi"; + sha256 = "sha256-qzhy4yHmOk13dFUd2KEZhXtWY86QwyjJgYxx9GGoN80="; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,16 +28,16 @@ stdenv.mkDerivation rec { (writeText "soapui-${version}.patch" '' --- a/bin/soapui.sh +++ b/bin/soapui.sh - @@ -34,7 +34,7 @@ SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-${version}.jar:$SOAPUI_HOME/lib/* - export SOAPUI_CLASSPATH + @@ -50,7 +50,7 @@ + #JAVA 16 + JAVA_OPTS="$JAVA_OPTS --illegal-access=permit" - JAVA_OPTS="-Xms128m -Xmx1024m -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME/bin -splash:SoapUI-Spashscreen.png" -JFXRTPATH=`java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` +JFXRTPATH=`${jdk}/bin/java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` SOAPUI_CLASSPATH=$JFXRTPATH:$SOAPUI_CLASSPATH if $darwin - @@ -69,4 +69,4 @@ echo = SOAPUI_HOME = $SOAPUI_HOME + @@ -85,4 +85,4 @@ echo = echo ================================ diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 02a7fe0622f3d..531873df8c408 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "nicotine-plus"; repo = "nicotine-plus"; rev = "refs/tags/${version}"; - sha256 = "sha256-MPhMKbDBKZAF5fktzA6bZBlVkyDrBnhEFhRWkRbXP/A="; + sha256 = "sha256-/l31w7ohBgjeE+Ywuo7aaDZBzVNLFD3dqMRr/P3ge+s="; }; nativeBuildInputs = [ gettext wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 5bc29832c5f3b..7a1252f806fbe 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ++ lib.optionals (selinuxSupport) [ libselinux ] ++ lib.optionals (udevSupport) [ udev ]; nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ]; - checkInputs = [ glibcLocales rsync ]; + nativeCheckInputs = [ glibcLocales rsync ]; postPatch = '' for f in test/test-*.sh.in; do diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 980e70aff50aa..cc9663dd6fc29 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,25 +1,17 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync, - asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: + asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, xnu }: stdenv.mkDerivation rec { pname = "lsyncd"; - version = "2.2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1hbsih5hfq9lhgnxm0wb5mrj6xmlk2l0i9a79wzd5f6cnjil9l3x"; + hash = "sha256-QBmvS1HGF3VWS+5aLgDr9AmUfEsuSz+DTFIeql2XHH4="; }; - patches = [ - (fetchpatch { - sha256 = "0b0h2qxh73l502p7phf6qgl8576nf6fvqqp2x5wy3nz7sc9qb1z8"; - name = "fix-non-versioned-lua-not-search-in-cmake.patch"; - url = "https://github.com/axkibe/lsyncd/pull/500/commits/0af99d8d5ba35118e8799684a2d4a8ea4b0c6957.patch"; - }) - ]; - postPatch = '' substituteInPlace default-rsync.lua \ --replace "/usr/bin/rsync" "${rsync}/bin/rsync" @@ -27,7 +19,7 @@ stdenv.mkDerivation rec { # Special flags needed on Darwin: # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; dontUseCmakeBuildDir = true; @@ -44,7 +36,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ bobvanderlinden ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 78d5fa91ff95c..6c64b755be0aa 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -8,19 +8,19 @@ , curl , sqlite , libnotify -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.22"; + version = "2.4.23"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-/NhZHJEu2s+HlEUb1DqRdrpvrIWrDAtle07+oXMJCdI="; + hash = "sha256-yHpjutZV2u1VhnLxsQIu0NtKnqwtoRn4TM+8tXJ4RNo="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/sync/openrsync/default.nix b/pkgs/applications/networking/sync/openrsync/default.nix new file mode 100644 index 0000000000000..0398ccd960945 --- /dev/null +++ b/pkgs/applications/networking/sync/openrsync/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "openrsync"; + version = "unstable-2022-05-08"; + + src = fetchFromGitHub { + owner = "kristapsdz"; + repo = "openrsync"; + rev = "f50d0f8204ea18306a0c29c6ae850292ea826995"; + hash = "sha256-4tygoCQGIM0wqLfdWp55/oOPhD3lPUuTd9/LXQAASXU="; + }; + + # Uses oconfigure + prefixKey = "PREFIX="; + + meta = with lib; { + homepage = "https://www.openrsync.org/"; + description = "BSD-licensed implementation of rsync"; + license = licenses.isc; + maintainers = with maintainers; [ fgaz ]; + # https://github.com/kristapsdz/openrsync#portability + # https://github.com/kristapsdz/oconfigure#readme + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 52ff6a5c108ac..d1a304f44001f 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { # disable the included zlib explicitly as it otherwise still compiles and # links them even. "--with-included-zlib=no" + ] ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [ + # fix `multiversioning needs 'ifunc' which is not supported on this target` error + "--disable-roll-simd" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 297520dcb923d..e74084e14c524 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.22.2"; + version = "1.23.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-t1JIkUjSEshSm3Zi5Ck8IOmTv2tC0dUYyJvlKua/BcI="; + hash = "sha256-Z4YVU45na4BgIbN/IlORpTCuf2EuSuOyppDRzswn3EI="; }; - vendorSha256 = "sha256-UdzWD8I8ulPBXdF5wZQ7hQoVO9Bnj18Gw5t4wqolSPA="; + vendorHash = "sha256-q63iaRxJRvPY0Np20O6JmdMEjSg/kxRneBfs8fRTwXk="; doCheck = false; diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index 7dd8978dc2168..d91ba790610ee 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -49,7 +49,7 @@ in rec { enableParallelBuilding = true; - checkInputs = [ wget curl ]; + nativeCheckInputs = [ wget curl ]; doInstallCheck = true; checkTarget = "check"; @@ -100,7 +100,7 @@ in rec { enableParallelBuilding = true; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; doInstallCheck = true; checkTarget = "check"; diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index 5745408625620..7d703d2db4ff5 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ aiohttp python-dateutil humanize click ]; - checkInputs = [ pytestCheckHook tox ]; + nativeCheckInputs = [ pytestCheckHook tox ]; disabledTests = [ # Disable test using relative date and time diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 3398d4bd51cdb..9af0fb7b73ca2 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl protobufc libconfig ]; + # https://github.com/umurmur/umurmur/issues/176 + postPatch = '' + sed -i '/CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);/d' src/ssli_openssl.c + ''; + configureFlags = [ "--with-ssl=openssl" "--enable-shmapi" diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 8e9cfb5aee950..56a609e3de4df 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gd ncurses sqlite ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; doCheck = true; diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/applications/office/beancount/beancount-ing-diba.nix index 67c76f7381196..e1f3cb55fd8a8 100644 --- a/pkgs/applications/office/beancount/beancount-ing-diba.nix +++ b/pkgs/applications/office/beancount/beancount-ing-diba.nix @@ -1,11 +1,10 @@ { lib -, stdenv +, python3 , fetchFromGitHub -, buildPythonApplication -, poetry +, fetchpatch }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "beancount-ing-diba"; version = "0.6.0"; @@ -16,10 +15,18 @@ buildPythonApplication rec { sha256 = "sha256-1cdXqdeTz38n0g13EXJ1/IF/gJJCe1uL/Z5NJz4DL+E="; }; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/siddhantgoel/beancount-ing/commit/2d030330eed313a32c3968a2c8ce9400c6d18a41.patch"; + hash = "sha256-6v7eQhgj6d4x9uWSyuO3IxXrSWkJZRS/M4N3j0H3R/U="; + }) + ]; + format = "pyproject"; - nativeBuildInputs = [ - poetry + nativeBuildInputs = with python3.pkgs; [ + poetry-core ]; meta = with lib; { diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index fce5bb1496417..5828ac35fc3f4 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -10,7 +10,9 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU="; }; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; + pythonRelaxDeps = [ "cheroot" ]; + + nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ babel @@ -27,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { werkzeug ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch new file mode 100644 index 0000000000000..289822365490f --- /dev/null +++ b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch @@ -0,0 +1,23 @@ +diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm +index 8e3ff255f..a6b805fa5 100644 +--- a/gnucash/price-quotes.scm ++++ b/gnucash/price-quotes.scm +@@ -44,7 +44,7 @@ + (define (start-program) + (set! program + (gnc-spawn-process-async +- (list "perl" "-w" gnc:*finance-quote-check*) #t))) ++ (list gnc:*finance-quote-check*) #t))) + + (define (get-sources) + (when program +@@ -119,7 +119,7 @@ + + (define (start-quoter) + (set! quoter +- (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t))) ++ (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t))) + + (define (get-quotes) + (when quoter + diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 9e5294c4b00d0..700a94429964d 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { ./0002-disable-gnc-fq-update.patch # this patch prevents the building of gnucash-valgrind ./0003-remove-valgrind.patch + # this patch makes gnucash exec the Finance::Quote helpers directly + ./0004-exec-fq-helpers.patch ]; # this needs to be an environment variable and not a cmake flag to suppress diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 16a498afcac00..8165cc381c112 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { caldav ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ nose mock xvfb-run diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index a7b5a39d72f6b..4f6ef33caec5c 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { binaryBytecode # source bundles dependencies as jars binaryNativeCode # source bundles dependencies as jars ]; - license = licenses.gpl2; + license = licenses.mit; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ gebner linsui ]; }; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 4900dafb08e58..37240b8ac5691 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { All database objects - tables, queries and forms - are stored in the database, making it easy to share data and design. ''; - homepage = "http://kexi-project.org/"; + homepage = "https://kexi-project.org/"; maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 64167b84247c0..dfab08ace2d90 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; - installCheckInputs = [ xvfb-run ]; + nativeInstallCheckInputs = [ xvfb-run ]; installCheckPhase = lib.optionalString doInstallCheck '' xvfb-run -s '-screen 0 1024x768x24' make test \ diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 4f992c3ebe95e..55b89f195e693 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { # Checks require ledger as a python package, # ledger does not support python3 while ledger-autosync requires it. - checkInputs = with python3Packages; [ ledger hledger nose mock pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ ledger hledger nose mock pytestCheckHook ]; # Disable some non-passing tests: # https://github.com/egh/ledger-autosync/issues/127 diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index d4b4bde7b10b4..e885e03c1cd2a 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -41,6 +41,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk="; excludes = [ "doc/NEWS.md" ]; }) + + # Fix included bug with boost >= 1.76. Remove with the next release + (fetchpatch { + url = "https://github.com/ledger/ledger/commit/1cb9b84fdecc5604bd1172cdd781859ff3871a52.patch"; + sha256 = "sha256-ipVkRcTmnEvpfyPgMzLVJ9Sz8QxHeCURQI5dX8xh758="; + excludes = [ "test/regress/*" ]; + }) ]; installTargets = [ "doc" "install" ]; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index ddfaf584021cb..eb5097a1b0e3e 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -9,21 +9,21 @@ let appName = "LibreOffice.app"; scriptName = "soffice"; - version = "7.3.3"; + version = "7.4.3"; dist = { aarch64-darwin = rec { arch = "aarch64"; archSuffix = arch; url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "50ed3deb8d9c987516e2687ebb865bca15486c69da79f1b6d74381e43f2ec863"; + sha256 = "cf95f9ecd4451d27e8304cea3ba116675267bdf75f08fbb60e0d8917f86edc04"; }; x86_64-darwin = rec { arch = "x86_64"; archSuffix = "x86-64"; url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "fb2f9bb90eee34a22af3a2bf2854ef5b76098302b3c41d13d4f543f0d72b994f"; + sha256 = "fe569ba23bb74eb3e86974537dd80e504debe5fd8526a00edbad6be4da18986a"; }; }; in diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index cc40237d1552a..fdf76152a6521 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -96,7 +96,7 @@ , gpgme , libwebp , abseil-cpp -, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false , mkDerivation ? null diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh index c054e2c72cbe9..31cab28fd82e2 100644 --- a/pkgs/applications/office/libreoffice/download-list-builder.sh +++ b/pkgs/applications/office/libreoffice/download-list-builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tar --extract --file=$src libreoffice-$version/download.lst -O > $out diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index eaad04c64f6f3..c87e54e091543 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -10,6 +10,7 @@ , qpdf , tesseract5 , unpaper +, poppler_utils , liberation_ttf , fetchFromGitHub }: @@ -75,16 +76,17 @@ let qpdf tesseract5 unpaper + poppler_utils ]; in python.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; - version = "1.10.2"; + version = "1.11.3"; # Fetch the release tarball instead of a git ref because it contains the prebuilt frontend src = fetchurl { url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-uOrRHHNqIYsDbzKcA7EsYZjadpLyAB4Ks+PU+BNsTWE="; + hash = "sha256-wGNkdczgV+UDd9ZO+BXMSWotpetE/+c/jJAAH+6SXps="; }; format = "other"; @@ -97,6 +99,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { attrs autobahn automat + bleach blessed celery certifi @@ -126,6 +129,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { httptools humanfriendly hyperlink + imagehash idna imap-tools img2pdf @@ -136,6 +140,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { langdetect lxml msgpack + nltk numpy ocrmypdf pathvalidate @@ -153,7 +158,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { python-dateutil python-dotenv python-gnupg - python-Levenshtein + levenshtein python-magic pytz pyyaml @@ -205,7 +210,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { --prefix PATH : "${path}" ''; - checkInputs = with python.pkgs.pythonPackages; [ + nativeCheckInputs = with python.pkgs.pythonPackages; [ pytest-django pytest-env pytest-sugar diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index b9e78246609b6..b67dfe436fa2a 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -7,7 +7,7 @@ , pycountry , whoosh , termcolor -, python-Levenshtein +, levenshtein , pygobject3 , pyocr , natsort @@ -39,6 +39,9 @@ buildPythonPackage rec { patchFlags = [ "-p2" ]; postPatch = '' + substituteInPlace setup.py \ + --replace python-Levenshtein Levenshtein + echo 'version = "${version}"' > src/paperwork_backend/_version.py chmod a+w -R .. patchShebangs ../tools @@ -55,7 +58,7 @@ buildPythonPackage rec { pygobject3 pyocr pypillowfight - python-Levenshtein + levenshtein poppler_gi scikit-learn termcolor @@ -72,7 +75,7 @@ buildPythonPackage rec { make l10n_compile ''; - checkInputs = [ + nativeCheckInputs = [ libreoffice openpaperwork-gtk psutil diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 387e6c2d7657c..6c09681137e74 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -22,7 +22,7 @@ let documentation_deps = [ (texlive.combine { - inherit (texlive) scheme-small wrapfig was; + inherit (texlive) scheme-small wrapfig gensymb; }) xvfb-run imagemagick @@ -45,6 +45,9 @@ python3Packages.buildPythonApplication rec { # Patch out a few paths that assume that we're using the FHS: postPatch = '' + substituteInPlace setup.py \ + --replace python-Levenshtein Levenshtein + chmod a+w -R .. patchShebangs ../tools @@ -83,7 +86,7 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ dbus ]; + nativeCheckInputs = [ dbus ]; nativeBuildInputs = [ wrapGAppsHook diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index 7e633f54f9e1c..ee621df4d8379 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ openpaperwork-gtk ]; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 64dc3f400ec16..e0bfa57b1e8d3 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.60.0"; + version = "0.60.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-L4ZLlxHsnJrvrrrX56Z+agjnaMl472Izm4Un1uaNqZA="; + hash = "sha256-jSRZZufGi1wmdT7LeNutkO74bqln8uJ5TSEDCJyfPB4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index e13cdc9c71c00..fbfe11a2c9476 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Quick access to Zotero references"; - homepage = "http://www.cogsci.nl/software/qnotero"; + homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.nico202 ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 73c470259f14d..158c2389a3139 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,29 +1,66 @@ -{ mkDerivation, lib, stdenv, fetchurl -, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets -, qtx11extras, qtwayland +{ lib +, stdenv +, fetchurl +, qmake +, qttools +, qtbase +, qtdeclarative +, qtsvg +, qtwayland +, qtwebsockets +, qtx11extras +, qtxmlpatterns +, makeWrapper +, wrapQtAppsHook }: -mkDerivation rec { +let pname = "qownnotes"; - version = "22.11.7"; + appname = "QOwnNotes"; + version = "23.1.0"; +in +stdenv.mkDerivation { + inherit pname appname version; 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 = "2fbc20f17422bc44c35dd3e78feb710ca275ecb34c550b2a9c743939531f7878"; + sha256 = "sha256-HMs8DTL2BDSDmchadpVvbShjJMPP6W587F38uiixCuQ="; }; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ + qmake + qttools + wrapQtAppsHook + ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; - buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + buildInputs = [ + qtbase + qtdeclarative + qtsvg + qtwebsockets + qtx11extras + qtxmlpatterns + ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + + postInstall = + # Create a lowercase symlink for Linux + lib.optionalString stdenv.isLinux '' + ln -s $out/bin/${appname} $out/bin/${pname} + '' + # Wrap application for macOS as lowercase binary + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/${appname}.app $out/Applications + makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} + ''; meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration"; homepage = "https://www.qownnotes.org/"; + changelog = "https://www.qownnotes.org/changelog.html"; + downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ totoroot ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index 7cf777ae13f10..2295071b09c67 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { markdown ]; - checkInputs = [ + nativeCheckInputs = [ gettext python3.pkgs.mock ]; @@ -76,8 +76,8 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - homepage = "http://thetimelineproj.sourceforge.net/"; - changelog = "http://thetimelineproj.sourceforge.net/changelog.html"; + homepage = "https://thetimelineproj.sourceforge.net/"; + changelog = "https://thetimelineproj.sourceforge.net/changelog.html"; description = "Display and navigate information on a timeline"; license = with licenses; [ gpl3Only cc-by-sa-30 ]; platforms = with platforms; unix; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 68ec08e156e1e..50db368073d14 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ flake8 flake8-import-order freezegun diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 30e6835ed3693..926e97af80b38 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-12-13"; + version = "unstable-2023-01-20"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "321a1df0b3364ffa9a29c6ad6e6e93d203e4cf48"; - sha256 = "DGYwJKfWhnCQ5rUgY232k+SuFmj2xEHAPCqPrV2uTXI="; + rev = "4d48bbe730b19963efeb3bb6f59e92aa3968b229"; + sha256 = "03REE7/jn1uuU89DKkGD1QqqzOt+DR6qmoyyaf8042c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 7b2635cfe121a..7acf353bea1bf 100644 --- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -1,5 +1,5 @@ diff --git a/src/services/log.js b/src/services/log.js -index 0fcd9812..dcbff070 100644 +index a141eae14..094b9381b 100644 --- a/src/services/log.js +++ b/src/services/log.js @@ -1,15 +1,7 @@ @@ -35,7 +35,7 @@ index 0fcd9812..dcbff070 100644 -function initLogFile() { - todaysMidnight = getTodaysMidnight(); - -- const path = dataDir.LOG_DIR + '/trilium-' + formatDate() + '.log'; +- const path = `${dataDir.LOG_DIR}/trilium-${formatDate()}.log`; - - if (logFile) { - logFile.end(); @@ -65,8 +65,8 @@ index 0fcd9812..dcbff070 100644 - - millisSinceMidnight = checkDate(millisSinceMidnight); - -- logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE); +- logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`); - console.log(str); } - + \ No newline at end of file diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 9396246652cc0..08084bfbf7ac8 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -10,13 +10,13 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.57.5"; + version = "0.58.7"; desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "0zm16g30bz9xm2z1x7w7knm352hpb8n301gcr8kwab79qrhszwl2"; + desktopSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0l53kps7rhf8rx9zx29psvjl3611y7pymfkh2yb13h6iv1c77gdf"; + serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; in { diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index a1a6fd3330577..4d5fd8542f2e8 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -28,7 +28,7 @@ buildPythonApplication rec { installShellCompletion --fish watson.fish ''; - checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; propagatedBuildInputs = [ arrow click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index c638a4b2713bc..2dc24570b7210 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.18"; + version = "6.0.20"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-MIBhvhgttqfUO42ipVNXhdKbcN/0YPtFK8Ox8KlafG0="; + sha256 = "sha256-HsAvodqio3GJ9TK1pt4WwlEZEAo52ocH0r7cf9IQe9w="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 48a3f1281fcbf..86a4f1d10071a 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -79,6 +79,7 @@ let plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; spacebar = callPackage ./spacebar.nix { inherit srcs; }; + tokodon = callPackage ./tokodon.nix {}; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/plasma-mobile/tokodon.nix b/pkgs/applications/plasma-mobile/tokodon.nix new file mode 100644 index 0000000000000..a412835c8ccd1 --- /dev/null +++ b/pkgs/applications/plasma-mobile/tokodon.nix @@ -0,0 +1,78 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules +, pkg-config + +, kconfig +, kdbusaddons +, ki18n +, kirigami2 +, kirigami-addons +, knotifications +, libwebsockets +, qqc2-desktop-style +, qtbase +, qtkeychain +, qtmultimedia +, qtquickcontrols2 +, qttools +, qtwebsockets +, kitemmodels +, pimcommon + +# Workarounds for the point release being missing. +, libsForQt5 +, fetchFromGitLab +}: + +# NOTE: we cannot use `mkDerivation` injected by the Plasma Mobile package +# set for the point release, as the point release was not uploaded to +# the Plasma Mobile gear repo, and the injected `mkDerivation` only can +# use the src (and version) from the `srcs` set. +libsForQt5.mkDerivation rec { + pname = "tokodon"; + + version = "22.11.2"; + # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo. + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = "v${version}"; + hash = "sha256-uE9iHZDfpn1NTCeJPgsp2WBe0curdguTUbMTrkrmJ6M="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + kconfig + kdbusaddons + ki18n + kirigami2 + kirigami-addons + knotifications + qqc2-desktop-style + qtbase + qtkeychain + qtmultimedia + qtquickcontrols2 + qttools + qtwebsockets + kitemmodels + pimcommon + ]; + + meta = with lib; { + description = "A Mastodon client for Plasma and Plasma Mobile"; + homepage = "https://invent.kde.org/network/tokodon"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/applications/radio/ax25-apps/default.nix b/pkgs/applications/radio/ax25-apps/default.nix new file mode 100644 index 0000000000000..4f9ecd3580f87 --- /dev/null +++ b/pkgs/applications/radio/ax25-apps/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchurl +, libax25 +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "ax25-apps"; + version = "0.0.8-rc5"; + + buildInputs = [ libax25 ncurses ]; + + # Due to recent unsolvable administrative domain problems with linux-ax25.org, + # the new domain is linux-ax25.in-berlin.de + src = fetchurl { + url = "https://linux-ax25.in-berlin.de/pub/ax25-apps/ax25-apps-${version}.tar.gz"; + sha256 = "sha256-MzQOIyy5tbJKmojMrgtOcsaQTFJvs3rqt2hUgholz5Y="; + }; + + configureFlags = [ + "--sysconfdir=/etc" + "--program-transform-name=s@^call$@ax&@;s@^listen$@ax&@" + ]; + + meta = with lib; { + description = "AX.25 ham radio applications"; + homepage = "https://linux-ax25.in-berlin.de/wiki/Main_Page"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index d6b4794e97d8f..06cb2776a0b34 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -3,6 +3,9 @@ , stdenv , fetchFromGitHub , cmake +, macdylibbundler +, makeWrapper +, darwin , codec2 , libpulseaudio , libsamplerate @@ -21,23 +24,28 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-zzzRePBc09fK1ILoDto3EVz7IxJKePi39E18BrQedE0="; + hash = "sha256-N9LZCf2YAhVgxnQWgCB9TqGNpUGP1ZqpLmbYIaQsn08="; }; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/CMakeLists.txt \ - --replace "if(APPLE)" "if(0)" \ - --replace "\''${FREEDV_LINK_LIBS})" "\''${FREEDV_LINK_LIBS} \''${FREEDV_LINK_LIBS_OSX})" \ - --replace "\''${RES_FILES})" "\''${RES_FILES} \''${FREEDV_SOURCES_OSX})" + --replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" + sed -i "/hdiutil/d" src/CMakeLists.txt ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals stdenv.isDarwin [ + macdylibbundler + makeWrapper + darwin.autoSignDarwinBinariesHook + ]; buildInputs = [ codec2 @@ -67,6 +75,12 @@ stdenv.mkDerivation rec { doCheck = true; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/FreeDV.app $out/Applications + makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv + ''; + meta = with lib; { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 6aac0112f9614..e6461c924489d 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -44,7 +44,7 @@ gnuradio.pkgs.mkDerivation rec { gnuradio.unwrapped.python.pkgs.Mako gnuradio.unwrapped.python.pkgs.six ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 8dcc9ca65d45d..2ccc2c73771f7 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -2,7 +2,9 @@ , fetchFromGitHub , cmake , pkg-config -, qt5 +, qtbase +, qtsvg +, qtwayland , gnuradio3_8Minimal , thrift , mpir @@ -10,6 +12,7 @@ , alsa-lib , libjack2 , wrapGAppsHook +, wrapQtAppsHook # drivers (optional): , rtl-sdr , hackrf @@ -30,13 +33,13 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; + hash = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; }; nativeBuildInputs = [ cmake pkg-config - qt5.wrapQtAppsHook + wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ @@ -46,8 +49,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { alsa-lib libjack2 gnuradio3_8Minimal.unwrapped.boost - qt5.qtbase - qt5.qtsvg + qtbase + qtsvg + qtwayland gnuradio3_8Minimal.pkgs.osmosdr rtl-sdr hackrf diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix new file mode 100644 index 0000000000000..0e6216cdda422 --- /dev/null +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitLab +, nwjs +}: + +stdenv.mkDerivation rec { + pname = "gridtracker"; + version = "1.22.1226"; + + src = fetchFromGitLab { + owner = "gridtracker.org"; + repo = "gridtracker"; + rev = "v${version}"; + sha256 = "sha256-/Noc2aqHBjphX6RDqxQBI/OOKZgEnOndn0daBt1edXM="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace '$(DESTDIR)/usr' '$(DESTDIR)/' + substituteInPlace gridtracker.sh \ + --replace "exec nw" "exec ${nwjs}/bin/nw" \ + --replace "/usr/share/gridtracker" "$out/share/gridtracker" + substituteInPlace gridtracker.desktop \ + --replace "/usr/share/gridtracker/gridview.png" "$out/share/gridtracker/gridview.png" + ''; + + makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ]; + + meta = with lib; { + description = "An amateur radio companion to WSJT-X or JTDX"; + longDescription = '' + GridTracker listens to traffic from WSJT-X/JTDX, displays it on a map, + and has a sophisticated alerting and filtering system for finding and + working interesting stations. It also will upload QSO records to multiple + logging frameworks including Logbook of the World. + ''; + homepage = "https://gridtracker.org"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/applications/radio/grig/default.nix b/pkgs/applications/radio/grig/default.nix new file mode 100644 index 0000000000000..33ae8b8ff88bf --- /dev/null +++ b/pkgs/applications/radio/grig/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, wrapGAppsHook +, gtk2 +, hamlib_4 }: + +stdenv.mkDerivation rec { + pname = "grig"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "fillods"; + repo = "grig"; + rev = "GRIG-${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ hamlib_4 gtk2 ]; + + meta = with lib; { + description = "A simple Ham Radio control (CAT) program based on Hamlib"; + longDescription = '' + Grig is a graphical user interface for the Ham Radio Control Libraries. + It is intended to be simple and generic, presenting the user with the + same interface regardless of which radio they use. + ''; + homepage = "https://groundstation.sourceforge.net/grig/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/applications/radio/kappanhang/default.nix index a236de8d9468d..9146bfd781c9e 100644 --- a/pkgs/applications/radio/kappanhang/default.nix +++ b/pkgs/applications/radio/kappanhang/default.nix @@ -20,6 +20,7 @@ buildGoModule rec { homepage = "https://github.com/nonoo/kappanhang"; description = "Remote control for Icom radio transceivers"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ mvs ]; }; } diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 45f609c08f232..cac4144f544c1 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,14 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.8.3"; + version = "7.8.5"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-zP3Ic0mru0FcX7ZuE/IKGmHA596lq5Y1cWdBESzzU0U="; - fetchSubmodules = false; + sha256 = "sha256-m5b51rR2l4EdF2kMogHIi1ojoy3UwuU0Q3pfB1ev300="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index dc84dcfd98d72..2eef054d5ff57 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30 +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK32 , curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - wxGTK30 + wxGTK32 curl gettext glib diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 559c36ece8c90..89ba8bf0e9d96 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://stellarium.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index abcedf7ee7b9f..bd92ae01ebb1f 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mafo ]; license = "xearth"; platforms=platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 8a143d36a29b5..e117af03b57dd 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ANTs"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; rev = "v${version}"; - sha256 = "sha256-edkvTkgBNaC87Q0N/Fsebr9nRLMhDo4mrSGoMICdnwU="; + sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 1702079e017fe..954b704be0c6b 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.4.5"; + version = "2.5.1"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xCsTkQXrZS+Njn0YfidhPln+OwVfTXOqbtB0dCfTP2U="; + sha256 = "sha256-HaiZmWU6akHXJVWBmCvkG2E61NDrAP7UIxx9DNCEZqE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index 801ad00876bf5..d9ae226027a0b 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A software package for mapping low-divergent sequences against a large reference genome, such as the human genome"; license = licenses.gpl3; - homepage = "http://bio-bwa.sourceforge.net/"; + homepage = "https://bio-bwa.sourceforge.net/"; maintainers = with maintainers; [ luispedro ]; platforms = platforms.x86_64; }; diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix index 1739a4c999a44..eaf0b59327260 100644 --- a/pkgs/applications/science/biology/deeptools/default.nix +++ b/pkgs/applications/science/biology/deeptools/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { deeptoolsintervals ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "https://deeptools.readthedocs.io/en/develop"; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 29669d027303a..d590a5da8a674 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; license = lib.licenses.gpl2; - homepage = "http://emboss.sourceforge.net/"; + homepage = "https://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/genmap/default.nix b/pkgs/applications/science/biology/genmap/default.nix index c2d1b8da7af12..c6f9cf1fb1932 100644 --- a/pkgs/applications/science/biology/genmap/default.nix +++ b/pkgs/applications/science/biology/genmap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; patches = [ ./gtest.patch ]; - checkInputs = [ gtest which ]; + nativeCheckInputs = [ gtest which ]; preCheck = "make genmap_algo_test"; # disable benchmarks diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 8262714256635..b330f6b41a05b 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.15.1"; + version = "2.15.4"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-hwZ6Pl6BxoVbJI5e3b0s7jhQ/AADhVJVqM9Q8ppERuk="; + sha256 = "sha256-nDD0QTtLDe//VFMsIPKIykZ6dY85p3aomrCaF1p9HQM="; }; installPhase = '' diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 99b6269737d1e..4cb130296aeca 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { qt5.qtsvg ]; - installCheckInputs = [ bc ]; + nativeInstallCheckInputs = [ bc ]; postPatch = '' patchShebangs ./build ./configure ./run_tests ./bin/* diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 4696b63d7a179..f6f2f3c43bb28 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.27.4"; + version = "2.27.5"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-H52iduXuZXkH7i+1qGq05DTPgLGZD2ke6US5nTzmvDg="; + sha256 = "sha256-Exyj4GJqPvEug5l5XnpJ+Cm7ToXXG0ib9PIx0hpsMZk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 41129a667e914..c72dd1b19077d 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; # tests require `bgzip` from the htslib package - checkInputs = [ htslib ]; + nativeCheckInputs = [ htslib ]; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix index 590f10dd87a1a..2472e4976cad9 100644 --- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; - homepage = "http://samtools.sourceforge.net/"; + homepage = "https://samtools.sourceforge.net/"; platforms = platforms.unix; maintainers = [ maintainers.unode ]; }; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index a47a107349da0..269d6e307f1da 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Genetic variant annotation and effect prediction toolbox"; license = licenses.lgpl3; - homepage = "http://snpeff.sourceforge.net/"; + homepage = "https://snpeff.sourceforge.net/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 3555929a33eaf..e1a21cba0da23 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.10a"; + version = "2.7.10b"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "sha256-qwddCGMOKWgx76qGwRQXwvv9fCSeVsZbWHmlBwEqGKE="; + sha256 = "sha256-58Y4lzqXwBhRlXcionUg2IhAg5znNUuyr/FsuNZd+5Q="; }; sourceRoot = "source/source"; diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 987433a3a6d5d..9206c4fbed7bf 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; - homepage = "http://subread.sourceforge.net/"; + homepage = "https://subread.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index 31c1fc50ee3ef..412642f523f2d 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyvcf - python-Levenshtein + levenshtein progressbar2 pysam pyfaidx diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 01fbfb1ccf9c0..81849f675af31 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "cp2k"; - version = "2022.2"; + version = "2023.1"; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; rev = "v${version}"; - hash = "sha256-zDIsgPcLnA0ATJEN1vQClpkToqvIyW7KuXhyGiXJXDw="; + hash = "sha256-SG5Gz0cDiSfbSZ8m4K+eARMLU4iMk/xK3esN5yt05RE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c72a4ace2480a..b5b5be84c8ec1 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.76"; + version = "14.32.83"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-KdQZKiAJFKE2PW0/DdZGIOC8QQ1icQR+TY4hoXCQdxg="; + sha256 = "sha256-otvaDPdGRmtUfWfy7m+CJOyDOFuW/AExbskYnYEikY8="; }; patchPhase = '' diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index fc24ec7e1aab2..9b15ef8939c32 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.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; rev = "refs/tags/v${version}"; - sha256 = "U9jqFdksD1D9+mFoyj57eHCPi8raWKpf6iB+mRXMG8o="; + sha256 = "sha256-TKF7nkhnp+JXTD2J/FyVxQoVZgOSKX1IQ/RPqRBOI/4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 9d06f614870aa..535871e4edba8 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -2,18 +2,17 @@ , stdenv , fetchurl , jdk -, jre , ant , makeWrapper }: stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-cqvlPV4i9m0x3hbruC5y2APsyjfI5y9RT8XVzsDaT/Q="; + sha256 = "sha256-bghI7Hun7ZKUVEj7T58K0oaclnhUGd4z+eIqZF3eXHQ="; }; nativeBuildInputs = [ ant makeWrapper ]; @@ -37,11 +36,11 @@ stdenv.mkDerivation rec { # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/DataExplorer \ + makeWrapper ${jdk}/bin/java $out/bin/DataExplorer \ --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 - makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \ + makeWrapper ${jdk}/bin/java $out/bin/DevicePropertiesEditor \ --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix new file mode 100644 index 0000000000000..0515809dffebb --- /dev/null +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -0,0 +1,99 @@ +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper +, jre, maven, git +}: + +let + pkgDescription = "A digital logic designer and circuit simulator."; + version = "0.29"; + buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date + + desktopItem = makeDesktopItem { + type = "Application"; + name = "Digital"; + desktopName = pkgDescription; + comment = "Easy-to-use digital logic designer and circuit simulator"; + exec = "digital"; + icon = "digital"; + categories = [ "Education" "Electronics" ]; + mimeTypes = [ "text/x-digital" ]; + terminal = false; + keywords = [ "simulator" "digital" "circuits" ]; + }; + + # Use the "no-git-rev" maven profile, which deactivates the plugin that + # inspect the .git folder to find the version number we are building, we then + # provide that version number manually as a property. + # (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481) + mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}"; +in +stdenv.mkDerivation rec { + pname = "digital"; + inherit version jre; + + src = fetchFromGitHub { + owner = "hneemann"; + repo = "Digital"; + rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c"; + sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg="; + }; + + # Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to + # a version where they support reproducible builds + patches = [ ./pom.xml.patch ]; + + # Fetching maven dependencies from "central" needs the network at build phase, + # we do that in this extra derivation that explicitely specifies its + # outputHash to ensure determinism. + mavenDeps = stdenv.mkDerivation { + name = "${pname}-${version}-maven-deps"; + inherit src nativeBuildInputs version patches postPatch; + dontFixup = true; + buildPhase = '' + mvn package ${mvnOptions} -Dmaven.repo.local=$out + ''; + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with + # lastModified timestamps inside + installPhase = '' + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI="; + }; + + nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; + + postPatch = '' + substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}" + ''; + + buildPhase = '' + mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps} + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/java + + classpath=$(find ${mavenDeps} -name "*.jar" -printf ':%h/%f'); + install -Dm644 target/Digital.jar $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ + --add-flags "-jar $out/share/java/Digital.jar" + ''; + + desktopItems = [ desktopItem ]; + + meta = with lib; { + homepage = "https://github.com/hneemann/Digital"; + description = pkgDescription; + license = licenses.gpl3Only; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ Dettorer ]; + }; +} diff --git a/pkgs/applications/science/electronics/digital/pom.xml.patch b/pkgs/applications/science/electronics/digital/pom.xml.patch new file mode 100644 index 0000000000000..cdc5a777c49d1 --- /dev/null +++ b/pkgs/applications/science/electronics/digital/pom.xml.patch @@ -0,0 +1,30 @@ +diff --git a/pom.xml b/pom.xml +index d5f8330b4..58ed18b63 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -129,7 +130,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> +- <version>2.5</version> ++ <version>3.2.0</version> + <configuration> + <archive> + <manifest> +@@ -188,6 +189,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> ++ <version>3.2.0</version> + <configuration> + <finalName>Digital</finalName> + <appendAssemblyId>false</appendAssemblyId> +@@ -202,7 +204,7 @@ + </manifest> + <manifestEntries> + <Build-SCM-Revision>${git.commit.id.describe}</Build-SCM-Revision> +- <Build-Time>${maven.build.timestamp}</Build-Time> ++ <Build-Time>@buildDate@</Build-Time> + <SplashScreen-Image>icons/splash.png</SplashScreen-Image> + </manifestEntries> + </archive> diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index c8d5fc5dde748..f016b53d553cc 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "dsview"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; rev = "v${version}"; - sha256 = "sha256-TE2yfzv2h77GLMkmoVGXmzs7J0l/N+n1eYxyrtnrnGU="; + sha256 = "sha256-QaCVu/n9PDbAiJgPDVN6SJMILeUO/KRkKcHYAstm86Q="; }; patches = [ diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index ca2b2e5175b0a..22b65f2da313a 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -a ${parts}/* parts/ ''; - NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; + NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; qmakeFlags = [ "phoenix.pro" diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 57104cb045eee..57a832fed2423 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.113"; + version = "3.3.114"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-bv81puBSiFVkO2hNk63rMchbTSN3KtSnyHnL0/apQe0="; + sha256 = "sha256-zzpfyrs3qWckzeLkp0A73ye1HpFGzmenlNvkcBfPhKw="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 3bc4133a222ca..7f001e73cf7ba 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { # Fixes replaced/obsolete Qt methods (fetchpatch { url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch"; - sha256 = "1rg8azin2b7gmp68bn3z398swqlg15ddyp4xynrz49wj44cgxsdv"; + sha256 = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8="; }) ]; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index b2e3704cba70f..e22138997beaf 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical editor for finite state machines"; - homepage = "http://qfsm.sourceforge.net/"; + homepage = "https://qfsm.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 0a190a1c90294..33d145c007566 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ perl ]; nativeBuildInputs = [ flex bison python3 autoconf ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; doCheck = stdenv.isLinux; # darwin tests are broken for now... checkTarget = "test"; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 4994a1db7b2a2..994ecb8c13149 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installCheckInputs = [ perl ]; + nativeInstallCheckInputs = [ perl ]; installCheckPhase = '' # copy tests to allow writing results diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 2c52916bd9059..06872eae740f0 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { popd ''; - checkInputs = [ + nativeCheckInputs = [ bc perl (python3.withPackages (ps: with ps; [ numpy scipy ])) diff --git a/pkgs/applications/science/engineering/strictdoc/default.nix b/pkgs/applications/science/engineering/strictdoc/default.nix index ce834f7d576bd..c81652c5ae7e6 100644 --- a/pkgs/applications/science/engineering/strictdoc/default.nix +++ b/pkgs/applications/science/engineering/strictdoc/default.nix @@ -73,7 +73,7 @@ buildPythonApplication rec { XlsxWriter ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index 9ca7cc10c77f7..121d9bf2e20bb 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jOyoWPcZvHWuddLasjIjHSn8MOV3viIgmBrsuzY7P6U="; + sha256 = "sha256-OKVAgmHdhQoS3kCwclE9ljON3H2NVCCvpR2hgwfqnA0="; }; buildInputs = [ expat ]; nativeBuildInputs = [ texinfo zip ]; - checkInputs = [ octave libxml2 ]; + nativeCheckInputs = [ octave libxml2 ]; doCheck = true; meta = with lib ; { diff --git a/pkgs/applications/science/logic/anders/default.nix b/pkgs/applications/science/logic/anders/default.nix index bb60b2b8321af..ccb81686cb32c 100644 --- a/pkgs/applications/science/logic/anders/default.nix +++ b/pkgs/applications/science/logic/anders/default.nix @@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec { pname = "anders"; version = "1.1.1"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "groupoid"; diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 6a94d3f639e25..19d296269f98b 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec { sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw"; }; - useDune2 = true; + duneVersion = "3"; buildInputs = with ocamlPackages; [ gen sedlex extlib dune-build-info linenoise @@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec { ''; checkPhase = "./TEST"; - checkInputs = [ rsync ]; + nativeCheckInputs = [ rsync ]; doCheck = true; postInstall = '' diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index cc8651f69cfa0..4af4058339d93 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "-DBtor2Tools_LIBRARIES=${lib.getLib btor2tools}/lib/libbtor2parser${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optional doCheck "-DTESTING=YES"; - checkInputs = [ python3 gtest ]; + nativeCheckInputs = [ python3 gtest ]; # two tests fail on darwin and 3 on aarch64-linux doCheck = stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAarch64); preCheck = let diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 74927dd434d02..1d7e01c553b65 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "-DUSE_LINGELING=YES" ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES"); - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; preCheck = let var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index ddee2351f6f3c..4009761e8dc3c 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.71.0"; + version = "5.74.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-GApVmLTa1GsZNhwVW6R0KsNJOQH/2qP1CfR7VyP+o8I="; + sha256 = "sha256-n4a/0Ak2psHDCXykVSPYavuIl22uq2ZP7LUcdSzg1ow="; }; nativeBuildInputs = [ @@ -78,5 +78,7 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; + # https://github.com/diffblue/cbmc/issues/7423 + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 611bbbe979f88..4d026a2d9c7a3 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -4,7 +4,6 @@ , alex , happy , Agda -, buildPlatform , buildPackages , ghcWithPackages }: @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = - lib.optionalString (buildPlatform.libc == "glibc") + lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; postPatch = '' diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f223763c9b603..8a40216c3ecba 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -53,6 +53,7 @@ let "8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd"; "8.16.0".sha256 = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is="; "8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc="; + "8.17+rc1".sha256 = "sha256-BsVgYa2fAYqRmQNSaY/YSiZhqkmwM+xbE5T4FHOEqkc="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index aa3fba635ffc1..67f70e7165d4c 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -1,22 +1,44 @@ -{ lib, stdenv, fetchurl, ocamlPackages }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, which +, ocamlPackages +}: stdenv.mkDerivation rec { pname = "cubicle"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; - sha256 = "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q"; + url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz"; + hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y="; }; + # https://github.com/cubicle-model-checker/cubicle/issues/1 postPatch = '' - substituteInPlace Makefile.in --replace "\\n" "" + substituteInPlace Makefile.in \ + --replace "@OCAMLC@" "ocamlfind ocamlc -package num" \ + --replace "@OCAMLOPT@" "ocamlfind ocamlopt -package num" ''; - buildInputs = with ocamlPackages; [ ocaml findlib functory ]; + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + which + ] ++ (with ocamlPackages; [ + findlib + ocaml + ]); + + buildInputs = with ocamlPackages; [ + functory + num + ]; meta = with lib; { description = "An open source model checker for verifying safety properties of array-based systems"; - homepage = "http://cubicle.lri.fr/"; + homepage = "https://cubicle.lri.fr/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dwarfmaster ]; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index ba0f3ee2e255f..98db5682e7e76 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fast-downward"; - version = "22.06.1"; + version = "22.12.0"; src = fetchFromGitHub { owner = "aibasel"; repo = "downward"; rev = "release-${version}"; - sha256 = "sha256-SBksyZoLR1MtyJUbGigGIbT72qVpN+nznU/bmJGYRz8="; + sha256 = "sha256-GwZ5BGzLRMgWNBaA7M2D2p9OxvdyWqm+sTwxGpcI/qY="; }; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/applications/science/logic/kissat/default.nix index 772e9c22a59a2..48d986cd5f6dd 100644 --- a/pkgs/applications/science/logic/kissat/default.nix +++ b/pkgs/applications/science/logic/kissat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - checkInputs = [ drat-trim p7zip ]; + nativeCheckInputs = [ drat-trim p7zip ]; doCheck = true; # 'make test' assumes that /etc/passwd is not writable. diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index e492daaced378..024e6e526c4e4 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { cmake ]; - checkInputs = [ + nativeCheckInputs = [ gtest # Should appear BEFORE lit, since lit passes through python rather diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 81a5afbc2bace..d3d87be387485 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.49.0"; + version = "3.50.3"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "acf633e01a8783a12060b0a1b7b5b5e15fd73e77"; - sha256 = "sha256-KF13DlGEl6aICSp/haczo54gjLZaOxyzFRdzvyyiu5M="; + rev = "855e5b74e3a52a40552e8f067169d747d48743fd"; + sha256 = "sha256-RH4w7PpzC+fhqCHikXQO2pUUvWD2qrA0mVMUGxpauwE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 9650d97814bf4..affbfc170b901 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logisim-evolution"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "sha256-RI+ioOHj13UAGuPzseAAy3oQBQYkja/ucjj4QMeRZhw="; + sha256 = "sha256-TFm+fa3CMp0OMhnKBc6cLIWGQbIG/OpOOCG7ea7wbCw="; }; dontUnpack = true; diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index fca3c20cd853c..5b17403dc7f4b 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Automatic theorem prover for first-order logic with equality"; - homepage = "http://www.gilith.com/research/metis/"; + homepage = "https://www.gilith.com/research/metis/"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 7295cdd30ae16..5b894d2c9376f 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -89,7 +89,7 @@ let --replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"' ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_assertAtMostOne" diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 7a523bbf24ef1..648ebee6550c0 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -1,10 +1,10 @@ -{lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: +{ lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq }: stdenv.mkDerivation rec { pname = "satallax"; version = "2.7"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ocaml zlib which eprover coq]; + buildInputs = [ ocaml zlib which eprover coq ]; src = fetchurl { url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { ./fix-declaration-gcc9.patch ]; + prePatch = '' + patch -p1 -i ${../avy/minisat-fenv.patch} -d minisat + ''; + preConfigure = '' mkdir fake-tools echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname @@ -41,7 +45,8 @@ stdenv.mkDerivation rec { ) ''; - postBuild = "echo testing; ! (bash ./test | grep ERROR)"; + # error: invalid suffix on literal; C++11 requires a space between literal and identifier + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal"; installPhase = '' mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" @@ -59,11 +64,22 @@ stdenv.mkDerivation rec { cp -r coq* "$out/lib/satallax/" ''; + doCheck = stdenv.isLinux; + + checkPhase = '' + runHook preCheck + if bash ./test | grep ERROR; then + echo "Tests failed" + exit 1 + fi + runHook postCheck + ''; + meta = { description = "Automated theorem prover for higher-order logic"; - license = lib.licenses.mit ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.unix; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; }; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index ffc61ed1d03bb..19c021684b3ff 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; doCheck = false; # not all provers are yet packaged... - checkInputs = [ python3 yosys boolector yices z3 aiger ]; + nativeCheckInputs = [ python3 yosys boolector yices z3 aiger ]; checkPhase = "make test"; meta = { diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 160d67094f4c0..8ca2a6baa8890 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A platform for deductive program verification"; - homepage = "http://why3.lri.fr/"; + homepage = "https://why3.lri.fr/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vbgl ]; diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 5671317e30ef0..173d1d5a21300 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.3.8"; + version = "3.3.9"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-T2rUEZsO8g/nk10LZvC+mXEC6IzutbjncERlmqg814g="; + sha256 = "sha256-Z3QtOGyOjmiM+qfB0FO4UDg8O99Ru/Qy2WNoBpXd1So="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix deleted file mode 100644 index 857bbbdee5d00..0000000000000 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python }: - -stdenv.mkDerivation rec { - pname = "z3"; - version = "4.4.0"; - - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152"; - sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx"; - }; - - buildInputs = [ python ]; - enableParallelBuilding = true; - - CXXFLAGS = if stdenv.isDarwin then "-std=gnu++98" else null; - - configurePhase = "python scripts/mk_make.py --prefix=$out && cd build"; - - # z3's install phase is stupid because it tries to calculate the - # python package store location itself, meaning it'll attempt to - # write files into the nix store, and fail. - soext = stdenv.hostPlatform.extensions.sharedLibrary; - installPhase = '' - mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include - cp ../src/api/z3*.h $out/include - cp ../src/api/c++/z3*.h $out/include - cp z3 $out/bin - cp libz3${soext} $out/lib - cp libz3${soext} $out/lib/${python.libPrefix}/site-packages - cp z3*.pyc $out/lib/${python.libPrefix}/site-packages - cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages - ''; - - meta = { - description = "A high-performance theorem prover and SMT solver"; - homepage = "https://github.com/Z3Prover/z3"; - license = lib.licenses.mit; - platforms = lib.platforms.x86_64; - maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; - }; -} diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 4d92f4f2ea34b..75cfa2568f85a 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -92,8 +92,4 @@ in version = "4.8.15"; sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5"; }; - z3_4_7 = common { - version = "4.7.1"; - sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d"; - }; } diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index 81e0ccc71d66d..ab0c10efebce7 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, boost165, zlib }: +{ lib, stdenv, fetchFromGitHub, boost, zlib }: stdenv.mkDerivation rec { pname = "starspace"; - version = "unstable-2021-01-17"; + version = "unstable-2019-12-13"; src = fetchFromGitHub { owner = "facebookresearch"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj"; }; - buildInputs = [ boost165 zlib ]; + buildInputs = [ boost zlib ]; makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" - "BOOST_DIR=${boost165.dev}/include" + "BOOST_DIR=${boost.dev}/include" ]; preBuild = '' diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index b23b433becd31..fedb219a0c194 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ bc python3Packages.pytestCheckHook ]; + nativeCheckInputs = [ bc python3Packages.pytestCheckHook ]; pytestFlagsArray = [ "test.py" ]; diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index af1be978459cb..48c36b6677f5d 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { - homepage = "http://fricas.sourceforge.net/"; + homepage = "https://fricas.sourceforge.net/"; description = "An advanced computer algebra system"; license = lib.licenses.bsd3; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 22eee8b305a52..4d9b3afe31ca4 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,15 +1,17 @@ { lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg -, zlib, libGL, libGLU, xorg, opencascade-occt }: +, zlib, libGL, libGLU, xorg, opencascade-occt +, python ? null, enablePython ? false }: assert (!blas.isILP64) && (!lapack.isILP64); +assert enablePython -> (python != null); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-PPLyRFXuCSUsmeZNTmRilW5o8P8fN7rKC3jICdbMVXo="; + sha256 = "sha256-xf4bfL1AOIioFJKfL9D11p4nYAIioYx4bbW3boAFs2U="; }; buildInputs = [ @@ -18,10 +20,31 @@ stdenv.mkDerivation rec { libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE + ] ++ lib.optional enablePython python; + + enableParallelBuilding = true; + + patches = [ ./fix-python.patch ]; + + postPatch = '' + substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so + ''; + + # N.B. the shared object is used by bindings + cmakeFlags = [ + "-DENABLE_BUILD_SHARED=ON" + "-DENABLE_BUILD_DYNAMIC=ON" + "-DENABLE_OPENMP=ON" ]; nativeBuildInputs = [ cmake gfortran ]; + postFixup = lib.optionalString enablePython '' + mkdir -p $out/lib/python${python.pythonVersion}/site-packages + mv $out/lib/gmsh.py $out/lib/python${python.pythonVersion}/site-packages + mv $out/lib/*.dist-info $out/lib/python${python.pythonVersion}/site-packages + ''; + doCheck = true; meta = { diff --git a/pkgs/applications/science/math/gmsh/fix-python.patch b/pkgs/applications/science/math/gmsh/fix-python.patch new file mode 100644 index 0000000000000..ac07c169c99b8 --- /dev/null +++ b/pkgs/applications/science/math/gmsh/fix-python.patch @@ -0,0 +1,50 @@ +diff --git a/api/gmsh.py b/api/gmsh.py +index 747acb203..02004da5d 100644 +--- a/api/gmsh.py ++++ b/api/gmsh.py +@@ -44,44 +44,7 @@ moduledir = os.path.dirname(os.path.realpath(__file__)) + parentdir1 = os.path.dirname(moduledir) + parentdir2 = os.path.dirname(parentdir1) + +-if platform.system() == "Windows": +- libname = "gmsh-4.11.dll" +-elif platform.system() == "Darwin": +- libname = "libgmsh.4.11.dylib" +-else: +- libname = "libgmsh.so.4.11" +- +-# check if the library is in the same directory as the module... +-libpath = os.path.join(moduledir, libname) +- +-# ... or in the parent directory or its lib or Lib subdirectory +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, "lib", libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, "Lib", libname) +- +-# ... or in the parent of the parent directory or its lib or Lib subdirectory +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, "lib", libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, "Lib", libname) +- +-# if we couldn't find it, use ctype's find_library utility... +-if not os.path.exists(libpath): +- if platform.system() == "Windows": +- libpath = find_library("gmsh-4.11") +- if not libpath: +- libpath = find_library("gmsh") +- else: +- libpath = find_library("gmsh") +- +-# ... and print a warning if everything failed +-if not os.path.exists(libpath): +- print("Warning: could not find Gmsh shared library " + libname) ++libpath = "@LIBPATH@" + + lib = CDLL(libpath) + diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 5e1ac5d17733b..a2624c29662e4 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2022b"; + version = "2022c"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-A+LyWPSUBBvnnyBrVSAUCiny24UAztUwy1nmRoDaGjI="; + sha256 = "sha256-4QAQTNqbfIX6K3CdtKcVONtCWrkTRvGl2ZXGR1eyQdA="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index e2526bdffa366..c0f370d884570 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -4,6 +4,7 @@ , cudaPackages , cudaSupport ? config.cudaSupport or false , lang ? "en" +, webdoc ? false , version ? null /* If you wish to completely override the src, use: @@ -30,16 +31,20 @@ let versions = callPackage ./versions.nix { }; matching-versions = lib.sort (v1: v2: lib.versionAtLeast v1.version v2.version) (lib.filter (v: v.lang == lang - && (if version == null then true else isMatching v.version version)) + && (version == null || isMatching v.version version) + && matchesDoc v) versions); found-version = if matching-versions == [] then throw ("No registered Mathematica version found to match" - + " version=${version} and language=${lang}") + + " version=${toString version} and language=${lang}," + + " ${if webdoc + then "using web documentation" + else "and with local documentation"}") else lib.head matching-versions; - specific-drv = ./. + "/(lib.versions.major found-version.version).nix"; + specific-drv = ./. + "/${lib.versions.major found-version.version}.nix"; real-drv = if lib.pathExists specific-drv then specific-drv @@ -52,6 +57,11 @@ let versions = callPackage ./versions.nix { }; sublist = l: lib.sublist 0 n l; in lib.compareLists lib.compare (sublist as) (sublist bs) == 0; + matchesDoc = v: + builtins.match (if webdoc + then ".*[0-9]_LINUX.sh" + else ".*[0-9]_BNDL_LINUX.sh") v.src.name != null; + in callPackage real-drv { diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 225ceb6e3b2de..09df9e13977e1 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -1,7 +1,34 @@ { lib, requireFile }: +/* + * To calculate the hash of an installer, use a command like this: + * + * nix --extra-experimental-features nix-command hash file <installer-file> + */ + let versions = [ { + version = "13.2.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-T9XOXA6jpgN6bcO/do9sw1L73ABtyxuZCLzftv4Cl6o="; + installer = "Mathematica_13.2.0_LINUX.sh"; + } + { + version = "13.2.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-YRUvl2H9SwpwDZx04ugd7ZnK5G+t88bzAObXsGGVhk0="; + installer = "Mathematica_13.2.0_BNDL_LINUX.sh"; + } + { + version = "13.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-GZyUYslx/M4aFI3Pj9Osw3/w79/Jp/4T3mRE277pNuM="; + installer = "Mathematica_13.1.0_LINUX.sh"; + } + { version = "13.1.0"; lang = "en"; language = "English"; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 8bad09f178802..dffc212176b30 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { strictDeps = true; - checkInputs = [ + nativeCheckInputs = [ gnuplot ]; diff --git a/pkgs/applications/science/math/pagsuite/default.nix b/pkgs/applications/science/math/pagsuite/default.nix index e8ae3318eebad..6994712e18fd9 100644 --- a/pkgs/applications/science/math/pagsuite/default.nix +++ b/pkgs/applications/science/math/pagsuite/default.nix @@ -1,7 +1,8 @@ { lib , stdenv -, fetchzip +, fetchurl , cmake +, unzip , gmp , scalp }: @@ -10,17 +11,16 @@ stdenv.mkDerivation rec { pname = "pagsuite"; version = "1.80"; - src = fetchzip { + src = fetchurl { url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "sha256-JuRuDPhKKBGz8jUBkZcZW5s2berOewjsPNR/n7kuofY="; - stripRoot = false; - postFetch = '' - mv $out/pagsuite*/* $out - ''; + hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ="; }; + sourceRoot = "pagsuite_${lib.replaceStrings ["."] ["_"] version}"; + nativeBuildInputs = [ cmake + unzip ]; buildInputs = [ diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 134b075ea1a43..dd1b7c301ae2d 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-NRoHmQw20NfZtZVzckh8eigJ4s2RUcQRb8w8fLh5yeQ="; + sha256 = "sha256-ilPz2W9pcbK5dnYl7Tuxf9p7ag/KmEufckooXBUcCk0="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 5571286d542cf..dbcacb36be6b9 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -1,18 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools }: +{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools, qtsvg, qtwayland }: stdenv.mkDerivation rec { pname = "qalculate-qt"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${version}"; - sha256 = "sha256-oUteOAtNjmYzHeIg4xdMAlMW/lLRV0DZCK1RqHVvYEQ="; + hash = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w="; }; nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ]; - buildInputs = [ libqalculate qtbase qttools ]; + buildInputs = [ libqalculate qtbase qttools qtsvg qtwayland ]; + + postPatch = '' + substituteInPlace qalculate-qt.pro\ + --replace "LRELEASE" "${qttools.dev}/bin/lrelease" + ''; meta = with lib; { description = "The ultimate desktop calculator"; diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index 7621c2dfdff74..bb945b06ba137 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ libiconv ]; + buildInputs = [ libiconv ]; + + enableParallelBuilding = true; meta = { homepage = "https://github.com/WizardMac/ReadStat"; diff --git a/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch b/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch new file mode 100644 index 0000000000000..b0f3634340f53 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch @@ -0,0 +1,13 @@ +diff --git a/src/sage/interacts/library.py b/src/sage/interacts/library.py +index 06d680109a..139b00bfd1 100644 +--- a/src/sage/interacts/library.py ++++ b/src/sage/interacts/library.py +@@ -1434,6 +1434,8 @@ def riemann_sum( + creates the mathlet:: + + sage: interacts.calculus.riemann_sum() ++ ... ++ DeprecationWarning: on_submit is deprecated. Instead, set the .continuous_update attribute to False and observe the value changing with: mywidget.observe(callback, 'value'). + Manual interactive function <function riemann_sum at ...> with 9 widgets + title: HTMLText(value='<h2>Riemann integral with random sampling</h2>') + f: EvalText(value='x^2+1', description='$f(x)=$', layout=Layout(max_width='41em')) diff --git a/pkgs/applications/science/math/sage/patches/sphinx-fix-matplotlib-css-perms.patch b/pkgs/applications/science/math/sage/patches/sphinx-fix-matplotlib-css-perms.patch deleted file mode 100644 index 764ecffa23772..0000000000000 --- a/pkgs/applications/science/math/sage/patches/sphinx-fix-matplotlib-css-perms.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/sage_docbuild/ext/multidocs.py b/src/sage_docbuild/ext/multidocs.py -index f91c7753ca..edeb81ff2e 100644 ---- a/src/sage_docbuild/ext/multidocs.py -+++ b/src/sage_docbuild/ext/multidocs.py -@@ -284,6 +284,16 @@ def init_subdoc(app): - if not app.config.multidoc_first_pass: - app.connect('env-updated', fetch_citation) - -+ def fix_matplotlib_css_permissions(app: Sphinx, env): -+ css_file = os.path.join(app.builder.outdir, '_static', 'plot_directive.css') -+ try: -+ os.chmod(css_file, 0o644) -+ except: -+ pass -+ -+ # executed after matplotlib's _copy_css_file -+ app.connect('build-finished', fix_matplotlib_css_permissions, priority=600) -+ - # Monkey patch copy_static_files to make a symlink to "../" - def link_static_files(): - """ diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index cd553843d69d3..d68a2c8a107ac 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -80,10 +80,6 @@ stdenv.mkDerivation rec { # Parallelize docubuild using subprocesses, fixing an isolation issue. See # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch - - # Docbuilding copies files from the Nix store and expects them to be writable. - # Remove when https://github.com/matplotlib/matplotlib/pull/23805 lands. - ./patches/sphinx-fix-matplotlib-css-perms.patch ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -93,6 +89,14 @@ stdenv.mkDerivation rec { # To help debug the transient error in # https://trac.sagemath.org/ticket/23087 when it next occurs. ./patches/configurationpy-error-verbose.patch + + # https://trac.sagemath.org/ticket/33907 + (fetchSageDiff { + name = "interfaces-expectpy-intermittent.patch"; + base = "9.8.beta6"; + rev = "6f5c1c2fc8bcfb5e6555716d05ce70511795ffa1"; + sha256 = "sha256-z8FQxtrk62MHzPjrUTad+fMAE6XV8GTsLWKgGOM3zBg="; + }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -163,6 +167,33 @@ stdenv.mkDerivation rec { # conflicts. The patch below contains rebased versions. ./patches/pari-2.15.1-upgrade-rebased.patch + # https://trac.sagemath.org/ticket/34668 + (fetchSageDiff { + name = "matplotlib-3.6-upgrade.patch"; + base = "9.8.beta2"; + rev = "5501e0de0dca1cff0355326dd42bd8c7e5749568"; + sha256 = "sha256-ceJkVaecIsZewN8v/3gPQXFbFjv5Akz6zEFg/ToXdek="; + }) + + # https://trac.sagemath.org/ticket/34693 + (fetchSageDiff { + name = "matplotlib-3.6-docbuilding.patch"; + base = "9.8.beta4"; + rev = "64589686c261d33e6b5aff2589bcae8af004bcc6"; + sha256 = "sha256-j5AMY1TmhP+HBBBYaFZSkABJ5vtwe6iP2LRfGEgSm8Q="; + }) + + # https://trac.sagemath.org/ticket/34615 + (fetchSageDiff { + name = "sphinx-5.2-upgrade.patch"; + base = "9.8.beta1"; + rev = "8f8af65e54d3a9962cfab40f15dc23f4e955b43f"; + sha256 = "sha256-yhDdyxnXSSkqLcuOPBWSEBc26rk1Od3gLcWW8S2p8bY="; + }) + + # temporarily paper over https://github.com/jupyter-widgets/ipywidgets/issues/3669 + ./patches/ipywidgets-on_submit-deprecationwarning.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/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 8f864d136928a..143e5a2a22b3c 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -49,7 +49,7 @@ , boost , singular , pip -, jupyter_core +, jupyter-core , sage-setup , libhomfly , libbraiding @@ -87,7 +87,7 @@ buildPythonPackage rec { nativeBuildInputs = [ iml perl - jupyter_core + jupyter-core pkg-config sage-setup pip # needed to query installed packages diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index c29015402a39f..004060f832c22 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; # The -Xmx1000M comes suggested from their download page: - # http://www.cs.waikato.ac.nz/ml/weka/downloading.html + # https://www.cs.waikato.ac.nz/ml/weka/downloading.html installPhase = '' mkdir -pv $out/share/weka cp -Rv * $out/share/weka @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; + homepage = "https://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index aea24b84d1d4c..205fe3ebed5de 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -7,17 +7,18 @@ , maxima , wxGTK , gnome +, glib }: stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "22.05.0"; + version = "22.12.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-pcKnEjJmvMXCBpjtOSLyl4I0x3fjh0os9Sdp39I2Re0="; + sha256 = "sha256-RT6y4M6LQD1fXJcjtdSXnDmoJvv160g2asdV4WtTcok="; }; buildInputs = [ @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { maxima # So it won't embed svg files into headers. gnome.adwaita-icon-theme + # So it won't crash under Sway. + glib ]; nativeBuildInputs = [ @@ -33,6 +36,10 @@ stdenv.mkDerivation rec { gettext ]; + cmakeFlags = [ + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + ]; + preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index f7dc2a344e185..7fa2fe1a6075e 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { preCheck = '' patchShebangs ../tests/test-yacas ''; - checkInputs = [ + nativeCheckInputs = [ gtest ]; doCheck = true; diff --git a/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch new file mode 100644 index 0000000000000..053edac85b21b --- /dev/null +++ b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in +index 13c79c0d5..b1edf725c 100644 +--- a/CMake/dcmtk.pc.in ++++ b/CMake/dcmtk.pc.in +@@ -1,6 +1,6 @@ + prefix="@CMAKE_INSTALL_PREFIX@" + exec_prefix="${prefix}" +- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" ++ libdir=@CMAKE_INSTALL_FULL_LIBDIR@" + includedir="${prefix}/include/" + + Name: DCMTK diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index a1f4b455ce797..878f62c666e28 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv +, libpng, cmake, fetchpatch }: with lib; stdenv.mkDerivation rec { @@ -14,8 +15,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng zlib libtiff libxml2 openssl libiconv ]; + # This is only needed until https://github.com/DCMTK/dcmtk/pull/75/files is merged + patches = [ ./0001-Fix-cmake.patch ]; + + doCheck = true; + meta = { - description = "Collection of libraries and applications implementing large parts of the DICOM standard"; + description = + "Collection of libraries and applications implementing large parts of the DICOM standard"; longDescription = '' DCMTK is a collection of libraries and applications implementing large parts of the DICOM standard. It includes software for examining, constructing and converting DICOM image files, handling offline media, diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index 2050517894b97..5a0f3877cdbf4 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xmedcon"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ui7XoLSzTMPIFW/3nARCmvlGF+1l7pmcnKsnvn3NFJE="; + sha256 = "sha256-g1CRJDokLDzB+1YIuVQNByBLx01CI47EwGeluqVDujk="; }; buildInputs = [ diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 2304e9f77f4cb..76495f5cae150 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.7.2"; + version = "0.8.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+b4Ko2srWZUs8zsH9jU+aiKQYZti3z2Bil8PogfpPlc="; + sha256 = "sha256-mdAoJh3qOwtPX8cMCYw7MDDNy10GdhynnS8gtszJROI="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { libadwaita ]; - checkInputs = [ + nativeCheckInputs = [ appstream-glib desktop-file-utils ]; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 6a1bdc3de1607..f6d9f4510faf8 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,19 +7,19 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220224085855"; + version = "3.1.20221201130942"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; - rev = version; - sha256 = "sha256-7+1xOV5Lodqtku0wX1urAEHsCcYKM3Vcd5RDg4DdVow="; + rev = "refs/tags/${version}"; + hash = "sha256-PeddmHMJYtj/AAItmUVeyETizF7SKzkJ3bXYkeZU+xs="; }; postPatch = '' substituteInPlace setup.py \ - --replace "ruamel.yaml >= 0.15, < 0.17.18" "ruamel.yaml" \ + --replace "ruamel.yaml >= 0.15, < 0.17.22" "ruamel.yaml" \ --replace "prov == 1.5.1" "prov" \ --replace "setup_requires=PYTEST_RUNNER," "" ''; @@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { argcomplete bagit coloredlogs + cwl-utils mypy-extensions prov psutil @@ -44,10 +45,11 @@ python3.pkgs.buildPythonApplication rec { typing-extensions ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock nodejs pytest-mock + pytest-httpserver pytest-xdist pytestCheckHook ]; @@ -56,6 +58,7 @@ python3.pkgs.buildPythonApplication rec { "test_content_types" "test_env_filtering" "test_http_path_mapping" + "test_modification_date" ]; disabledTestPaths = [ @@ -70,6 +73,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Common Workflow Language reference implementation"; homepage = "https://www.commonwl.org"; + changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 6c55027d3c6fc..e71c232be8f01 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -12,11 +12,24 @@ stdenv.mkDerivation { patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ]; - buildInputs = [ ocaml ncurses ]; + postPatch = '' + # Deprecated in ocaml 3.10 https://github.com/ocaml/ocaml/commit/f6190f3d0c49c5220d443ee8d03ca5072d68aa87 + # Deprecated in ocaml 3.08 https://github.com/ocaml/ocaml/commit/0c7aecb88dc696f66f49f3bed54a037361a26b8d + substituteInPlace fastdot_c.c --replace copy_double caml_copy_double --replace Bigarray_val Caml_ba_array_val --replace caml_bigarray caml_ba_array + # They were already deprecated in 3.12 https://v2.ocaml.org/releases/3.12/htmlman/libref/Array.html + substituteInPlace abffs.ml main.ml --replace create_matrix make_matrix + substituteInPlace intHashtbl.ml --replace Array.create Array.make + ''; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml ]; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ncurses ]; - makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" ]; + makeFlags = [ + "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" + ("WITHBIGARRAY=" + lib.optionalString (lib.versionOlder ocaml.version "4.08.0") "bigarray.cma") + ]; # see https://bugzilla.redhat.com/show_bug.cgi?id=435559 dontStrip = true; @@ -42,6 +55,6 @@ stdenv.mkDerivation { license = "non-commercial"; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/megam/ocaml-includes.patch b/pkgs/applications/science/misc/megam/ocaml-includes.patch index b3a56643448ca..d4f38949b4d31 100644 --- a/pkgs/applications/science/misc/megam/ocaml-includes.patch +++ b/pkgs/applications/science/misc/megam/ocaml-includes.patch @@ -15,7 +15,7 @@ diff -ru megam_0.92/Makefile megam_0.92-b/Makefile #WITHCLIBS =-I /usr/lib/ocaml/3.09.2/caml -WITHCLIBS =-I /usr/lib/ocaml/caml -+WITHCLIBS =-I $(CAML_INCLUDES) ++WITHCLIBS =-I $(CAML_INCLUDES) -I +unix -I +str ################ End of user's variables ##################### diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/applications/science/misc/nextinspace/default.nix index 8f168ab83839f..78e21dcd8788e 100644 --- a/pkgs/applications/science/misc/nextinspace/default.nix +++ b/pkgs/applications/science/misc/nextinspace/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { colorama ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-lazy-fixture pytestCheckHook requests-mock diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 81c377a91c78f..1e20e58963637 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -8,14 +8,14 @@ , enableDocs ? false }: stdenv.mkDerivation rec { - version = "2.0"; + version = "unstable-2022-12-30"; pname = "openmvg"; src = fetchFromGitHub { owner = "openmvg"; repo = "openmvg"; - rev = "v${version}"; - sha256 = "sha256-6F/xUgZpqY+v6CpwTBhIXI4JdT8HVB0P5JzOL66AVd8="; + rev = "e1bbfe801986cd7171f36443a1573b0f69f3702d"; + sha256 = "sha256-DngfmejNFw5pogTo7Ec5aUey2LUQIojvJybLmtCfvVY="; fetchSubmodules = true; }; @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.isDarwin && stdenv.isx86_64; description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; license = lib.licenses.mpl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix new file mode 100644 index 0000000000000..031f1655b0af3 --- /dev/null +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }: + +let + boostWithZstd = boost.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ zstd ]; + }); +in +stdenv.mkDerivation rec { + version = "2.1.0"; + pname = "openmvs"; + + src = fetchFromGitHub { + owner = "cdcseacave"; + repo = "openmvs"; + rev = "v${version}"; + sha256 = "sha256-eqNprBgR0hZnbLKLZLJqjemKxHhDtGblmaSxYlmegsc="; + fetchSubmodules = true; + }; + + # SSE is enabled by default + cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; + + buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + meta = { + description = "Open Multi-View Stereo reconstruction library"; + homepage = "https://github.com/cdcseacave/openMVS"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bouk ]; + }; +} diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 14a7d33af7865..ef7037eea3adc 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -5,7 +5,7 @@ , cmake , pcre , pkg-config -, python2 +, python3 , libX11 , libXpm , libXft @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] + buildInputs = [ pcre python3 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -59,6 +59,11 @@ stdenv.mkDerivation rec { url = "https://github.com/root-project/root/commit/3c243b18768d3c3501faf3ca4e4acfc071021350.diff"; sha256 = "1hjmgnp4zx6im8ps78673x0rrhmfyy1nffhgxjlfl1r2z8cq210z"; }) + (fetchpatch { + name = "root5-python37-fix.patch"; + url = "https://github.com/root-project/root/commit/c75458024082de0cc35b45505c652b8460a9e71b.patch"; + sha256 = "sha256-A5zEjQE9OGPFp/L1HUs4NIdxQMRiwbwCRNWOLN2ENrM="; + }) ]; preConfigure = '' diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index f0924d1402a92..af6aed851e09c 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -157,9 +157,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=OFF" @@ -174,6 +171,7 @@ stdenv.mkDerivation rec { "-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" + "-Dgnuinstall=ON" "-Dimt=ON" "-Dgfal=OFF" "-Dgviz=OFF" diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index 34ad91235e330..ca94be96d64e3 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook unittest-xml-reporting ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 89b174515c479..f162e2329a74d 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { # for the current basic test suite. Tibanna and Tes require extra # setup. - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pandas pytestCheckHook requests-mock diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix index 43cb6bbbc7ee3..7fc070f4f9f75 100644 --- a/pkgs/applications/science/misc/toil/default.nix +++ b/pkgs/applications/science/misc/toil/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ rsync ] ++ (with python3.pkgs; [ boto diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 576c5745b35c5..5093a586a85af 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { reference or manual for details), but there are also quite a few features that make it stand out from the competition. - See: http://www.gromacs.org/About_Gromacs for details. + See: https://www.gromacs.org/About_Gromacs for details. ''; platforms = platforms.unix; maintainers = with maintainers; [ sheepforce markuskowa ]; diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 7c5794eb8e831..92f64fbfb9168 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -1,7 +1,7 @@ { lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, libpng, libtiff, libxcrypt, openscenegraph , proj, python3, - python37Packages, stdenv, swig, xercesc, xorg, zlib }: + python3Packages, stdenv, swig, xercesc, xorg, zlib }: stdenv.mkDerivation rec { pname = "sumo"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libxcrypt openscenegraph proj - python37Packages.setuptools + python3Packages.setuptools xercesc zlib python3 diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index ff44fb34374e3..c9911c5b99937 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "sha256-UpRkd1yoKLncllEQUm80DedDtgA8Hm+Kvi/BRVCu0AE="; + sha256 = "sha256-FIozm2AmxaELIDiLBNx8RtUCy1fIjTGtnpFiAcKcZXE="; }; postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/applications/science/physics/xnec2c/default.nix new file mode 100644 index 0000000000000..47fb7cf61df98 --- /dev/null +++ b/pkgs/applications/science/physics/xnec2c/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, which +, gtk3 +, blas +, lapack +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation rec { + pname = "xnec2c"; + version = "4.4.12"; + + src = fetchurl { + url = "https://www.xnec2c.org/releases/${pname}-v${version}.tar.gz"; + hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config which ]; + buildInputs = [ gtk3 blas lapack ]; + + meta = with lib; { + homepage = "https://www.xnec2c.org/"; + description = "Graphical antenna simulation"; + license = licenses.gpl3; + maintainers = with maintainers; [ mvs ]; + platforms = platforms.unix; + + # Darwin support likely to be fixed upstream in the next release + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 712374ef7520e..c7a7315f70de0 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.57"; + version = "1.8.59"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tsx3oVXPIa3OtbLWj3QWrW9leL9/jsdbbLG+Wd3nxn4="; + sha256 = "sha256-XY0d9q4nSuPflN4ZX+nT4RKFy6i4Cd2lNWvWaJQzWW8="; }; postPatch = '' diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 7a3210459d1b7..14ac6ed69ce8b 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Wrapper for grepmail utilizing mutt"; - homepage = "http://www.barsnick.net/sw/grepm.html"; + homepage = "https://www.barsnick.net/sw/grepm.html"; license = licenses.free; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/system/mgmt/default.nix b/pkgs/applications/system/mgmt/default.nix new file mode 100644 index 0000000000000..0bc65dc95052d --- /dev/null +++ b/pkgs/applications/system/mgmt/default.nix @@ -0,0 +1,67 @@ +{ augeas +, buildGoModule +, fetchFromGitHub +, gotools +, lib +, libvirt +, libxml2 +, nex +, pkg-config +, ragel +}: +buildGoModule rec { + pname = "mgmt"; + version = "unstable-2022-10-24"; + + src = fetchFromGitHub { + owner = "purpleidea"; + repo = pname; + rev = "d8820fa1855668d9e0f7a7829d9dd0d122b2c5a9"; + hash = "sha256-jurZvEtiaTjWeDkmCJDIFlTzR5EVglfoDxkFgOilo8s="; + }; + + # patching must be done in prebuild, so it is shared with go-modules + # see https://github.com/NixOS/nixpkgs/issues/208036 + preBuild = '' + for file in `find -name Makefile -type f`; do + substituteInPlace $file --replace "/usr/bin/env " "" + done + + substituteInPlace lang/types/Makefile \ + --replace "unset GOCACHE && " "" + patchShebangs misc/header.sh + make lang funcgen + ''; + + buildInputs = [ + augeas + libvirt + libxml2 + ]; + + nativeBuildInputs = [ + gotools + nex + pkg-config + ragel + ]; + + + ldflags = [ + "-s" + "-w" + "-X main.program=${pname}" + "-X main.version=${version}" + ]; + + subPackages = [ "." ]; + + vendorHash = "sha256-Dtqy4TILN+7JXiHKHDdjzRTsT8jZYG5sPudxhd8znXY="; + + meta = with lib; { + description = "Next generation distributed, event-driven, parallel config management!"; + homepage = "https://mgmtconfig.com"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 7c0bd8b6410a3..272b875cd7a8c 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -60,6 +60,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; + auditable = true; # TODO: remove when this is the default + nativeBuildInputs = [ cmake installShellFiles diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 65b0274ca20dc..72ecca4ea488d 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -14,6 +14,7 @@ , pcre2 , libxml2 , librsvg +, libgee , callPackage , python3 , gtk3 @@ -26,14 +27,14 @@ let in stdenv.mkDerivation rec { pname = "blackbox"; - version = "0.12.2"; + version = "0.13.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "blackbox"; rev = "v${version}"; - sha256 = "sha256-4/rtviBv5KXheLLExxOvaF0wU87eRKMNxlYCVxuIQgU="; + hash = "sha256-WeR7zdYdRWBR+kmxLjRFE6QII9RdBig7wrbVoCPA5go="; }; postPatch = '' @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { pcre2 libxml2 librsvg + libgee ]; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index dbc4c444c7df0..c547e3d0d769b 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.18"; + version = "3.4.19"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "sha256-jXaymp0GIM+UD51z1zsgz8OBHP1LiqKFGvrzutw8ecY="; + hash = "sha256-UioKFhlwVdrkHtoS1ixXE2rykVO5aQeNQ8TnC5kNSUc="; }; dontFixup = true; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index b6a6ca7780fb6..aad2c367b91fd 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libunistring , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor , libxkbcommon, libXi, libXext, wayland-protocols, wayland @@ -7,13 +7,11 @@ , openssl , installShellFiles , dbus -, darwin +, Libsystem , Cocoa -, CoreGraphics -, Foundation -, IOKit , Kernel -, OpenGL +, UniformTypeIdentifiers +, UserNotifications , libcanberra , libicns , libpng @@ -28,14 +26,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.26.2"; + version = "0.26.5"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; - rev = "v${version}"; - sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4="; }; buildInputs = [ @@ -46,16 +44,14 @@ buildPythonApplication rec { openssl.dev ] ++ lib.optionals stdenv.isDarwin [ Cocoa - CoreGraphics - Foundation - IOKit Kernel - OpenGL + UniformTypeIdentifiers + UserNotifications libpng python3 zlib - ] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [ - darwin.apple_sdk.frameworks.UserNotifications + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + Libsystem ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext @@ -79,6 +75,13 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ + # Fix clone-in-kitty not working on bash >= 5.2 + # TODO: Removed on kitty release > 0.26.5 + (fetchpatch { + url = "https://github.com/kovidgoyal/kitty/commit/51bba9110e9920afbefeb981e43d0c1728051b5e.patch"; + sha256 = "sha256-1aSU4aU6j1/om0LsceGfhH1Hdzp+pPaNeWAi7U6VcP4="; + }) + # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. ./fix-test_ssh_env_vars.patch @@ -109,6 +112,7 @@ buildPythonApplication rec { ''; in '' runHook preBuild + ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' ${python.interpreter} setup.py build ${darwinOptions} make docs @@ -125,7 +129,7 @@ buildPythonApplication rec { runHook postBuild ''; - checkInputs = [ + nativeCheckInputs = [ pillow # Shells needed for shell integration tests @@ -218,6 +222,6 @@ buildPythonApplication rec { license = licenses.gpl3Only; changelog = "https://sw.kovidgoyal.net/kitty/changelog/"; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs Luflosi ]; + maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ]; }; } diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 2783795f3e535..817042a7bcf02 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi Lingual TERMinal emulator"; - homepage = "http://mlterm.sourceforge.net/"; + homepage = "https://mlterm.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg atemu ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix index a6f4ab1321c33..9894a8cdb05a5 100644 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://rxvt.sourceforge.net/"; + homepage = "https://rxvt.sourceforge.net/"; description = "Colour vt102 terminal emulator with less features and lower memory consumption"; longDescription = '' rxvt (acronym for our extended virtual terminal) is a terminal diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 06a941de7b461..2b4b09fd2500f 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/134445 doCheck = !stdenv.isDarwin && stdenv.isx86_64; - checkInputs = [ + nativeCheckInputs = [ expect which coreutils diff --git a/pkgs/applications/version-management/bump2version/default.nix b/pkgs/applications/version-management/bump2version/default.nix index ffb9455bd19f9..86d1618cc48d4 100644 --- a/pkgs/applications/version-management/bump2version/default.nix +++ b/pkgs/applications/version-management/bump2version/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix index 756a031ae1e7f..d32e0154c8ae7 100644 --- a/pkgs/applications/version-management/bumpver/default.nix +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pathlib2 click toml lexid colorama setuptools ]; - checkInputs = [ python3.pkgs.pytestCheckHook git mercurial]; + nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial]; meta = with lib; { description = "Bump version numbers in project files"; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index b2b459589b39e..f7ba075114b7f 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -1,5 +1,6 @@ { buildPythonApplication , colorama +, commitizen , decli , fetchFromGitHub , git @@ -7,28 +8,31 @@ , lib , packaging , poetry-core -, pytest-freezegun +, py +, pytest-freezer , pytest-mock , pytest-regressions , pytestCheckHook , pyyaml , questionary , termcolor +, testers , tomlkit , typing-extensions , argcomplete , nix-update-script +, pre-commit }: buildPythonApplication rec { pname = "commitizen"; - version = "2.37.0"; + version = "2.39.1"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-wo1I6QDWLxByHISmkPdass+BcKh0oxR5hD31UN/5+WQ="; + hash = "sha256-QQIYyg2zwV7cfFxGHVsLiTRBgTGs3O7OJcmURvfY3LQ="; deepClone = true; }; @@ -36,6 +40,11 @@ buildPythonApplication rec { nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' + ''; + propagatedBuildInputs = [ termcolor questionary @@ -51,9 +60,11 @@ buildPythonApplication rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ + pre-commit + py pytestCheckHook - pytest-freezegun + pytest-freezer pytest-mock pytest-regressions argcomplete @@ -79,9 +90,17 @@ buildPythonApplication rec { "test_bump_pre_commit_changelog" "test_bump_pre_commit_changelog_fails_always" "test_get_commits_with_signature" + # fatal: not a git repository (or any of the parent directories): .git + "test_commitizen_debug_excepthook" ]; - passthru.updateScript = nix-update-script { }; + passthru = { + tests.version = testers.testVersion { + package = commitizen; + command = "cz version"; + }; + updateScript = nix-update-script { }; + }; meta = with lib; { description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; diff --git a/pkgs/applications/version-management/conform/default.nix b/pkgs/applications/version-management/conform/default.nix index 67741d55ceb22..5905b6e4d1ba4 100644 --- a/pkgs/applications/version-management/conform/default.nix +++ b/pkgs/applications/version-management/conform/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/siderolabs/conform/internal/version.Tag=v${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Policy enforcement for your pipelines"; diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index a5903b7266e46..fe429fdb7afc9 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -15,7 +15,7 @@ pypy2Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - checkInputs = [ subversion git breezy ]; + nativeCheckInputs = [ subversion git breezy ]; checkPhase = "${pypy2Packages.python.interpreter} run-tests.py"; diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/applications/version-management/deepgit/default.nix new file mode 100644 index 0000000000000..312dc523710e6 --- /dev/null +++ b/pkgs/applications/version-management/deepgit/default.nix @@ -0,0 +1,86 @@ +{ copyDesktopItems +, fetchurl +, glib +, gnome +, gtk3 +, jre +, lib +, makeDesktopItem +, stdenv +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "deepgit"; + version = "4.3"; + + src = fetchurl { + url = "https://www.syntevo.com/downloads/deepgit/deepgit-linux-${lib.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; + hash = "sha256-bA/EySZjuSDYaZplwHcpeP1VakcnG5K1hYTk7cSVbz0="; + }; + + nativeBuildInputs = [ + copyDesktopItems + wrapGAppsHook + ]; + + buildInputs = [ + gnome.adwaita-icon-theme + gtk3 + jre + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk3 ]} + --set DEEPGIT_JAVA_HOME ${jre} + ) + patchShebangs bin/deepgit.sh + ''; + + desktopItems = [(makeDesktopItem rec { + name = pname; + desktopName = "DeepGit"; + keywords = [ "git" ]; + comment = "Git-Client"; + categories = [ + "Development" + "RevisionControl" + ]; + terminal = false; + startupNotify = true; + startupWMClass = desktopName; + exec = pname; + mimeTypes = [ + "x-scheme-handler/${pname}" + "x-scheme-handler/sourcetree" + ]; + icon = pname; + })]; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/{bin,share/icons/hicolor/scalable/apps/} + cp -a lib license.html $out + mv bin/deepgit.sh $out/bin/deepgit + + for icon_size in 32 48 64 128 256; do + path=$icon_size'x'$icon_size + icon=bin/deepgit-$icon_size.png + mkdir -p $out/share/icons/hicolor/$path/apps + cp $icon $out/share/icons/hicolor/$path/apps/deepgit.png + done + + runHook postInstall + ''; + + meta = with lib; { + description = "A tool to investigate the history of source code"; + homepage = "https://www.syntevo.com/deepgit"; + changelog = "https://www.syntevo.com/deepgit/changelog.txt"; + license = licenses.unfree; + maintainers = with maintainers; [ urandom ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 1bdd028d8101b..c02a9af2538ec 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -7,6 +7,7 @@ , Foundation , libiconv , Security +, git }: rustPlatform.buildRustPackage rec { @@ -26,12 +27,18 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ]; + nativeCheckInputs = [ git ]; + postInstall = '' installShellCompletion --bash --name delta.bash etc/completion/completion.bash installShellCompletion --zsh --name _delta etc/completion/completion.zsh installShellCompletion --fish --name delta.fish etc/completion/completion.fish ''; + checkFlags = lib.optionals stdenv.isDarwin [ + "--skip=test_diff_same_non_empty_file" + ]; + meta = with lib; { homepage = "https://github.com/dandavison/delta"; description = "A syntax-highlighting pager for git"; diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 40b550cb9e389..f76f413ea661c 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -97,6 +97,6 @@ python3.pkgs.buildPythonApplication rec { description = "Version Control System for Machine Learning Projects"; homepage = "https://dvc.org"; license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai fab anthonyroussel ]; + maintainers = with maintainers; [ cmcdragonkai fab ]; }; } diff --git a/pkgs/applications/version-management/fast-export/default.nix b/pkgs/applications/version-management/fast-export/default.nix index 9d726795c6200..a4d9c030c9b49 100644 --- a/pkgs/applications/version-management/fast-export/default.nix +++ b/pkgs/applications/version-management/fast-export/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; - # deliberately not adding git or hg into installCheckInputs - package should + # deliberately not adding git or hg into nativeInstallCheckInputs - package should # be able to work without them in runtime env installCheckPhase = '' mkdir repo-hg diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 2cc8bb3c816a3..819f9bf8b716e 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -1,25 +1,66 @@ -{ fetchurl, gitea, lib }: +{ lib +, stdenv +, buildGoPackage +, fetchurl +, makeWrapper +, git +, bash +, gzip +, openssh +, pam +, pamSupport ? true +, sqliteSupport ? true +}: -gitea.overrideAttrs (old: rec { +buildGoPackage rec { pname = "forgejo"; - version = "1.18.0-rc1-1"; + version = "1.18.2-0"; src = fetchurl { name = "${pname}-src-${version}.tar.gz"; # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/976c426a-3e04-49ff-9762-47fab50624a3"; - hash = "sha256-kreBMHlMVB1UeG67zMbszGrgjaROateCRswH7GrKnEw="; + url = "https://codeberg.org/attachments/5d59ec04-9f29-4b32-a1ef-bec5c3132e26"; + hash = "sha256-RLShwdx8geyFr1Jk5qDVbsEt2hCjdrwX0lNHea7P+pk="; }; - postInstall = old.postInstall or "" + '' - mv $out/bin/{${old.pname},${pname}} + outputs = [ "out" "data" ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = lib.optional pamSupport pam; + + patches = [ + ./../gitea/static-root-path.patch + ]; + + postPatch = '' + substituteInPlace modules/setting/setting.go --subst-var data ''; + tags = lib.optional pamSupport "pam" + ++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ]; + ldflags = [ + "-X main.Version=${version}" + "-X 'main.Tags=${lib.concatStringsSep " " tags}'" + ]; + + postInstall = '' + mkdir $data + cp -R ./go/src/${goPackagePath}/{public,templates,options} $data + mkdir -p $out + cp -R ./go/src/${goPackagePath}/options/locale $out/locale + wrapProgram $out/bin/gitea \ + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} + ''; + + goPackagePath = "code.gitea.io/gitea"; + meta = with lib; { description = "A self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; + broken = stdenv.isDarwin; }; -}) +} diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ea06107ed7ca8..174094dedea4c 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,6 +3,7 @@ , tcl , libiconv , fetchurl +, buildPackages , zlib , openssl , readline @@ -23,6 +24,9 @@ stdenv.mkDerivation rec { sha256 = "1knff50rr8f39myxj50fprb9ya87cslmwz7zzfya56l33r7i7jh3"; }; + # required for build time tool `./tools/translate.c` + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ installShellFiles tcl tcllib ]; buildInputs = [ zlib openssl readline which ed ] diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/applications/version-management/gg/default.nix index 032c461a74ce8..b94fea8da8582 100644 --- a/pkgs/applications/version-management/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -36,7 +36,7 @@ in buildGoModule { vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; - checkInputs = [ bash coreutils git ]; + nativeCheckInputs = [ bash coreutils git ]; buildInputs = [ bash git ]; postInstall = '' diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 6035c1d7eb783..cb1690872c013 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, testers, gh }: buildGoModule rec { pname = "gh"; - version = "2.21.1"; + version = "2.21.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-DVdbyHGBnbFkKu0h01i0d1qw5OuBYydyP7qHc6B1qs0="; + sha256 = "sha256-syd7OMBEMv9uJUDjIIqVkJ3pvuyKnD5pubG4d3TbkY8="; }; - vendorSha256 = "sha256-b4pNcOfG+W+l2cqn4ncvR47zJltKYIcE3W1GvrWEOFY="; + vendorSha256 = "sha256-m9K43Ns8j82nMkz+zkmC7HueOA6q6T4mFPQ1GSdqo24="; nativeBuildInputs = [ installShellFiles ]; @@ -42,6 +42,10 @@ buildGoModule rec { # most tests require network access doCheck = false; + passthru.tests.version = testers.testVersion { + package = gh; + }; + meta = with lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix index 9b2465366f672..3009edcb90a38 100644 --- a/pkgs/applications/version-management/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/version-management/git-annex-utils/default.nix b/pkgs/applications/version-management/git-annex-utils/default.nix index 07af33951dfb4..2b63192ea3b08 100644 --- a/pkgs/applications/version-management/git-annex-utils/default.nix +++ b/pkgs/applications/version-management/git-annex-utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { This is a set of utilities that are handy to use with git-annex repositories. Currently there is only one utility gadu, a du like utility for annexed files. ''; - homepage = "http://git-annex.mysteryvortex.com/git-annex-utils.html"; + homepage = "https://git-annex.mysteryvortex.com/git-annex-utils.html"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ woffs ]; mainProgram = "gadu"; diff --git a/pkgs/applications/version-management/git-bug-migration/default.nix b/pkgs/applications/version-management/git-bug-migration/default.nix new file mode 100644 index 0000000000000..36ddc93d839c5 --- /dev/null +++ b/pkgs/applications/version-management/git-bug-migration/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, git }: +buildGoModule rec { + pname = "git-bug-migration"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "MichaelMure"; + repo = "git-bug-migration"; + rev = "v${version}"; + hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ="; + }; + + vendorSha256 = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0="; + + nativeCheckInputs = [ git ]; + + ldflags = [ + "-X main.GitExactTag=${version}" + "-X main.GitLastTag=${version}" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + git config --global user.name 'Nixpkgs Test User' + git config --global user.email 'nobody@localhost' + ''; + + meta = with lib; { + description = "Tool for upgrading repositories using git-bug to new versions"; + homepage = "https://github.com/MichaelMure/git-bug-migration"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/applications/version-management/git-bug/default.nix b/pkgs/applications/version-management/git-bug/default.nix index b85681a73cd94..45c0557c30ad6 100644 --- a/pkgs/applications/version-management/git-bug/default.nix +++ b/pkgs/applications/version-management/git-bug/default.nix @@ -1,42 +1,43 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "git-bug"; - version = "0.8.0"; # the `rev` below pins the version of the source to get - rev = "v0.8.0"; + version = "0.8.0"; src = fetchFromGitHub { - inherit rev; owner = "MichaelMure"; repo = "git-bug"; + rev = "v${version}"; sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8"; }; vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE="; + nativeBuildInputs = [ installShellFiles ]; + doCheck = false; + excludedPackages = [ "doc" "misc" ]; + ldflags = [ - "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}" + "-X github.com/MichaelMure/git-bug/commands.GitCommit=v${version}" "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}" "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}" ]; postInstall = '' - install -D -m 0644 misc/completion/bash/git-bug "$out/share/bash-completion/completions/git-bug" - install -D -m 0644 misc/completion/zsh/git-bug "$out/share/zsh/site-functions/git-bug" - install -D -m 0644 -t "$out/share/man/man1" doc/man/* - - # not sure why the following executables are in $out/bin/ - rm -f $out/bin/cmd - rm -f $out/bin/completion - rm -f $out/bin/doc + installShellCompletion \ + --bash misc/completion/bash/git-bug \ + --zsh misc/completion/zsh/git-bug \ + --fish misc/completion/fish/git-bug + + installManPage doc/man/* ''; meta = with lib; { description = "Distributed bug tracker embedded in Git"; homepage = "https://github.com/MichaelMure/git-bug"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ royneary ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ royneary DeeUnderscore ]; }; } diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index c159d95fad05e..278208c48bff2 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-2EaPVNRcSiXN43iazK5MkZ8ytiALlnYRCH2gEtlqBW0="; + hash = "sha256-GCHwpOfjti9PETy3cHFHBFBot6YcSSFTBCd3zEtpP3U="; }; - cargoSha256 = "sha256-kWWg3Ul6SzULdW7oOmkz5Lm2FK1vF/TkggrZcNbIzck="; + cargoHash = "sha256-76HWkfct9weA64yvY5G/l96mjNpuKjPYHFZ5Ctz43Us="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index af641d241b849..90dcbdb0dddc3 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Manage the code review process for Git changes using a Gerrit server"; diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index 07d36cba891b1..fb4ebea2480f5 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "4.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "refs/tags/v${version}"; - hash = "sha256-++cpzspN7REp9dOcsostcaJPnFHUW624hlgngQWjQCs="; + hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY="; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-credential-1password/default.nix b/pkgs/applications/version-management/git-credential-1password/default.nix index 8d180f5176a2e..65afd5f1c3870 100644 --- a/pkgs/applications/version-management/git-credential-1password/default.nix +++ b/pkgs/applications/version-management/git-credential-1password/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-credential-1password"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "develerik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bz/EW+K4XtDap3cu3/+9nJePcdxMXakj8HDPsbCx1FU="; + sha256 = "sha256-8qdUOJ0MOk/xVvp3kDuxNRo3lMEJhLeI3Fle0tuZez0="; }; - vendorSha256 = "sha256-cPHA6rVUQg41sS79UBFf85OfLn53C8/OZVGT5xVdBdw="; + vendorHash = "sha256-B6BlVnUX4XLT+9EpL63Ht4S8Wo84RsmY99CL+srQfpw="; meta = with lib; { description = "A git credential helper for 1Password"; diff --git a/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-delete-merged-branches/default.nix index dc9b251537ec8..08d93bcf69e7d 100644 --- a/pkgs/applications/version-management/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-delete-merged-branches/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { prompt-toolkit ]; - checkInputs = [ git ] + nativeCheckInputs = [ git ] ++ (with python3Packages; [ parameterized ]); meta = with lib; { diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index bbb7d29422aa7..4285c5be8a389 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { make man ''; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' unset subPackages diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 9871cbe87a88f..24fc850b31b08 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,18 +12,22 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.13.0"; + version = "3.14.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ku142NjiDTxiZ50Sm6vZs5ZHJ25oALnLQw8ThWqQ2rE="; + hash = "sha256-VOny8r00JYUT4Z7LukvWTH9ZTn86vn2Dc1YhPmtdE5s="; }; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git pytest-mock pytestCheckHook ]; + nativeCheckInputs = [ + git + pytest-mock + pytestCheckHook + ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash @@ -42,6 +46,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/VirtusLab/git-machete"; description = "Git repository organizer and rebase/merge workflow automation tool"; + changelog = "https://github.com/VirtusLab/git-machete/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ blitz ]; }; diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix index 04ba2ca849a6e..15534fc01bb36 100644 --- a/pkgs/applications/version-management/git-nomad/default.nix +++ b/pkgs/applications/version-management/git-nomad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, SystemConfiguration }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: rustPlatform.buildRustPackage rec { pname = "git-nomad"; @@ -11,13 +11,20 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; }; - buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; - cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + nativeCheckInputs = [ + git + ]; + meta = with lib; { description = "Synchronize work-in-progress git branches in a light weight fashion"; homepage = "https://github.com/rraval/git-nomad"; + changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ rraval ]; }; diff --git a/pkgs/applications/version-management/git-privacy/default.nix b/pkgs/applications/version-management/git-privacy/default.nix index d162f9ce20ba5..0a87793639d8e 100644 --- a/pkgs/applications/version-management/git-privacy/default.nix +++ b/pkgs/applications/version-management/git-privacy/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ git pytestCheckHook ]; diff --git a/pkgs/applications/version-management/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-remote-codecommit/default.nix index 8ada5cc42f54e..f2b47af2e3828 100644 --- a/pkgs/applications/version-management/git-remote-codecommit/default.nix +++ b/pkgs/applications/version-management/git-remote-codecommit/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ botocore ]; - checkInputs = [ pytest mock flake8 tox awscli ]; + nativeCheckInputs = [ pytest mock flake8 tox awscli ]; checkPhase = '' pytest diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index abca61358d99b..8a59fad46431b 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { "-X ${modulePath}/src/cmd.buildDate=nix" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = let skippedTests = [ diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index a20c750ade10d..0ef5a678ee8ef 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "1rb9dhj7b7mjrhsvm9vw5gzjfxj10idnzv488jkfdz7sfhd3fcvz"; + sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM="; }; - cargoSha256 = "1gy77c1cnm2qpgf0fr03alvxi3936x36c032865a6ch8bzns7k5v"; + cargoHash = "sha256-KCLMb8NXxjscrmKXkP/RbV+LsJqOG7zaClJGFiQ4o9k="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 71ae40e25d35b..308c04b05d603 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { termcolor ]); - checkInputs = [ git pythonPackages.nose ]; # git needs to be on path + nativeCheckInputs = [ git pythonPackages.nose ]; # git needs to be on path # 1. git fails to run as it cannot detect the email address, so we set it # 2. $HOME is by default not a valid dir, so we have to set that too # https://github.com/NixOS/nixpkgs/issues/12591 diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 2d63ae403791c..56f7e697ec87b 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -12,7 +12,7 @@ , withManual ? true , pythonSupport ? true , withpcre2 ? true -, sendEmailSupport ? false +, sendEmailSupport ? perlSupport , Security, CoreServices , nixosTests , withLibsecret ? false @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.38.1"; + version = "2.39.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-l9346liiueD7wlCOJFAoynWRG9ONFVFhaxSMGqV0Ctk="; + sha256 = "sha256-uhmbE/tamco97JF7C9c2vA61qd+Hc31DXt398Q1pJls="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/applications/version-management/gita/default.nix index 6f20e4a44c6fe..f2d9d2a9f66d1 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/applications/version-management/gita/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { done ''; - checkInputs = [ + nativeCheckInputs = [ git pytest ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index aa394fb452787..b1373a7098b13 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoPackage , fetchurl , makeWrapper @@ -14,12 +15,12 @@ buildGoPackage rec { pname = "gitea"; - version = "1.17.4"; + version = "1.18.2"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-koZEr89QhxCf2Dd/7SWiS/ZZoRIBfyu0mbxKknjXPK4="; + hash = "sha256-NqlY5s3tZT9HO6X0knlTPwoY6tMsYm9SyH3CEZpIcy0="; }; patches = [ @@ -68,5 +69,6 @@ buildGoPackage rec { homepage = "https://gitea.io"; license = licenses.mit; maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 5ed726e2bf60f..745934ae38775 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -15,15 +15,16 @@ , cups , mesa , systemd +, openssl }: stdenv.mkDerivation rec { pname = "github-desktop"; - version = "3.0.6"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - hash = "sha256-UQsMT4/D571xgrU8C4HBoRO+qf08GCGerA4Y5gHcjRc="; + hash = "sha256-R8t0y7b2upMOsWebIBr9+qT2GqQ/ahzWLcFIWwK4JTs="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { alsa-lib cups mesa + openssl ]; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 196845bf52d7f..2b6018dfe4460 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -122,7 +122,9 @@ let postFixup = '' pushd $out/share/${pname} - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ${pname} + for file in ${pname} chrome-sandbox chrome_crashpad_handler; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file + done for file in $(find . -type f \( -name \*.node -o -name ${pname} -o -name \*.so\* \) ); do patchelf --set-rpath ${libPath}:$out/share/${pname} $file || true diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 6a9707dd41103..a36dc3bc2503c 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,28 +1,14 @@ { - "version": "15.6.2", - "repo_hash": "sha256-WMDst9BHjqK5UIYKzqJJnhrLPHxV0PmW+r8FGBueBs8=", - "yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh", + "version": "15.7.5", + "repo_hash": "sha256-zo1b82y114NpX43rJAWQmUhORM1kQxyiSnonqPUQJmY=", + "yarn_hash": "086v3lr4hnz8z8pla1d3mi2smldidmx2z2cmffn830ianpqkk83l", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.6.2-ee", + "rev": "v15.7.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.6.2", - "GITLAB_PAGES_VERSION": "1.63.0", - "GITLAB_SHELL_VERSION": "14.13.0", - "GITLAB_WORKHORSE_VERSION": "15.6.2" - }, - "vendored_gems": [ - "bundler-checksum", - "devise-pbkdf2-encryptable", - "omniauth-azure-oauth2", - "omniauth-cas3", - "omniauth-gitlab", - "omniauth_crowd", - "omniauth-salesforce", - "attr_encrypted", - "mail-smtp_pool", - "microsoft_graph_mailer", - "ipynbdiff", - "error_tracking_open_api" - ] + "GITALY_SERVER_VERSION": "15.7.5", + "GITLAB_PAGES_VERSION": "15.7.5", + "GITLAB_SHELL_VERSION": "14.14.0", + "GITLAB_WORKHORSE_VERSION": "15.7.5" + } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 2ed65c59901b0..e6cd605a51ea0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn -, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper +, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config }: let @@ -20,8 +20,11 @@ let inherit ruby; gemdir = ./rubyEnv; gemset = - let x = import (gemdir + "/gemset.nix"); + let x = import (gemdir + "/gemset.nix") src; in x // { + gpgme = x.gpgme // { + nativeBuildInputs = [ pkg-config ]; + }; # the openssl needs the openssl include files openssl = x.openssl // { buildInputs = [ openssl ]; @@ -47,7 +50,7 @@ let # `console` executable. ignoreCollisions = true; - extraConfigPaths = lib.forEach data.vendored_gems (gem: "${src}/vendor/gems/${gem}"); + extraConfigPaths = [ "${src}/vendor" ]; }; assets = stdenv.mkDerivation { @@ -99,6 +102,7 @@ let yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ + patchShebangs scripts/frontend/ runHook postConfigure ''; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 5c9feca5cebcb..9c561119f118c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' 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 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools @@ -13,13 +12,13 @@ gem 'rbtrace', require: false gem 'gitaly', '~> 15.5.0' # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.28' +gem 'gitlab-labkit', '~> 0.29' # 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.9' +gem 'google-protobuf', '~> 3.21.12' # 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 diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 85f0f5c03d14d..da95241d34c4b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -29,7 +29,6 @@ GEM ast (2.4.2) binding_ninja (0.2.3) builder (3.2.4) - charlock_holmes (0.7.7) coderay (1.1.2) concord (0.1.5) adamantium (~> 0.2.0) @@ -40,7 +39,6 @@ GEM dotenv (2.7.6) equalizer (0.0.11) erubi (1.11.0) - escape_utils (1.2.2) factory_bot (5.0.2) activesupport (>= 4.2.0) faraday (1.0.1) @@ -48,12 +46,7 @@ GEM ffi (1.15.5) 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) - gitlab-labkit (0.28.0) + gitlab-labkit (0.29.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -69,7 +62,7 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.7.1) - google-protobuf (3.21.9) + google-protobuf (3.21.12) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) grpc (1.42.0) @@ -93,7 +86,6 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.2) - mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.16.3) msgpack (1.3.3) @@ -205,11 +197,10 @@ DEPENDENCIES activesupport (~> 6.1.6.1) factory_bot gitaly (~> 15.5.0) - github-linguist (~> 7.20.0) - gitlab-labkit (~> 0.28) + gitlab-labkit (~> 0.29) gitlab-license_finder gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.21.9) + google-protobuf (~> 3.21.12) grpc (~> 1.42.0) licensee (~> 9.15) pry (~> 0.12.2) @@ -223,4 +214,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.3.24 + 2.3.26 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5f47a29cf1e52..9f217aa65f34c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.6.2"; + version = "15.7.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,10 +22,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-or5Z96BCLFUC4r9bAZf9ytUOt4WozqwwuWGFuX2ix9k="; + sha256 = "sha256-FT77MUcErc/16tChwyNczCLtADTOEzKKTsTlhLI6aV8="; }; - vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo="; + vendorSha256 = "sha256-UEEM0mv7d0gmDcsSKbeh4JcTnX4f5oogZnhRpqaNxwY="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index a36e88e086689..f7471a12b008d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -90,16 +90,6 @@ }; version = "3.2.4"; }; - charlock_holmes = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; - type = "gem"; - }; - version = "0.7.7"; - }; coderay = { source = { remotes = ["https://rubygems.org"]; @@ -173,16 +163,6 @@ }; version = "1.11.0"; }; - escape_utils = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182ha3nmsc6ny4384233pav58a5x2spjn838w9nciwb29lxah1x3"; - type = "gem"; - }; - version = "1.2.2"; - }; factory_bot = { dependencies = ["activesupport"]; groups = ["development" "test"]; @@ -226,27 +206,16 @@ }; version = "15.5.0"; }; - github-linguist = { - dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10biwhh50fdssqs3ai651qgv079bn6h06g5cv00jc5s73iszfns9"; - type = "gem"; - }; - version = "7.20.0"; - }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7"; + sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -274,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras"; + sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; type = "gem"; }; - version = "3.21.9"; + version = "3.21.12"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -370,16 +339,6 @@ }; version = "0.9.2"; }; - mini_mime = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; - type = "gem"; - }; - version = "1.1.2"; - }; mini_portile2 = { groups = ["default"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 535d4faa13a90..74fd1ab320e02 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.13.0"; + version = "14.14.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-KN1twfuamRsG5/jan4Frhd4LXOU9Bp5Htex+TsTc+Is="; + sha256 = "sha256-zXRLaEy2Q+mm1GLjLB1AxRtBxXAoLw6PA1YOJfvVhoc="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-CAadjiZCopjGNxQTJbvs56THtAve92ewiFLjGTY2/9E="; + vendorSha256 = "sha256-mhmM33cXJbqVJ1jY82Mi/nWzz7HXdxxSsFNQknFkwpQ="; 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 3cf201a9fef57..b164076c28b69 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.6.2"; + version = "15.7.5"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-VqJqyRRFmDugq0VG7gPBxllikVNv5et93jJHleSTS7M="; + vendorSha256 = "sha256-TrLc5L4kLAdu1CEM3ezw6hhF6Icy3rXkFyUaVTUQ6X4="; 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 a2997bff4d3bf..417dc56637da3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -8,18 +8,18 @@ if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still expe Bundler::Checksum.patch! end -gem 'bundler-checksum', '~> 0.1.0', path: 'bundler-checksum', require: false +gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/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 +gem 'bootsnap', '~> 1.15.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' +gem 'openssl', '2.2.2' # 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. @@ -50,31 +50,31 @@ gem 'declarative_policy', '~> 1.1.0' # Authentication libraries gem 'devise', '~> 4.8.1' -gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'devise-pbkdf2-encryptable' +gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' gem 'bcrypt', '~> 3.1', '>= 3.1.14' -gem 'doorkeeper', '~> 5.5.0.rc2' -gem 'doorkeeper-openid_connect', '~> 1.7.5' +gem 'doorkeeper', '~> 5.5' +gem 'doorkeeper-openid_connect', '~> 1.8' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 2.0.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-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md +gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-alicloud', '~> 2.0.0' gem 'omniauth-facebook', '~> 4.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-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/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' gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.4.0', path: 'omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md +gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md 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-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.21.3' gem 'jwt', '~> 2.1.0' @@ -91,7 +91,7 @@ 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.2.4', path: 'attr_encrypted' +gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' gem 'u2f', '~> 0.2.1' # GitLab Pages @@ -107,7 +107,7 @@ gem 'browser', '~> 5.3.1' gem 'ohai', '~> 16.10' # GPG -gem 'gpgme', '~> 2.0.19' +gem 'gpgme', '~> 2.0.22' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -166,9 +166,9 @@ 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.167.0' +gem 'aws-sdk-core', '~> 3.168.4' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.117.1' +gem 'aws-sdk-s3', '~> 1.117.2' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections @@ -190,7 +190,7 @@ 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.9' +gem 'nokogiri', '~> 1.13.10' # Calendar rendering gem 'icalendar' @@ -242,7 +242,7 @@ gem 're2', '~> 1.6.0' # Misc -gem 'version_sorter', '~> 2.2.4' +gem 'version_sorter', '~> 2.3' # Export Ruby Regex to Javascript gem 'js_regex', '~> 3.8' @@ -264,9 +264,6 @@ gem 'discordrb-webhooks', '~> 3.4', require: false gem 'jira-ruby', '~> 2.1.4' gem 'atlassian-jwt', '~> 0.2.0' -# Flowdock integration -gem 'flowdock', '~> 0.7' - # Slack integration gem 'slack-messenger', '~> 2.3.4' @@ -280,14 +277,14 @@ gem 'asana', '~> 0.10.13' gem 'ruby-fogbugz', '~> 0.3.0' # Kubernetes integration -gem 'kubeclient', '~> 4.9.3' +gem 'kubeclient', '~> 4.9.3', path: 'vendor/gems/kubeclient' # Sanitize user input gem 'sanitize', '~> 6.0' gem 'babosa', '~> 1.0.4' # Sanitizes SVG input -gem 'loofah', '~> 2.19.0' +gem 'loofah', '~> 2.19.1' # Working with license # Detects the open source license the repository includes @@ -352,16 +349,16 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking -gem 'snowplow-tracker', '~> 0.6.1' +gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.6.1', require: false -gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.2.0', require: false + gem 'lefthook', '~> 1.2.6', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false @@ -372,6 +369,8 @@ group :development do gem 'better_errors', '~> 2.9.1' gem 'sprite-factory', '~> 1.7' + + gem "listen", "~> 3.7" end group :development, :test do @@ -393,10 +392,10 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'spring', '~> 2.1.0' + gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 9.0.0', require: false + gem 'gitlab-styles', '~> 9.1.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -410,8 +409,6 @@ group :development, :test do gem 'simple_po_parser', '~> 1.1.6', require: false - gem 'timecop', '~> 0.9.1' - gem 'png_quantizator', '~> 0.2.1', require: false gem 'parallel', '~> 1.19', require: false @@ -424,7 +421,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.6.2', require: false + gem 'gitlab-dangerfiles', '~> 3.6.4', require: false end group :development, :test, :coverage do @@ -506,7 +503,7 @@ gem 'kas-grpc', '~> 0.0.2' gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.21', '>= 3.21.9' +gem 'google-protobuf', '~> 3.21', '>= 3.21.12' gem 'toml-rb', '~> 2.2.0' @@ -525,7 +522,7 @@ gem 'grape_logging', '~> 1.8' gem 'gitlab-net-dns', '~> 0.9.1' # Countries list -gem 'countries', '~> 3.0' +gem 'countries', '~> 4.0.0' gem 'retriable', '~> 3.1.2' @@ -536,9 +533,9 @@ gem 'lru_redux' # Monkey-patched in `config/initializers/mail_encoding_patch.rb` # See https://gitlab.com/gitlab-org/gitlab/issues/197386 gem 'mail', '= 2.7.1' -gem 'mail-smtp_pool', '~> 0.1.0', path: 'mail-smtp_pool', require: false +gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false -gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'microsoft_graph_mailer' +gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # File encryption gem 'lockbox', '~> 0.6.2' @@ -561,13 +558,13 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', path: 'ipynbdiff' +gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff' 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' +gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' # Vulnerability advisories gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index c179654f21dd1..087d4d8aeec04 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1,51 +1,60 @@ PATH - remote: attr_encrypted + remote: vendor/gems/attr_encrypted specs: attr_encrypted (3.2.4) encryptor (~> 3.0.0) PATH - remote: bundler-checksum + remote: vendor/gems/bundler-checksum specs: bundler-checksum (0.1.0) bundler PATH - remote: devise-pbkdf2-encryptable + remote: vendor/gems/devise-pbkdf2-encryptable specs: devise-pbkdf2-encryptable (0.0.0) devise (~> 4.0) devise-two-factor (~> 4.0) PATH - remote: error_tracking_open_api + remote: vendor/gems/error_tracking_open_api specs: error_tracking_open_api (1.0.0) typhoeus (~> 1.0, >= 1.0.1) PATH - remote: ipynbdiff + remote: vendor/gems/ipynbdiff specs: ipynbdiff (0.4.7) diffy (~> 3.4) oj (~> 3.13.16) PATH - remote: mail-smtp_pool + remote: vendor/gems/kubeclient + specs: + kubeclient (4.9.4.pre.gitlab1) + http (>= 3.0, < 6.0) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) + rest-client (~> 2.0) + +PATH + remote: vendor/gems/mail-smtp_pool specs: mail-smtp_pool (0.1.0) connection_pool (~> 2.0) mail (~> 2.7) PATH - remote: microsoft_graph_mailer + remote: vendor/gems/microsoft_graph_mailer specs: microsoft_graph_mailer (0.1.0) mail (~> 2.7) oauth2 (>= 1.4.4, < 3) PATH - remote: omniauth-azure-oauth2 + remote: vendor/gems/omniauth-azure-oauth2 specs: omniauth-azure-oauth2 (0.0.10) jwt (>= 1.0, < 3.0) @@ -53,7 +62,7 @@ PATH omniauth-oauth2 (~> 1.4) PATH - remote: omniauth-cas3 + remote: vendor/gems/omniauth-cas3 specs: omniauth-cas3 (1.1.4) addressable (~> 2.3) @@ -61,21 +70,21 @@ PATH omniauth (~> 2.0) PATH - remote: omniauth-gitlab + remote: vendor/gems/omniauth-gitlab specs: omniauth-gitlab (4.0.0) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) PATH - remote: omniauth-salesforce + remote: vendor/gems/omniauth-salesforce specs: omniauth-salesforce (1.0.5) omniauth (~> 2.0) omniauth-oauth2 (~> 1.0) PATH - remote: omniauth_crowd + remote: vendor/gems/omniauth_crowd specs: omniauth_crowd (2.4.0) activesupport @@ -185,19 +194,19 @@ GEM awesome_print (1.9.2) awrence (1.1.1) aws-eventstream (1.2.0) - aws-partitions (1.658.0) + aws-partitions (1.674.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.167.0) + aws-sdk-core (3.168.4) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.59.0) + aws-sdk-kms (1.61.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.1) + aws-sdk-s3 (1.117.2) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -229,7 +238,7 @@ GEM rack (>= 0.9.0) bindata (2.4.11) binding_ninja (0.2.3) - bootsnap (1.13.0) + bootsnap (1.15.0) msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -284,16 +293,14 @@ GEM commonmarker (0.23.6) concurrent-ruby (1.1.10) connection_pool (2.3.0) - contracts (0.11.0) cork (0.3.0) colored2 (~> 3.1) cose (1.0.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 0.4.0) - countries (3.0.0) - i18n_data (~> 0.8.0) + countries (4.0.1) + i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) - unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -363,11 +370,11 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.5.0.rc2) + doorkeeper (5.5.4) railties (>= 5) - doorkeeper-openid_connect (1.7.5) - doorkeeper (>= 5.2, < 5.5) - json-jwt (>= 1.11.0) + doorkeeper-openid_connect (1.8.3) + doorkeeper (>= 5.5, < 5.7) + json-jwt (>= 1.15.0) dotenv (2.7.6) dry-configurable (0.12.0) concurrent-ruby (~> 1.0) @@ -484,9 +491,6 @@ GEM flipper-active_support_cache_store (0.25.0) activesupport (>= 4.2, < 8) flipper (~> 0.25.0) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json fog-aliyun (0.3.3) fog-core fog-json @@ -556,12 +560,12 @@ GEM rchardet (~> 1.8) gitaly (15.5.2) grpc (~> 1.0) - gitlab (4.16.1) - httparty (~> 0.14, >= 0.14.0) - terminal-table (~> 1.5, >= 1.5.1) + gitlab (4.19.0) + httparty (~> 0.20) + terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.6.2) + gitlab-dangerfiles (3.6.4) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -594,13 +598,13 @@ GEM gitlab-sidekiq-fetcher (0.9.0) json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (9.0.0) - rubocop (~> 1.36.0) + gitlab-styles (9.1.0) + rubocop (~> 1.38.0) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.14) rubocop-performance (~> 1.14) rubocop-rails (~> 2.15) - rubocop-rspec (~> 2.12) + rubocop-rspec (~> 2.15) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -651,7 +655,7 @@ GEM google-apis-core (>= 0.9.1, < 2.a) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-protobuf (3.21.9) + google-protobuf (3.21.12) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) googleauth (1.3.0) @@ -661,8 +665,8 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - gpgme (2.0.20) - mini_portile2 (~> 2.3) + gpgme (2.0.22) + mini_portile2 (~> 2.7) grape (1.5.2) activesupport builder @@ -753,24 +757,22 @@ GEM nokogiri (~> 1.6) htmlbeautifier (1.4.2) htmlentities (4.3.4) - http (4.4.1) - addressable (~> 2.3) + http (5.1.0) + addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) - http-parser (~> 1.2.0) + llhttp-ffi (~> 0.4.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) 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) + i18n_data (0.13.1) icalendar (2.8.0) ice_cube (~> 0.16) ice_cube (0.16.4) @@ -789,7 +791,7 @@ GEM atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) - jmespath (1.6.1) + jmespath (1.6.2) js_regex (3.8.0) character_set (~> 1.4) regexp_parser (~> 2.5) @@ -828,14 +830,9 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - kubeclient (4.9.3) - http (>= 3.0, < 5.0) - jsonpath (~> 1.0) - recursive-open-struct (~> 1.1, >= 1.1.1) - rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.2.0) + lefthook (1.2.6) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -860,6 +857,9 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) locale (2.1.3) lockbox (0.6.2) lograge (0.11.2) @@ -867,7 +867,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lookbook (1.2.1) @@ -938,7 +938,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.9) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -1028,7 +1028,7 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openssl (2.2.1) + openssl (2.2.2) ipaddr openssl-signature_algorithm (0.4.0) opentracing (0.5.0) @@ -1061,7 +1061,7 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.1.2.1) + parser (3.1.3.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -1086,7 +1086,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.16.2) + prometheus-client-mmap (0.17.0) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -1107,7 +1107,7 @@ GEM puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) - racc (1.6.0) + racc (1.6.1) rack (2.2.4) rack-accept (0.4.5) rack (>= 0.4) @@ -1258,31 +1258,31 @@ GEM pg rails sqlite3 - rubocop (1.36.0) + rubocop (1.38.0) json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.23.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) + rubocop-ast (1.23.0) parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.14.6) + rubocop-graphql (0.18.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.14.3) + rubocop-performance (1.15.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.15.2) + rubocop-rails (2.17.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.12.1) - rubocop (~> 1.31) + rubocop (>= 1.33.0, < 2.0) + rubocop-rspec (2.15.0) + rubocop (~> 1.33) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) @@ -1322,7 +1322,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - sd_notify (0.1.0) + sd_notify (0.1.1) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1377,8 +1377,7 @@ GEM snaky_hash (2.0.0) hashie version_gem (~> 1.1) - snowplow-tracker (0.6.1) - contracts (~> 0.7, <= 0.11) + snowplow-tracker (0.8.0) solargraph (0.47.2) backport (~> 1.2) benchmark @@ -1399,7 +1398,7 @@ GEM set (~> 1.0) spamcheck (1.0.0) grpc (~> 1.0) - spring (2.1.1) + spring (4.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprite-factory (1.7.1) @@ -1442,8 +1441,8 @@ GEM temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) test-prof (1.0.7) @@ -1453,7 +1452,6 @@ GEM thor (1.2.1) thrift (0.16.0) tilt (2.0.11) - timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) tins (1.31.1) @@ -1526,7 +1524,7 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) version_gem (1.1.0) - version_sorter (2.2.4) + version_sorter (2.3.0) view_component (2.74.1) activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) @@ -1569,7 +1567,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.3) yard (0.9.26) - zeitwerk (2.6.0) + zeitwerk (2.6.6) PLATFORMS ruby @@ -1594,8 +1592,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.167.0) - aws-sdk-s3 (~> 1.117.1) + aws-sdk-core (~> 3.168.4) + aws-sdk-s3 (~> 1.117.2) babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1603,7 +1601,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.1) - bootsnap (~> 1.13.0) + bootsnap (~> 1.15.0) bootstrap_form (~> 4.2.0) browser (~> 5.3.1) bullet (~> 7.0.2) @@ -1616,7 +1614,7 @@ DEPENDENCIES commonmarker (~> 0.23.6) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) - countries (~> 3.0) + countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) cvss-suite (~> 3.0.1) @@ -1633,8 +1631,8 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.4) discordrb-webhooks (~> 3.4) - doorkeeper (~> 5.5.0.rc2) - doorkeeper-openid_connect (~> 1.7.5) + doorkeeper (~> 5.5) + doorkeeper-openid_connect (~> 1.8) ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) @@ -1650,7 +1648,6 @@ DEPENDENCIES flipper (~> 0.25.0) flipper-active_record (~> 0.25.0) flipper-active_support_cache_store (~> 0.25.0) - flowdock (~> 0.7) fog-aliyun (~> 0.3) fog-aws (~> 3.15) fog-core (= 2.1.0) @@ -1665,7 +1662,7 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly (~> 15.5.2) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.6.2) + gitlab-dangerfiles (~> 3.6.4) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.4.0) gitlab-labkit (~> 0.29.0) @@ -1675,13 +1672,13 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.10.0) gitlab-sidekiq-fetcher (= 0.9.0) - gitlab-styles (~> 9.0.0) + gitlab-styles (~> 9.1.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, >= 3.21.9) - gpgme (~> 2.0.19) + google-protobuf (~> 3.21, >= 3.21.12) + gpgme (~> 2.0.22) grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) @@ -1718,14 +1715,15 @@ DEPENDENCIES kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) - kubeclient (~> 4.9.3) - lefthook (~> 1.2.0) + kubeclient (~> 4.9.3)! + lefthook (~> 1.2.6) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) + listen (~> 3.7) lockbox (~> 0.6.2) lograge (~> 0.5) - loofah (~> 2.19.0) + loofah (~> 2.19.1) lookbook (~> 1.2, >= 1.2.1) lru_redux mail (= 2.7.1) @@ -1738,7 +1736,7 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - nokogiri (~> 1.13.9) + nokogiri (~> 1.13.10) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) @@ -1763,7 +1761,7 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! - openssl (= 2.2.1) + openssl (= 2.2.2) org-ruby (~> 0.9.12) pact (~> 1.63) parallel (~> 1.19) @@ -1773,7 +1771,7 @@ DEPENDENCIES pg_query (~> 2.2) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.16) + prometheus-client-mmap (~> 0.17) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.5.1) @@ -1835,10 +1833,10 @@ DEPENDENCIES simplecov-cobertura (~> 1.3.1) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) - snowplow-tracker (~> 0.6.1) + snowplow-tracker (~> 0.8.0) solargraph (~> 0.47.2) spamcheck (~> 1.0.0) - spring (~> 2.1.0) + spring (~> 4.1.0) spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) @@ -1852,7 +1850,6 @@ DEPENDENCIES 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.2.0) truncato (~> 0.7.12) @@ -1863,7 +1860,7 @@ DEPENDENCIES unleash (~> 3.2.2) valid_email (~> 0.1) validates_hostname (~> 1.0.11) - version_sorter (~> 2.2.4) + version_sorter (~> 2.3) view_component (~> 2.74.1) vmstat (~> 2.3.0) warning (~> 1.3.0) @@ -1874,4 +1871,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.3.25 + 2.3.26 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 69ac4830afce5..968d07704fcb9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1,3 +1,4 @@ +src: { acme-client = { dependencies = ["faraday" "faraday-retry"]; @@ -290,6 +291,16 @@ }; version = "0.2.0"; }; + attr_encrypted = { + dependencies = ["encryptor"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/attr_encrypted"; + type = "path"; + }; + version = "3.2.4"; + }; attr_required = { groups = ["default"]; platforms = []; @@ -346,10 +357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z5k0zi8lnlwmxp27aqic6l9rmc15g6y62awpb3nhkkwr0gy58mv"; + sha256 = "0a4inr58vqzqb6g4j09pch55xyhj4kbbl4drsk1apfwhakc70vpr"; type = "gem"; }; - version = "1.658.0"; + version = "1.674.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -368,10 +379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk"; + sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc"; type = "gem"; }; - version = "3.167.0"; + version = "3.168.4"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -379,10 +390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c"; + sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy"; type = "gem"; }; - version = "1.59.0"; + version = "1.61.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -390,10 +401,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn"; + sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91"; type = "gem"; }; - version = "1.117.1"; + version = "1.117.2"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -576,10 +587,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; + sha256 = "1ln89f9ypzincd5hqgmzd5vvfgf7fgir56v1spsri40ma88vnipj"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.0"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -634,6 +645,16 @@ }; version = "0.7.0.1"; }; + bundler-checksum = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/bundler-checksum"; + type = "path"; + }; + version = "0.1.0"; + }; byebug = { groups = ["default" "development" "test"]; platforms = [{ @@ -849,16 +870,6 @@ }; version = "2.3.0"; }; - contracts = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz"; - type = "gem"; - }; - version = "0.11.0"; - }; cork = { dependencies = ["colored2"]; groups = ["default" "development"]; @@ -882,15 +893,15 @@ version = "1.0.0"; }; countries = { - dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"]; + dependencies = ["i18n_data" "sixarm_ruby_unaccent"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w278pjhwkbin7jpr7m47wac7gj5n4l2him9k2q4ngzq6rs2id7c"; + sha256 = "1ic1zbzqbrvb3myhgzpq4vigr3qnyl2r0vga84d9z5121cy8lbnk"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.1"; }; crack = { dependencies = ["safe_yaml"]; @@ -1092,8 +1103,18 @@ }; version = "4.8.1"; }; + devise-pbkdf2-encryptable = { + dependencies = ["devise" "devise-two-factor"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/devise-pbkdf2-encryptable"; + type = "path"; + }; + version = "0.0.0"; + }; devise-two-factor = { - dependencies = ["activesupport" "devise" "railties" "rotp"]; + dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; groups = ["default"]; platforms = []; source = { @@ -1171,10 +1192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mdjnw5n2r3hclg4gmzx19w750sdcxw9y6dhcawbzb9wrbzj58wk"; + sha256 = "188ybg2cgghcp5r1jpfnbx3anf0z8fzlla72jra0vgwkdylk7qkz"; type = "gem"; }; - version = "5.5.0.rc2"; + version = "5.5.4"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; @@ -1182,10 +1203,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cj7b45lxiifi6pw8gnylfzlhji572v0pj896rbyqjwyzlgj1sid"; + sha256 = "0vhbw2la2hx9dm0jg14hfah6blwhifrrg7k6nkyl67wga0afgwhd"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.3"; }; dotenv = { groups = ["default"]; @@ -1388,6 +1409,16 @@ }; version = "3.0.0"; }; + error_tracking_open_api = { + dependencies = ["typhoeus"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/error_tracking_open_api"; + type = "path"; + }; + version = "1.0.0"; + }; erubi = { groups = ["default" "development" "test"]; platforms = []; @@ -1785,17 +1816,6 @@ }; version = "0.25.0"; }; - flowdock = { - dependencies = ["httparty" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg"; - type = "gem"; - }; - version = "0.7.1"; - }; fog-aliyun = { dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; groups = ["default"]; @@ -2029,10 +2049,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kq77304vn733xc8iipq4wpdk5qb0zwjryhm3fia3mfsrdcp1z8k"; + sha256 = "0ycnjjk1im5a82k02avix7c5c87vrkl87gsghgq29g2x34z5wr1z"; type = "gem"; }; - version = "4.16.1"; + version = "4.19.0"; }; gitlab-chronic = { dependencies = ["numerizer"]; @@ -2051,10 +2071,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1if6makvlxxmjsyaga660smrw4ij9a0b6xh7mmifih5mpcr5an48"; + sha256 = "0v3m056hpds46byqsacvf4y4xgikgm9ngmz0xlrz57il812a4kl6"; type = "gem"; }; - version = "3.6.2"; + version = "3.6.4"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2157,10 +2177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b9vvgdgzsaiq1kp3f38xm9bmigy8ky4v8lv63i5nyl0iymxy3pg"; + sha256 = "1ch27hxbby16jxvxg1jq3sqdbd3gg7ss4ymxn3yhsjy7gyglxza6"; type = "gem"; }; - version = "9.0.0"; + version = "9.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2343,10 +2363,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras"; + sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; type = "gem"; }; - version = "3.21.9"; + version = "3.21.12"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2376,10 +2396,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw"; + sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw"; type = "gem"; }; - version = "2.0.20"; + version = "2.0.22"; }; grape = { dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"]; @@ -2703,15 +2723,15 @@ version = "4.3.4"; }; http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; + dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; + sha256 = "0jn1y6sfxpfaq0hcblv8hhyxzam8n39kvypi07q2vxaimh6ly7mj"; type = "gem"; }; - version = "4.4.1"; + version = "5.1.0"; }; http-accept = { groups = ["default"]; @@ -2744,17 +2764,6 @@ }; version = "2.3.0"; }; - http-parser = { - dependencies = ["ffi-compiler"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1"; - type = "gem"; - }; - version = "1.2.3"; - }; httparty = { dependencies = ["mime-types" "multi_xml"]; groups = ["danger" "default" "development" "test"]; @@ -2792,10 +2801,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v0cdwxiaqdwhaljd7z0fbx29q3r5kjl93xnjm5abi1x37645ncj"; + sha256 = "0rizqqss1bvb668mw72ls7rlj6im82aizz230jxn7d39kaq9kap5"; type = "gem"; }; - version = "0.8.0"; + version = "0.13.1"; }; icalendar = { dependencies = ["ice_cube"]; @@ -2860,6 +2869,16 @@ }; version = "0.8.3"; }; + ipynbdiff = { + dependencies = ["diffy" "oj"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/ipynbdiff"; + type = "path"; + }; + version = "0.4.7"; + }; jaeger-client = { dependencies = ["opentracing" "thrift"]; groups = ["default"]; @@ -2897,10 +2916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; @@ -3058,11 +3077,10 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ih04d0vgj91rl66iaqh8jmpskwz3g6mgajid0wlzi5skxqqxlym"; - type = "gem"; + path = "${src}/vendor/gems/kubeclient"; + type = "path"; }; - version = "4.9.3"; + version = "4.9.4.pre.gitlab1"; }; launchy = { dependencies = ["addressable"]; @@ -3080,10 +3098,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1avkih414xnaznjlwp64cw4jhzvb7yd4szmnb88yvi7aj4n8r7hq"; + sha256 = "0qyylcc57pcf8mwm9dvlzkfjxcpbypnp4q21ni05s7wxalxb12ld"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.6"; }; letter_opener = { dependencies = ["launchy"]; @@ -3150,6 +3168,17 @@ }; version = "3.7.1"; }; + llhttp-ffi = { + dependencies = ["ffi-compiler" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + type = "gem"; + }; + version = "0.4.0"; + }; locale = { groups = ["default" "development"]; platforms = []; @@ -3187,10 +3216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; lookbook = { dependencies = ["actioncable" "activemodel" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; @@ -3234,6 +3263,16 @@ }; version = "2.7.1"; }; + mail-smtp_pool = { + dependencies = ["connection_pool" "mail"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/mail-smtp_pool"; + type = "path"; + }; + version = "0.1.0"; + }; marcel = { groups = ["default" "test"]; platforms = []; @@ -3289,6 +3328,16 @@ }; version = "1.0.0"; }; + microsoft_graph_mailer = { + dependencies = ["mail" "oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/microsoft_graph_mailer"; + type = "path"; + }; + version = "0.1.0"; + }; mime-types = { dependencies = ["mime-types-data"]; groups = ["danger" "default" "development" "test"]; @@ -3604,10 +3653,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; type = "gem"; }; - version = "1.13.9"; + version = "1.13.10"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3760,6 +3809,26 @@ }; version = "2.0.0"; }; + omniauth-azure-oauth2 = { + dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-azure-oauth2"; + type = "path"; + }; + version = "0.0.10"; + }; + omniauth-cas3 = { + dependencies = ["addressable" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-cas3"; + type = "path"; + }; + version = "1.1.4"; + }; omniauth-dingtalk-oauth2 = { dependencies = ["omniauth-oauth2"]; groups = ["default"]; @@ -3793,6 +3862,16 @@ }; version = "2.0.1"; }; + omniauth-gitlab = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-gitlab"; + type = "path"; + }; + version = "4.0.0"; + }; omniauth-google-oauth2 = { dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -3837,6 +3916,16 @@ }; version = "0.2.8"; }; + omniauth-salesforce = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-salesforce"; + type = "path"; + }; + version = "1.0.5"; + }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; groups = ["default"]; @@ -3870,6 +3959,16 @@ }; version = "1.4.0"; }; + omniauth_crowd = { + dependencies = ["activesupport" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth_crowd"; + type = "path"; + }; + version = "2.4.0"; + }; open4 = { groups = ["default" "development"]; platforms = []; @@ -3897,10 +3996,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wkx3b598mxmr3idfbgas0cnrds54bfivnn1ip0d7z7kcr5vzbzn"; + sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; openssl-signature_algorithm = { groups = ["default"]; @@ -4012,10 +4111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.1.3.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -4139,10 +4238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r8iaviqw0bjp83364k04n5kyzvr0hawf3h5xlgjsg30vmpykrrn"; + sha256 = "095gq9sr6pab1jzbvn3pjs7i1p5hnlasnhvq2xdfsvxjyw33fvbn"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4249,10 +4348,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rack = { groups = ["default" "development" "test"]; @@ -4877,10 +4976,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; + sha256 = "1fhyia6fw438ld83vz7vx37zynmzv042saf04ir43ga6sxk4m9k4"; type = "gem"; }; - version = "1.36.0"; + version = "1.38.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4888,10 +4987,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; type = "gem"; }; - version = "1.21.0"; + version = "1.23.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4910,10 +5009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bdxal5n0q6aq457jz60jzhs3z04mv2wbvl5xd2cw3lrr6x2q3xl"; + sha256 = "1669dfwhnfkmz7yz7fl5bhhsdwxivnh2zkp260my7w4yzfckki7i"; type = "gem"; }; - version = "0.14.6"; + version = "0.18.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -4921,10 +5020,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l87hrzjch2mdpwi0wf9b5nci7fmz5pfzqn5v44zi3rq80zawigf"; + sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c"; type = "gem"; }; - version = "1.14.3"; + version = "1.15.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4932,10 +5031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g342zj7b01z3l8k9hsvx0x2qyp74a59qz6j3a26pwzalr3ap48q"; + sha256 = "052viwgi7dbbnq0pxihz1k72dwhph8gw4v2zzw057w42l39hhh6i"; type = "gem"; }; - version = "2.15.2"; + version = "2.17.2"; }; rubocop-rspec = { dependencies = ["rubocop"]; @@ -4943,10 +5042,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; + sha256 = "0pj53m5zcrgyhb2zsjxqsav9sm9s8jh0mgk8c1qckaxy3dkwfxm4"; type = "gem"; }; - version = "2.12.1"; + version = "2.15.0"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -5154,10 +5253,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qx6hwi10s0ir46l3aq4lspkxlcs1x4cjhvdhpdxyxaicciqddi2"; + sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; securecompare = { groups = ["default"]; @@ -5434,15 +5533,14 @@ version = "2.0.0"; }; snowplow-tracker = { - dependencies = ["contracts"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w"; + sha256 = "0f2afcmwbfxfrkf0scc5yi3x5lyrfbd3xri8zm2ri0is8kqz99kv"; type = "gem"; }; - version = "0.6.1"; + version = "0.8.0"; }; solargraph = { dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; @@ -5482,10 +5580,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2wz1y2b0kp7mlk9k8zkl39rddk2l3x34b7dar3bh3axd1cs30d"; + sha256 = "1jx3y1krmx7flrp8fldb354cap1xxlln4yl97ik8smfzn07hhzzi"; type = "gem"; }; - version = "2.1.1"; + version = "4.1.0"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -5720,14 +5818,14 @@ }; terminal-table = { dependencies = ["unicode-display_width"]; - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "1.8.0"; + version = "3.0.2"; }; terser = { dependencies = ["execjs"]; @@ -5801,16 +5899,6 @@ }; version = "2.0.11"; }; - timecop = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d7mm786180v4kzvn1f77rhfppsg5n0sq2bdx63x9nv114zm8jrp"; - type = "gem"; - }; - version = "0.9.1"; - }; timeliness = { groups = ["default"]; platforms = []; @@ -6154,10 +6242,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; + sha256 = "1np1xy15xq5lcp0y5zr7sxnpwwgcq7bvfs6jc27vnkw0lfhz4ir1"; type = "gem"; }; - version = "2.2.4"; + version = "2.3.0"; }; view_component = { dependencies = ["activesupport" "concurrent-ruby" "method_source"]; @@ -6353,9 +6441,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.6"; }; } diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 0f322a5d375e7..266ca3e4cebd0 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -15,22 +15,6 @@ from typing import Iterable import requests -# Always keep this in sync with the GitLaab version you're updating to. -# If you see any errors about vendored dependencies during an update, check the Gemfile. -VENDORED_GEMS = [ - "bundler-checksum", - "devise-pbkdf2-encryptable", - "omniauth-azure-oauth2", - "omniauth-cas3", - "omniauth-gitlab", - "omniauth_crowd", - "omniauth-salesforce", - "attr_encrypted", - "mail-smtp_pool", - "microsoft_graph_mailer", - "ipynbdiff", - "error_tracking_open_api", -] logger = logging.getLogger(__name__) @@ -101,8 +85,7 @@ class GitLabRepo: owner=self.owner, repo=self.repo, rev=rev, - passthru=passthru, - vendored_gems=VENDORED_GEMS) + passthru=passthru) def _get_data_json(): @@ -155,30 +138,25 @@ def update_rubyenv(): # load rev from data.json data = _get_data_json() rev = data['rev'] + version = data['version'] - gemfile = repo.get_file('Gemfile', rev) - gemfile_lock = repo.get_file('Gemfile.lock', rev) + for fn in ['Gemfile.lock', 'Gemfile']: + with open(rubyenv_dir / fn, 'w') as f: + f.write(repo.get_file(fn, rev)) - with open(rubyenv_dir / 'Gemfile', 'w') as f: - f.write(re.sub(f'.*({"|".join(VENDORED_GEMS)}).*', "", gemfile)) + # Fetch vendored dependencies temporarily in order to build the gemset.nix + subprocess.check_output(['mkdir', '-p', 'vendor/gems'], cwd=rubyenv_dir) + subprocess.check_output(['sh', '-c', f'curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=vendor/gems | tar -xj --strip-components=3'], cwd=f'{rubyenv_dir}/vendor/gems') - with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: - f.write(gemfile_lock) + # Undo our gemset.nix patches so that bundix runs through + subprocess.check_output(['sed', '-i', '-e', '1d', '-e', 's:\\${src}/::g' , 'gemset.nix'], cwd=rubyenv_dir) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) - with open(rubyenv_dir / 'Gemfile', 'w') as f: - for gem in VENDORED_GEMS: - gemfile = gemfile.replace(f'path: \'vendor/gems/{gem}\'', f'path: \'{gem}\'') - - f.write(gemfile) - - with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: - for gem in VENDORED_GEMS: - gemfile_lock = gemfile_lock.replace(f'remote: vendor/gems/{gem}', f'remote: {gem}') + subprocess.check_output(['sed', '-i', '-e', '1i\\src:', '-e', 's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g', 'gemset.nix'], cwd=rubyenv_dir) + subprocess.check_output(['rm', '-rf', 'vendor'], cwd=rubyenv_dir) - f.write(gemfile_lock) @cli.command('update-gitaly') diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix index 626739864c713..6adb5bdc7a3f6 100644 --- a/pkgs/applications/version-management/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { sh ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ gitMinimal pytestCheckHook ]; diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/applications/version-management/gitprompt-rs/default.nix new file mode 100644 index 0000000000000..6980c8f225764 --- /dev/null +++ b/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform, git }: + +rustPlatform.buildRustPackage rec { + pname = "gitprompt-rs"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "9ary"; + repo = pname; + rev = version; + sha256 = "00xxz7awk01981daabp8m3kwq127y733ynijiwqgs8xvn4nkg8h6"; + }; + + cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418"; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' + ''; + + meta = with lib; { + description = "Simple Git prompt"; + homepage = "https://github.com/9ary/gitprompt-rs"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ novenary ]; + }; +} diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index d9eaae3ecbca3..a795f0f6f6dd3 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://gitstats.sourceforge.net/"; + homepage = "https://gitstats.sourceforge.net/"; description = "Git history statistics generator"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/version-management/gitstatus/default.nix b/pkgs/applications/version-management/gitstatus/default.nix index 4b669c27252e2..21e8bafcd0b35 100644 --- a/pkgs/applications/version-management/gitstatus/default.nix +++ b/pkgs/applications/version-management/gitstatus/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # that the script was sourced successfully and that the "gitstatus_query" # command ran successfully. This tests the binary itself and the zsh # integration. - installCheckInputs = [ git zsh ]; + nativeInstallCheckInputs = [ git zsh ]; doInstallCheck = true; installCheckPhase = '' TEMP=$(mktemp -d) diff --git a/pkgs/applications/version-management/glitter/default.nix b/pkgs/applications/version-management/glitter/default.nix index e51791042b999..5786ebc8a6507 100644 --- a/pkgs/applications/version-management/glitter/default.nix +++ b/pkgs/applications/version-management/glitter/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, git }: rustPlatform.buildRustPackage rec { pname = "glitter"; @@ -13,6 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-GQ7Bns+FPj4jl2dBXnMrmcKIYcZTLZc1WvaHgKGj/gU="; + nativeCheckInputs = [ + git + ]; + # tests require it to be in a git repository preCheck = '' git init @@ -24,6 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A git wrapper that allows you to compress multiple commands into one"; homepage = "https://github.com/milo123459/glitter"; + changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 00b49f2957ad1..392551aace3ef 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.79"; + version = "0.81"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-eL4cCpBRhO0ctQZGg1n6+H5O6GhRKRsWcEOcRr+z2Hw="; + sha256 = "sha256-ayPXOtqJIJAzDTY1T4rw9GF7KvfI2XJ/c9uo4Fs8db8="; }; nativeBuildInputs = [ pkg-config bison ]; diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/applications/version-management/hub/default.nix index cb75ec8264640..307bf0e6f408f 100644 --- a/pkgs/applications/version-management/hub/default.nix +++ b/pkgs/applications/version-management/hub/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { --suffix PATH : ${lib.makeBinPath [ git ]} ''; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index ac4b7762c2e44..3e1f002f9776d 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-M15ESB8JCSryD6/+6N2EA6NUzLI4cwgAJUQC9UDNJrM="; + sha256 = "sha256-bsPTOv1s/kU6UUxmmPpYC5Y9/YeR6LnuL09j1x5e3Es="; }; - vendorSha256 = "sha256-KNegRQhVZMNDgcJZOgEei3oviDPM/RFwZbpoh38pxBw="; + vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 2bd780548114f..467359d9c901a 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.1"; + version = "6.3.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-bDmrhzKUjYnPEgh1HdfYXUBCqoIVOXdFG56xM2dYUHI="; + sha256 = "sha256-z+butd2JOrMsC3nBUxqsQgdz4PyDejXbPU2ScD30Wpg="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-UZ/ZSZkAedrm3iUkaQu6zvfX4bhrYDlwR9L9ytf38ZY="; + sha256 = "sha256-pJNX0j/Rg3cQanveD7z2x5wixo/jLvHai8Ib2Akmmgk"; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index a201ce6ddbb46..e88f21a85cb15 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { nbformat ]; - checkInputs = [ + nativeCheckInputs = [ coreutils git mercurial diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix index 63f7a459a70a5..7085e0c48f250 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/pass-git-helper/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ pyxdg ]; - checkInputs = [ pytest pytest-mock ]; + nativeCheckInputs = [ pytest pytest-mock ]; preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/applications/version-management/radicle-cli/default.nix b/pkgs/applications/version-management/radicle-cli/default.nix index a8df056774a2a..f74ae1cf37a3b 100644 --- a/pkgs/applications/version-management/radicle-cli/default.nix +++ b/pkgs/applications/version-management/radicle-cli/default.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { done ''; - checkInputs = [ openssh ]; + nativeCheckInputs = [ openssh ]; preCheck = '' eval $(ssh-agent) ''; diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index 0065449e7d075..cd4fee2194559 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -44,9 +44,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -86,15 +86,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "arc-swap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "assert-json-diff" @@ -120,25 +120,22 @@ 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", + "pin-project-lite", + "tokio", "zstd", "zstd-safe", ] [[package]] name = "async-io" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ "async-lock", "autocfg", @@ -151,7 +148,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -171,14 +168,14 @@ dependencies = [ "futures 0.3.25", "num_cpus", "once_cell", - "tokio 1.22.0", + "tokio", ] [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" dependencies = [ "proc-macro2", "quote", @@ -199,7 +196,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi 0.3.9", ] @@ -211,14 +208,14 @@ dependencies = [ "anyhow", "chrono", "configmodel", - "configparser", "indexmap", "once_cell", "pem", "simple_asn1", + "staticconfig", "thiserror", "tracing", - "url 2.3.1", + "url", "util", ] @@ -245,8 +242,7 @@ name = "backingstore" version = "0.1.0" dependencies = [ "anyhow", - "configmodel", - "configparser", + "configloader", "eagerepo", "edenapi", "env_logger 0.7.1", @@ -254,8 +250,6 @@ dependencies = [ "libc", "log", "manifest", - "manifest-tree", - "minibytes", "parking_lot 0.11.2", "revisionstore", "tracing", @@ -286,6 +280,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] name = "bincode" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -319,7 +319,7 @@ dependencies = [ "pycheckout", "pyclientinfo", "pycliparser", - "pyconfigparser", + "pyconfigloader", "pydag", "pydiffhelpers", "pydirs", @@ -469,12 +469,22 @@ dependencies = [ ] [[package]] +name = "bstr" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "bufsize" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c81e4b4a053ed8b2123b6ed751a334bb30df2eb3da76d0e8bb97e9e69bbd9d51" +checksum = "0ccc76d50a81d3a49665c71444ecefed1d1386477cb700c6fb7db517454fe1ff" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", ] [[package]] @@ -501,24 +511,18 @@ dependencies = [ [[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" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" dependencies = [ "serde", ] [[package]] name = "bzip2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ "bzip2-sys", "libc", @@ -536,12 +540,6 @@ dependencies = [ ] [[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" @@ -578,9 +576,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -622,7 +620,7 @@ dependencies = [ "storemodel", "tempfile", "thiserror", - "tokio 1.22.0", + "tokio", "tracing", "treestate", "types", @@ -643,7 +641,7 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time 0.1.44", + "time 0.1.45", "wasm-bindgen", "winapi 0.3.9", ] @@ -679,7 +677,7 @@ dependencies = [ "regex", "strsim 0.10.0", "termcolor", - "terminal_size 0.2.2", + "terminal_size 0.2.3", "textwrap 0.16.0", "unicase", ] @@ -713,8 +711,8 @@ dependencies = [ "anyhow", "blackbox", "cliparser", + "configloader", "configmodel", - "configparser", "hgplain", "identity", "indexedlog", @@ -775,12 +773,12 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "quote", ] @@ -856,11 +854,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" dependencies = [ - "cache-padded", + "crossbeam-utils 0.8.14", ] [[package]] @@ -904,22 +902,12 @@ dependencies = [ ] [[package]] -name = "configmodel" -version = "0.1.0" -dependencies = [ - "anyhow", - "auto_impl", - "minibytes", - "thiserror", - "util", -] - -[[package]] -name = "configparser" +name = "configloader" version = "0.1.0" dependencies = [ "anyhow", "configmodel", + "configset", "dirs 2.0.2", "filetime", "hgplain", @@ -928,39 +916,62 @@ dependencies = [ "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", + "serde_urlencoded 0.7.1", "sha2 0.10.6", + "staticconfig", "tempdir", "tempfile", "tracing", "types", - "url 2.3.1", + "unionconfig", + "url", "util", "version", "zstd", ] [[package]] +name = "configmodel" +version = "0.1.0" +dependencies = [ + "anyhow", + "auto_impl", + "minibytes", + "thiserror", + "util", +] + +[[package]] +name = "configset" +version = "0.1.0" +dependencies = [ + "configmodel", + "hgrc-parser", + "indexmap", + "minibytes", + "tempdir", + "tracing", + "util", +] + +[[package]] name = "console" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" dependencies = [ "encode_unicode", "lazy_static", "libc", - "terminal_size 0.1.17", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -970,6 +981,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" [[package]] +name = "control-point" +version = "0.1.0" +dependencies = [ + "anyhow", + "lazy_static", + "parking_lot 0.11.2", + "serde_json", + "tempdir", + "tracing", + "util", +] + +[[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1017,7 +1041,7 @@ dependencies = [ "cpython_ext", "futures 0.3.25", "itertools 0.10.5", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -1105,9 +1129,9 @@ 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", + "crossbeam-epoch 0.9.13", + "crossbeam-queue 0.3.8", + "crossbeam-utils 0.8.14", ] [[package]] @@ -1136,7 +1160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.12", + "crossbeam-utils 0.8.14", ] [[package]] @@ -1157,8 +1181,8 @@ 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", + "crossbeam-epoch 0.9.13", + "crossbeam-utils 0.8.14", ] [[package]] @@ -1178,14 +1202,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.12", - "memoffset 0.6.5", + "crossbeam-utils 0.8.14", + "memoffset 0.7.1", "scopeguard", ] @@ -1202,12 +1226,12 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.12", + "crossbeam-utils 0.8.14", ] [[package]] @@ -1233,9 +1257,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if 1.0.0", ] @@ -1301,7 +1325,7 @@ version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ - "bstr", + "bstr 0.2.17", "csv-core", "itoa 0.4.8", "ryu", @@ -1360,9 +1384,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" dependencies = [ "cc", "cxxbridge-flags", @@ -1372,9 +1396,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" dependencies = [ "cc", "codespan-reporting", @@ -1387,15 +1411,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" [[package]] name = "cxxbridge-macro" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" dependencies = [ "proc-macro2", "quote", @@ -1428,7 +1452,7 @@ dependencies = [ "serde", "tempfile", "thiserror", - "tokio 1.22.0", + "tokio", "tracing", "unicode-width", "vlqencoding", @@ -1468,16 +1492,16 @@ dependencies = [ "hashbrown 0.12.3", "lock_api", "once_cell", - "parking_lot_core 0.9.4", + "parking_lot_core 0.9.6", "rayon", "serde", ] [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "debugtop" @@ -1611,7 +1635,7 @@ dependencies = [ "storemodel", "tempfile", "thiserror", - "tokio 1.22.0", + "tokio", "tracing", "zstore", ] @@ -1639,7 +1663,7 @@ dependencies = [ "async-runtime", "async-trait", "auth", - "bytes 1.2.1", + "bytes 1.3.0", "chrono", "configmodel", "edenapi_trait", @@ -1660,10 +1684,10 @@ dependencies = [ "serde", "serde_cbor", "serde_json", - "tokio 1.22.0", + "tokio", "tracing", "types", - "url 2.3.1", + "url", "version", ] @@ -1680,7 +1704,7 @@ dependencies = [ "futures 0.3.25", "itertools 0.10.5", "minibytes", - "tokio 1.22.0", + "tokio", "types", "vfs", ] @@ -1700,7 +1724,7 @@ dependencies = [ "serde_cbor", "thiserror", "types", - "url 2.3.1", + "url", ] [[package]] @@ -1708,7 +1732,7 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "bytes 1.2.1", + "bytes 1.3.0", "dag-types", "insta_ext", "paste", @@ -1740,7 +1764,7 @@ dependencies = [ "status", "thiserror", "thrift-types", - "tokio 1.22.0", + "tokio", "tokio-uds-compat", "toml", "types", @@ -1791,9 +1815,9 @@ dependencies = [ [[package]] name = "enum_dispatch" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" +checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", "proc-macro2", @@ -1907,7 +1931,7 @@ dependencies = [ [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#42f3e6ac3bf02d4038f5ca5e7d97942d538fdd06" +source = "git+https://github.com/facebook/fb303.git?branch=main#0b9b58848f96c78f65513457c15292b81dc6b91e" dependencies = [ "anyhow", "async-trait", @@ -1928,7 +1952,7 @@ dependencies = [ [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "fbinit_macros", "quickcheck", @@ -1937,7 +1961,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "proc-macro2", "quote", @@ -1947,13 +1971,13 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#d5780da13719eaca77b1aec44d8d16b233c79b5e" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#46238c81c2c30ec8e9907203922218e4ecfd4cbb" dependencies = [ "anyhow", "async-trait", "base64 0.11.0", "bufsize", - "bytes 1.2.1", + "bytes 1.3.0", "futures 0.3.25", "ghost", "num-derive", @@ -1967,25 +1991,25 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "byteorder", - "bytes 1.2.1", + "bytes 1.3.0", "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" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "anyhow", - "bytes 1.2.1", + "bytes 1.3.0", "fbthrift", "fbthrift_framed", "fbthrift_util", "futures 0.3.25", - "tokio 1.22.0", + "tokio", "tokio-tower", "tokio-util 0.6.10", "tower-service", @@ -1994,9 +2018,9 @@ dependencies = [ [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ - "tokio 1.22.0", + "tokio", ] [[package]] @@ -2012,14 +2036,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2075,7 +2099,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "percent-encoding 2.2.0", + "percent-encoding", ] [[package]] @@ -2191,9 +2215,9 @@ dependencies = [ [[package]] name = "futures-batch" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5c372b0c5d1023cce2a0ff7667b589ba88dae751b5f65c400b5d0803b30cbf" +checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a" dependencies = [ "futures 0.3.25", "futures-timer", @@ -2244,7 +2268,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.9", + "pin-project-lite", "waker-fn", ] @@ -2273,9 +2297,9 @@ checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-timer" -version = "2.0.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" @@ -2291,7 +2315,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", "pin-utils", "slab", ] @@ -2339,9 +2363,9 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" dependencies = [ "proc-macro2", "quote", @@ -2360,7 +2384,7 @@ dependencies = [ "log", "openssl-probe", "openssl-sys", - "url 2.3.1", + "url", ] [[package]] @@ -2390,18 +2414,18 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr", + "bstr 1.1.0", "fnv", "log", "regex", @@ -2413,7 +2437,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "fnv", "futures-core", "futures-sink", @@ -2421,7 +2445,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.22.0", + "tokio", "tokio-util 0.7.4", "tracing", ] @@ -2475,6 +2499,15 @@ dependencies = [ ] [[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2516,8 +2549,8 @@ dependencies = [ "cliparser", "clone", "comfy-table", + "configloader", "configmodel", - "configparser", "cpython", "cpython_ext", "dag", @@ -2548,7 +2581,7 @@ dependencies = [ "procinfo", "progress-model", "progress-render", - "pyconfigparser", + "pyconfigloader", "python3-sys", "pytracing", "rand 0.8.5", @@ -2567,7 +2600,7 @@ dependencies = [ "tracing-subscriber", "treestate", "types", - "url 2.3.1", + "url", "util", "version", "workingcopy", @@ -2604,7 +2637,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clidispatch", - "configparser", + "configloader", "dirs 2.0.2", "encoding", "hgcommands", @@ -2622,6 +2655,10 @@ dependencies = [ ] [[package]] +name = "hgrc-parser" +version = "0.1.0" + +[[package]] name = "hgtime" version = "0.1.0" dependencies = [ @@ -2632,7 +2669,7 @@ dependencies = [ [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "lazy_static", ] @@ -2640,7 +2677,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2663,9 +2700,9 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "fnv", - "itoa 1.0.4", + "itoa 1.0.5", ] [[package]] @@ -2674,9 +2711,9 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "http", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] @@ -2707,10 +2744,10 @@ dependencies = [ "serde_json", "structopt", "thiserror", - "tokio 1.22.0", + "tokio", "tokio-util 0.6.10", "tracing", - "url 2.3.1", + "url", "zstd", ] @@ -2747,7 +2784,7 @@ version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures-channel", "futures-core", "futures-util", @@ -2756,10 +2793,10 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.4", - "pin-project-lite 0.2.9", + "itoa 1.0.5", + "pin-project-lite", "socket2", - "tokio 1.22.0", + "tokio", "tower-service", "tracing", "want", @@ -2767,14 +2804,14 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", "rustls", - "tokio 1.22.0", + "tokio", "tokio-rustls", ] @@ -2784,10 +2821,10 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "hyper", "native-tls", - "tokio 1.22.0", + "tokio", "tokio-native-tls", ] @@ -2829,17 +2866,6 @@ dependencies = [ [[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" @@ -2861,11 +2887,10 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3" dependencies = [ - "crossbeam-utils 0.8.12", "globset", "lazy_static", "log", @@ -2934,9 +2959,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.21.1" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1e75aa1530e7385af7b2685478dece08dafb9db3b4225c753286decea83bef" +checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" dependencies = [ "console", "lazy_static", @@ -2979,9 +3004,13 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.5" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] [[package]] name = "iovec" @@ -3006,9 +3035,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "itertools" @@ -3036,9 +3065,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" @@ -3105,9 +3134,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.137" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libgit2-sys" @@ -3170,9 +3199,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -3185,9 +3214,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "local-encoding" @@ -3378,6 +3407,15 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] name = "metalog" version = "0.1.0" dependencies = [ @@ -3460,7 +3498,7 @@ version = "0.1.0" name = "minibytes" version = "0.1.0" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "memmap", "quickcheck", "serde", @@ -3517,7 +3555,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -3659,14 +3697,14 @@ dependencies = [ "tempfile", "thiserror", "tracing", - "url 2.3.1", + "url", ] [[package]] name = "nix" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -3783,11 +3821,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -3802,9 +3840,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "oorandom" @@ -3820,9 +3858,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -3852,9 +3890,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ "autocfg", "cc", @@ -3894,9 +3932,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "output_vt100" @@ -3933,7 +3971,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -3943,14 +3981,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.4", + "parking_lot_core 0.9.6", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.0", "instant", @@ -3962,22 +4000,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pathhistory" @@ -3991,7 +4029,7 @@ dependencies = [ "manifest", "manifest-tree", "storemodel", - "tokio 1.22.0", + "tokio", "tracing", "types", ] @@ -4026,38 +4064,25 @@ dependencies = [ [[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" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8" +checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a" dependencies = [ "thiserror", "ucd-trie", ] [[package]] -name = "pest-hgrc" -version = "0.1.0" -dependencies = [ - "pest", -] - -[[package]] name = "pest_derive" -version = "2.4.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f" +checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6" dependencies = [ "pest", "pest_generator", @@ -4065,9 +4090,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.4.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4" +checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c" dependencies = [ "pest", "pest_meta", @@ -4078,13 +4103,13 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.4.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe" +checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51" dependencies = [ "once_cell", "pest", - "sha1 0.10.5", + "sha2 0.10.6", ] [[package]] @@ -4227,12 +4252,6 @@ dependencies = [ [[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" @@ -4286,16 +4305,16 @@ dependencies = [ [[package]] name = "polling" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", "cfg-if 1.0.0", "libc", "log", "wepoll-ffi", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -4350,9 +4369,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -4374,7 +4393,7 @@ dependencies = [ "once_cell", "parking_lot 0.11.2", "paste", - "tokio 1.22.0", + "tokio", "tracing", ] @@ -4404,8 +4423,8 @@ dependencies = [ "auth", "cpython", "cpython_ext", - "pyconfigparser", - "url 2.3.1", + "pyconfigloader", + "url", ] [[package]] @@ -4435,8 +4454,8 @@ dependencies = [ "cats", "cpython", "cpython_ext", - "pyconfigparser", - "url 2.3.1", + "pyconfigloader", + "url", ] [[package]] @@ -4451,7 +4470,7 @@ dependencies = [ "manifest-tree", "pathmatcher", "progress-model", - "pyconfigparser", + "pyconfigloader", "pymanifest", "pypathmatcher", "pystatus", @@ -4469,7 +4488,7 @@ dependencies = [ "clientinfo", "cpython", "cpython_ext", - "pyconfigparser", + "pyconfigloader", ] [[package]] @@ -4481,15 +4500,15 @@ dependencies = [ "configmodel", "cpython", "cpython_ext", - "pyconfigparser", + "pyconfigloader", ] [[package]] -name = "pyconfigparser" +name = "pyconfigloader" version = "0.1.0" dependencies = [ "anyhow", - "configparser", + "configloader", "cpython", "cpython_ext", "util", @@ -4539,7 +4558,7 @@ dependencies = [ "cpython", "cpython_ext", "network-doctor", - "pyconfigparser", + "pyconfigloader", ] [[package]] @@ -4583,7 +4602,7 @@ dependencies = [ "futures 0.3.25", "minibytes", "progress-model", - "pyconfigparser", + "pyconfigloader", "pyprogress", "pyrevisionstore", "revisionstore", @@ -4696,7 +4715,7 @@ dependencies = [ "clidispatch", "cpython", "cpython_ext", - "pyconfigparser", + "pyconfigloader", "termstyle", ] @@ -4857,7 +4876,7 @@ dependencies = [ "cpython", "cpython_ext", "parking_lot 0.11.2", - "pyconfigparser", + "pyconfigloader", "pydag", "pyedenapi", "pymetalog", @@ -4875,14 +4894,13 @@ dependencies = [ "async-runtime", "async-trait", "configmodel", - "configparser", "cpython", "cpython_ext", "futures 0.3.25", "io", "minibytes", "parking_lot 0.11.2", - "pyconfigparser", + "pyconfigloader", "revisionstore", "storemodel", "types", @@ -5008,7 +5026,7 @@ dependencies = [ "io", "parking_lot 0.11.2", "pathmatcher", - "pyconfigparser", + "pyconfigloader", "pymanifest", "pypathmatcher", "pystatus", @@ -5057,7 +5075,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "proc-macro2", "quickcheck", @@ -5078,9 +5096,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -5207,11 +5225,10 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "crossbeam-deque 0.8.2", "either", "rayon-core", ] @@ -5224,7 +5241,7 @@ checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel 0.5.6", "crossbeam-deque 0.8.2", - "crossbeam-utils 0.8.12", + "crossbeam-utils 0.8.14", "num_cpus", ] @@ -5259,18 +5276,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ "proc-macro2", "quote", @@ -5286,9 +5303,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -5332,8 +5349,8 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "configloader", "configmodel", - "configparser", "edenapi", "fail", "hgcommits", @@ -5361,7 +5378,7 @@ name = "repo_name" version = "0.1.0" dependencies = [ "anyhow", - "percent-encoding 2.2.0", + "percent-encoding", ] [[package]] @@ -5384,7 +5401,7 @@ version = "0.11.11" source = "git+https://github.com/vmagro/reqwest?rev=f9490c06756a9d35ab874c44657db790a87af80b#f9490c06756a9d35ab874c44657db790a87af80b" dependencies = [ "base64 0.13.1", - "bytes 1.2.1", + "bytes 1.3.0", "encoding_rs", "futures-core", "futures-util", @@ -5401,21 +5418,21 @@ dependencies = [ "mime", "mime_guess", "native-tls", - "percent-encoding 2.2.0", - "pin-project-lite 0.2.9", + "percent-encoding", + "pin-project-lite", "rustls", "rustls-native-certs", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded 0.7.1", - "tokio 1.22.0", + "tokio", "tokio-native-tls", "tokio-rustls", "tokio-util 0.7.4", "tower-service", "trust-dns-resolver", - "url 2.3.1", + "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -5484,11 +5501,11 @@ dependencies = [ "storemodel", "tempfile", "thiserror", - "tokio 1.22.0", + "tokio", "tokio-stream", "tracing", "types", - "url 2.3.1", + "url", "util", "version", "vlqencoding", @@ -5591,28 +5608,28 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver 1.0.16", ] [[package]] name = "rustix" -version = "0.35.13" +version = "0.36.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -5634,18 +5651,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safemem" @@ -5664,12 +5681,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] @@ -5695,9 +5711,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -5743,9 +5759,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "semver-parser" @@ -5758,9 +5774,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.147" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -5772,20 +5788,20 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#3e3b21c09d74f90b7342c26bbfa420c4e6b2da41" +source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" dependencies = [ "anyhow", "byteorder", - "bytes 1.2.1", + "bytes 1.3.0", "serde", "thiserror", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" dependencies = [ "serde", ] @@ -5802,9 +5818,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -5813,29 +5829,17 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.88" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ - "itoa 1.0.4", + "itoa 1.0.5", "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" @@ -5843,7 +5847,7 @@ dependencies = [ "dtoa", "itoa 0.4.8", "serde", - "url 2.3.1", + "url", ] [[package]] @@ -5853,16 +5857,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.4", + "itoa 1.0.5", "ryu", "serde", ] [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5879,17 +5883,6 @@ dependencies = [ ] [[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" @@ -6044,7 +6037,7 @@ dependencies = [ [[package]] name = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "itertools 0.10.5", "quickcheck", @@ -6061,7 +6054,7 @@ dependencies = [ "pathmatcher", "regex", "thiserror", - "tokio 1.22.0", + "tokio", "tracing", "types", ] @@ -6100,8 +6093,8 @@ dependencies = [ name = "staticconfig_macros" version = "0.1.0" dependencies = [ + "hgrc-parser", "indexmap", - "pest-hgrc", ] [[package]] @@ -6163,7 +6156,7 @@ dependencies = [ "async-trait", "futures 0.3.25", "pin-project 0.4.30", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -6234,9 +6227,9 @@ checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" [[package]] name = "syn" -version = "1.0.103" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -6310,12 +6303,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" dependencies = [ "rustix", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -6421,24 +6414,24 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ - "terminal_size 0.2.2", + "terminal_size 0.2.3", "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -6494,7 +6487,7 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "anyhow", "clap 2.34.0", @@ -6503,9 +6496,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -6518,7 +6511,7 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "itoa 1.0.4", + "itoa 1.0.5", "libc", "num_threads", "serde", @@ -6568,43 +6561,23 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.25" +version = "1.24.1" 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" +checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" 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", + "bytes 1.3.0", "libc", "memchr", "mio 0.8.5", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", "tracing", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -6620,9 +6593,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -6636,7 +6609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -6646,7 +6619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", - "tokio 1.22.0", + "tokio", "webpki", ] @@ -6657,8 +6630,8 @@ 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", + "pin-project-lite", + "tokio", "tokio-util 0.7.4", ] @@ -6673,7 +6646,7 @@ dependencies = [ "futures-sink", "futures-util", "pin-project 1.0.12", - "tokio 1.22.0", + "tokio", "tower", "tower-service", "tracing", @@ -6682,11 +6655,11 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#0e97dccc909dbc089ec010d1d02931d56d346a6e" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" dependencies = [ "async-io", "futures 0.3.25", - "tokio 1.22.0", + "tokio", "tracing", "uds_windows", ] @@ -6697,14 +6670,14 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures-core", "futures-io", "futures-sink", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "slab", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -6713,11 +6686,11 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures-core", "futures-sink", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", "tracing", ] @@ -6737,8 +6710,8 @@ 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", + "pin-project-lite", + "tokio", "tower-layer", "tower-service", "tracing", @@ -6764,7 +6737,7 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -6947,8 +6920,8 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "tokio 1.22.0", - "url 2.3.1", + "tokio", + "url", ] [[package]] @@ -6967,15 +6940,15 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio 1.22.0", + "tokio", "trust-dns-proto", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "twox-hash" @@ -6999,9 +6972,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "types" @@ -7061,9 +7034,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -7109,24 +7082,13 @@ 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", + "percent-encoding", ] [[package]] @@ -7164,7 +7126,7 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ "getrandom 0.2.8", "serde", - "sha1 0.6.1", + "sha1", ] [[package]] @@ -7214,10 +7176,12 @@ dependencies = [ "crossbeam 0.8.2", "dashmap", "fsinfo", + "identity", "libc", "minibytes", + "once_cell", "tempfile", - "tokio 1.22.0", + "tokio", "types", "util", ] @@ -7358,16 +7322,16 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#3e3b21c09d74f90b7342c26bbfa420c4e6b2da41" +source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" dependencies = [ "anyhow", - "bytes 1.2.1", + "bytes 1.3.0", "futures 0.3.25", "maplit", "serde", "serde_bser", "thiserror", - "tokio 1.22.0", + "tokio", "tokio-util 0.6.10", "winapi 0.3.9", ] @@ -7394,9 +7358,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -7518,103 +7482,60 @@ 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_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.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" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[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" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[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" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[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" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -7633,7 +7554,6 @@ dependencies = [ "async-runtime", "async-trait", "configmodel", - "configparser", "crossbeam 0.8.2", "edenfs_client", "futures 0.3.25", @@ -7643,6 +7563,7 @@ dependencies = [ "manifest-tree", "parking_lot 0.11.2", "pathmatcher", + "progress-model", "repolock", "serde", "serde_json", @@ -7653,7 +7574,7 @@ dependencies = [ "tempfile", "thiserror", "thrift-types", - "tokio 1.22.0", + "tokio", "tracing", "treestate", "types", @@ -7729,12 +7650,13 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.5+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" dependencies = [ "cc", "libc", + "pkg-config", ] [[package]] diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 172c262005fb9..8873e8c4718ee 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python38Packages +, python3Packages , fetchFromGitHub , fetchurl , sd @@ -43,7 +43,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-IzbUaFrsSMojhsbpnRj1XLkhO9V2zYdmmZls4mtZquw="; + hash = "sha256-zlvb+qn9SSBPZmlF8KwKTWyKj94FGOafSMRMNLsccOU"; }; addonsSrc = "${src}/addons"; @@ -51,7 +51,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-B61T0ReZPRfrRjBC3iHLVkVYiifhzOXlaG1YL6rgmj4="; + sha256 = "sha256-+29WAgSXVciHhLMN04yfKiWCpjM3Vo54nUdTP6owSLs"; }; # Builds the NodeJS server that runs with `sl web` @@ -90,11 +90,7 @@ let }; # 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 { + sapling = python3Packages.buildPythonPackage { pname = "sapling-main"; inherit src version; @@ -104,12 +100,12 @@ let cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "cloned-0.1.0" = "sha256-c3CPWVjOk+VKBLD6WuaYZvBoKi5PwgXmiwxKoCk0bsI="; + "cloned-0.1.0" = "sha256-DYQTK722wgeDUJtOVXHLt42G6gpe6A62rET+JH+bPKU="; "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="; + "fb303_core-0.0.0" = "sha256-YEFNTYvtgp8nc/1O7AbdyxCD3Xx2xCjbS17fTTEsUL0="; + "fbthrift-0.0.1+unstable" = "sha256-mDoYhXOzQIDqP7XdmiBbmq5VmAKAgggTNH/kW2kHv4k="; "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; - "serde_bser-0.3.1" = "sha256-KCAC+rbczroZn/oKYTVpAPJl40yMrszt/PGol+JStDU="; + "serde_bser-0.3.1" = "sha256-/zn1NfXWytXvnalkgPsg9BdujVV97PGkXwmPtQGVeCc="; }; }; postPatch = '' @@ -135,7 +131,7 @@ let # so that 'sl web' always works # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB preFixup = '' - sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages + sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages chmod +w $sitepackages cp -r ${isl} $sitepackages/edenscm-isl '' + lib.optionalString (!enableMinimal) '' diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index 06751b51b15e3..9cbcd71cbcf7c 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -69,10 +69,10 @@ "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" + "sha256": "1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7", + "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" } ], - "version": "0.1.20221118-210929-cfbb68aa", - "versionHash": "5535144625961033752" + "version": "0.2.20221222-152408-ha6a66d09", + "versionHash": "14601963598499040874" } diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index b6e4f8c33110f..95ef43775ec2c 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ''; # pytest tests fail - checkInputs = [ + nativeCheckInputs = [ pytest factory_boy ]; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 699103b98f5d8..763c60f654bba 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-XslMwA1DhztK9DPNCucUpzjCQXz6PN8ml8JBvKtJeqg="; + sha256 = "sha256-yeyAorVMHFl9wm57gmK6ZAI1w5daN2xl29Gqq0DsTtc="; }; - cargoSha256 = "sha256-KxwBF5t8lcaH8ZD4SorIBiq7p6r9LGHfEOyNXtB9HJw="; + cargoHash = "sha256-/1TL0lWb4I9h6nGV7exx7U6ACrieN0EULTWg7Weexeg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - checkInputs = [ webfs ]; + nativeCheckInputs = [ webfs ]; # remove timeouts in tests to make them less flaky TEST_SRVC_DISABLE_TIMEOUT = 1; diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index b5bdecd85ad16..535edeeff1529 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { format = "other"; - checkInputs = [ git perl ]; + nativeCheckInputs = [ git perl ]; postPatch = '' for f in Documentation/*.xsl; do diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/applications/version-management/subgit/default.nix index 0ec06aeaaa685..a7288aa24e6e8 100644 --- a/pkgs/applications/version-management/subgit/default.nix +++ b/pkgs/applications/version-management/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.15"; + version = "3.3.16"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-2/J/d4GrlLXR/7QBxgIMepzP+xxkeLvrCBwLl7Ke8wI="; + sha256 = "sha256-p7uBEG43N4Hed+8HYf3I9lQEvmYLV61oIyRrPHuGmUA="; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 69a2bce490606..613872721d204 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -101,7 +101,7 @@ let enableParallelBuilding = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = false; # fails 10 out of ~2300 tests meta = with lib; { diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 1fa100591832d..0625d0a684e00 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ git ]; - checkInputs = [] + nativeCheckInputs = [] ++ (with perlPackages; [ perl ShellCommand TestMost ]); outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 6c267aad77eb8..079fb1792e180 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -25,6 +25,7 @@ , pcre , pkg-config , which +, wrapGAppsHook , wxGTK , zlib @@ -75,6 +76,7 @@ stdenv.mkDerivation rec { pkg-config which cmake + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 4a19121f34ad8..7e1157fc4a67f 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -13,7 +13,7 @@ let owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU="; }; }); @@ -29,7 +29,7 @@ let version = "9.2.0"; src = oldAttrs.src.override { inherit version; - sha256 = "02ig2wf2yyrnnl88r2n13s1naskwsifwgx3syifmcxygflsmjd3d"; + hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo="; }; }); }; diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index f931e905127f7..42c1d40b61256 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -3,7 +3,6 @@ , cacert , curl , runCommandLocal -, targetPlatform , unzip , appimage-run , addOpenGLRunpath @@ -49,7 +48,7 @@ let SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${targetPlatform.linuxArch})" + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" "AppleWebKit/537.36 (KHTML, like Gecko)" "Chrome/77.0.3865.75" "Safari/537.36" diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 165cb4ab4d636..6499b6153c8da 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { meta = { description = "Suite of command line programs that creates a slideshow-style video from groups of pictures"; - homepage = "http://dvd-slideshow.sourceforge.net/wiki/Main_Page"; + homepage = "https://dvd-slideshow.sourceforge.net/wiki/Main_Page"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.robbinch ]; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 941b0808886e5..daf785b7139fa 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; - homepage = "http://dvdauthor.sourceforge.net/"; + homepage = "https://dvdauthor.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index 89995ab8cba7f..3e998d0c4a170 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool to rip video DVDs from the command line"; - homepage = "http://dvdbackup.sourceforge.net/"; + homepage = "https://dvdbackup.sourceforge.net/"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bradediger ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index cd36914583364..ba0d4945385e6 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -17,7 +17,7 @@ , libjpeg , pkg-config , wrapGAppsHook -, wxGTK30 # crash with wxGTK30 with GTK2 compat +, wxGTK32 , wxSVG , xine-ui , xmlto @@ -33,13 +33,18 @@ let inherit (lib) optionals makeBinPath; in stdenv.mkDerivation rec { pname = "dvdstyler"; - version = "3.1.2"; + version = "3.2.1"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2"; - sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4"; + sha256 = "sha256-C7M0hzn0yTCXRUuBTss6WPa6zo8DD0Fhmp/ur7R0dVg="; }; + patches = [ + # https://sourceforge.net/p/dvdstyler/DVDStyler/ci/679fa8dc6ac7657775eda9d7b0ed9da9d069aeec/ + ./wxgtk32.patch + ]; + nativeBuildInputs = [ bison docbook_xml_dtd_412 @@ -62,7 +67,7 @@ in stdenv.mkDerivation rec { libexif libjpeg wxSVG - wxGTK30 + wxGTK32 xine-ui ] ++ optionals dvdisasterSupport [ dvdisaster ] diff --git a/pkgs/applications/video/dvdstyler/wxgtk32.patch b/pkgs/applications/video/dvdstyler/wxgtk32.patch new file mode 100644 index 0000000000000..92b3c3fbe3ba7 --- /dev/null +++ b/pkgs/applications/video/dvdstyler/wxgtk32.patch @@ -0,0 +1,12 @@ +--- a/wxVillaLib/PropDlg.cpp ++++ b/wxVillaLib/PropDlg.cpp +@@ -12,7 +12,9 @@ + #include "utils.h" + #include <wx/fontdlg.h> + #include <wx/colordlg.h> ++#ifdef __WXMSW__ + #include <wx/generic/colrdlgg.h> ++#endif + #include <wx/filedlg.h> + #include <wx/dirdlg.h> + #include <wx/grid.h> diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 91d0e6edf3780..75a7a9b46bb77 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.26.0"; + version = "1.26.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+WpWcQnnAUiARLZBkv51AblZDz9g8bM5MQTkm2kYsPQ="; + sha256 = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix new file mode 100644 index 0000000000000..a688e0476256c --- /dev/null +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, zlib +, potrace +, ffmpeg +, libarchive +, python3 +, qtbase +, qttools +, wrapQtAppsHook +, testers +, qtsvg +, qtimageformats + # For the tests +, glaxnimate # Call itself, for the tests +, xvfb-run +}: +let + # TODO: try to add a python library, see toPythonModule in doc/languages-frameworks/python.section.md + python3WithLibs = python3.withPackages (ps: with ps; [ + # In data/lib/python-lottie/requirements.txt + numpy + pillow + cairosvg + fonttools + grapheme + opencv4 + pyqt5 + qscintilla + # Not sure if needed, but appears in some files + pyyaml + requests + pybind11 + ]); +in +stdenv.mkDerivation rec { + pname = "glaxnimate"; + version = "0.5.1"; + + src = fetchFromGitLab { + owner = "mattbas"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + zlib + potrace + # Upstream asks for libav dependency, which is fulfilled by ffmpeg + ffmpeg + libarchive + qtbase + qttools + qtsvg + qtimageformats + python3WithLibs + ]; + + qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; + + passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { + package = glaxnimate; + command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; + }); + + meta = with lib; { + homepage = "https://gitlab.com/mattbas/glaxnimate"; + description = "Simple vector animation program."; + license = licenses.gpl3; + maintainers = with maintainers; [ tobiasBora ]; + }; +} diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 0d063e707185c..a776fabc9a790 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-JINvLmiS6EnkAmxbqPJI+J9Wk4+ZXwZZm1x5Ew7FCBg="; + hash = "sha256-UU8tbaZz7udDulh+PHPZDc3rm1MvK4dafPgXL50apMI="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index c210743f6eaeb..ee62a711398bd 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 = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-hCVItxvYTE0G5inI/A4w4FYfSfrACINBSaKXhA1mh4A="; + hash = "sha256-R9bp1RQHHCrIE/3rIAHzWHXpXBUDUpJTkO53n+xZw3Q="; }; patches = [ @@ -26,10 +26,6 @@ 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 deleted file mode 100644 index 06c971b51520d..0000000000000 --- a/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/kodi/addons/a4ksubtitles/default.nix b/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix index 9c62198cb0f3a..ae32fb7c5a77c 100644 --- a/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix +++ b/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "a4ksubtitles"; namespace = "service.subtitles.a4ksubtitles"; - version = "2.8.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "a4k-openproject"; repo = "a4kSubtitles"; rev = "${namespace}/${namespace}-${version}"; - sha256 = "0fg5mcvxdc3hqybp1spy7d1nnqirwhcvrblbwksikym9m3qgw2m5"; + sha256 = "sha256-t6oclFAOsUC+hFtw6wjRh1zl2vQfc7RKblVJpBPfE9w="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index 2607ee64f70a0..30b54c2adae2e 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -2,13 +2,13 @@ let drv = stdenv.mkDerivation { pname = "controller-topology-project"; - version = "unstable-2022-01-22"; + version = "unstable-2022-11-19"; src = fetchFromGitHub { owner = "kodi-game"; repo = "controller-topology-project"; - rev = "e2a9bac903f21b2acfeee374070cfc97d03aba2d"; - sha256 = "sha256-o6uKxOjEYNAK27drvNOokOFPdjkOEnr49mBre9ycM0w="; + rev = "d96894ca68678000f26f56d14aa3ceea47b1a3a8"; + sha256 = "sha256-KfDr2bSJFey/aNO5WzoOQ8Mz0v4uitKkOesymIMZH1o="; }; postPatch = '' diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix index a7dc758696c10..92a877fe84005 100644 --- a/pkgs/applications/video/kodi/addons/iagl/default.nix +++ b/pkgs/applications/video/kodi/addons/iagl/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "iagl"; namespace = "plugin.program.iagl"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "zach-morris"; repo = "plugin.program.iagl"; rev = version; - sha256 = "sha256-Ha9wUHURPql6xew5bUd33DpgRt+8vwIHocxPopmXj4c="; + sha256 = "sha256-fwPrNDsEGoysHbl9k9cRYKlr3MxDRiUmJhSsWVT2HHQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 59aaa2e8b2613..36e8aa4a02250 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.7"; + version = "0.7.10"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "06glhnpayldficvvhlkbxg7zizl2wqms66fnc3p63nm3y7mqa9dd"; + sha256 = "sha256-hR4cJEpP/RZH24M4Ma33ZUe9oydRg7CyP1hHncvDW8Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/joystick/default.nix b/pkgs/applications/video/kodi/addons/joystick/default.nix index a1b9c3eeeefdb..310cd4d08345c 100644 --- a/pkgs/applications/video/kodi/addons/joystick/default.nix +++ b/pkgs/applications/video/kodi/addons/joystick/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "peripheral.joystick"; - version = "1.7.1"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914"; + sha256 = "sha256-jSz0AgxhbCIbbZJxm4oq22y/hqew949UsqEAPoqEnHA="; }; extraBuildInputs = [ tinyxml udev ]; diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index aaaed78d4147c..6c42bd78f45cf 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -1,13 +1,13 @@ -{ lib, buildKodiAddon, fetchzip, defusedxml, kodi-six }: +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }: buildKodiAddon rec { pname = "keymap"; namespace = "script.keymap"; - version = "1.1.3+matrix.1"; + version = "1.1.4"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1icrailzpf60nw62xd0khqdp66dnr473m2aa9wzpmkk3qj1ay6jv"; + sha256 = "eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g="; }; propagatedBuildInputs = [ @@ -15,6 +15,12 @@ buildKodiAddon rec { kodi-six ]; + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.keymap"; + }; + }; + meta = with lib; { homepage = "https://github.com/tamland/xbmc-keymap-editor"; description = "A GUI for configuring mappings for remotes, keyboard and other inputs supported by Kodi"; diff --git a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix index 064375107e26e..4e2a700101066 100644 --- a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "kodi-libretro-genplus"; namespace = "game.libretro.genplus"; - version = "1.7.4.31"; + version = "1.7.4.35"; src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.genplus"; rev = "${version}-${rel}"; - sha256 = "0lcii32wzpswjjkwhv250l238g31akr66dhkbv8gj4v1i4z7hry8"; + sha256 = "sha256-F3bt129lBZKlDtp7X0S0q10T9k9C2zNeHG+yIP3818Q="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix index a58f1c51b295f..f669e24f8bd49 100644 --- a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "kodi-libretro-mgba"; namespace = "game.libretro.mgba"; - version = "0.9.2.31"; + version = "0.10.0.35"; src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.mgba"; rev = "${version}-${rel}"; - sha256 = "sha256-eZLuNhLwMTtzpLGkymc9cLC83FQJWZ2ZT0iyz4sY4EA="; + sha256 = "sha256-lxpj6Y34apYcE22q4W3Anhigp79r4RgiJ36DbES1kzU="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix index 640aec3d49714..7994016b6cd5b 100644 --- a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "kodi-libretro-snes9x"; namespace = "game.libretro.snes9x"; - version = "1.60.0.29"; + version = "1.61.0.34"; src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.snes9x"; rev = "${version}-${rel}"; - sha256 = "1wyfkg4fncc604alnbaqk92fi1h80n7bwiqfkb8479x5517byab1"; + sha256 = "sha256-LniZf8Gae4+4Rgc9OGhMCkOI3IA7CPjVrN/gbz9te38="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index 86f5dfb7545c9..ab034c13755e0 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.18.2"; + version = "1.20.2"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-nunjcVapWWTxYtILEcrkfJiWvSz71zyxSCbWQ4aCfLM="; + sha256 = "sha256-k2O8a0P+TzQVoFQJkzmdqmkKh3Aj7OlsnuhJfUwxOmI="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/orftvthek/default.nix b/pkgs/applications/video/kodi/addons/orftvthek/default.nix index c1abb00d0a306..634347be4826e 100644 --- a/pkgs/applications/video/kodi/addons/orftvthek/default.nix +++ b/pkgs/applications/video/kodi/addons/orftvthek/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "orftvthek"; namespace = "plugin.video.orftvthek"; - version = "0.12.3+matrix.1"; + version = "0.12.6"; src = fetchFromGitHub { owner = "s0faking"; repo = namespace; rev = version; - sha256 = "sha256-GB9VkC9Vbi7TJXl/vF3ViF/tAcHGH0KxYQ0zkfMLZCY="; + sha256 = "sha256-r18vQ+2TSeflwByEAX33vIZG5qIGneraf5rLBugl5BU="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 2e20043c162d8..736ea03843bbb 100644 --- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "19.1.1"; + version = "19.2.2"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-ZkB+Va9w/AHLZ+LSOJpJ93nVOw33tcNqjScbLt77zJw="; + sha256 = "sha256-snW6sgbdyGqdZtd7HU5FTf4Kx5/Zjk2fLLi0MS+9tTU="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix b/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix index 2db17f17abad9..4288d4e039a3e 100644 --- a/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix +++ b/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.libarchive"; - version = "2.0.0"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; + sha256 = "sha256-4sERFC/XBEE46n+iq6YJg/5Wz0+223tq4+O5cIf6X6E="; }; extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ]; diff --git a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix index e41f008281ad8..a9c37cc30a5c7 100644 --- a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix +++ b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.sftp"; - version = "2.0.0"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk"; + sha256 = "sha256-UXycPqPEn3W5X3SQs1fxgkdV5PSkzs3pjYyuhAVngt8="; }; extraBuildInputs = [ openssl libssh zlib ]; diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix index 851289bc06d46..a4036be735d06 100644 --- a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "visualization-waveform"; namespace = "visualization.waveform"; - version = "19.0.2"; + version = "19.0.3"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-IQLW4CDNtt/ptE679hnoXbharq61Ru9S2m7QbJLtNSI="; + hash = "sha256-3mTfL1UjPLDKardJy4IDNyzvHnkF//4nmWInOxP/XhQ="; }; extraBuildInputs = [ pkg-config libGL ]; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index fe6ac234cc140..8dab69bb56ac3 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.23+matrix.1"; + version = "6.8.24+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "GIPgw1exAgw/D5vNpQQkUnTye66jfLLI5/asrthEDPQ="; + sha256 = "/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 1dae66723379f..05e594d80aa23 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame @@ -107,13 +107,20 @@ in stdenv.mkDerivation { src = kodi_src; - # This is a backport of - # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 - # to Kodi 19.4 Matrix. - # This can be removed once a new release of Kodi comes out and we upgrade - # to it. patches = [ + # This is a backport of + # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 + # to Kodi 19.4 Matrix. + # This can be removed once a new major release of Kodi comes out and we upgrade + # to it. ./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch + + # A patch to fix build until the next major release of Kodi comes out and we upgrade + # https://github.com/xbmc/xbmc/pull/22291 + (fetchpatch { + url = "https://github.com/xbmc/xbmc/commit/5449652abf0bb9dddd0d796de4120e60f19f89a5.patch"; + sha256 = "sha256-vqX08dTSPhIur4aVu2BzXEpAxMOjaadwRNI43GSV9Og="; + }) ]; buildInputs = [ @@ -226,7 +233,8 @@ in stdenv.mkDerivation { ''; postInstall = '' - for p in $(ls $out/bin/) ; do + # TODO: figure out which binaries should be wrapped this way and which shouldn't + for p in $(ls --ignore=kodi-send $out/bin/) ; do wrapProgram $out/bin/$p \ --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \ @@ -236,6 +244,9 @@ in stdenv.mkDerivation { ++ lib.optional rtmpSupport rtmpdump)}" done + wrapProgram $out/bin/kodi-send \ + --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} + substituteInPlace $out/share/xsessions/kodi.desktop \ --replace kodi-standalone $out/bin/kodi-standalone ''; diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 267393ad0548d..02f71a94db5c9 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,7 +1,7 @@ { lib +, stdenv , callPackage , buildPackages -, hostPlatform }: let @@ -34,9 +34,9 @@ let }; in ( - if hostPlatform.system == "aarch64-darwin" then aarch64-dmg - else if hostPlatform.isDarwin then x86_64-dmg - else if hostPlatform.isCygwin then x86_64-windows + if stdenv.hostPlatform.system == "aarch64-darwin" then aarch64-dmg + else if stdenv.hostPlatform.isDarwin then x86_64-dmg + else if stdenv.hostPlatform.isCygwin then x86_64-windows else x86_64-appimage ).overrideAttrs (oldAttrs: { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 9c370741cdebf..d083f1eda20a9 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -55,7 +55,7 @@ in mkDerivation { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin out/makemkv out/mmccextr ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -Dm555 -t $out/bin out/makemkv out/mmccextr out/mmgplsrv ../makemkv-bin-${version}/bin/amd64/makemkvcon install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 3f1d5ecb81b92..bcb6eca16321a 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -107,7 +107,7 @@ in python3.pkgs.buildPythonApplication rec { ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.pytest-xdist python3.pkgs.pytestCheckHook diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 76e26ba017661..1b62c89c6ae8c 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-uu/4S7cVWHOhBq52NF0AargE0nbPwjF0txSWL0DquQo="; + sha256 = "sha256-RMZG+rPbwJFL2AzEZlTrc8/bQCx8CWCWppEBjCj5hnU="; }; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 05aaa8fe646e7..bce50b43a07c4 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "71.1.0"; + version = "73.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-JHbnjcXOctB6HQeHXykWbykdn35S2fCYegMkc3GLmAI="; + sha256 = "HGoT3t/ooRMiyjUkHnvVGOB04IU5U8VEKDixhE57kR8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 71fd52f35d885..7f6fd0b286f49 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -8,7 +8,7 @@ , ninja , pkg-config , python3 -, ffmpeg +, ffmpeg_5 , freefont_ttf , freetype , libass @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = [ - ffmpeg + ffmpeg_5 freetype libass libpthreadstubs diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix index a08bce6699fa3..60b392a6aa277 100644 --- a/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpv-thumbnail-script"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "marzzzello"; repo = "mpv_thumbnail_script"; rev = version; - sha256 = "sha256-0nqV8vY3cBOJkLRoQ33Cc+4+vSK45i9yWbhKiQIuVSw="; + sha256 = "sha256-6J1eeuSYyUJmWLIl9WsQ4NzQOBJNO3Cnl5jcPEal4vM="; }; nativeBuildInputs = [ python3 ]; @@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A lua script to show preview thumbnails in mpv's OSC seekbar"; homepage = "https://github.com/marzzzello/mpv_thumbnail_script"; + changelog = "https://github.com/marzzzello/mpv_thumbnail_script/releases/tag/${version}"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 82eaa30bba3ec..b41503b73597c 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, - poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio, + poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio_1, qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }: let @@ -74,7 +74,7 @@ let sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libpng ffmpeg openexr opencolorio_1 openimageio boost libGL + libpng ffmpeg openexr opencolorio_1 openimageio_1 boost libGL seexpr libraw openjpeg libwebp ]; }) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fb4ffe93a9e84..fa6167b9c1184 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -38,10 +38,10 @@ , libdrm , libajantv2 , librist +, libva , srt , qtwayland , wrapQtAppsHook -, ... }: let @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "obs-studio"; - version = "28.1.2"; + version = "29.0.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-M5UEOtdzXBVY0UGfwWx3MsM28bJ1EcVPl8acWXWV0lg="; + sha256 = "sha256-c+G02k4AACaYfa5Zhsanr6AU3vNbopDMcYtuny/d25Y="; fetchSubmodules = true; }; @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { pciutils libajantv2 librist + libva srt qtwayland ] diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index d1a3cc988a50e..1a7be5aa98114 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -6,12 +6,12 @@ # - Add plugin to it's own directory (because of future patches). { + droidcam-obs = callPackage ./droidcam-obs { }; + input-overlay = qt6Packages.callPackage ./input-overlay.nix { }; looking-glass-obs = callPackage ./looking-glass-obs.nix { }; - obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; - obs-gstreamer = callPackage ./obs-gstreamer.nix { }; obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; @@ -34,5 +34,7 @@ obs-websocket = throw "obs-websocket has been removed: Functionality has been integrated into obs-studio itself."; + obs-backgroundremoval = throw "obs-backgroundremoval has been removed: It does not work anymore and is unmaintained."; + wlrobs = callPackage ./wlrobs.nix { }; } diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix new file mode 100644 index 0000000000000..131817a2589f8 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub +, obs-studio +, ffmpeg +, libjpeg +, libimobiledevice +, libusbmuxd +, libplist +}: + +stdenv.mkDerivation rec { + pname = "droidcam-obs"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "dev47apps"; + repo = "droidcam-obs-plugin"; + rev = version; + sha256 = "sha256-oaw/mq4WCQMlf3sv9WtNlv9J9rm79xnqDwKzHtyFW50="; + }; + + postPatch = '' + substituteInPlace ./linux/linux.mk \ + --replace "-limobiledevice" "-limobiledevice-1.0" \ + --replace "-I/usr/include/obs" "-I${obs-studio}/include/obs" \ + --replace "-I/usr/include/ffmpeg" "-I${ffmpeg}/include" + ''; + + preBuild = '' + mkdir ./build + ''; + + buildInputs = [ + libjpeg + libimobiledevice + libusbmuxd + libplist + obs-studio + ffmpeg + ]; + + makeFlags = [ + "ALLOW_STATIC=no" + "JPEG_DIR=${lib.getDev libjpeg}" + "JPEG_LIB=${lib.getLib libjpeg}/lib" + "IMOBILEDEV_DIR=${libimobiledevice}" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/obs/obs-plugins/droidcam-obs + mkdir -p $out/lib/obs-plugins + cp build/droidcam-obs.so $out/lib/obs-plugins + cp -R ./data/locale $out/share/obs/obs-plugins/droidcam-obs/locale + + runHook postInstall + ''; + + doCheck = false; + + meta = with lib; { + description = "DroidCam OBS"; + homepage = "https://github.com/dev47apps/droidcam-obs-plugin"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ulrikstrid ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix index 1696a2d9493b0..cd7548846fa25 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = looking-glass-client.src; - sourceRoot = "source/obs"; + sourceRoot = "${looking-glass-client.src.name}/obs"; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio libbfd SDL2 ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix deleted file mode 100644 index 79a3f82fec87d..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, obs-studio -, onnxruntime -, opencv -}: - -stdenv.mkDerivation rec { - pname = "obs-backgroundremoval"; - version = "unstable-2022-05-02"; - - src = fetchFromGitHub { - owner = "royshil"; - repo = "obs-backgroundremoval"; - rev = "cc9d4a5711f9388ed110230f9f793bb071577a23"; - hash = "sha256-xkVZ4cB642p4DvZAPwI2EVhkfVl5lJhgOQobjNMqpec="; - }; - - patches = [ - # Fix c++ include directives - ./includes.patch - - # Use CPU backend instead of CUDA/DirectML - ./use-cpu-backend.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio onnxruntime opencv ]; - - dontWrapQtApps = true; - - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" - "-DOnnxruntime_INCLUDE_DIRS=${onnxruntime.dev}/include/onnxruntime/core/session" - ]; - - - prePatch = '' - sed -i 's/version_from_git()/set(VERSION "0.4.0")/' CMakeLists.txt - ''; - - meta = with lib; { - description = "OBS plugin to replace the background in portrait images and video"; - homepage = "https://github.com/royshil/obs-backgroundremoval"; - maintainers = with maintainers; [ puffnfresh ]; - license = licenses.mit; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch deleted file mode 100644 index b99fc11818811..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/Model.h b/src/Model.h -index 6a73745..6bb8a7d 100644 ---- a/src/Model.h -+++ b/src/Model.h -@@ -1,13 +1,8 @@ - #ifndef MODEL_H - #define MODEL_H - --#if defined(__APPLE__) - #include <onnxruntime/core/session/onnxruntime_cxx_api.h> - #include <onnxruntime/core/providers/cpu/cpu_provider_factory.h> --#else --#include <onnxruntime_cxx_api.h> --#include <cpu_provider_factory.h> --#endif - - #ifdef WITH_CUDA - #include <cuda_provider_factory.h> -diff --git a/src/background-filter.cpp b/src/background-filter.cpp -index 0853818..32c6483 100644 ---- a/src/background-filter.cpp -+++ b/src/background-filter.cpp -@@ -1,13 +1,8 @@ - #include <obs-module.h> - #include <media-io/video-scaler.h> - --#if defined(__APPLE__) - #include <onnxruntime/core/session/onnxruntime_cxx_api.h> - #include <onnxruntime/core/providers/cpu/cpu_provider_factory.h> --#else --#include <onnxruntime_cxx_api.h> --#include <cpu_provider_factory.h> --#endif - #ifdef WITH_CUDA - #include <cuda_provider_factory.h> - #endif diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch deleted file mode 100644 index 0db5592e5cdb7..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d04e167f9081a3ec8c49f0967b5b0cec79e40e4d Mon Sep 17 00:00:00 2001 -From: Raphael Robatsch <raphael-git@tapesoftware.net> -Date: Fri, 14 Oct 2022 16:55:36 +0200 -Subject: [PATCH] unix: use CPU backend instead of DirectML - ---- - src/background-filter.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/background-filter.cpp b/src/background-filter.cpp -index 32c6483..55e838f 100644 ---- a/src/background-filter.cpp -+++ b/src/background-filter.cpp -@@ -205,10 +205,14 @@ static void createOrtSession(struct background_removal_filter *tf) { - if (tf->useGPU == USEGPU_CUDA) { - Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CUDA(sessionOptions, 0)); - } --#else -+#elseif _WIN32 - if (tf->useGPU == USEGPU_DML) { - Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_DML(sessionOptions, 0)); - } -+#else -+ if (tf->useGPU == USEGPU_CPU) { -+ Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CPU(sessionOptions, 0)); -+ } - #endif - tf->session.reset(new Ort::Session(*tf->env, tf->modelFilepath, sessionOptions)); - } catch (const std::exception& e) { --- -2.37.3 - diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 3b97644bf2557..ba0e8a8182633 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.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - hash = "sha256-Ya4p0eXOTID1qmxokgSXdmBOd3nqzcOHM+pLqJi8LGg="; + hash = "sha256-xtIcIT9lWw73Et9WgyEUznwy1X947Rv5nTiM+t0qYaM="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index e3bc964ad18c7..87056a1598d72 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "151g6jwhipgbq4llwib92sq23p1s9hm6avr7j4qq3bvykzrm8z1a"; }; + patches = [ + ./q-painter-path.patch + ]; + nativeBuildInputs = [ pkg-config which diff --git a/pkgs/applications/video/olive-editor/q-painter-path.patch b/pkgs/applications/video/olive-editor/q-painter-path.patch new file mode 100644 index 0000000000000..232f157e7cdd9 --- /dev/null +++ b/pkgs/applications/video/olive-editor/q-painter-path.patch @@ -0,0 +1,48 @@ +diff --git a/effects/internal/texteffect.cpp b/effects/internal/texteffect.cpp +index 279f406d9..7fe9e8e72 100644 +--- a/effects/internal/texteffect.cpp ++++ b/effects/internal/texteffect.cpp +@@ -20,6 +20,7 @@ + + #include "texteffect.h" + ++#include <QPainterPath> + #include <QGridLayout> + #include <QLabel> + #include <QOpenGLTexture> +diff --git a/effects/internal/timecodeeffect.cpp b/effects/internal/timecodeeffect.cpp +index 4de3e3497..fd0fa6224 100644 +--- a/effects/internal/timecodeeffect.cpp ++++ b/effects/internal/timecodeeffect.cpp +@@ -20,6 +20,7 @@ + + #include "timecodeeffect.h" + ++#include <QPainterPath> + #include <QGridLayout> + #include <QLabel> + #include <QOpenGLTexture> +diff --git a/ui/graphview.cpp b/ui/graphview.cpp +index 3e13075cd..c441133a8 100644 +--- a/ui/graphview.cpp ++++ b/ui/graphview.cpp +@@ -20,6 +20,7 @@ + + #include "graphview.h" + ++#include <QPainterPath> + #include <QPainter> + #include <QMouseEvent> + #include <QtMath> +diff --git a/ui/timelineheader.cpp b/ui/timelineheader.cpp +index f39065b4f..aa7fd638d 100644 +--- a/ui/timelineheader.cpp ++++ b/ui/timelineheader.cpp +@@ -20,6 +20,7 @@ + + #include "timelineheader.h" + ++#include <QPainterPath> + #include <QPainter> + #include <QMouseEvent> + #include <QScrollBar> diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 5d8b68200ded6..02270cd75e06e 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -13,13 +13,13 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { pname = "openshot-qt"; - version = "2.6.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - hash = "sha256-29fAg4SDoAFzv6q43Dcs2HdaeKZfPEzlGqCcICiPSF0="; + hash = "sha256-h4R2txi038m6tzdKYiXIB8CiqWt2MFFRNerp1CFP5as="; }; nativeBuildInputs = [ @@ -45,22 +45,6 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - # Following Arch PKGBUILD for Python 3.10 compatibility - # https://github.com/OpenShot/openshot-qt/issues/4608 - # https://github.com/archlinux/svntogit-community/commits/packages/openshot/trunk - patches = [ - (fetchpatch { - name = "video-widget.patch"; - url = "https://github.com/OpenShot/openshot-qt/commit/9748a13268d66a5949aebc970637b5903756d018.patch"; - hash = "sha256-QwLtcooDJeYWDp80a1dUFo2so/zEWqqsq5IgkXWX324="; - }) - (fetchpatch { - name = "python-3.10-int.patch"; - url = "https://github.com/OpenShot/openshot-qt/commit/fff785eb1e3e0c30ed6ca57e2d1933aaa807ae22.patch"; - hash = "sha256-ee/s7rhF71ot5oPkGK+j59mL1B3e72xoH27KFoDL8s8="; - }) - ]; - doCheck = false; dontWrapGApps = true; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 438eae4670980..0c028a4a046f9 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libopenshot-audio"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "sha256-XtwTZsj/L/sw/28E7Qr5UyghGlBFFXvbmZLGXBB8vg0="; + sha256 = "sha256-b3BZ275oJTxWfBWtdZetUQw0t7QznL0Q0lP7cKy/avg="; }; patches = [ diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 22ed82fd3d0b7..4214bed7167f4 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libopenshot"; - version = "0.2.7"; + version = "0.3.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U="; + sha256 = "sha256-qe866gFhcbd7yCNXDiZ9Aj0TAiWoJ+r7C5BjtWBKSGA="; }; postPatch = '' diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index 620cedb6c1b29..18e38122f27c8 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -62,7 +62,7 @@ buildPerlModule rec { substituteInPlace Build.PL --replace 'my $gtk ' 'my $gtk = 1;#' ''; - checkInputs = [ + nativeCheckInputs = [ TestPod ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 34842b38743b4..7778e7c222408 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -13,7 +13,10 @@ mkDerivation rec { sha256 = "0mrx8wprs8bi42fwwvk6rh634ic9jnn0gkfpd6q9pcawnnbz3vq8"; }; - cmakeFlags = [ "-DWITH_QT5=TRUE" ]; + cmakeFlags = [ + "-DWITH_QT5=TRUE" + "-DWITH_GLINJECT=${if stdenv.hostPlatform.isx86 then "TRUE" else "FALSE"}" + ]; patches = [ ./fix-paths.patch ]; @@ -35,7 +38,7 @@ mkDerivation rec { description = "A screen recorder for Linux"; homepage = "https://www.maartenbaert.be/simplescreenrecorder"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/video/srtrelay/default.nix b/pkgs/applications/video/srtrelay/default.nix index 898f728d3eec1..b0dc49d7610d1 100644 --- a/pkgs/applications/video/srtrelay/default.nix +++ b/pkgs/applications/video/srtrelay/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = "sha256-xTYlfdijSo99ei+ZMX6N9gl+yw0DrPQ2wOhn6SS9S/E="; buildInputs = [ srt ]; - checkInputs = [ ffmpeg ]; + nativeCheckInputs = [ ffmpeg ]; meta = with lib; { description = "Streaming-Relay for the SRT-protocol"; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 6aeab3e6e4277..6a8207e7bc16d 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno="; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock requests-mock diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 7fd00ec66d03e..8becf629d153d 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xine.sourceforge.net/"; + homepage = "https://xine.sourceforge.net/"; description = "Xlib-based frontend for Xine video player"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 1e2e8c764a9ec..837e86082f950 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -13,7 +13,7 @@ let "OvmfPkg/OvmfPkgIa32.dsc" else if stdenv.isx86_64 then "OvmfPkg/OvmfPkgX64.dsc" - else if stdenv.isAarch64 then + else if stdenv.hostPlatform.isAarch then "ArmVirtPkg/ArmVirtQemu.dsc" else throw "Unsupported architecture"; @@ -21,6 +21,7 @@ let version = lib.getVersion edk2; suffixes = { + i686 = "FV/OVMF"; x86_64 = "FV/OVMF"; aarch64 = "FV/AAVMF"; }; @@ -51,7 +52,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin ''; - postFixup = if stdenv.isAarch64 then '' + postFixup = if stdenv.hostPlatform.isAarch then '' mkdir -vp $fd/FV mkdir -vp $fd/AAVMF mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV @@ -87,7 +88,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { description = "Sample UEFI firmware for QEMU and KVM"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; + inherit (edk2.meta) platforms; maintainers = [ lib.maintainers.raitobezarius ]; }; }) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index b14ae35f5fa5c..e6f5be057371c 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "28.0"; + version = "29.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gl8LgR2Sz0DxPAYeyfTvLJg4Esotg/eBfCjbdgEUfRI="; + sha256 = "sha256-UH5HGXTRYcCBGhswHpGAn8a7rfl5j7gF8GgdpGj5Cb8="; }; separateDebugInfo = true; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-qPlk8MHuXnfmtQSqIiFBYQK7TgHun1CxLqVOz/DDvrs="; + cargoSha256 = "sha256-30pUKZgGjjXP7UFY4y7XRXlHPF09mnyGWAhx7rPgs+o="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 7a16489c044cd..40a1e671cc565 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.14"; + version = "1.6.15"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-+2K2lLxTXZS8pjgqhJZd+JovUFqG5Cgw9iAbDjnUvvQ="; + sha256 = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 4f54b4044cd0e..9031f941ab349 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.25.1"; + version = "1.26.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-MFqCRHsIpc8ianyNW+PsDINQavbTZs2rZ2k6q/6wTkY="; + sha256 = "sha256-7tbnnERV+dYtEXzloHgWeSFpe8Dl18tiNWoAhIALWjE="; }; vendorSha256 = null; @@ -54,6 +54,9 @@ buildGoModule rec { installShellCompletion --$shell completions/$shell/* done + install contrib/cni/*.conflist -Dt $out/etc/cni/net.d + install crictl.yaml -Dt $out/etc + installManPage docs/*.[1-9] runHook postInstall ''; diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index b220c8e29cbf0..5d15847d9c3ee 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -40,6 +40,7 @@ in runCommand cri-o-unwrapped.name { ln -s ${cri-o-unwrapped.man} $man mkdir -p $out/bin + ln -s ${cri-o-unwrapped}/etc $out/etc ln -s ${cri-o-unwrapped}/share $out/share for p in ${cri-o-unwrapped}/bin/*; do diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index aca97a811fb30..fda676ca0043b 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.4.1"; + version = "1.4.2.1"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-WIpl3eSdResAmWFc8OG8Jm0uLTGaovkItGAZTOEzhuE="; + sha256 = "sha256-s3lq1Xr2y29cmyT1nY5/amiDA9dNfyGaMtjTvUINSD8="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 467a235dc8849..1646c05175141 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.14.2"; + version = "2.15.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-Yr4R2w6tUsir57etZeex2jT1PW3EZvsLJkVAo/QkhUA="; + sha256 = "sha256-CDkewlZFvjp6kb6UoMDUv9iAUfm0akMD9RpI9/H7Sz8="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorSha256 = "sha256-ar61gvbcm7bcgoPodppqrVJnyFHdZkPIMQ6IUXNpGBA="; + vendorSha256 = "sha256-sv4lK6MRwmp/1CSGBoYMpcGunVCuE8p1vB4VKaRuwQc="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix index 425363e2b73b6..4e692eb51b118 100644 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { # lots of networking and other fails doCheck = false; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ mock pytest nose ]; + nativeCheckInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml colorama dockerpty docker jsonschema requests six texttable websocket-client diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index fff9200285aa4..5027a8fd5c911 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -15,7 +15,7 @@ rec { , iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests , clientOnly ? !stdenv.isLinux, symlinkJoin - , withSystemd ? stdenv.isLinux, systemd + , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withBtrfs ? stdenv.isLinux, btrfs-progs , withLvm ? stdenv.isLinux, lvm2 , withSeccomp ? stdenv.isLinux, libseccomp diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/applications/virtualization/dumb-init/default.nix index fa408cb910bc5..ee61a1bafacca 100644 --- a/pkgs/applications/virtualization/dumb-init/default.nix +++ b/pkgs/applications/virtualization/dumb-init/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs="; }; - buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc.static ]; + postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) '' + substituteInPlace Makefile --replace "-static" "" + ''; + + buildInputs = lib.optional (stdenv.hostPlatform.isGnu && stdenv.hostPlatform.isStatic) glibc.static; installPhase = '' runHook preInstall diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 88c5f3779df64..58c303a46c404 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.66.2"; + version = "1.67.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik="; + hash = "sha256-iSL5ogS8BLcxge3eo+kCqtsGmj7P1wbi+/84nA9fO2Q="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 03d049477b5db..29dd9b27232e6 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -1,31 +1,41 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , qemu +, xcbuild +, sigtool , makeWrapper }: buildGoModule rec { pname = "lima"; - version = "0.13.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM="; + sha256 = "sha256-g4FvkjBviI1m8zlc+GK/09dIqVkTQ2MqqK1Wkyu4qBc="; }; - vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY="; + vendorSha256 = "sha256-l53MTxLY/uid+0U/eY96l0aBWKImST1gN2BARilh2K0="; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ makeWrapper installShellFiles ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; # clean fails with read only vendor dir postPatch = '' - substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' + substituteInPlace Makefile \ + --replace 'binaries: clean' 'binaries:' \ + --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' ''; + # It attaches entitlements with codesign and strip removes those, + # voiding the entitlements and making it non-operational. + dontStrip = stdenv.isDarwin; + buildPhase = '' runHook preBuild make "VERSION=v${version}" binaries diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index eac91d4bf29bb..c41779459454b 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.16.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p9kKTNtZoWl2rZyL1cD7fK9+IwDtBCfdRzWjKQmje5M="; + sha256 = "sha256-SrNYvkJy97GwneA7UClNLaO0fd+ZiMSxCCSgqwESw5Y="; }; - cargoSha256 = "sha256-UWefCe5DLaxUFNbQV0XNyqNI1dx9HPHfwj+aJaEasFc="; + cargoHash = "sha256-S/V2PVkL9T/USXAzorDpo0nhRm9DOkNtfw5CADg4oKM="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 3fed07237f75e..f6cc83fde17c4 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -68,7 +68,6 @@ buildGoModule rec { ${if stdenv.isDarwin then '' mv bin/{darwin/podman,podman} '' else '' - install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d for s in contrib/systemd/**/*.in; do substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary @@ -92,7 +91,6 @@ buildGoModule rec { # related modules inherit (nixosTests) podman-tls-ghostunnel - podman-dnsname ; oci-containers-podman = nixosTests.oci-containers.podman; }; diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index d0131eacdd37e..7fe483a7079e5 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -15,12 +15,12 @@ , iproute2 , catatonit , gvproxy +, aardvark-dns +, netavark }: # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed -# adding aardvark-dns/netavark to `helpersBin` requires changes to the modules and tests - let binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ @@ -41,7 +41,9 @@ let paths = [ gvproxy ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` + netavark podman-unwrapped.rootlessport ]; }; diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 516fba43f4b33..18472f03d850c 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.0-rc.3"; + version = "1.0.2"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4dRwrB2M0GooRq3Hi2nmpbQm9RaLqrkZkEDTQpEd7bo="; + sha256 = "sha256-Kjonyd0xL0QLjPS+U3xDC6AhOOxQmVAZ3STLXaa8eXc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-wGO2qp8jKHEevQ5vMDxqMzvRr1QazclhZ98M3B29PqQ="; + sha256 = "sha256-K5oOpo3xJiNg7F549JLGs83658MYcoGfuIcNoF88Njc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e0c29518a7293..e68cf7048b56a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation rec { # tests can still timeout on slower systems inherit doCheck; - checkInputs = [ socat ]; + nativeCheckInputs = [ socat ]; preCheck = '' # time limits are a little meagre for a build machine that's # potentially under load. diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index c870abc302822..502a04c260fcc 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "seabios"; - version = "1.16.0"; + version = "1.16.1"; src = fetchgit { url = "https://git.seabios.org/seabios.git"; rev = "rel-${version}"; - sha256 = "0acal1rr7sya86wlhw2mgimabwhjnr0y1pl5zxwb79j8k1w1r8sh"; + sha256 = "sha256-oIl2ZbhgSiVJPMBGbVt6N074vOifAoZL6VdKcBwM8D4="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 03aba1c41218a..e5d5a1fbfe7cc 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { --replace "'--owner=root:root'" "'--owner=0:0'" ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook cpio cdrtools diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 7837bd3751a44..f6612f3d9aea3 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.4.2"; + version = "7.6.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-oyxD6VCut7OfFYozdP0D2+ocOvidTrtaYrh0oCfZzBY="; + sha256 = "sha256-DehAWrEvoE/zWbfjQmF5Z7HTaQL5WMA/279Ee1Xm47g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix new file mode 100644 index 0000000000000..54a88a334f8a3 --- /dev/null +++ b/pkgs/applications/virtualization/youki/default.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, installShellFiles +, dbus +, libseccomp +, systemd +}: + +rustPlatform.buildRustPackage rec { + pname = "youki"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XwapCfu6Me0xSe+qFz9BFRYpQvG+ztb6QyhGejYRPb4="; + }; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + + buildInputs = [ dbus libseccomp systemd ]; + + postInstall = '' + installShellCompletion --cmd youki \ + --bash <($out/bin/youki completion -s bash) \ + --fish <($out/bin/youki completion -s fish) \ + --zsh <($out/bin/youki completion -s zsh) + ''; + + cargoBuildFlags = [ "-p" "youki" ]; + cargoTestFlags = [ "-p" "youki" ]; + + cargoSha256 = "sha256-PT1kVo4gQFH9sIprEoAioNvDL/soMHcA2utEiQJPS/0="; + + doCheck = false; # test failed + + meta = with lib; { + description = "A container runtime written in Rust"; + homepage = "https://containers.github.io/youki/"; + changelog = "https://github.com/containers/youki/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 93f5b788c7ce8..63a5e8613e189 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-YaLGRlvppTUCSHFlt3sEfHgN3pYHuc5oGt3dt0DDw3I="; + hash = "sha256-pU1QHYOqnkb3L4iSKbZY9Vo60Z6EaX9mp2Nw48NSPic="; }; nativeBuildInputs = [ @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ berbiche ]; platforms = platforms.linux; + changelog = "https://github.com/project-repo/cagebreak/blob/${version}/Changelog.md"; }; passthru.tests.basic = nixosTests.cagebreak; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index a1b790b33da8e..424528e9c1aa8 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = pname; rev = version; - sha256 = "sha256-BCnEnBB0OCUwvhh4XEI2eOzfy34VHNFzbqqW26X6If0="; + sha256 = "sha256-GkTPEmsnHFLUvbasAOXOQjFKs1Y9aaG87uyPvnQaT8Y="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "sha256-ylB0XGmIPW7Dbc6eDS8FZsq1AOOqntx1byaH3XIal0I="; + cargoSha256 = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE="; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Highly performant and configurable DWM status service"; homepage = "https://github.com/Gerschtli/dwm-status"; + changelog = "https://github.com/Gerschtli/dwm-status/blob/master/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; mainProgram = pname; diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index 5c2cc999f45e4..a0cddeff23ac6 100644 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -7,7 +7,6 @@ , fontconfig , freetype , fribidi -, imlib , libSM , libX11 , libXcursor @@ -32,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fvwm3"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm3"; rev = finalAttrs.version; - hash = "sha256-/2Ssl/sgKCXbUCtKj2WIcvEC3B16h5/1Jp87AggKxJo="; + hash = "sha256-uYkIuMzhaWeCZm5aJF4oBYD72OLgwCBuUhDqpg6HQUM="; }; nativeBuildInputs = [ @@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype fribidi - imlib libSM libX11 libXcursor diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix index 0f608b83a70a7..f38d0d6beb9b1 100644 --- a/pkgs/applications/window-managers/hackedbox/default.nix +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A bastard hacked offspring of Blackbox"; - homepage = "http://github.com/museoa/hackedbox/"; + homepage = "https://github.com/museoa/hackedbox/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (libX11.meta) platforms; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 4918dad35f425..ed6b9fd4aac73 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ ewmh pytest xlib ])) xdotool xorgserver diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 4ffa04d73bf5f..b9079c8828148 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.21.1"; + version = "4.22"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-7f14EoXGVKBdxtsnLOAwDEQo5vvYddmZZOV94ltBvB4="; + sha256 = "sha256-KGOZEeWdlWOfCSZCqYL14d6lkiUMK1zpjtoQCDNRPks="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix deleted file mode 100644 index 35a58bd25f00e..0000000000000 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ fetchFromGitHub, lib, i3 }: - -i3.overrideAttrs (oldAttrs : rec { - pname = "i3-gaps"; - version = "4.21.1"; - - src = fetchFromGitHub { - owner = "Airblader"; - repo = "i3"; - rev = version; - sha256 = "sha256-+JxJjvzEuAA4CH+gufzAzIqd5BSvHtPvLm2zTfXc/xk="; - }; - - meta = with lib; { - description = "A fork of the i3 tiling window manager with some additional features"; - homepage = "https://github.com/Airblader/i3"; - maintainers = with maintainers; [ fmthoma ]; - license = licenses.bsd3; - platforms = platforms.linux ++ platforms.netbsd ++ platforms.openbsd; - - longDescription = '' - Fork of i3wm, a tiling window manager primarily targeted at advanced users - and developers. Based on a tree as data structure, supports tiling, - stacking, and tabbing layouts, handled dynamically, as well as floating - windows. This fork adds a few features such as gaps between windows. - Configured via plain text file. Multi-monitor. UTF-8 clean. - ''; - }; -}) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index ddc4383fbd73c..d36ac492f9859 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = "https://github.com/greshake/i3status-rust"; license = licenses.gpl3Only; - maintainers = with maintainers; [ backuitist globin ma27 ]; + maintainers = with maintainers; [ backuitist globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index f18ca995b14ba..5b4480499d95d 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -1,11 +1,13 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config , python3 , wrapGAppsHook +, libadwaita , libhandy , libxkbcommon , libgudev @@ -13,7 +15,7 @@ , pulseaudio , evince , glib -, gtk3 +, gtk4 , gnome , gnome-desktop , gcr @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -43,10 +45,11 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-q2AYm+zbL4/pRG1wn+MT6IYM8CZt15o48U9+piMPf74="; + sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; }; nativeBuildInputs = [ + libadwaita meson ninja pkg-config @@ -71,7 +74,7 @@ stdenv.mkDerivation rec { gnome.gnome-control-center gnome-desktop gnome.gnome-session - gtk3 + gtk4 pam systemd upower @@ -79,7 +82,7 @@ stdenv.mkDerivation rec { feedbackd ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; @@ -127,11 +130,16 @@ stdenv.mkDerivation rec { ]; tests.phosh = nixosTests.phosh; + + updateScript = gitUpdater { + rev-prefix = "v"; + }; }; meta = with lib; { description = "A pure Wayland shell prototype for GNOME on mobile devices"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; + changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 6786576e6edc4..c09df0065ef44 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config @@ -17,19 +18,20 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.21.1"; + version = "0.23.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "guidog"; repo = "phosh-mobile-settings"; rev = "v${version}"; - sha256 = "sha256-60AXaKSF8bY+Z3TNlIIa7jZwQ2IkHqCbZ3uIlhkx6i0="; + sha256 = "sha256-D605efn25Dl3Bj92DZiagcx+MMcRz0GRaWxplBRcZhA="; }; nativeBuildInputs = [ meson ninja + phosh pkg-config wrapGAppsHook ]; @@ -41,7 +43,6 @@ stdenv.mkDerivation rec { libadwaita lm_sensors phoc - phosh wayland-protocols ]; @@ -56,9 +57,14 @@ stdenv.mkDerivation rec { --replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings" ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "A settings app for mobile specific things"; homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; + changelog = "https://gitlab.gnome.org/guidog/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/applications/window-managers/picom/picom-jonaburg.nix index 9b018a281377b..2c08a355dde84 100644 --- a/pkgs/applications/window-managers/picom/picom-jonaburg.nix +++ b/pkgs/applications/window-managers/picom/picom-jonaburg.nix @@ -13,6 +13,6 @@ picom.overrideAttrs (oldAttrs: rec { meta = with lib; { description = "A fork of picom featuring animations and improved rounded corners."; homepage = "https://github.com/jonaburg/picom"; - maintainers = with maintainers; oldAttrs.meta.maintainers ++ [ quasigod-io ]; + maintainers = with maintainers; oldAttrs.meta.maintainers ++ [ michaelBelsanti ]; }; }) diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix index c89eb9e7cab31..3788974355489 100644 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ b/pkgs/applications/window-managers/picom/picom-next.nix @@ -1,13 +1,14 @@ -{ picom, lib, fetchFromGitHub }: +{ pcre, pcre2, picom, lib, fetchFromGitHub }: picom.overrideAttrs (oldAttrs: rec { pname = "picom-next"; - version = "unstable-2022-09-29"; + version = "unstable-2022-12-23"; + buildInputs = [ pcre2 ] ++ lib.remove pcre oldAttrs.buildInputs; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; - rev = "0fe4e0a1d4e2c77efac632b15f9a911e47fbadf3"; - sha256 = "1slcmayja8cszapxzs83xl1i9n9q0dz79cn5gzzf4mfcwvnxp8km"; + rev = "60ac2b64db78363fe04189cc734daea3d721d87e"; + sha256 = "09s8kgczks01xbvg3qxqi2rz3lkzgdfyvhrj30mg6n11b6xfgi0d"; }; meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; }) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 3231882a4fba2..7a10bf4cfaefc 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -7,7 +7,7 @@ , scdoc , xwayland , wayland-protocols -, wlroots +, wlroots_0_16 , libxkbcommon , pixman , udev @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.1.3"; + version = "0.2.1"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-bHfHhyDx/Wzhvhr7mAeVzJf0TBJgMTGb/ClGjWMLlQ8="; + rev = "refs/tags/v${version}"; + hash = "sha256-eIW8NNhacAM/7gZCUHCmiySANLenfcaCRTUkoJUZRPQ="; fetchSubmodules = true; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland-protocols - wlroots + wlroots_0_16 libxkbcommon pixman udev @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ fortuneteller2k adamcstephens ]; }; } diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index ef001787a596f..51f3b0012a40a 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -5,7 +5,6 @@ , gdk-pixbuf-xlib , gettext , gtk2 -, imlib , libICE , libSM , libxcrypt @@ -42,7 +41,6 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf-xlib gtk2 - imlib libICE libSM libxcrypt diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index 0528553b1894f..4df306eec9c0a 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; postInstall = '' rm $out/bin/sommelier_test # why does it install the test binary? o_O diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 218b2a4fefd25..5cd0f7569caa8 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "stalonetray"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "kolbusa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-grxPqSYPLUstLIOKqzMActaSQ2ftYrjbalfR4HcPDRY="; + sha256 = "sha256-/55oP6xA1LeLawOBkhh9acaDcObO4L4ojcy7e3vwnBw="; }; preConfigure = diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index e49edbd190930..6cfc55240222a 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -6,9 +6,8 @@ , nixosTests # Used by the NixOS module: , isNixOS ? false - , enableXWayland ? true, xorg -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , dbusSupport ? true , dbus , trayEnabled ? systemdSupport && dbusSupport diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 6479760a743e8..b410919022f12 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, runtimeShell -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 52ff05a418784..b7e07444a06be 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gnxlxnxx ma27 ]; + maintainers = with maintainers; [ gnxlxnxx ]; }; } diff --git a/pkgs/applications/window-managers/sway/swaycons.nix b/pkgs/applications/window-managers/sway/swaycons.nix new file mode 100644 index 0000000000000..c990a2bb5186c --- /dev/null +++ b/pkgs/applications/window-managers/sway/swaycons.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "swaycons"; + version = "unstable-2023-01-05"; + + src = fetchFromGitHub { + owner = "ActuallyAllie"; + repo = "swaycons"; + rev = "e863599fb56177fc9747d60db661be2d7c2d290b"; + hash = "sha256-zkCpZ3TehFKNePtSyFaEk+MA4mi1+la9yFjRPFy+eq8="; + }; + + cargoSha256 = "sha256-GcoRx52dwL/ehJ1Xg6xQHVzPIKXWqBrG7IjzxRjfgqA="; + + meta = with lib; { + description = "Window Icons in Sway with Nerd Fonts!"; + homepage = "https://github.com/ActuallyAllie/swaycons"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aacebedo ]; + }; +} diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index e1a8c8f3dd24a..b0b40afc9e4cb 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with lib; { - homepage = "http://vwm.sourceforge.net/"; + homepage = "https://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; |