diff options
Diffstat (limited to 'pkgs/applications')
1293 files changed, 33275 insertions, 17274 deletions
diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/applications/audio/CHOWTapeModel/default.nix index 3eff818cca903..c36de2cb878d4 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/applications/audio/CHOWTapeModel/default.nix @@ -74,5 +74,8 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; + # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? + # error: no matching function for call to 'juce::dsp::SIMDRegister<double>::SIMDRegister(xsimd::simd_batch_traits<xsimd::batch<double, 2> >::batch_bool_type)' + broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 }; } diff --git a/pkgs/applications/audio/LibreArp/default.nix b/pkgs/applications/audio/LibreArp/default.nix index 2374059e95a8e..0736745aaaf40 100644 --- a/pkgs/applications/audio/LibreArp/default.nix +++ b/pkgs/applications/audio/LibreArp/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "LibreArp"; - version = "2.2"; + version = "2.4"; src = fetchFromGitLab { owner = "LibreArp"; repo = "LibreArp"; rev = version; - hash = "sha256-jCUT/sflO9L57xRTqNR90RbwJ0uZ+xJVXnB3n+FhWBo="; + hash = "sha256-jEpES68NuHhelUq/L46CxEeadk3LbuPZ72JaGDbw8fg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/LibreArp/lv2.nix b/pkgs/applications/audio/LibreArp/lv2.nix index ce70fd112f2f9..b723683b7ec6b 100644 --- a/pkgs/applications/audio/LibreArp/lv2.nix +++ b/pkgs/applications/audio/LibreArp/lv2.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "LibreArp-lv2"; - version = "2.2"; + version = "2.4"; src = fetchFromGitLab { owner = "LibreArp"; repo = "LibreArp"; rev = "${version}-lv2"; - hash = "sha256-j5SksuhC4ZXXILfOpwXNqIu5fO07a/6tiZ5qUo+p0Ug="; + hash = "sha256-x+ZPiU/ZFzrXb8szMS9Ts4JEEyXYpM8CLZHT4lNJWY8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index c3cc1a21ffc58..90c92d8f421d5 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "1.0"; + version = "5.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xokV4Af0evdo73D9JObzAmY1wD0aUyXiI0Z7BUN0m+M="; + sha256 = "sha256-sLkcEEYez0Z3pkhMCC7raiwe/m9Tk/lFmOuybZvFqSk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index 4f4b79b620063..757c3dcf5db35 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.6.3"; + version = "0.8.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - hash = "sha256-KV3nYJbLaQxpMpC7aCzfpNMe9bYpZKrdoOtYA++eC74="; + hash = "sha256-27jXpx79JNF5FjVKERNrQFS7VHZHWh57jjBWvX5IRio="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-UjHL/5iVht2jPnOiYjoIKWJdvwQQkNuKfF8rpi48j3c="; + hash = "sha256-M5T+imP7up3RRiXOJRrqimcjs8r81V5jfQMjR02skko="; }; postPatch = '' @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://gitlab.gnome.org/ebassi/amberol"; + homepage = "https://gitlab.gnome.org/World/amberol"; description = "A small and simple sound and music player"; maintainers = with maintainers; [ linsui ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 7cd22d2583157..7ccdc4eced679 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -11,15 +11,15 @@ mkDerivation rec { pname = "audacious"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z"; + sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM="; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns"; + sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8="; }; nativeBuildInputs = [ gettext pkg-config ]; diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 7d6d51011cc2e..6e5c53091d7c6 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -r . "$out/libexec/baudline/" - interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" + interpreter="$(echo ${stdenv.cc.libc}/lib/ld-linux*)" for prog in "$out"/libexec/baudline/baudline*; do patchelf --interpreter "$interpreter" "$prog" ln -sr "$prog" "$out/bin/" @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { # See http://www.baudline.com/faq.html#licensing_terms. # (Do NOT (re)distribute on hydra.) license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index eabdad3caa9c6..c6dd879152295 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.4.8"; + version = "1.4.10"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-zczDqJdUAN2oSyIRt9m3OnwOWXlwL4Yod8UMCXs5zM0="; + sha256 = "sha256-zfhPYH4eUNWHV27ZtX2IIvobyPdKs5yGr/ryJRQa6as="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index a1db5bb275bbb..f09a9169c9473 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -1,9 +1,7 @@ { stdenv , fetchFromGitHub -, fetchpatch , fetchurl -, fetchzip , freetype , jansson , lib @@ -23,12 +21,12 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.04"; + version = "22.06"; src = fetchurl { url = - "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz"; - sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE="; + "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; + sha256 = "sha256-h7pNoLpB7XkWHZUCQfvJsSnOn37DcP9xuH9kxtfmCos="; }; prePatch = '' @@ -55,6 +53,7 @@ stdenv.mkDerivation rec { speexdsp ]; + hardeningDisable = [ "format" ]; makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; meta = { diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch deleted file mode 100644 index 344fc31d70dcc..0000000000000 --- a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp -index 88c7383..6e0893c 100644 ---- a/src/internet/spotify/spotifyservice.cpp -+++ b/src/internet/spotify/spotifyservice.cpp -@@ -94,7 +94,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent) - system_blob_path_ = QCoreApplication::applicationDirPath() + - "/../PlugIns/clementine-spotifyblob"; - #else -- system_blob_path_ = QCoreApplication::applicationDirPath() + -+ system_blob_path_ = qgetenv("CLEMENTINE_SPOTIFYBLOB") + - "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX; - #endif - diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index a7f58e0d68bb6..e3558127a61d0 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -23,12 +23,10 @@ , libpulseaudio , gvfs , libcdio -, libechonest -, libspotify , pcre , projectm , protobuf -, qca2 +, qca-qt5 , pkg-config , sparsehash , config @@ -50,7 +48,8 @@ let withMTP = config.clementine.mtp or true; withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; - +in mkDerivation { + pname = "clementine"; version = "unstable-2022-04-11"; src = fetchFromGitHub { @@ -60,10 +59,6 @@ let sha256 = "06fcbs3wig3mh711iypyj49qm5246f7qhvgvv8brqfrd8cqyh6qf"; }; - patches = [ - ./clementine-spotify-blob.patch - ]; - nativeBuildInputs = [ cmake pkg-config @@ -87,13 +82,12 @@ let gst_all_1.gst-plugins-bad gst_all_1.gstreamer gvfs - libechonest liblastfm libpulseaudio pcre projectm protobuf - qca2 + qca-qt5 qjson qtbase qtx11extras @@ -103,6 +97,8 @@ let alsa-lib ] + # gst_plugins needed for setup-hooks + ++ gst_plugins ++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ] ++ lib.optionals (withMTP) [ libmtp ] ++ lib.optionals (withCD) [ libcdio ] @@ -117,74 +113,25 @@ let -e 's,libprotobuf.a,protobuf,g' ''; - free = mkDerivation { - pname = "clementine-free"; - inherit version; - inherit src patches nativeBuildInputs postPatch; - - # gst_plugins needed for setup-hooks - buildInputs = buildInputs ++ gst_plugins; - - preConfigure = '' - rm -rf ext/{,lib}clementine-spotifyblob - ''; - - cmakeFlags = [ - "-DUSE_SYSTEM_PROJECTM=ON" - "-DSPOTIFY_BLOB=OFF" - ]; - - passthru.unfree = unfree; - - postInstall = '' - wrapProgram $out/bin/clementine \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - meta = with lib; { - homepage = "https://www.clementine-player.org"; - description = "A multiplatform music player"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.ttuegel ]; - }; - }; - - # Unfree Spotify blob for Clementine - unfree = mkDerivation { - pname = "clementine-blob"; - inherit version; - # Use the same patches and sources as Clementine - inherit src nativeBuildInputs patches postPatch; - - buildInputs = buildInputs ++ [ libspotify ]; - # Only build and install the Spotify blob - preBuild = '' - cd ext/clementine-spotifyblob - ''; - postInstall = '' - mkdir -p $out/libexec/clementine - mv $out/bin/clementine-spotifyblob $out/libexec/clementine - rmdir $out/bin + preConfigure = '' + rm -rf ext/{,lib}clementine-spotifyblob + ''; - makeWrapper ${free}/bin/clementine $out/bin/clementine \ - --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine + cmakeFlags = [ + "-DUSE_SYSTEM_PROJECTM=ON" + "-DSPOTIFY_BLOB=OFF" + ]; - mkdir -p $out/share - for dir in applications icons kde4; do - ln -s "${free}/share/$dir" "$out/share/$dir" - done - ''; + postInstall = '' + wrapProgram $out/bin/clementine \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; - meta = with lib; { - homepage = "https://www.clementine-player.org"; - description = "Spotify integration for Clementine"; - # The blob itself is Apache-licensed, although libspotify is unfree. - license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ maintainers.ttuegel ]; - }; + meta = with lib; { + homepage = "https://www.clementine-player.org"; + description = "A multiplatform music player"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.ttuegel ]; }; - -in -free +} diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix new file mode 100644 index 0000000000000..8a5c3d842d4dc --- /dev/null +++ b/pkgs/applications/audio/codecserver/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub +, cmake, pkg-config, udev, protobuf +}: + +stdenv.mkDerivation rec { + pname = "codecserver"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "jketterl"; + repo = pname; + rev = version; + sha256 = "sha256-JzaVBFl3JsFNDm4gy1qOKA9uAjUjNeMiI39l5gfH0aE="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + udev + ]; + + propagatedBuildInputs = [ protobuf ]; + + meta = with lib; { + homepage = "https://github.com/jketterl/codecserver"; + description = "Modular audio codec server"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = teams.c3d2.members; + }; +} diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ac5cb06a21985..b4e348a39779b 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,10 +1,11 @@ -{ config, lib, stdenv, fetchFromGitHub +{ lib, config, clangStdenv, fetchFromGitHub , autoconf , automake , libtool , intltool , pkg-config , jansson +, swift-corelibs-libdispatch # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 , gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook @@ -26,7 +27,7 @@ , osdSupport ? true, dbus # output plugins , alsaSupport ? true, alsa-lib -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pulseSupport ? config.pulseaudio or true, libpulseaudio # effect plugins , resamplerSupport ? true, libsamplerate , overloadSupport ? true, zlib @@ -36,40 +37,70 @@ assert gtk2Support || gtk3Support; -stdenv.mkDerivation rec { +let + inherit (lib) optionals; + + version = "1.9.1"; +in clangStdenv.mkDerivation { pname = "deadbeef"; - version = "1.8.4"; + inherit version; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; + fetchSubmodules = true; rev = version; - sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll"; + sha256 = "sha256-e3bAGpkRPIqVWl0nvSZ61JpIQZw24mqE9218SWHBCFo="; }; - buildInputs = with lib; [ jansson ] - ++ optional gtk2Support gtk2 - ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] - ++ optional vorbisSupport libvorbis - ++ optional mp123Support libmad - ++ optional flacSupport flac - ++ optional wavSupport libsndfile - ++ optionals cdaSupport [ libcdio libcddb ] - ++ optional aacSupport faad2 - ++ optional opusSupport opusfile - ++ optional zipSupport libzip - ++ optional ffmpegSupport ffmpeg - ++ optional apeSupport yasm - ++ optional artworkSupport imlib2 - ++ optional hotkeysSupport libX11 - ++ optional osdSupport dbus - ++ optional alsaSupport alsa-lib - ++ optional pulseSupport libpulseaudio - ++ optional resamplerSupport libsamplerate - ++ optional overloadSupport zlib - ++ optional wavpackSupport wavpack - ++ optional remoteSupport curl - ; + buildInputs = [ + jansson + swift-corelibs-libdispatch + ] ++ optionals gtk2Support [ + gtk2 + ] ++ optionals gtk3Support [ + gtk3 + gsettings-desktop-schemas + ] ++ optionals vorbisSupport [ + libvorbis + ] ++ optionals mp123Support [ + libmad + ] ++ optionals flacSupport [ + flac + ] ++ optionals wavSupport [ + libsndfile + ] ++ optionals cdaSupport [ + libcdio + libcddb + ] ++ optionals aacSupport [ + faad2 + ] ++ optionals opusSupport [ + opusfile + ] ++ optionals zipSupport [ + libzip + ] ++ optionals ffmpegSupport [ + ffmpeg + ] ++ optionals apeSupport [ + yasm + ] ++ optionals artworkSupport [ + imlib2 + ] ++ optionals hotkeysSupport [ + libX11 + ] ++ optionals osdSupport [ + dbus + ] ++ optionals alsaSupport [ + alsa-lib + ] ++ optionals pulseSupport [ + libpulseaudio + ] ++ optionals resamplerSupport [ + libsamplerate + ] ++ optionals overloadSupport [ + zlib + ] ++ optionals wavpackSupport [ + wavpack + ] ++ optionals remoteSupport [ + curl + ]; nativeBuildInputs = [ autoconf @@ -77,7 +108,9 @@ stdenv.mkDerivation rec { intltool libtool pkg-config - ] ++ lib.optional gtk3Support wrapGAppsHook; + ] ++ optionals gtk3Support [ + wrapGAppsHook + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index d0c1b4f9e500c..d0b0d0a86567b 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,21 +1,38 @@ -{ lib, stdenv, fetchurl, pkg-config, deadbeef, glib }: +{ lib +, stdenv +, fetchFromGitHub +, deadbeef +, autoreconfHook +, pkg-config +, glib +}: -stdenv.mkDerivation rec { +let pname = "deadbeef-mpris2-plugin"; - version = "1.12"; + version = "1.14"; +in stdenv.mkDerivation { + inherit pname version; - src = fetchurl { - url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh"; + src = fetchFromGitHub { + owner = "DeaDBeeF-Player"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-w7ccIhcPjbjs18kb3ZdM9JtSail9ik3uyAc40T8lHho="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - buildInputs = [ deadbeef glib ]; + buildInputs = [ + deadbeef + glib + ]; meta = with lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; - homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; + homepage = "https://github.com/DeaDBeeF-Player/deadbeef-mpris2-plugin/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix b/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix new file mode 100644 index 0000000000000..de371bfb552da --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix @@ -0,0 +1,42 @@ +{ deadbeef +, fetchFromGitHub +, fftw +, glib +, gtk3 +, lib +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "deadbeef-musical-spectrum-plugin"; + version = "unstable-2020-07-01"; + + src = fetchFromGitHub { + owner = "cboxdoerfer"; + repo = "ddb_musical_spectrum"; + rev = "a97fd4e1168509911ab43ba32d815b5489000a06"; + sha256 = "0p33wyqi27y0q1mvjv5nn6l3vvqlg6b8yd6k2l07bax670bl0q3g"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ deadbeef fftw glib gtk3 ]; + makeFlags = [ "gtk3" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/deadbeef + install -v -c -m 644 gtk3/ddb_vis_musical_spectrum_GTK3.so $out/lib/deadbeef/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Musical spectrum plugin for the DeaDBeeF music player"; + homepage = "https://github.com/cboxdoerfer/ddb_musical_spectrum"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.ddelabru ]; + }; +} diff --git a/pkgs/applications/audio/deadbeef/plugins/playlist-manager.nix b/pkgs/applications/audio/deadbeef/plugins/playlist-manager.nix new file mode 100644 index 0000000000000..cf82697988941 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/playlist-manager.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, deadbeef +, gtk3 +}: + +stdenv.mkDerivation { + pname = "deadbeef-playlist-manager-plugin"; + version = "unstable-2021-05-02"; + + src = fetchFromGitHub { + owner = "kpcee"; + repo = "deadbeef-playlist-manager"; + rev = "b1393022b2d9ea0a19b845420146e0fc56cd9c0a"; + sha256 = "sha256-dsKthlQ0EuX4VhO8K9VTyX3zN8ytzDUbSi/xSMB4xRw="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + deadbeef + gtk3 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/deadbeef/ + cp *.so $out/lib/deadbeef/ + + runHook postInstall + ''; + + buildFlags = [ + "CFLAGS=-I${deadbeef}/include/deadbeef" + "gtk3" + ]; + + meta = with lib; { + description = "Removes duplicate and vanished files from the current playlist"; + homepage = "https://github.com/kpcee/deadbeef-playlist-manager"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.cmm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix index a1ca052f9c6be..287f439c94d50 100644 --- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix +++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl -, libdbusmenu-glib }: +, libdbusmenu }: stdenv.mkDerivation rec { pname = "deadbeef-statusnotifier-plugin"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ deadbeef gtk3 libdbusmenu-glib ]; + buildInputs = [ deadbeef gtk3 libdbusmenu ]; buildFlags = [ "gtk3" ]; diff --git a/pkgs/applications/audio/delayarchitect/default.nix b/pkgs/applications/audio/delayarchitect/default.nix new file mode 100644 index 0000000000000..3500d51d29529 --- /dev/null +++ b/pkgs/applications/audio/delayarchitect/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, libGL, libX11, libXext, libXrandr, libXinerama, libXcursor, freetype, alsa-lib, cmake, pkg-config, gcc-unwrapped }: + +stdenv.mkDerivation rec { + pname = "delayarchitect"; + version = "unstable-2022-01-16"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = "DelayArchitect"; + rev = "5abf4dfb7f92ba604d591a2c388d2d69a9055fe3"; + sha256 = "sha256-LoK2pYPLzyJF7tDJPRYer6gKHNYzvFvX/d99TuOPECo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + libGL libX11 libXext libXrandr libXinerama libXcursor freetype alsa-lib + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/vst3 + cd DelayArchitect_artefacts/Release + cp -r VST3/Delay\ Architect.vst3 $out/lib/vst3 + ''; + + meta = with lib; { + homepage = "https://github.com/jpcima/DelayArchitect"; + description = "A visual, musical editor for delay effects"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.all; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 7dd78e5131815..71841a616a358 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "An LV2 sample based drum plugin"; homepage = "https://www.drumgizmo.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index de4b7a3176f68..46b801bba331d 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , calf , fftwFloat -, fmt +, fmt_8 , glib , gtk4 , itstool @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.4"; + version = "6.2.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw="; + sha256 = "sha256-1kXYh2Qk0Wj0LgHTcRVAKro7LAPV/UM5i9VmHjmxTx0="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftwFloat - fmt + fmt_8 glib gtk4 libadwaita diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 3531132f2fdbb..ba0715eb1dfb7 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "LV2 EQ plugins and more, with 64 bit processing"; longDescription = '' Up to 10-Bands parametric equalizer with mono and stereo versions. diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix new file mode 100644 index 0000000000000..002ddd78abb89 --- /dev/null +++ b/pkgs/applications/audio/famistudio/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchzip +, autoPatchelfHook +, makeWrapper +, alsa-lib +, gtk-sharp-2_0 +, glib +, gtk2 +, mono +, openal +}: + +stdenv.mkDerivation rec { + pname = "famistudio"; + version = "3.3.1"; + + src = fetchzip { + url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; + stripRoot = false; + sha256 = "sha256-Bgry+cRsmC+aBff6EaeHoGBygpiZS5SmgICPU32zO+c="; + }; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = [ alsa-lib gtk-sharp-2_0 glib gtk2 mono openal ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/famistudio} + mv * $out/lib/famistudio + + makeWrapper ${mono}/bin/mono $out/bin/famistudio \ + --add-flags $out/lib/famistudio/FamiStudio.exe \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 gtk-sharp-2_0 ]} + + # Fails to find openal32.dll on its own, needs abit of help + rm $out/lib/famistudio/libopenal32.so + cat <<EOF >$out/lib/famistudio/OpenTK.dll.config + <configuration> + <dllmap dll="openal32.dll" target="${openal}/lib/libopenal.so"/> + </configuration> + EOF + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://famistudio.org/"; + description = "NES Music Editor"; + longDescription = '' + FamiStudio is very simple music editor for the Nintendo Entertainment System + or Famicom. It is targeted at both chiptune artists and NES homebrewers. + ''; + license = licenses.mit; + # Maybe possible to build from source but I'm not too familiar with C# packaging + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 2ad98d3d6d8d8..32bcbee2e6cd2 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "2.40.0"; + version = "2.41.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A="; + sha256 = "sha256-x0nBWyILrNJijs7CIvRrgYG6vgB3UlxLj9i7E4cHr9I="; fetchSubmodules = true; }; @@ -58,9 +58,10 @@ let cd build ''; - cmakeFlags = '' - -C ../backends/all.cmake -C ../targets/all.cmake .. - ''; + cmakeFlags = [ + "-C../backends/all.cmake" + "-C../targets/all.cmake" + ]; postInstall = '' # syntax error when eval'd directly diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 38d3bafdea6a5..4ee5ab82e6e46 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.8"; + version = "2.5.11"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-dt5YlvaCZ6JiNGPwVXPrKzVGWxnhdyP4lnKgck7ZSF8="; + sha256 = "sha256-ldn6st3/iIABjEfAwodOnPrI97DygWbnYmvMktlOgrk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index bea08b0bfc9f6..5fd4eb2fb7d37 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.40.0"; + version = "2.41.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-t3I3j5s2ACHfub+fxxaTwu+5ptEwH0JQpVdmHYOzbCA="; + sha256 = "sha256-I5No9J7TLOf++B+lx1RfGY8LBoDAApq/EV8016wH9Hc="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/faustStk/default.nix b/pkgs/applications/audio/faustStk/default.nix index 85ebb1d9a0212..c41ee8d597698 100644 --- a/pkgs/applications/audio/faustStk/default.nix +++ b/pkgs/applications/audio/faustStk/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { done ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "The physical modeling instruments included with faust, compiled as jack standalone and lv2 instruments"; homepage = "https://ccrma.stanford.edu/~rmichon/faustSTK/"; license = licenses.stk; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 83d9c5da83819..782792086ed1f 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,20 +1,20 @@ { stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac -, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain, gtk3, qtbase +, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain, gtk3, qtbase , qttools, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "flacon"; - version = "7.0.1"; + version = "9.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-35tARJkyhC8EisIyDCwuT/UUruzLjJRUuZysuqeNssM="; + sha256 = "sha256-gchFd3yL0ni0PJ4+mWwR8XCKPpyQOajtO+/A7fnwoeE="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qttools libuchardet ]; + buildInputs = [ qtbase qttools libuchardet taglib ]; bin_path = lib.makeBinPath [ shntool diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 03c8e8d6ce699..addc9313527a3 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.54"; + version = "1.55"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-lNiQ0X2vvPGubb4Pde+eh0Z6ClCQgigIUM+PddaiVUg="; + sha256 = "sha256-qk6SHL9K4+9Em1jjrPOm14msOoqRiAahlRoiRiAMLC0="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index 115c5b7767d2e..cbd15248fee64 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -7,8 +7,10 @@ , cmake , pkg-config , makeWrapper +, fftw , fmt_8 , libsndfile +, rtmidi , SDL2 , zlib , withJACK ? stdenv.hostPlatform.isUnix @@ -19,21 +21,16 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.5.8"; + version = "0.6pre1"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "103ymd3wa1sfsr6qg15vpcs53j350i7zidv3azlf7cynk6k28xim"; + sha256 = "sha256-7MrzSC8PYQ4X8fyX1hB8mOoSCtLpY+o1x42v9HLdoao="; }; - postPatch = '' - # rtmidi is not used yet - sed -i -e '/add_subdirectory(extern\/rtmidi/d' -e '/DEPENDENCIES_LIBRARIES rtmidi/d' CMakeLists.txt - ''; - nativeBuildInputs = [ cmake pkg-config @@ -42,8 +39,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + fftw fmt_8 libsndfile + rtmidi SDL2 zlib ] ++ lib.optionals withJACK [ @@ -54,10 +53,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_GUI=${if withGUI then "ON" else "OFF"}" + "-DSYSTEM_FFTW=ON" "-DSYSTEM_FMT=ON" "-DSYSTEM_LIBSNDFILE=ON" - "-DSYSTEM_ZLIB=ON" + "-DSYSTEM_RTMIDI=ON" "-DSYSTEM_SDL2=ON" + "-DSYSTEM_ZLIB=ON" "-DWITH_JACK=${if withJACK then "ON" else "OFF"}" "-DWARNINGS_ARE_ERRORS=ON" ]; @@ -85,8 +86,6 @@ stdenv.mkDerivation rec { }; tests.version = testers.testVersion { package = furnace; - # The command always exits with code 1 - command = "(furnace --version || [ $? -eq 1 ])"; }; }; diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 3d280ca72abd8..59253af2ad68a 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Gameboy sound player"; license = licenses.gpl1; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ dasuxullebt ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 9739a88586ae0..0a99edd7b069c 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY="; + sha256 = "sha256-XSqcj8+X6QMBnIusPB9VNrgcbdiWhNMOYeFyKklGmO8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 4b7b760db355d..15eccc46943fa 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; homepage = "https://giadamusic.com/"; license = licenses.gpl3; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 10c199d94b698..1cdea4629bbce 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libsndfile portaudio ]; + # Workaround build failure on -fno-common toolchains: + # ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint'; + # src/net/../../src/gnauralnet.h:233: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + postInstall = '' mkdir -p $out/share/applications substitute \ diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix deleted file mode 100644 index 74286073b9048..0000000000000 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv, alsa-lib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype -, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr -, nss, pango, udev, xorg -}: - -let - version = "4.7.1"; - - deps = [ - alsa-lib - atk - at-spi2-atk - cairo - cups - dbus - expat - fontconfig - freetype - GConf - gdk-pixbuf - glib - gtk2 - gtk3 - libpulseaudio - nspr - nss - pango - stdenv.cc.cc - udev - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; - -in - -stdenv.mkDerivation { - pname = "google-play-music-desktop-player"; - inherit version; - - src = fetchurl { - url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r"; - }; - - dontBuild = true; - nativeBuildInputs = [ dpkg makeWrapper ]; - - unpackPhase = '' - dpkg -x $src . - ''; - - installPhase = '' - mkdir -p $out - cp -r ./usr/share $out - cp -r ./usr/bin $out - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player" - - wrapProgram $out/bin/google-play-music-desktop-player \ - --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}" - ''; - - meta = { - homepage = "https://www.googleplaymusicdesktopplayer.com/"; - description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music"; - license = lib.licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ anna328p SuprDewd ]; - }; -} diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch deleted file mode 100644 index 3a6296baaa643..0000000000000 --- a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001 -From: Sam Parkinson <sam@sam.today> -Date: Thu, 26 Oct 2017 14:50:13 +1100 -Subject: [PATCH] Remove post-install script that hardcodes paths - ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 25f3e1a..18b43bd 100644 ---- a/meson.build -+++ b/meson.build -@@ -21,4 +21,5 @@ subdir('src') - # subdir('tests') - # TODO: unit tests - --meson.add_install_script('meson_post_install.sh') -+# This does not work for nixos; it hard-codes paths -+# meson.add_install_script('meson_post_install.sh') --- -2.14.2 - diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix deleted file mode 100644 index 9e2187f4a8fdc..0000000000000 --- a/pkgs/applications/audio/gradio/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, python3 -, gsettings-desktop-schemas -, desktop-file-utils -, glib -, gtk3 -, intltool -, libsoup -, json-glib -, wrapGAppsHook -, meson -, ninja -, vala -, sqlite -, gst_all_1 -, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] -}: -let - version = "7.3"; - -in stdenv.mkDerivation { - pname = "gradio"; - inherit version; - - src = fetchFromGitHub { - owner = "haecker-felix"; - repo = "gradio"; - rev = "v${version}"; - sha256 = "00982dynl36lpsrx3mkd2a479zsrc8jvwfb8i7pi6w7fzzd8n8bl"; - }; - - nativeBuildInputs = [ - pkg-config - - meson - ninja - vala - - python3 - ]; - buildInputs = [ - sqlite - - glib - intltool - libsoup - json-glib - - gtk3 - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - - wrapGAppsHook - desktop-file-utils - gsettings-desktop-schemas - ] ++ gst_plugins; - - postInstall = '' - glib-compile-schemas "$out"/share/glib-2.0/schemas - ''; - - patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; - - meta = with lib; { - homepage = "https://github.com/haecker-felix/gradio"; - description = "A GTK3 app for finding and listening to internet radio stations"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.samdroid-apps ]; - }; -} diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 5cfd9c7cbe898..17c8f936efd11 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -86,6 +86,7 @@ mkDerivation rec { homepage = "https://www.signalyst.com/custom.html"; description = "High-end upsampling multichannel software HD-audio player"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index f894c856c751a..97862104a057c 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { pname = "industrializer"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.bz2"; - sha256 = "0vls94hqpkk8h17da6fddgqbl5dgm6250av3raimhhzwvm5r1gfi"; + url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.xz"; + sha256 = "0k688k2wppam351by7cp9m7an09yligzd89padr8viqy63gkdk6v"; }; nativeBuildInputs = [ pkg-config autoconf automake ]; diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 944d40cd3ef1a..786b455120852 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , mkDerivation , fetchFromGitHub , pipewire @@ -86,6 +87,7 @@ in ]; meta = with lib;{ + broken = (stdenv.isLinux && stdenv.isAarch64); description = "An audio effect processor for PipeWire clients"; homepage = "https://github.com/Audio4Linux/JDSP4Linux"; license = licenses.gpl3Only; diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/applications/audio/jellycli/default.nix index cfb9deb587269..ec60998ec8ff4 100644 --- a/pkgs/applications/audio/jellycli/default.nix +++ b/pkgs/applications/audio/jellycli/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, alsa-lib }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, alsa-lib }: buildGoModule rec { pname = "jellycli"; @@ -21,6 +21,7 @@ buildGoModule rec { buildInputs = [ alsa-lib ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Jellyfin terminal client"; longDescription = '' Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 94290ada7b353..d9d7bf19e7d61 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Discord music bot that's easy to set up and run yourself"; homepage = "https://github.com/jagrosh/MusicBot"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index a29ddbb815080..37bb05d903874 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, automoc4 , chromaprint , cmake , docbook_xml_dtd_45 @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; buildInputs = [ - automoc4 chromaprint ffmpeg flac diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index 5d26397efdb72..362c76a0d4dec 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { }) ]; + # Workaround build failure on -fno-common toolchains: + # ld: libengine_gui.a(gui_menu.o):(.bss+0x0): multiple definition of + # `menu_t'; objs.release/action.o:(.bss+0x20): first defined here + # TODO: remove it for 1.7.7+ release as it was fixed upstream. + NIX_CFLAGS_COMPILE = "-fcommon"; + buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ]; installPhase = '' diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/applications/audio/losslessaudiochecker/default.nix index 9fecf7b9ba924..b7150d6b67713 100644 --- a/pkgs/applications/audio/losslessaudiochecker/default.nix +++ b/pkgs/applications/audio/losslessaudiochecker/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { meta = { description = "Utility to check whether audio is truly lossless or not"; homepage = "https://losslessaudiochecker.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ p-h ]; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index f6f3237d6f07f..5fc0a94d7576d 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,17 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper +{ lib, stdenv, fetchurl, pkg-config, makeWrapper , libsndfile, jack2 , libGLU, libGL, lv2, cairo , ladspaH, php }: stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.31"; + version = "1.2.1"; - src = fetchFromGitHub { - owner = "sadko4u"; - repo = pname; - rev = version; - sha256 = "sha256-P1woSkenSlVUwWr3q0sNv8K2fVtTa6zWwKfSHQgg9Xw="; + src = fetchurl { + url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "sha256-wHibZJbrgy7t0z2rRDe1FUAG38BW/dR0JgoKVWYCn60="; }; nativeBuildInputs = [ pkg-config php makeWrapper ]; @@ -19,22 +17,15 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "ETC_PATH=$(out)/etc" ]; NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; - doCheck = true; - - checkPhase = '' - runHook preCheck - TEST_PATH=$(pwd)".build-test" - make OBJDIR=$TEST_PATH test - $TEST_PATH/lsp-plugins-test utest - runHook postCheck + configurePhase = '' + make config PREFIX=${placeholder "out"} ''; - buildFlags = [ "release" ]; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index 86c7e64a6e645..32802eebb88cd 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { pname = "meters.lv2"; - version = "0.9.10"; - robtkVersion = "0.6.2"; + version = "0.9.20"; + robtkVersion = "0.7.5"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ]; @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { owner = "x42"; repo = "meters.lv2"; rev = "v${version}"; - sha256 = "sha256-u2KIsaia0rAteQoEh6BLNCiRHFufHYF95z6J/EMgeSE="; + sha256 = "sha256-eGXTbE83bJEDqTBltL6ZX9qa/OotCFmUxpE/aLqGELU="; }; robtkSrc = fetchFromGitHub { owner = "x42"; repo = "robtk"; rev = "v${robtkVersion}"; - sha256 = "sha256-zeRMobfKW0+wJwYVem74tglitkI6DSoK75Auywcu4Tw="; + sha256 = "sha256-L1meipOco8esZl+Pgqgi/oYVbhimgh9n8p9Iqj3dZr0="; }; postUnpack = '' @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { ln -s ${robtkSrc} $sourceRoot/robtk ''; + postPatch = '' + substituteInPlace Makefile --replace "-msse -msse2 -mfpmath=sse" "" + ''; # remove x86-specific flags + meter_VERSION = version; enableParallelBuilding = true; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index b58bd0b275726..8c34318191bcf 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit homepage; description = "Editor for the ${brand} ${type} digital mixer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 870584d357eba..7e11c0a8d75fd 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,4 +1,5 @@ -{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, makeWrapper +{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch +, pkg-config, makeWrapper , alsa-lib, alsa-plugins, libtool, icu, pcre2 , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: @@ -13,6 +14,16 @@ stdenv.mkDerivation rec { sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/MycroftAI/mimic1/pull/216 + (fetchpatch { + name = "fno-common"; + url = "https://github.com/MycroftAI/mimic1/commit/77b36eaeb2c38eba571b8db7e9bb0fd507774e6d.patch"; + sha256 = "0n3hqrfpbdp44y0c8bq55ay9m4c96r09k18hjxka4x54j5c7lw1m"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix new file mode 100644 index 0000000000000..0a29b7aad9390 --- /dev/null +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, pkg-config +, glfw +, libvgm +, libX11 +, libXau +, libXdmcp +, Carbon +, Cocoa +, cppunit +}: + +stdenv.mkDerivation rec { + pname = "mmlgui"; + version = "unstable-2022-05-24"; + + src = fetchFromGitHub { + owner = "superctr"; + repo = "mmlgui"; + rev = "fe2b298c1eddae4cc38096f6c1ba1ccaed562cf1"; + fetchSubmodules = true; + sha256 = "Q34zzZthdThMbduXcc/qMome89mAMrn1Vinr073u4zo="; + }; + + postPatch = '' + # Actually wants pkgconf but that seems abit broken: + # https://github.com/NixOS/nixpkgs/pull/147503#issuecomment-1055943897 + # Removing a pkgconf-specific option makes it work with pkg-config + substituteInPlace libvgm.mak \ + --replace '--with-path=/usr/local/lib/pkgconfig' "" + substituteInPlace Makefile \ + --replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)' + ''; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glfw + libvgm + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXau + libXdmcp + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Carbon + Cocoa + ]; + + checkInputs = [ + cppunit + ]; + + makeFlags = [ + "RELEASE=1" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + installPhase = '' + runHook preInstall + + install -Dm755 {,$out/}bin/mmlgui + mkdir -p $out/share/ctrmml + mv ctrmml/sample $out/share/ctrmml/ + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/superctr/mmlgui.git"; + }; + + meta = with lib; { + homepage = "https://github.com/superctr/mmlgui"; + description = "MML (Music Macro Language) editor and compiler GUI, powered by the ctrmml framework"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 8bf50e720929c..facad8879623a 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -33,10 +33,6 @@ lib.makeScope newScope (self: with self; { mopidy-soundcloud = callPackage ./soundcloud.nix { }; - mopidy-spotify = callPackage ./spotify.nix { }; - - mopidy-spotify-tunigo = callPackage ./spotify-tunigo.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 ebe9885e4954c..4e9b18d7eb651 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , mopidy , python3Packages }: @@ -22,6 +23,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://github.com/mopidy/mopidy-local"; description = "Mopidy extension for playing music from your local music archive"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix deleted file mode 100644 index 70d076190cda2..0000000000000 --- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: - -pythonPackages.buildPythonApplication rec { - pname = "mopidy-spotify-tunigo"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "trygveaa"; - repo = "mopidy-spotify-tunigo"; - rev = "v${version}"; - sha256 = "1jwk0b2iz4z09qynnhcr07w15lx6i1ra09s9lp48vslqcf2fp36x"; - }; - - propagatedBuildInputs = [ mopidy mopidy-spotify pythonPackages.tunigo ]; - - doCheck = false; - - meta = with lib; { - description = "Mopidy extension for providing the browse feature of Spotify"; - license = licenses.asl20; - maintainers = [ maintainers.spwhitt ]; - }; -} diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix deleted file mode 100644 index ed68769f6650e..0000000000000 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - pname = "mopidy-spotify"; - version = "4.1.1"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-spotify"; - rev = "v${version}"; - sha256 = "1qsac2yy26cdlsmxd523v8ayacs0s6jj9x79sngwap781i63zqrm"; - }; - - propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; - - doCheck = false; - - meta = with lib; { - homepage = "https://www.mopidy.com/"; - description = "Mopidy extension for playing music from Spotify"; - license = licenses.asl20; - maintainers = with maintainers; [ rski ]; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 7ce8af1de23ab..e247ebeb2b1d1 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { patches = [ ./use-gcc.patch ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: /build/cc566Cj9.o:(.bss+0x0): multiple definition of `mpc123_file_reader'; ao.o:(.bss+0x40): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + buildInputs = [ gettext libmpcdec libao ]; installPhase = diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index 3676697f16e8b..f8fac7d14a9f5 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -48,6 +48,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/SoongNoonien/mpdevil"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ bloomvdomino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index f79a2667542fd..58fb9cddc9021 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmt32emu"; - version = "2.5.3"; + version = "2.6.3"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; + sha256 = "0ncy55fj9l2s750clxjpv102hrgcndz4qba9w2sf8lwzgy6d1xmp"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix index 0c541885689e4..c2b84fd6ed782 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -13,15 +13,18 @@ , withJack ? stdenv.hostPlatform.isUnix, libjack2 }: +let + char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str; +in mkDerivation rec { pname = "mt32emu-qt"; - version = "1.9.0"; + version = "1.10.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "mt32emu_qt_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-9vapBKpl1NC3mIDetuCb452IHV6c7c7NCzSyiBry5oo="; + rev = "${char2underscore "-" pname}_${char2underscore "." version}"; + sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9"; }; postPatch = '' @@ -55,8 +58,8 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications - mv $out/bin/${meta.mainProgram}.app $out/Applications/ - ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} + mv $out/bin/${pname}.app $out/Applications/ + ln -s $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} ''; meta = with lib; { @@ -70,6 +73,5 @@ mkDerivation rec { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; - mainProgram = "mt32emu-qt"; }; } diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index 378b5dd8fb832..eee9f01ebb559 100644 --- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -7,15 +7,18 @@ , pkg-config }: +let + char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str; +in stdenv.mkDerivation rec { pname = "mt32emu-smf2wav"; - version = "1.7.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "mt32emu_smf2wav_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-FnKlKJxe7P4Yqpv0oVGgV4253dMgSmgtb7EAa2FI+aI="; + rev = "${char2underscore "-" pname}_${char2underscore "." version}"; + sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9"; }; postPatch = '' @@ -45,6 +48,5 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; - mainProgram = "mt32emu-smf2wav"; }; } diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 2cf1b9ff68de3..add56f99d9b38 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, undmg }: let - versionComponents = [ "2" "1" ]; + versionComponents = [ "3" "6" "2" "548020600" ]; appName = "MuseScore ${builtins.head versionComponents}"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { sourceRoot = "${appName}.app"; src = fetchurl { - url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; - sha256 = "19xkaxlkbrhvfip6n3iw6q7463ngr6y5gfisrpjqg2xl2igyl795"; + url = "https://github.com/musescore/MuseScore/releases/download/v${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; + sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; }; buildInputs = [ undmg ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Music notation and composition software"; homepage = "https://musescore.org/"; - license = licenses.gpl2; + license = licenses.gpl3Only; platforms = platforms.darwin; maintainers = []; }; diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 15c61196d43e7..29a97b94dcac7 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -29,9 +29,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1hgdzyz005244f2mh97js9ga0a6s2hcd6iydz07f1hmhsh1j2bwy"; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "An automatic music sorter (based on ID3 tags)"; homepage = "https://github.com/quebin31/muso"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ bloomvdomino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/myxer/default.nix b/pkgs/applications/audio/myxer/default.nix deleted file mode 100644 index 0aa3727f79721..0000000000000 --- a/pkgs/applications/audio/myxer/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libpulseaudio -, glib -, pango -, gtk3 -}: - -rustPlatform.buildRustPackage rec { - pname = "myxer"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "Aurailus"; - repo = pname; - rev = version; - sha256 = "0bnhpzmx4yyasv0j7bp31q6jm20p0qwcia5bzmpkz1jhnc27ngix"; - }; - - cargoSha256 = "1cyh0nk627sgyr78rcnhj7af5jcahvjkiv5sz7xwqfdhvx5kqsk5"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libpulseaudio glib pango gtk3 ]; - - # Currently no tests are implemented, so we avoid building the package twice - doCheck = false; - - meta = with lib; { - description = "A modern Volume Mixer for PulseAudio"; - homepage = "https://github.com/Aurailus/Myxer"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ erin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index aca96ef5da351..f929d9b6f1f72 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ncpamixer"; - version = "1.3.3.1"; + version = "unstable-2021-10-17"; src = fetchFromGitHub { owner = "fulhax"; repo = "ncpamixer"; - rev = version; - sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z"; + rev = "4faf8c27d4de55ddc244f372cbf5b2319d0634f7"; + sha256 = "sha256-ElbxdAaXAY0pj0oo2IcxGT+K+7M5XdCgom0XbJ9BxW4="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ StijnDW SuperSandro2000 ]; + maintainers = with maintainers; [ StijnDW ] ++ teams.c3d2.members; }; } diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 050c54e168d2e..c929f1da5b616 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl , withALSA ? true, alsa-lib , withPulseAudio ? false, libpulseaudio , withPortAudio ? false, portaudio @@ -7,21 +7,21 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-lrEIFPi55aP9utAaMIFtqocpkbDXRJqS/jlGUtE26kE="; + sha256 = "sha256-lZ7wFhXJ9I4IcHLLoyMTnq3MJDtUNcVdMHYLThuN7c8="; }; - cargoSha256 = "sha256-vkNGQ3SXKJpUqDZ4TfmlSleAPAOQnsEncE8475NLJ4M="; + cargoSha256 = "sha256-JLNB196GWpLyCrZ8fBH8+1RF1fa6PhdwFw6RW3fUARM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses openssl ] - ++ lib.optional stdenv.isDarwin libiconv + buildInputs = [ ncurses ] + ++ lib.optional stdenv.isLinux openssl ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 067263032b0df..9fcd35a9de324 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "NoiseTorch"; - version = "0.11.5"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "lawl"; + owner = "noisetorch"; repo = "NoiseTorch"; - rev = version; - sha256 = "sha256-j/6XB3vA5LvTuCxmeB0HONqEDzYg210AWW/h3nCGOD8="; + rev = "v${version}"; + sha256 = "sha256-A6cX1ck47/ZIn9cnV/Ow4CxVFfOX5J0K0Q+B70jCFdQ="; + fetchSubmodules = true; }; vendorSha256 = null; doCheck = false; - ldflags = [ "-X main.version=${version}" "-X main.distribution=nix" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.distribution=nix" ]; subPackages = [ "." ]; @@ -34,9 +35,10 @@ buildGoModule rec { meta = with lib; { insecure = true; - knownVulnerabilities = [ "https://github.com/lawl/NoiseTorch/releases/tag/0.11.6" ]; + knownVulnerabilities = + lib.optional (lib.versionOlder version "0.12") "https://github.com/noisetorch/NoiseTorch/releases/tag/v0.12.0"; description = "Virtual microphone device with noise supression for PulseAudio"; - homepage = "https://github.com/lawl/NoiseTorch"; + homepage = "https://github.com/noisetorch/NoiseTorch"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ panaeon lom ]; diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index b5e820e83459b..9dbaefa740630 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Application for practicing playing musical scores and ear training"; homepage = "https://nootka.sourceforge.io/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index cae9353d2deff..0fe6da9537dab 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { ''; 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 8fe6beebc4b8d..1bbbe3583f90a 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform, easy to use, fast and functional audio editor"; homepage = "https://www.ocenaudio.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ onny ]; diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix index a5ed7c41eb797..b76a52ca3d28f 100644 --- a/pkgs/applications/audio/open-music-kontrollers/generic.nix +++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { ] ++ additionalBuildInputs; meta = with lib; { + broken = stdenv.isDarwin; description = description; homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; license = licenses.artistic2; diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix new file mode 100644 index 0000000000000..f865e31b2dc91 --- /dev/null +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -0,0 +1,72 @@ +{ pkgs, stdenv, lib, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, nodejs, electron, python3, ... }: + +let + nodeComposition = import ./node-composition.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in + +nodeComposition.package.override rec { + pname = "open-stage-control"; + inherit (nodeComposition.args) version; + + src = fetchFromGitHub { + owner = "jean-emmanuel"; + repo = "open-stage-control"; + rev = "v${version}"; + hash = "sha256-q18pRtsHfme+OPmi3LhJDK1AdpfkwhoE9LA2rNenDtY="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeBinaryWrapper + ]; + + buildInputs = [ + python3.pkgs.python-rtmidi + ]; + + dontNpmInstall = true; + + postInstall = '' + # build assets + npm run build + + # copy icon + install -Dm644 resources/images/logo.png $out/share/icons/hicolor/256x256/apps/open-stage-control.png + install -Dm644 resources/images/logo.svg $out/share/icons/hicolor/scalable/apps/open-stage-control.svg + + # wrap electron and include python-rtmidi + makeWrapper '${electron}/bin/electron' $out/bin/open-stage-control \ + --inherit-argv0 \ + --add-flags $out/lib/node_modules/open-stage-control/app \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : '${lib.makeBinPath [ python3 ]}' + ''; + + installCheckPhase = '' + XDG_CONFIG_HOME="$(mktemp -d)" $out/bin/open-stage-control --help + ''; + doInstallCheck = true; + + desktopItems = [ + (makeDesktopItem { + name = "open-stage-control"; + exec = "open-stage-control"; + icon = "open-stage-control"; + desktopName = "Open Stage Control"; + comment = meta.description; + categories = [ "Network" "Audio" "AudioVideo" "Midi" ]; + startupWMClass = "open-stage-control"; + }) + ]; + + meta = with lib; { + description = "Libre and modular OSC / MIDI controller"; + homepage = "https://openstagecontrol.ammd.net/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/open-stage-control/generate-dependencies.sh b/pkgs/applications/audio/open-stage-control/generate-dependencies.sh new file mode 100755 index 0000000000000..ce811b669e121 --- /dev/null +++ b/pkgs/applications/audio/open-stage-control/generate-dependencies.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p jq nodePackages.node2nix + +# Get latest release tag +tag="$(curl -s https://api.github.com/repos/jean-emmanuel/open-stage-control/releases/latest | jq -r .tag_name)" + +# Download package.json from the latest release +curl -s https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/"$tag"/package.json | grep -v '"electron"\|"electron-installer-debian"\|"electron-packager"\|"electron-packager-plugin-non-proprietary-codecs-ffmpeg"' >package.json + +# Lock dependencies with node2nix +node2nix \ + --node-env ../../../development/node-packages/node-env.nix \ + --nodejs-16 \ + --input package.json \ + --output node-packages.nix \ + --composition node-composition.nix + +rm -f package.json diff --git a/pkgs/applications/audio/open-stage-control/node-composition.nix b/pkgs/applications/audio/open-stage-control/node-composition.nix new file mode 100644 index 0000000000000..2e810490ca8d8 --- /dev/null +++ b/pkgs/applications/audio/open-stage-control/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.11.1. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/pkgs/applications/audio/open-stage-control/node-packages.nix b/pkgs/applications/audio/open-stage-control/node-packages.nix new file mode 100644 index 0000000000000..177412726c400 --- /dev/null +++ b/pkgs/applications/audio/open-stage-control/node-packages.nix @@ -0,0 +1,8311 @@ +# This file has been generated by node2nix 1.11.1. Do not edit! + +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "@ampproject/remapping-2.2.0" = { + name = "_at_ampproject_slash_remapping"; + packageName = "@ampproject/remapping"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"; + sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; + }; + }; + "@babel/code-frame-7.18.6" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; + }; + }; + "@babel/compat-data-7.18.6" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.6.tgz"; + sha512 = "tzulrgDT0QD6U7BJ4TKVk2SDDg7wlP39P9yAx1RfLy7vP/7rsDRlWVfbWxElslu56+r7QOhB2NSDsabYYruoZQ=="; + }; + }; + "@babel/core-7.18.0" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.0.tgz"; + sha512 = "Xyw74OlJwDijToNi0+6BBI5mLLR5+5R3bcSH80LXzjzEGEUlvNzujEE71BaD/ApEZHAvFI/Mlmp4M5lIkdeeWw=="; + }; + }; + "@babel/eslint-parser-7.17.0" = { + name = "_at_babel_slash_eslint-parser"; + packageName = "@babel/eslint-parser"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz"; + sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA=="; + }; + }; + "@babel/generator-7.18.7" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.18.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz"; + sha512 = "shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A=="; + }; + }; + "@babel/helper-annotate-as-pure-7.18.6" = { + name = "_at_babel_slash_helper-annotate-as-pure"; + packageName = "@babel/helper-annotate-as-pure"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; + sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; + }; + }; + "@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" = { + name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; + packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz"; + sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; + }; + }; + "@babel/helper-compilation-targets-7.18.6" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz"; + sha512 = "vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg=="; + }; + }; + "@babel/helper-create-class-features-plugin-7.18.6" = { + name = "_at_babel_slash_helper-create-class-features-plugin"; + packageName = "@babel/helper-create-class-features-plugin"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz"; + sha512 = "YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw=="; + }; + }; + "@babel/helper-create-regexp-features-plugin-7.18.6" = { + name = "_at_babel_slash_helper-create-regexp-features-plugin"; + packageName = "@babel/helper-create-regexp-features-plugin"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"; + sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; + }; + }; + "@babel/helper-define-polyfill-provider-0.3.1" = { + name = "_at_babel_slash_helper-define-polyfill-provider"; + packageName = "@babel/helper-define-polyfill-provider"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"; + sha512 = "J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="; + }; + }; + "@babel/helper-environment-visitor-7.18.6" = { + name = "_at_babel_slash_helper-environment-visitor"; + packageName = "@babel/helper-environment-visitor"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz"; + sha512 = "8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q=="; + }; + }; + "@babel/helper-explode-assignable-expression-7.18.6" = { + name = "_at_babel_slash_helper-explode-assignable-expression"; + packageName = "@babel/helper-explode-assignable-expression"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; + sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; + }; + }; + "@babel/helper-function-name-7.18.6" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz"; + sha512 = "0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw=="; + }; + }; + "@babel/helper-hoist-variables-7.18.6" = { + name = "_at_babel_slash_helper-hoist-variables"; + packageName = "@babel/helper-hoist-variables"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; + }; + }; + "@babel/helper-member-expression-to-functions-7.18.6" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz"; + sha512 = "CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng=="; + }; + }; + "@babel/helper-module-imports-7.18.6" = { + name = "_at_babel_slash_helper-module-imports"; + packageName = "@babel/helper-module-imports"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; + }; + }; + "@babel/helper-module-transforms-7.18.6" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.6.tgz"; + sha512 = "L//phhB4al5uucwzlimruukHB3jRd5JGClwRMD/ROrVjXfLqovYnvQrK/JK36WYyVwGGO7OD3kMyVTjx+WVPhw=="; + }; + }; + "@babel/helper-optimise-call-expression-7.18.6" = { + name = "_at_babel_slash_helper-optimise-call-expression"; + packageName = "@babel/helper-optimise-call-expression"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; + sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; + }; + }; + "@babel/helper-plugin-utils-7.18.6" = { + name = "_at_babel_slash_helper-plugin-utils"; + packageName = "@babel/helper-plugin-utils"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz"; + sha512 = "gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg=="; + }; + }; + "@babel/helper-remap-async-to-generator-7.18.6" = { + name = "_at_babel_slash_helper-remap-async-to-generator"; + packageName = "@babel/helper-remap-async-to-generator"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz"; + sha512 = "z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ=="; + }; + }; + "@babel/helper-replace-supers-7.18.6" = { + name = "_at_babel_slash_helper-replace-supers"; + packageName = "@babel/helper-replace-supers"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz"; + sha512 = "fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g=="; + }; + }; + "@babel/helper-simple-access-7.18.6" = { + name = "_at_babel_slash_helper-simple-access"; + packageName = "@babel/helper-simple-access"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; + sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; + }; + }; + "@babel/helper-skip-transparent-expression-wrappers-7.18.6" = { + name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; + packageName = "@babel/helper-skip-transparent-expression-wrappers"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.6.tgz"; + sha512 = "4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw=="; + }; + }; + "@babel/helper-split-export-declaration-7.18.6" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; + }; + }; + "@babel/helper-validator-identifier-7.18.6" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; + }; + }; + "@babel/helper-validator-option-7.18.6" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; + }; + }; + "@babel/helper-wrap-function-7.18.6" = { + name = "_at_babel_slash_helper-wrap-function"; + packageName = "@babel/helper-wrap-function"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz"; + sha512 = "I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw=="; + }; + }; + "@babel/helpers-7.18.6" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz"; + sha512 = "vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ=="; + }; + }; + "@babel/highlight-7.18.6" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; + }; + }; + "@babel/parser-7.18.6" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz"; + sha512 = "uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw=="; + }; + }; + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { + name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; + packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"; + sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="; + }; + }; + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.6" = { + name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; + packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.6.tgz"; + sha512 = "Udgu8ZRgrBrttVz6A0EVL0SJ1z+RLbIeqsu632SA1hf0awEppD6TvdznoH+orIF8wtFFAV/Enmw9Y+9oV8TQcw=="; + }; + }; + "@babel/plugin-proposal-async-generator-functions-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-async-generator-functions"; + packageName = "@babel/plugin-proposal-async-generator-functions"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz"; + sha512 = "WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w=="; + }; + }; + "@babel/plugin-proposal-class-properties-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-class-properties"; + packageName = "@babel/plugin-proposal-class-properties"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; + sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; + }; + }; + "@babel/plugin-proposal-class-static-block-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-class-static-block"; + packageName = "@babel/plugin-proposal-class-static-block"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; + sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; + }; + }; + "@babel/plugin-proposal-dynamic-import-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-dynamic-import"; + packageName = "@babel/plugin-proposal-dynamic-import"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; + sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; + }; + }; + "@babel/plugin-proposal-export-namespace-from-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-export-namespace-from"; + packageName = "@babel/plugin-proposal-export-namespace-from"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.6.tgz"; + sha512 = "zr/QcUlUo7GPo6+X1wC98NJADqmy5QTFWWhqeQWiki4XHafJtLl/YMGkmRB2szDD2IYJCCdBTd4ElwhId9T7Xw=="; + }; + }; + "@babel/plugin-proposal-json-strings-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-json-strings"; + packageName = "@babel/plugin-proposal-json-strings"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; + sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; + }; + }; + "@babel/plugin-proposal-logical-assignment-operators-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; + packageName = "@babel/plugin-proposal-logical-assignment-operators"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.6.tgz"; + sha512 = "zMo66azZth/0tVd7gmkxOkOjs2rpHyhpcFo565PUP37hSp6hSd9uUKIfTDFMz58BwqgQKhJ9YxtM5XddjXVn+Q=="; + }; + }; + "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; + packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; + sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; + }; + }; + "@babel/plugin-proposal-numeric-separator-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-numeric-separator"; + packageName = "@babel/plugin-proposal-numeric-separator"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; + sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.18.0" = { + name = "_at_babel_slash_plugin-proposal-object-rest-spread"; + packageName = "@babel/plugin-proposal-object-rest-spread"; + version = "7.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"; + sha512 = "nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw=="; + }; + }; + "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; + packageName = "@babel/plugin-proposal-optional-catch-binding"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; + sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; + }; + }; + "@babel/plugin-proposal-optional-chaining-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-optional-chaining"; + packageName = "@babel/plugin-proposal-optional-chaining"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.6.tgz"; + sha512 = "PatI6elL5eMzoypFAiYDpYQyMtXTn+iMhuxxQt5mAXD4fEmKorpSI3PHd+i3JXBJN3xyA6MvJv7at23HffFHwA=="; + }; + }; + "@babel/plugin-proposal-private-methods-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-private-methods"; + packageName = "@babel/plugin-proposal-private-methods"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; + sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; + }; + }; + "@babel/plugin-proposal-private-property-in-object-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-private-property-in-object"; + packageName = "@babel/plugin-proposal-private-property-in-object"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; + sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { + name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; + packageName = "@babel/plugin-proposal-unicode-property-regex"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; + sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; + }; + }; + "@babel/plugin-syntax-async-generators-7.8.4" = { + name = "_at_babel_slash_plugin-syntax-async-generators"; + packageName = "@babel/plugin-syntax-async-generators"; + version = "7.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; + }; + }; + "@babel/plugin-syntax-class-properties-7.12.13" = { + name = "_at_babel_slash_plugin-syntax-class-properties"; + packageName = "@babel/plugin-syntax-class-properties"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; + }; + }; + "@babel/plugin-syntax-class-static-block-7.14.5" = { + name = "_at_babel_slash_plugin-syntax-class-static-block"; + packageName = "@babel/plugin-syntax-class-static-block"; + version = "7.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; + sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; + }; + }; + "@babel/plugin-syntax-dynamic-import-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-dynamic-import"; + packageName = "@babel/plugin-syntax-dynamic-import"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; + }; + }; + "@babel/plugin-syntax-export-namespace-from-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-export-namespace-from"; + packageName = "@babel/plugin-syntax-export-namespace-from"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; + }; + }; + "@babel/plugin-syntax-import-assertions-7.18.6" = { + name = "_at_babel_slash_plugin-syntax-import-assertions"; + packageName = "@babel/plugin-syntax-import-assertions"; + version = "7.18.6"; + 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=="; + }; + }; + "@babel/plugin-syntax-json-strings-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-json-strings"; + packageName = "@babel/plugin-syntax-json-strings"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; + }; + }; + "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { + name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; + packageName = "@babel/plugin-syntax-logical-assignment-operators"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; + }; + }; + "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; + packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; + }; + }; + "@babel/plugin-syntax-numeric-separator-7.10.4" = { + name = "_at_babel_slash_plugin-syntax-numeric-separator"; + packageName = "@babel/plugin-syntax-numeric-separator"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; + }; + }; + "@babel/plugin-syntax-object-rest-spread-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-object-rest-spread"; + packageName = "@babel/plugin-syntax-object-rest-spread"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; + }; + }; + "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; + packageName = "@babel/plugin-syntax-optional-catch-binding"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; + }; + }; + "@babel/plugin-syntax-optional-chaining-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-chaining"; + packageName = "@babel/plugin-syntax-optional-chaining"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; + }; + }; + "@babel/plugin-syntax-private-property-in-object-7.14.5" = { + name = "_at_babel_slash_plugin-syntax-private-property-in-object"; + packageName = "@babel/plugin-syntax-private-property-in-object"; + version = "7.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; + sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; + }; + }; + "@babel/plugin-syntax-top-level-await-7.14.5" = { + name = "_at_babel_slash_plugin-syntax-top-level-await"; + packageName = "@babel/plugin-syntax-top-level-await"; + version = "7.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; + }; + }; + "@babel/plugin-transform-arrow-functions-7.18.6" = { + name = "_at_babel_slash_plugin-transform-arrow-functions"; + packageName = "@babel/plugin-transform-arrow-functions"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; + sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; + }; + }; + "@babel/plugin-transform-async-to-generator-7.18.6" = { + name = "_at_babel_slash_plugin-transform-async-to-generator"; + packageName = "@babel/plugin-transform-async-to-generator"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; + sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; + }; + }; + "@babel/plugin-transform-block-scoped-functions-7.18.6" = { + name = "_at_babel_slash_plugin-transform-block-scoped-functions"; + packageName = "@babel/plugin-transform-block-scoped-functions"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; + sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; + }; + }; + "@babel/plugin-transform-block-scoping-7.18.6" = { + name = "_at_babel_slash_plugin-transform-block-scoping"; + packageName = "@babel/plugin-transform-block-scoping"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.6.tgz"; + sha512 = "pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ=="; + }; + }; + "@babel/plugin-transform-classes-7.18.6" = { + name = "_at_babel_slash_plugin-transform-classes"; + packageName = "@babel/plugin-transform-classes"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.6.tgz"; + sha512 = "XTg8XW/mKpzAF3actL554Jl/dOYoJtv3l8fxaEczpgz84IeeVf+T1u2CSvPHuZbt0w3JkIx4rdn/MRQI7mo0HQ=="; + }; + }; + "@babel/plugin-transform-computed-properties-7.18.6" = { + name = "_at_babel_slash_plugin-transform-computed-properties"; + packageName = "@babel/plugin-transform-computed-properties"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.6.tgz"; + sha512 = "9repI4BhNrR0KenoR9vm3/cIc1tSBIo+u1WVjKCAynahj25O8zfbiE6JtAtHPGQSs4yZ+bA8mRasRP+qc+2R5A=="; + }; + }; + "@babel/plugin-transform-destructuring-7.18.6" = { + name = "_at_babel_slash_plugin-transform-destructuring"; + packageName = "@babel/plugin-transform-destructuring"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.6.tgz"; + sha512 = "tgy3u6lRp17ilY8r1kP4i2+HDUwxlVqq3RTc943eAWSzGgpU1qhiKpqZ5CMyHReIYPHdo3Kg8v8edKtDqSVEyQ=="; + }; + }; + "@babel/plugin-transform-dotall-regex-7.18.6" = { + name = "_at_babel_slash_plugin-transform-dotall-regex"; + packageName = "@babel/plugin-transform-dotall-regex"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; + sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; + }; + }; + "@babel/plugin-transform-duplicate-keys-7.18.6" = { + name = "_at_babel_slash_plugin-transform-duplicate-keys"; + packageName = "@babel/plugin-transform-duplicate-keys"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.6.tgz"; + sha512 = "NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg=="; + }; + }; + "@babel/plugin-transform-exponentiation-operator-7.18.6" = { + name = "_at_babel_slash_plugin-transform-exponentiation-operator"; + packageName = "@babel/plugin-transform-exponentiation-operator"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; + sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; + }; + }; + "@babel/plugin-transform-for-of-7.18.6" = { + name = "_at_babel_slash_plugin-transform-for-of"; + packageName = "@babel/plugin-transform-for-of"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.6.tgz"; + sha512 = "WAjoMf4wIiSsy88KmG7tgj2nFdEK7E46tArVtcgED7Bkj6Fg/tG5SbvNIOKxbFS2VFgNh6+iaPswBeQZm4ox8w=="; + }; + }; + "@babel/plugin-transform-function-name-7.18.6" = { + name = "_at_babel_slash_plugin-transform-function-name"; + packageName = "@babel/plugin-transform-function-name"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.6.tgz"; + sha512 = "kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA=="; + }; + }; + "@babel/plugin-transform-literals-7.18.6" = { + name = "_at_babel_slash_plugin-transform-literals"; + packageName = "@babel/plugin-transform-literals"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.6.tgz"; + sha512 = "x3HEw0cJZVDoENXOp20HlypIHfl0zMIhMVZEBVTfmqbObIpsMxMbmU5nOEO8R7LYT+z5RORKPlTI5Hj4OsO9/Q=="; + }; + }; + "@babel/plugin-transform-member-expression-literals-7.18.6" = { + name = "_at_babel_slash_plugin-transform-member-expression-literals"; + packageName = "@babel/plugin-transform-member-expression-literals"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; + sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; + }; + }; + "@babel/plugin-transform-modules-amd-7.18.6" = { + name = "_at_babel_slash_plugin-transform-modules-amd"; + packageName = "@babel/plugin-transform-modules-amd"; + version = "7.18.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=="; + }; + }; + "@babel/plugin-transform-modules-commonjs-7.18.6" = { + name = "_at_babel_slash_plugin-transform-modules-commonjs"; + packageName = "@babel/plugin-transform-modules-commonjs"; + version = "7.18.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=="; + }; + }; + "@babel/plugin-transform-modules-systemjs-7.18.6" = { + name = "_at_babel_slash_plugin-transform-modules-systemjs"; + packageName = "@babel/plugin-transform-modules-systemjs"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.6.tgz"; + sha512 = "UbPYpXxLjTw6w6yXX2BYNxF3p6QY225wcTkfQCy3OMnSlS/C3xGtwUjEzGkldb/sy6PWLiCQ3NbYfjWUTI3t4g=="; + }; + }; + "@babel/plugin-transform-modules-umd-7.18.6" = { + name = "_at_babel_slash_plugin-transform-modules-umd"; + packageName = "@babel/plugin-transform-modules-umd"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; + sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; + }; + }; + "@babel/plugin-transform-named-capturing-groups-regex-7.18.6" = { + name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; + packageName = "@babel/plugin-transform-named-capturing-groups-regex"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"; + sha512 = "UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg=="; + }; + }; + "@babel/plugin-transform-new-target-7.18.6" = { + name = "_at_babel_slash_plugin-transform-new-target"; + packageName = "@babel/plugin-transform-new-target"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; + sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; + }; + }; + "@babel/plugin-transform-object-super-7.18.6" = { + name = "_at_babel_slash_plugin-transform-object-super"; + packageName = "@babel/plugin-transform-object-super"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; + sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; + }; + }; + "@babel/plugin-transform-parameters-7.18.6" = { + name = "_at_babel_slash_plugin-transform-parameters"; + packageName = "@babel/plugin-transform-parameters"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.6.tgz"; + sha512 = "FjdqgMv37yVl/gwvzkcB+wfjRI8HQmc5EgOG9iGNvUY1ok+TjsoaMP7IqCDZBhkFcM5f3OPVMs6Dmp03C5k4/A=="; + }; + }; + "@babel/plugin-transform-property-literals-7.18.6" = { + name = "_at_babel_slash_plugin-transform-property-literals"; + packageName = "@babel/plugin-transform-property-literals"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; + sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; + }; + }; + "@babel/plugin-transform-regenerator-7.18.6" = { + name = "_at_babel_slash_plugin-transform-regenerator"; + packageName = "@babel/plugin-transform-regenerator"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; + sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; + }; + }; + "@babel/plugin-transform-reserved-words-7.18.6" = { + name = "_at_babel_slash_plugin-transform-reserved-words"; + packageName = "@babel/plugin-transform-reserved-words"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; + sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; + }; + }; + "@babel/plugin-transform-shorthand-properties-7.18.6" = { + name = "_at_babel_slash_plugin-transform-shorthand-properties"; + packageName = "@babel/plugin-transform-shorthand-properties"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; + sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; + }; + }; + "@babel/plugin-transform-spread-7.18.6" = { + name = "_at_babel_slash_plugin-transform-spread"; + packageName = "@babel/plugin-transform-spread"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.6.tgz"; + sha512 = "ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw=="; + }; + }; + "@babel/plugin-transform-sticky-regex-7.18.6" = { + name = "_at_babel_slash_plugin-transform-sticky-regex"; + packageName = "@babel/plugin-transform-sticky-regex"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; + sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; + }; + }; + "@babel/plugin-transform-template-literals-7.18.6" = { + name = "_at_babel_slash_plugin-transform-template-literals"; + packageName = "@babel/plugin-transform-template-literals"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.6.tgz"; + sha512 = "UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw=="; + }; + }; + "@babel/plugin-transform-typeof-symbol-7.18.6" = { + name = "_at_babel_slash_plugin-transform-typeof-symbol"; + packageName = "@babel/plugin-transform-typeof-symbol"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.6.tgz"; + sha512 = "7m71iS/QhsPk85xSjFPovHPcH3H9qeyzsujhTc+vcdnsXavoWYJ74zx0lP5RhpC5+iDnVLO+PPMHzC11qels1g=="; + }; + }; + "@babel/plugin-transform-unicode-escapes-7.18.6" = { + name = "_at_babel_slash_plugin-transform-unicode-escapes"; + packageName = "@babel/plugin-transform-unicode-escapes"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz"; + sha512 = "XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw=="; + }; + }; + "@babel/plugin-transform-unicode-regex-7.18.6" = { + name = "_at_babel_slash_plugin-transform-unicode-regex"; + packageName = "@babel/plugin-transform-unicode-regex"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; + sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; + }; + }; + "@babel/polyfill-7.12.1" = { + name = "_at_babel_slash_polyfill"; + packageName = "@babel/polyfill"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz"; + sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; + }; + }; + "@babel/preset-env-7.18.0" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.0.tgz"; + sha512 = "cP74OMs7ECLPeG1reiCQ/D/ypyOxgfm8uR6HRYV23vTJ7Lu1nbgj9DQDo/vH59gnn7GOAwtTDPPYV4aXzsMKHA=="; + }; + }; + "@babel/preset-modules-0.1.5" = { + name = "_at_babel_slash_preset-modules"; + packageName = "@babel/preset-modules"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; + sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; + }; + }; + "@babel/runtime-7.18.6" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz"; + sha512 = "t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ=="; + }; + }; + "@babel/template-7.18.6" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz"; + sha512 = "JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw=="; + }; + }; + "@babel/traverse-7.18.6" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.6.tgz"; + sha512 = "zS/OKyqmD7lslOtFqbscH6gMLFYOfG1YPqCKfAW5KrTeolKqvB8UelR49Fpr6y93kYkW2Ik00mT1LOGiAGvizw=="; + }; + }; + "@babel/types-7.18.7" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.18.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.7.tgz"; + sha512 = "QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ=="; + }; + }; + "@electron/remote-2.0.8" = { + name = "_at_electron_slash_remote"; + packageName = "@electron/remote"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@electron/remote/-/remote-2.0.8.tgz"; + sha512 = "P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw=="; + }; + }; + "@eslint/eslintrc-1.3.0" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; + sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; + }; + }; + "@gar/promisify-1.1.3" = { + name = "_at_gar_slash_promisify"; + packageName = "@gar/promisify"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; + }; + }; + "@humanwhocodes/config-array-0.9.5" = { + name = "_at_humanwhocodes_slash_config-array"; + packageName = "@humanwhocodes/config-array"; + version = "0.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; + sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; + }; + }; + "@humanwhocodes/object-schema-1.2.1" = { + name = "_at_humanwhocodes_slash_object-schema"; + packageName = "@humanwhocodes/object-schema"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; + }; + }; + "@jridgewell/gen-mapping-0.1.1" = { + name = "_at_jridgewell_slash_gen-mapping"; + packageName = "@jridgewell/gen-mapping"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + }; + }; + "@jridgewell/gen-mapping-0.3.2" = { + name = "_at_jridgewell_slash_gen-mapping"; + packageName = "@jridgewell/gen-mapping"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; + }; + }; + "@jridgewell/resolve-uri-3.0.8" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.8.tgz"; + sha512 = "YK5G9LaddzGbcucK4c8h5tWFmMPBvRZ/uyWmN1/SbBdIvqGUdWGkJ5BAaccgs6XbzVLsqbPJrBSFwKv3kT9i7w=="; + }; + }; + "@jridgewell/set-array-1.1.2" = { + name = "_at_jridgewell_slash_set-array"; + packageName = "@jridgewell/set-array"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; + sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; + }; + }; + "@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.14" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.3.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"; + sha512 = "bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ=="; + }; + }; + "@npmcli/fs-1.1.1" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"; + sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; + }; + }; + "@npmcli/move-file-1.1.2" = { + name = "_at_npmcli_slash_move-file"; + packageName = "@npmcli/move-file"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; + }; + }; + "@sindresorhus/is-0.14.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + }; + }; + "@szmarczak/http-timer-1.1.2" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + }; + }; + "@tootallnate/once-1.1.2" = { + name = "_at_tootallnate_slash_once"; + packageName = "@tootallnate/once"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + }; + }; + "@types/minimist-1.2.2" = { + name = "_at_types_slash_minimist"; + packageName = "@types/minimist"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; + sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; + }; + }; + "@types/normalize-package-data-2.4.1" = { + name = "_at_types_slash_normalize-package-data"; + packageName = "@types/normalize-package-data"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; + sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; + }; + }; + "JSONStream-1.3.5" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "acorn-7.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + }; + "acorn-8.7.1" = { + name = "acorn"; + packageName = "acorn"; + version = "8.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; + sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; + }; + }; + "acorn-jsx-5.3.2" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; + }; + }; + "acorn-node-1.8.2" = { + name = "acorn-node"; + packageName = "acorn-node"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz"; + sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; + }; + }; + "acorn-walk-7.2.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; + }; + }; + "agent-base-6.0.2" = { + name = "agent-base"; + packageName = "agent-base"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + }; + "agentkeepalive-4.2.1" = { + name = "agentkeepalive"; + packageName = "agentkeepalive"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + }; + }; + "aggregate-error-3.1.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + }; + "ajv-6.12.6" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; + "ansi-align-3.0.1" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; + }; + }; + "ansi-html-0.0.9" = { + name = "ansi-html"; + packageName = "ansi-html"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz"; + sha512 = "ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; + }; + }; + "ansi-regex-5.0.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + }; + "anymatch-3.1.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + }; + }; + "apache-crypt-1.2.5" = { + name = "apache-crypt"; + packageName = "apache-crypt"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.5.tgz"; + sha512 = "ICnYQH+DFVmw+S4Q0QY2XRXD8Ne8ewh8HgbuFH4K7022zCxgHM0Hz1xkRnUlEfAXNbwp1Cnhbedu60USIfDxvg=="; + }; + }; + "apache-md5-1.1.7" = { + name = "apache-md5"; + packageName = "apache-md5"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.7.tgz"; + sha512 = "JtHjzZmJxtzfTSjsCyHgPR155HBe5WGyUyHTaEkfy46qhwCFKx1Epm6nAxgUG3WfUZP1dWhGqj9Z2NOBeZ+uBw=="; + }; + }; + "aproba-2.0.0" = { + name = "aproba"; + packageName = "aproba"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; + }; + }; + "are-we-there-yet-2.0.0" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; + sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; + }; + }; + "are-we-there-yet-3.0.0" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz"; + sha512 = "0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw=="; + }; + }; + "argparse-2.0.1" = { + name = "argparse"; + packageName = "argparse"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + }; + "array-flatten-2.1.2" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha512 = "3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA=="; + }; + }; + "asn1-0.2.6" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; + sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; + }; + }; + "asn1.js-5.4.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; + sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; + }; + }; + "assert-1.5.0" = { + name = "assert"; + packageName = "assert"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; + }; + }; + "async-foreach-0.1.3" = { + name = "async-foreach"; + packageName = "async-foreach"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"; + sha512 = "VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA=="; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; + }; + }; + "available-typed-arrays-1.0.5" = { + name = "available-typed-arrays"; + packageName = "available-typed-arrays"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; + sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; + }; + }; + "aws4-1.11.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + }; + }; + "babel-plugin-dynamic-import-node-2.3.3" = { + name = "babel-plugin-dynamic-import-node"; + packageName = "babel-plugin-dynamic-import-node"; + version = "2.3.3"; + 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=="; + }; + }; + "babel-plugin-polyfill-corejs2-0.3.1" = { + name = "babel-plugin-polyfill-corejs2"; + packageName = "babel-plugin-polyfill-corejs2"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"; + sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; + }; + }; + "babel-plugin-polyfill-corejs3-0.5.2" = { + name = "babel-plugin-polyfill-corejs3"; + packageName = "babel-plugin-polyfill-corejs3"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"; + sha512 = "G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="; + }; + }; + "babel-plugin-polyfill-regenerator-0.3.1" = { + name = "babel-plugin-polyfill-regenerator"; + packageName = "babel-plugin-polyfill-regenerator"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"; + sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; + }; + }; + "babelify-10.0.0" = { + name = "babelify"; + packageName = "babelify"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz"; + sha512 = "X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg=="; + }; + }; + "balanced-match-1.0.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + }; + "balanced-match-2.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz"; + sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="; + }; + }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="; + }; + }; + "bcryptjs-2.4.3" = { + name = "bcryptjs"; + packageName = "bcryptjs"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; + sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; + }; + }; + "binary-extensions-2.2.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; + }; + }; + "bn.js-4.12.0" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"; + sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; + }; + }; + "bn.js-5.2.1" = { + name = "bn.js"; + packageName = "bn.js"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz"; + sha512 = "eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="; + }; + }; + "bonjour-git+https://github.com/jean-emmanuel/bonjour" = { + name = "bonjour"; + packageName = "bonjour"; + version = "4.0.0"; + src = fetchgit { + url = "https://github.com/jean-emmanuel/bonjour"; + rev = "33d7fa28c568d05cb7ffda1fd2b20f4cc364e273"; + sha256 = "3f9cd813a3cd8ac6ec02421bd590922a4722a0dd89416dc580df6ee1f34e48b0"; + }; + }; + "boxen-5.1.2" = { + name = "boxen"; + packageName = "boxen"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz"; + sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; + }; + }; + "brace-0.11.1" = { + name = "brace"; + packageName = "brace"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz"; + sha512 = "Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "brace-expansion-2.0.1" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; + "brorand-1.1.0" = { + name = "brorand"; + packageName = "brorand"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha512 = "cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="; + }; + }; + "browser-pack-6.1.0" = { + name = "browser-pack"; + packageName = "browser-pack"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz"; + sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA=="; + }; + }; + "browser-process-hrtime-0.1.3" = { + name = "browser-process-hrtime"; + packageName = "browser-process-hrtime"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; + sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="; + }; + }; + "browser-resolve-2.0.0" = { + name = "browser-resolve"; + packageName = "browser-resolve"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz"; + sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ=="; + }; + }; + "browserify-17.0.0" = { + name = "browserify"; + packageName = "browserify"; + version = "17.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz"; + sha512 = "SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w=="; + }; + }; + "browserify-aes-1.2.0" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; + }; + }; + "browserify-cipher-1.0.1" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; + }; + }; + "browserify-des-1.0.2" = { + name = "browserify-des"; + packageName = "browserify-des"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; + }; + }; + "browserify-rsa-4.1.0" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; + }; + }; + "browserify-sign-4.2.1" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; + }; + }; + "browserify-zlib-0.2.0" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; + }; + }; + "browserslist-4.21.1" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.21.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.1.tgz"; + sha512 = "Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ=="; + }; + }; + "buffer-5.2.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; + }; + }; + "buffer-from-1.1.2" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; + }; + }; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; + }; + }; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha512 = "571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="; + }; + }; + "builtin-status-codes-3.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha512 = "HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="; + }; + }; + "cacache-15.3.0" = { + name = "cacache"; + packageName = "cacache"; + version = "15.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"; + sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; + }; + }; + "cacheable-request-6.1.0" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + }; + }; + "cached-path-relative-1.1.0" = { + name = "cached-path-relative"; + packageName = "cached-path-relative"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz"; + sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="; + }; + }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camel-case-3.0.0" = { + name = "camel-case"; + packageName = "camel-case"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz"; + sha512 = "+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w=="; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "camelcase-6.3.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; + }; + }; + "camelcase-keys-6.2.2" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; + }; + }; + "caniuse-lite-1.0.30001363" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001363"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz"; + sha512 = "HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chalk-4.1.2" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; + }; + }; + "chokidar-3.5.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; + }; + }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; + "chroma-js-2.4.2" = { + name = "chroma-js"; + packageName = "chroma-js"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz"; + sha512 = "U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A=="; + }; + }; + "ci-info-2.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + }; + }; + "cipher-base-1.0.4" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; + }; + }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; + "cli-boxes-2.2.1" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + }; + }; + "cliui-7.0.4" = { + name = "cliui"; + packageName = "cliui"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + }; + }; + "clone-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha512 = "yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q=="; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; + }; + }; + "combine-source-map-0.8.0" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz"; + sha512 = "UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg=="; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "commander-2.20.3" = { + name = "commander"; + packageName = "commander"; + version = "2.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; + }; + }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; + "configstore-5.0.1" = { + name = "configstore"; + packageName = "configstore"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + }; + }; + "console-browserify-1.2.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"; + sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; + }; + }; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; + }; + }; + "convert-source-map-1.1.3" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha512 = "Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg=="; + }; + }; + "convert-source-map-1.8.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; + }; + }; + "core-js-2.6.12" = { + name = "core-js"; + packageName = "core-js"; + version = "2.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; + }; + }; + "core-js-3.22.5" = { + name = "core-js"; + packageName = "core-js"; + version = "3.22.5"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz"; + sha512 = "VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA=="; + }; + }; + "core-js-compat-3.23.3" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.23.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.3.tgz"; + sha512 = "WSzUs2h2vvmKsacLHNTdpyOC9k43AEhcGoFlVgCY4L7aw98oSBKtPL6vD0/TqZjRWRQYdDSLkzZIni4Crbbiqw=="; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; + }; + }; + "core-util-is-1.0.3" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + }; + }; + "cpr-3.0.1" = { + name = "cpr"; + packageName = "cpr"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz"; + sha512 = "Xch4PXQ/KC8lJ+KfJ9JI6eG/nmppLrPPWg5Q+vh65Qr9EjuJEubxh/H/Le1TmCZ7+Xv7iJuNRqapyOFZB+wsxA=="; + }; + }; + "create-ecdh-4.0.4" = { + name = "create-ecdh"; + packageName = "create-ecdh"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; + }; + }; + "create-hash-1.2.0" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; + }; + }; + "create-hmac-1.1.7" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; + }; + }; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + }; + "crypto-browserify-3.12.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; + }; + }; + "crypto-random-string-2.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; + }; + }; + "dash-ast-1.0.0" = { + name = "dash-ast"; + packageName = "dash-ast"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz"; + sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.2.7" = { + name = "debug"; + packageName = "debug"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + }; + "debug-4.3.4" = { + name = "debug"; + packageName = "debug"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; + }; + }; + "decamelize-keys-1.1.0" = { + name = "decamelize-keys"; + packageName = "decamelize-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha512 = "ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="; + }; + }; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="; + }; + }; + "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-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "deep-is-0.1.4" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; + }; + }; + "defer-to-connect-1.1.3" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; + }; + }; + "define-lazy-prop-2.0.0" = { + name = "define-lazy-prop"; + packageName = "define-lazy-prop"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; + sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; + }; + }; + "define-properties-1.1.4" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; + }; + }; + "defined-1.0.0" = { + name = "defined"; + packageName = "defined"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; + sha512 = "Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; + }; + }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; + "deps-sort-2.0.1" = { + name = "deps-sort"; + packageName = "deps-sort"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz"; + sha512 = "1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw=="; + }; + }; + "des.js-1.0.1" = { + name = "des.js"; + packageName = "des.js"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; + }; + }; + "destroy-1.2.0" = { + name = "destroy"; + packageName = "destroy"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; + sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; + }; + }; + "detective-5.2.1" = { + name = "detective"; + packageName = "detective"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz"; + sha512 = "v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw=="; + }; + }; + "diff-match-patch-1.0.5" = { + name = "diff-match-patch"; + packageName = "diff-match-patch"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz"; + sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; + }; + }; + "diffie-hellman-5.0.3" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; + }; + }; + "dns-equal-1.0.0" = { + name = "dns-equal"; + packageName = "dns-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; + sha512 = "z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="; + }; + }; + "dns-packet-1.3.4" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz"; + sha512 = "BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA=="; + }; + }; + "dns-txt-git+https://github.com/jean-emmanuel/dns-txt#v2.0.3" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.3"; + src = fetchgit { + url = "https://github.com/jean-emmanuel/dns-txt"; + rev = "0c11e084bceee17016f9466e3b64f47776c5fb6f"; + sha256 = "5a1b886c631e3e9fad925c16d09dc02bfb25617faf7b549c146ee5ca69d396cd"; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "dom-serializer-1.4.1" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; + sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; + }; + }; + "domain-browser-1.2.0" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; + }; + }; + "domelementtype-2.3.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; + sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; + }; + }; + "domhandler-3.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; + sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; + }; + }; + "domhandler-4.3.1" = { + name = "domhandler"; + packageName = "domhandler"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; + sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; + }; + }; + "domutils-2.8.0" = { + name = "domutils"; + packageName = "domutils"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; + }; + }; + "dot-prop-5.3.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; + }; + }; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha512 = "CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; + }; + }; + "electron-is-accelerator-0.1.2" = { + name = "electron-is-accelerator"; + packageName = "electron-is-accelerator"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz"; + sha512 = "fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA=="; + }; + }; + "electron-localshortcut-3.2.1" = { + name = "electron-localshortcut"; + packageName = "electron-localshortcut"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz"; + sha512 = "DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q=="; + }; + }; + "electron-to-chromium-1.4.179" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.179"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.179.tgz"; + sha512 = "1XeTb/U/8Xgh2YgPOqhakLYsvCcU4U7jUjTMbEnhIJoIWd/Qt3yC8y0cbG+fHzn4zUNF99Ey1xiPf20bwgLO3Q=="; + }; + }; + "elliptic-6.5.4" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; + }; + }; + "encoding-0.1.13" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; + "env-paths-2.2.1" = { + name = "env-paths"; + packageName = "env-paths"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; + }; + }; + "err-code-2.0.3" = { + name = "err-code"; + packageName = "err-code"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "error-stack-parser-2.1.4" = { + name = "error-stack-parser"; + packageName = "error-stack-parser"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz"; + sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="; + }; + }; + "es-abstract-1.20.1" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"; + sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; + }; + }; + "es-to-primitive-1.2.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + }; + }; + "escalade-3.1.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + }; + }; + "escape-goat-2.1.1" = { + name = "escape-goat"; + packageName = "escape-goat"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; + }; + }; + "escape-string-regexp-4.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + }; + "escaper-2.5.3" = { + name = "escaper"; + packageName = "escaper"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escaper/-/escaper-2.5.3.tgz"; + sha512 = "QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ=="; + }; + }; + "eslint-8.16.0" = { + name = "eslint"; + packageName = "eslint"; + version = "8.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz"; + sha512 = "MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA=="; + }; + }; + "eslint-scope-5.1.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + }; + "eslint-scope-7.1.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"; + sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; + }; + }; + "eslint-utils-3.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; + }; + }; + "eslint-visitor-keys-2.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; + }; + }; + "eslint-visitor-keys-3.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; + sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; + }; + }; + "espree-9.3.2" = { + name = "espree"; + packageName = "espree"; + version = "9.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz"; + sha512 = "D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA=="; + }; + }; + "esquery-1.4.0" = { + name = "esquery"; + packageName = "esquery"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; + }; + }; + "esrecurse-4.3.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "estraverse-5.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; + }; + }; + "estree-is-member-expression-1.0.0" = { + name = "estree-is-member-expression"; + packageName = "estree-is-member-expression"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-is-member-expression/-/estree-is-member-expression-1.0.0.tgz"; + sha512 = "Ec+X44CapIGExvSZN+pGkmr5p7HwUVQoPQSd458Lqwvaf4/61k/invHSh4BYK8OXnCkfEhWuIoG5hayKLQStIg=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; + }; + }; + "events-3.3.0" = { + name = "events"; + packageName = "events"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; + sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; + }; + }; + "evp_bytestokey-1.0.3" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; + }; + }; + "exorcist-2.0.0" = { + name = "exorcist"; + packageName = "exorcist"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/exorcist/-/exorcist-2.0.0.tgz"; + sha512 = "+c63SvhBq/HjmbV9cu9vkDkjXFiuI4lpqOZU5Y3t5GSV2l4TQCqVli9c7nIASHxkUL4THaOZDUcb6XNBI/eYjw=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; + }; + }; + "fast-deep-equal-3.1.3" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; + }; + }; + "fast-safe-stringify-2.1.1" = { + name = "fast-safe-stringify"; + packageName = "fast-safe-stringify"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz"; + sha512 = "W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="; + }; + }; + "fastdom-1.0.10" = { + name = "fastdom"; + packageName = "fastdom"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fastdom/-/fastdom-1.0.10.tgz"; + sha512 = "sbL4h358IlZn8VsTvA5TYnKVLYif46XhPEll+HTSxVtDSpqZEO/17D/QqlxE9V2K7AQ82GXeYeQLU2HWwKgk1A=="; + }; + }; + "file-entry-cache-6.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; + }; + }; + "file-saver-2.0.5" = { + name = "file-saver"; + packageName = "file-saver"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz"; + sha512 = "P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; + "flat-cache-3.0.4" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + }; + }; + "flatted-3.2.6" = { + name = "flatted"; + packageName = "flatted"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz"; + sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="; + }; + }; + "for-each-0.3.3" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; + sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; + }; + }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; + }; + }; + "fsevents-2.3.2" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "function.prototype.name-1.1.5" = { + name = "function.prototype.name"; + packageName = "function.prototype.name"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; + sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; + }; + }; + "functions-have-names-1.2.3" = { + name = "functions-have-names"; + packageName = "functions-have-names"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; + sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; + }; + }; + "gauge-3.0.2" = { + name = "gauge"; + packageName = "gauge"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz"; + sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; + }; + }; + "gauge-4.0.4" = { + name = "gauge"; + packageName = "gauge"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; + }; + }; + "gaze-1.1.3" = { + name = "gaze"; + packageName = "gaze"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz"; + sha512 = "BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g=="; + }; + }; + "gensync-1.0.0-beta.2" = { + name = "gensync"; + packageName = "gensync"; + version = "1.0.0-beta.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; + }; + }; + "get-assigned-identifiers-1.2.0" = { + name = "get-assigned-identifiers"; + packageName = "get-assigned-identifiers"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz"; + sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-intrinsic-1.1.2" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; + sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha512 = "F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-stream-5.2.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + }; + "get-symbol-description-1.0.0" = { + name = "get-symbol-description"; + packageName = "get-symbol-description"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; + sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; + }; + }; + "glob-7.1.7" = { + name = "glob"; + packageName = "glob"; + version = "7.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; + }; + }; + "glob-7.2.3" = { + name = "glob"; + packageName = "glob"; + version = "7.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; + }; + }; + "glob-parent-5.1.2" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + }; + }; + "glob-parent-6.0.2" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"; + sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; + }; + }; + "global-dirs-3.0.0" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "globals-13.16.0" = { + name = "globals"; + packageName = "globals"; + version = "13.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz"; + sha512 = "A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q=="; + }; + }; + "globule-1.3.4" = { + name = "globule"; + packageName = "globule"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz"; + sha512 = "OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg=="; + }; + }; + "got-9.6.0" = { + name = "got"; + packageName = "got"; + version = "9.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + }; + }; + "graceful-fs-4.2.10" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; + }; + }; + "gyronorm-2.0.6" = { + name = "gyronorm"; + packageName = "gyronorm"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/gyronorm/-/gyronorm-2.0.6.tgz"; + sha512 = "pE66zEK/3G9t1dpikTKIjNuY1JauXgtNiulgPKc28IKwMJ5NuJ03mOQ5ArqnkOyQxhlJSY71i3YdFcHhzx4TOg=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; + }; + }; + "har-validator-5.1.5" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; + }; + }; + "hard-rejection-2.1.0" = { + name = "hard-rejection"; + packageName = "hard-rejection"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="; + }; + }; + "has-bigints-1.0.2" = { + name = "has-bigints"; + packageName = "has-bigints"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; + sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "has-property-descriptors-1.0.0" = { + name = "has-property-descriptors"; + packageName = "has-property-descriptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + }; + }; + "has-symbols-1.0.3" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; + }; + }; + "has-tostringtag-1.0.0" = { + name = "has-tostringtag"; + packageName = "has-tostringtag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; + }; + }; + "has-yarn-2.1.0" = { + name = "has-yarn"; + packageName = "has-yarn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; + }; + }; + "hash-base-3.1.0" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; + }; + }; + "hash.js-1.1.7" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; + }; + }; + "hmac-drbg-1.0.1" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha512 = "Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="; + }; + }; + "hosted-git-info-2.8.9" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; + }; + }; + "hosted-git-info-4.1.0" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; + }; + }; + "htmlescape-1.1.1" = { + name = "htmlescape"; + packageName = "htmlescape"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; + sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg=="; + }; + }; + "htmlparser2-4.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; + }; + }; + "http-auth-4.1.9" = { + name = "http-auth"; + packageName = "http-auth"; + version = "4.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/http-auth/-/http-auth-4.1.9.tgz"; + sha512 = "kvPYxNGc9EKGTXvOMnTBQw2RZfuiSihK/mLw/a4pbtRueTE45S55Lw/3k5CktIf7Ak0veMKEIteDj4YkNmCzmQ=="; + }; + }; + "http-cache-semantics-4.1.0" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + }; + }; + "http-errors-2.0.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; + }; + }; + "http-proxy-agent-4.0.1" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; + }; + }; + "https-browserify-1.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha512 = "J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="; + }; + }; + "https-proxy-agent-5.0.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; + }; + }; + "humanize-ms-1.2.1" = { + name = "humanize-ms"; + packageName = "humanize-ms"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + }; + }; + "hyperscript-attribute-to-property-1.0.2" = { + name = "hyperscript-attribute-to-property"; + packageName = "hyperscript-attribute-to-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperscript-attribute-to-property/-/hyperscript-attribute-to-property-1.0.2.tgz"; + sha512 = "oerMul16jZCmrbNsUw8QgrtDzF8lKgFri1bKQjReLw1IhiiNkI59CWuzZjJDGT79UQ1YiWqXhJMv/tRMVqgtkA=="; + }; + }; + "hyperx-2.5.4" = { + name = "hyperx"; + packageName = "hyperx"; + version = "2.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperx/-/hyperx-2.5.4.tgz"; + sha512 = "iOkSh7Yse7lsN/B9y7OsevLWjeXPqGuHQ5SbwaiJM5xAhWFqhoN6erpK1dQsS12OFU36lyai1pnx1mmzWLQqcA=="; + }; + }; + "iconv-lite-0.6.3" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; + "ignore-5.2.0" = { + name = "ignore"; + packageName = "ignore"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; + }; + }; + "ignore-by-default-1.0.1" = { + name = "ignore-by-default"; + packageName = "ignore-by-default"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; + sha512 = "Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA=="; + }; + }; + "import-fresh-3.3.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha512 = "m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; + }; + }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; + }; + }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha512 = "8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.8" = { + name = "ini"; + packageName = "ini"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + }; + "ini-2.0.0" = { + name = "ini"; + packageName = "ini"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; + }; + }; + "inline-source-map-0.6.2" = { + name = "inline-source-map"; + packageName = "inline-source-map"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha512 = "0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA=="; + }; + }; + "insert-module-globals-7.2.1" = { + name = "insert-module-globals"; + packageName = "insert-module-globals"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz"; + sha512 = "ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg=="; + }; + }; + "internal-slot-1.0.3" = { + name = "internal-slot"; + packageName = "internal-slot"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; + "ip-1.1.8" = { + name = "ip"; + packageName = "ip"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz"; + sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + }; + }; + "is-arguments-1.1.1" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; + sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; + }; + }; + "is-bigint-1.0.4" = { + name = "is-bigint"; + packageName = "is-bigint"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; + }; + }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; + "is-boolean-attribute-0.0.1" = { + name = "is-boolean-attribute"; + packageName = "is-boolean-attribute"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-boolean-attribute/-/is-boolean-attribute-0.0.1.tgz"; + sha512 = "0kXT52Scokg2Miscvsn5UVqg6y1691vcLJcagie1YHJB4zOEuAhMERLX992jtvaStGy2xQTqOtJhvmG/MK1T5w=="; + }; + }; + "is-boolean-object-1.1.2" = { + name = "is-boolean-object"; + packageName = "is-boolean-object"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-buffer-2.0.5" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"; + sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; + }; + }; + "is-callable-1.2.4" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; + }; + }; + "is-ci-2.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + }; + }; + "is-core-module-2.9.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; + }; + }; + "is-date-object-1.0.5" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; + }; + }; + "is-docker-2.2.1" = { + name = "is-docker"; + packageName = "is-docker"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-generator-function-1.0.10" = { + name = "is-generator-function"; + packageName = "is-generator-function"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"; + sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; + }; + }; + "is-glob-4.0.3" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; + }; + }; + "is-installed-globally-0.4.0" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; + }; + }; + "is-lambda-1.0.1" = { + name = "is-lambda"; + packageName = "is-lambda"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; + }; + }; + "is-negative-zero-2.0.2" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; + sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; + }; + }; + "is-npm-5.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz"; + sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-number-object-1.0.7" = { + name = "is-number-object"; + packageName = "is-number-object"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; + sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; + }; + }; + "is-obj-2.0.0" = { + name = "is-obj"; + packageName = "is-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; + }; + }; + "is-path-inside-3.0.3" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; + }; + }; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; + }; + }; + "is-regex-1.1.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; + }; + }; + "is-regexp-1.0.0" = { + name = "is-regexp"; + packageName = "is-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; + sha512 = "7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="; + }; + }; + "is-shared-array-buffer-1.0.2" = { + name = "is-shared-array-buffer"; + packageName = "is-shared-array-buffer"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; + sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; + }; + }; + "is-stream-2.0.1" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; + }; + }; + "is-string-1.0.7" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; + }; + }; + "is-symbol-1.0.4" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; + }; + }; + "is-typed-array-1.1.9" = { + name = "is-typed-array"; + packageName = "is-typed-array"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz"; + sha512 = "kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A=="; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; + }; + }; + "is-weakref-1.0.2" = { + name = "is-weakref"; + packageName = "is-weakref"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; + sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; + }; + }; + "is-wsl-2.2.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; + }; + }; + "is-yarn-global-0.3.0" = { + name = "is-yarn-global"; + packageName = "is-yarn-global"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; + }; + }; + "js-base64-2.6.4" = { + name = "js-base64"; + packageName = "js-base64"; + version = "2.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz"; + sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-4.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; + }; + }; + "jsesc-0.5.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; + sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; + }; + }; + "jsesc-2.5.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; + }; + }; + "json-buffer-3.0.0" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; + sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="; + }; + }; + "json-parse-even-better-errors-2.3.1" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; + }; + }; + "json-schema-0.4.0" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; + sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; + }; + }; + "json5-2.2.1" = { + name = "json5"; + packageName = "json5"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + }; + }; + "jsondiffpatch-0.4.1" = { + name = "jsondiffpatch"; + packageName = "jsondiffpatch"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz"; + sha512 = "t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw=="; + }; + }; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha512 = "POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="; + }; + }; + "jsprim-1.4.2" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; + sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; + }; + }; + "keyboardevent-from-electron-accelerator-2.0.0" = { + name = "keyboardevent-from-electron-accelerator"; + packageName = "keyboardevent-from-electron-accelerator"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz"; + sha512 = "iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA=="; + }; + }; + "keyboardevents-areequal-0.2.2" = { + name = "keyboardevents-areequal"; + packageName = "keyboardevents-areequal"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz"; + sha512 = "Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw=="; + }; + }; + "keyboardjs-2.6.4" = { + name = "keyboardjs"; + packageName = "keyboardjs"; + version = "2.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/keyboardjs/-/keyboardjs-2.6.4.tgz"; + sha512 = "xDiNwiwH3KUqap++RFJiLAXzbvRB5Yw08xliuceOgLhM1o7g1puKKR9vWy6wp9H/Bi4VP0+SQMpiWXMWWmR6rA=="; + }; + }; + "keyv-3.1.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + }; + }; + "kind-of-6.0.3" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; + }; + }; + "labeled-stream-splicer-2.0.2" = { + name = "labeled-stream-splicer"; + packageName = "labeled-stream-splicer"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz"; + sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; + }; + }; + "latest-version-5.1.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; + }; + }; + "levn-0.4.1" = { + name = "levn"; + packageName = "levn"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; + }; + }; + "licensify-3.1.3" = { + name = "licensify"; + packageName = "licensify"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/licensify/-/licensify-3.1.3.tgz"; + sha512 = "3sEEBR0Cxq8yeSrV1KGZwpjm4KJKp8Cx/WHZxBnG/YX319ZTvxGtL+NCF+A9pcXwh8KwKB4BmVrc6eRrfk/Raw=="; + }; + }; + "lines-and-columns-1.2.4" = { + name = "lines-and-columns"; + packageName = "lines-and-columns"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; + }; + }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; + }; + }; + "lodash.memoize-3.0.4" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha512 = "eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A=="; + }; + }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; + "long-4.0.0" = { + name = "long"; + packageName = "long"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; + sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; + }; + }; + "loop-protect-git+https://github.com/jean-emmanuel/loop-protect#v1.0.1" = { + name = "loop-protect"; + packageName = "loop-protect"; + version = "1.0.1"; + src = fetchgit { + url = "https://github.com/jean-emmanuel/loop-protect"; + rev = "557a6d124e2bcd0463f26c0a61d035f4840a6dec"; + sha256 = "ffb6bd78172fc7e52cf94e10467c467210bec9ee27c7ba8536b51044e5ae4b5f"; + }; + }; + "lower-case-1.1.4" = { + name = "lower-case"; + packageName = "lower-case"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"; + sha512 = "2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA=="; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + }; + "lowercase-keys-2.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; + }; + }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "magic-string-0.23.2" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.23.2"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.23.2.tgz"; + sha512 = "oIUZaAxbcxYIp4AyLafV6OVKoB3YouZs0UTCJ8mOKBHNyJgGDaMJ4TgA+VylJh6fx7EQCC52XkbURxxG9IoJXA=="; + }; + }; + "make-dir-3.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; + }; + }; + "make-fetch-happen-9.1.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; + sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; + }; + }; + "map-obj-4.3.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"; + sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; + }; + }; + "md5.js-1.3.5" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; + "meow-9.0.0" = { + name = "meow"; + packageName = "meow"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz"; + sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; + }; + }; + "merge-source-map-1.0.4" = { + name = "merge-source-map"; + packageName = "merge-source-map"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz"; + sha512 = "PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA=="; + }; + }; + "miller-rabin-4.0.1" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-db-1.52.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.52.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; + }; + }; + "mime-types-2.1.35" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.35"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; + }; + }; + "mimic-response-1.0.1" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + }; + "min-indent-1.0.1" = { + name = "min-indent"; + packageName = "min-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"; + sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; + }; + }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha512 = "JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="; + }; + }; + "minimatch-3.0.8" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz"; + sha512 = "6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="; + }; + }; + "minimatch-3.1.2" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; + }; + }; + "minimatch-5.1.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; + sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + }; + }; + "minimist-1.2.6" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + }; + }; + "minimist-options-4.1.0" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"; + sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; + }; + }; + "minipass-3.3.4" = { + name = "minipass"; + packageName = "minipass"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; + sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; + }; + }; + "minipass-collect-1.0.2" = { + name = "minipass-collect"; + packageName = "minipass-collect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + }; + "minipass-fetch-1.4.1" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; + sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; + }; + }; + "minipass-flush-1.0.5" = { + name = "minipass-flush"; + packageName = "minipass-flush"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + }; + "minipass-pipeline-1.2.4" = { + name = "minipass-pipeline"; + packageName = "minipass-pipeline"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + }; + "minipass-sized-1.0.3" = { + name = "minipass-sized"; + packageName = "minipass-sized"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; + "mkdirp-0.5.6" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; + }; + }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + }; + "module-deps-6.2.3" = { + name = "module-deps"; + packageName = "module-deps"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz"; + sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; + }; + }; + "mold-source-map-0.4.0" = { + name = "mold-source-map"; + packageName = "mold-source-map"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz"; + sha512 = "Y0uA/sDKVuPgLd7BmaJOai+fqzjrOlR6vZgx5cJIvturI/xOPQPgbf3X7ZbzJd6MvqQ6ucIfK8dSteFyc2Mw2w=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; + "multicast-dns-git+https://github.com/jean-emmanuel/multicast-dns" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "7.2.1"; + src = fetchgit { + url = "https://github.com/jean-emmanuel/multicast-dns"; + rev = "1bb9f6ba892eba88f2cb12ca96a1c1b3088413c0"; + sha256 = "7c185bd09a5b28765c4dffabc82768249554ed98a8836c52264b4ba2195fcd44"; + }; + }; + "multicast-dns-service-types-1.1.0" = { + name = "multicast-dns-service-types"; + packageName = "multicast-dns-service-types"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha512 = "cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ=="; + }; + }; + "mutexify-1.4.0" = { + name = "mutexify"; + packageName = "mutexify"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.4.0.tgz"; + sha512 = "pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg=="; + }; + }; + "nan-2.16.0" = { + name = "nan"; + packageName = "nan"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz"; + sha512 = "UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA=="; + }; + }; + "nanoassert-1.1.0" = { + name = "nanoassert"; + packageName = "nanoassert"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz"; + sha512 = "C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ=="; + }; + }; + "nanobench-2.1.1" = { + name = "nanobench"; + packageName = "nanobench"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanobench/-/nanobench-2.1.1.tgz"; + sha512 = "z+Vv7zElcjN+OpzAxAquUayFLGK3JI/ubCl0Oh64YQqsTGG09CGqieJVQw4ui8huDnnAgrvTv93qi5UaOoNj8A=="; + }; + }; + "nanohtml-1.10.0" = { + name = "nanohtml"; + packageName = "nanohtml"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanohtml/-/nanohtml-1.10.0.tgz"; + sha512 = "r/3AQl+jxAxUIJRiKExUjBtFcE1cm4yTOsTIdVqqlxPNtBxJh522ANrcQYzdNHhPzbPgb7j6qujq6eGehBX0kg=="; + }; + }; + "nanoid-3.3.4" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; + sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; + }; + }; + "nanomorph-5.4.3" = { + name = "nanomorph"; + packageName = "nanomorph"; + version = "5.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomorph/-/nanomorph-5.4.3.tgz"; + sha512 = "uPP5y0x21KISffZCKHh1A0QW0RHZFQS0BR7LetlHBlay6UWAbjwhjiJTxOO6JeMHko5Cigl617zFoGrYFJ8ZLg=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; + }; + }; + "negotiator-0.6.3" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; + }; + }; + "no-case-2.3.2" = { + name = "no-case"; + packageName = "no-case"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"; + sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; + }; + }; + "node-forge-1.3.1" = { + name = "node-forge"; + packageName = "node-forge"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"; + sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; + }; + }; + "node-gyp-8.4.1" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "8.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; + sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; + }; + }; + "node-mouse-0.0.2" = { + name = "node-mouse"; + packageName = "node-mouse"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-mouse/-/node-mouse-0.0.2.tgz"; + sha512 = "qqm+c/uKB1ceGMrKW+mxAxPKFTu0HD1DWoCElJHA0VQDloudzZD4bI++Z18mSDA3n5lix+RTXiOiu3XAOSYVHA=="; + }; + }; + "node-releases-2.0.5" = { + name = "node-releases"; + packageName = "node-releases"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz"; + sha512 = "U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="; + }; + }; + "node-sass-7.0.1" = { + name = "node-sass"; + packageName = "node-sass"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz"; + sha512 = "uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ=="; + }; + }; + "nodemon-2.0.16" = { + name = "nodemon"; + packageName = "nodemon"; + version = "2.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.16.tgz"; + sha512 = "zsrcaOfTWRuUzBn3P44RDliLlp263Z/76FPoHFr3cFFkOz0lTPAcIw8dCzfdVIx/t3AtDYCZRCDkoCojJqaG3w=="; + }; + }; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha512 = "NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg=="; + }; + }; + "nopt-5.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; + }; + }; + "normalize-html-whitespace-0.2.0" = { + name = "normalize-html-whitespace"; + packageName = "normalize-html-whitespace"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-0.2.0.tgz"; + sha512 = "5CZAEQ4bQi8Msqw0GAT6rrkrjNN4ZKqAG3+jJMwms4O6XoMvh6ekwOueG4mRS1LbPUR1r9EdnhxxfpzMTOdzKw=="; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "normalize-package-data-3.0.3" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; + sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; + }; + }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "normalize-url-4.5.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; + }; + }; + "nosleep.js-0.12.0" = { + name = "nosleep.js"; + packageName = "nosleep.js"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz"; + sha512 = "9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA=="; + }; + }; + "npmlog-5.0.1" = { + name = "npmlog"; + packageName = "npmlog"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz"; + sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; + }; + }; + "npmlog-6.0.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; + }; + }; + "object-inspect-1.12.2" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; + sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; + }; + }; + "object-is-1.1.5" = { + name = "object-is"; + packageName = "object-is"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + }; + }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; + "object.assign-4.1.2" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + }; + }; + "offset-sourcemap-lines-1.0.1" = { + name = "offset-sourcemap-lines"; + packageName = "offset-sourcemap-lines"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/offset-sourcemap-lines/-/offset-sourcemap-lines-1.0.1.tgz"; + sha512 = "8giJa0GProV9hPLOp9qAobkvi6OiZnzeM6fdubVjhqcrISX8FYMk1jMVzG6R9d7HQWLysG22jyXEIF6sWu4fJw=="; + }; + }; + "on-finished-2.4.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; + }; + }; + "open-8.4.0" = { + name = "open"; + packageName = "open"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; + sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; + }; + }; + "optionator-0.9.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; + }; + }; + "os-browserify-0.3.0" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha512 = "gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="; + }; + }; + "osc-git+https://github.com/jean-emmanuel/osc.js" = { + name = "osc"; + packageName = "osc"; + version = "2.4.2"; + src = fetchgit { + url = "https://github.com/jean-emmanuel/osc.js"; + rev = "9197739162f26086e6a72670103c3fa036e9dcd5"; + sha256 = "ce01cbf6a7c5e47594a7587fa8a3aabcc4a7c53d6f26fcabe20edf5a060e7728"; + }; + }; + "osi-licenses-0.1.1" = { + name = "osi-licenses"; + packageName = "osi-licenses"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/osi-licenses/-/osi-licenses-0.1.1.tgz"; + sha512 = "ZGAGO6dIxTS/mXxEJCpIdYetAoxIOOr7uYpMOoDWo4+b/6rf+2GagOjTbegL+eoMI8aYAiyNgKWUT7vWJRPl9A=="; + }; + }; + "oss-license-name-to-url-1.2.1" = { + name = "oss-license-name-to-url"; + packageName = "oss-license-name-to-url"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/oss-license-name-to-url/-/oss-license-name-to-url-1.2.1.tgz"; + sha512 = "apFbKq0EAYi70q0pOpS0tDfSviZYdG3KM6U1GpofZPsRMwgDga0DQiPQ/GHyQx7PDDrLCGvFBNPLMLV/K4Jr4Q=="; + }; + }; + "p-cancelable-1.1.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + }; + }; + "p-limit-2.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; + "p-map-4.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "package-json-6.5.0" = { + name = "package-json"; + packageName = "package-json"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; + }; + }; + "pako-1.0.11" = { + name = "pako"; + packageName = "pako"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; + }; + }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parents-1.0.1" = { + name = "parents"; + packageName = "parents"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; + sha512 = "mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg=="; + }; + }; + "parse-asn1-5.1.6" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; + }; + }; + "parse-json-5.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; + }; + }; + "parse-srcset-1.0.2" = { + name = "parse-srcset"; + packageName = "parse-srcset"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; + sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; + }; + }; + "path-browserify-1.0.1" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz"; + sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; + }; + }; + "path-key-3.1.1" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + }; + "path-parse-1.0.7" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; + }; + }; + "path-platform-0.11.15" = { + name = "path-platform"; + packageName = "path-platform"; + version = "0.11.15"; + src = fetchurl { + url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; + sha512 = "Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg=="; + }; + }; + "pbkdf2-3.1.2" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz"; + sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; + }; + }; + "picocolors-0.2.1" = { + name = "picocolors"; + packageName = "picocolors"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"; + sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; + }; + }; + "picocolors-1.0.0" = { + name = "picocolors"; + packageName = "picocolors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + }; + }; + "picomatch-2.3.1" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; + }; + }; + "postcss-7.0.39" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.39"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"; + sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; + }; + }; + "prelude-ls-1.2.1" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; + }; + }; + "prepend-http-2.0.0" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; + sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="; + }; + }; + "pretty-hrtime-1.0.3" = { + name = "pretty-hrtime"; + packageName = "pretty-hrtime"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha512 = "66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A=="; + }; + }; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; + }; + }; + "promise-retry-2.0.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + }; + "psl-1.9.0" = { + name = "psl"; + packageName = "psl"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; + }; + }; + "pstree.remy-1.1.8" = { + name = "pstree.remy"; + packageName = "pstree.remy"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz"; + sha512 = "77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w=="; + }; + }; + "public-encrypt-4.0.3" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "pupa-2.1.1" = { + name = "pupa"; + packageName = "pupa"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; + }; + }; + "python-shell-3.0.1" = { + name = "python-shell"; + packageName = "python-shell"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/python-shell/-/python-shell-3.0.1.tgz"; + sha512 = "TWeotuxe1auhXa5bGRScxnc2J+0r41NBntSa6RYZtMBLtAEsvCboKrEbW6DvASosWQepVkhZZlT3B5Ei766G+Q=="; + }; + }; + "qs-6.5.3" = { + name = "qs"; + packageName = "qs"; + version = "6.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"; + sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; + }; + }; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha512 = "773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="; + }; + }; + "queue-tick-1.0.0" = { + name = "queue-tick"; + packageName = "queue-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.0.tgz"; + sha512 = "ULWhjjE8BmiICGn3G8+1L9wFpERNxkf8ysxkAer4+TFdRefDaXOCV5m92aMB9FtBVmn/8sETXLXY6BfW7hyaWQ=="; + }; + }; + "quick-lru-4.0.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; + sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + }; + }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + }; + "randomfill-1.0.4" = { + name = "randomfill"; + packageName = "randomfill"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "read-only-stream-2.0.0" = { + name = "read-only-stream"; + packageName = "read-only-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha512 = "3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w=="; + }; + }; + "read-pkg-5.2.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; + }; + }; + "read-pkg-up-7.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "readdirp-3.6.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; + }; + }; + "redent-3.0.0" = { + name = "redent"; + packageName = "redent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"; + sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; + }; + }; + "regenerate-1.4.2" = { + name = "regenerate"; + packageName = "regenerate"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; + }; + }; + "regenerate-unicode-properties-10.0.1" = { + name = "regenerate-unicode-properties"; + packageName = "regenerate-unicode-properties"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"; + sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; + }; + }; + "regenerator-runtime-0.13.9" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.9"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; + }; + }; + "regenerator-transform-0.15.0" = { + name = "regenerator-transform"; + packageName = "regenerator-transform"; + version = "0.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; + sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; + }; + }; + "regexp.prototype.flags-1.4.3" = { + name = "regexp.prototype.flags"; + packageName = "regexp.prototype.flags"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; + sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; + }; + }; + "regexpp-3.2.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; + sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; + }; + }; + "regexpu-core-5.1.0" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz"; + sha512 = "bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA=="; + }; + }; + "registry-auth-token-4.2.2" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz"; + sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; + }; + }; + "registry-url-5.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; + }; + }; + "regjsgen-0.6.0" = { + name = "regjsgen"; + packageName = "regjsgen"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz"; + sha512 = "ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="; + }; + }; + "regjsparser-0.8.4" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz"; + sha512 = "J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA=="; + }; + }; + "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"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; + }; + }; + "resolve-1.22.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.22.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; + }; + }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "responselike-1.0.2" = { + name = "responselike"; + packageName = "responselike"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; + sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "ripemd160-2.0.2" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sanitize-html-1.27.5" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "1.27.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz"; + sha512 = "M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A=="; + }; + }; + "sass-graph-4.0.0" = { + name = "sass-graph"; + packageName = "sass-graph"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz"; + sha512 = "WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ=="; + }; + }; + "scope-css-1.2.1" = { + name = "scope-css"; + packageName = "scope-css"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/scope-css/-/scope-css-1.2.1.tgz"; + sha512 = "UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q=="; + }; + }; + "screenfull-5.2.0" = { + name = "screenfull"; + packageName = "screenfull"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz"; + sha512 = "9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA=="; + }; + }; + "scss-tokenizer-0.3.0" = { + name = "scss-tokenizer"; + packageName = "scss-tokenizer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz"; + sha512 = "14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-7.0.0" = { + name = "semver"; + packageName = "semver"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; + }; + }; + "semver-7.3.7" = { + name = "semver"; + packageName = "semver"; + version = "7.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + }; + }; + "semver-diff-3.1.1" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; + }; + }; + "send-0.18.0" = { + name = "send"; + packageName = "send"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; + sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; + }; + }; + "setprototypeof-1.2.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; + }; + }; + "sha.js-2.4.11" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; + }; + }; + "shasum-object-1.0.0" = { + name = "shasum-object"; + packageName = "shasum-object"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz"; + sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg=="; + }; + }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; + "shell-quote-1.7.3" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz"; + sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; + }; + }; + "side-channel-1.0.4" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + }; + "signal-exit-3.0.7" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; + }; + }; + "simple-concat-1.0.1" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + }; + "slip-1.0.2" = { + name = "slip"; + packageName = "slip"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/slip/-/slip-1.0.2.tgz"; + sha512 = "XrcHe3NAcyD3wO+O4I13RcS4/3AF+S9RvGNj9JhJeS02HyImwD2E3QWLrmn9hBfL+fB6yapagwxRkeyYzhk98g=="; + }; + }; + "slugify-1.6.5" = { + name = "slugify"; + packageName = "slugify"; + version = "1.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz"; + sha512 = "8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ=="; + }; + }; + "smart-buffer-4.2.0" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; + }; + }; + "socks-2.6.2" = { + name = "socks"; + packageName = "socks"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz"; + sha512 = "zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA=="; + }; + }; + "socks-proxy-agent-6.2.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz"; + sha512 = "a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ=="; + }; + }; + "sortablejs-1.15.0" = { + name = "sortablejs"; + packageName = "sortablejs"; + version = "1.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz"; + sha512 = "bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="; + }; + }; + "source-map-0.5.6" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; + sha512 = "MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-0.7.4" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz"; + sha512 = "l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="; + }; + }; + "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=="; + }; + }; + "sourcemap-codec-1.4.8" = { + name = "sourcemap-codec"; + packageName = "sourcemap-codec"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; + sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; + }; + }; + "spdx-correct-3.1.1" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + }; + }; + "spdx-exceptions-2.3.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + }; + "spdx-expression-parse-3.0.1" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; + }; + }; + "spdx-license-ids-3.0.11" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; + }; + }; + "sshpk-1.17.0" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; + sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; + }; + }; + "ssri-8.0.1" = { + name = "ssri"; + packageName = "ssri"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; + sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; + }; + }; + "stack-generator-2.0.10" = { + name = "stack-generator"; + packageName = "stack-generator"; + version = "2.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz"; + sha512 = "mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ=="; + }; + }; + "stackframe-1.3.4" = { + name = "stackframe"; + packageName = "stackframe"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"; + sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="; + }; + }; + "stacktrace-gps-3.1.2" = { + name = "stacktrace-gps"; + packageName = "stacktrace-gps"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz"; + sha512 = "GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ=="; + }; + }; + "stacktrace-js-2.0.2" = { + name = "stacktrace-js"; + packageName = "stacktrace-js"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz"; + sha512 = "Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg=="; + }; + }; + "statuses-2.0.1" = { + name = "statuses"; + packageName = "statuses"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; + }; + }; + "stdout-stream-1.4.1" = { + name = "stdout-stream"; + packageName = "stdout-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz"; + sha512 = "j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA=="; + }; + }; + "stream-browserify-3.0.0" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz"; + sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA=="; + }; + }; + "stream-combiner2-1.1.1" = { + name = "stream-combiner2"; + packageName = "stream-combiner2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha512 = "3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw=="; + }; + }; + "stream-http-3.2.0" = { + name = "stream-http"; + packageName = "stream-http"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz"; + sha512 = "Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A=="; + }; + }; + "stream-splicer-2.0.1" = { + name = "stream-splicer"; + packageName = "stream-splicer"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz"; + sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg=="; + }; + }; + "strictdom-1.0.1" = { + name = "strictdom"; + packageName = "strictdom"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strictdom/-/strictdom-1.0.1.tgz"; + sha512 = "cEmp9QeXXRmjj/rVp9oyiqcvyocWab/HaoN4+bwFeZ7QzykJD6L3yD4v12K1x0tHpqRqVpJevN3gW7kyM39Bqg=="; + }; + }; + "string-width-4.2.3" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; + }; + }; + "string.prototype.trimend-1.0.5" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; + sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; + }; + }; + "string.prototype.trimstart-1.0.5" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; + sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "string_decoder-1.3.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; + }; + }; + "strip-ansi-6.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + }; + "strip-css-comments-3.0.0" = { + name = "strip-css-comments"; + packageName = "strip-css-comments"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz"; + sha512 = "xJwk2yMZ6j+0Clj7ETUfqQ6frsaCIqNGg3zjTVswIt3SbiOsCQgRI1E93hdt/JgGfh5De/sTwxrnrBhhWzMwcg=="; + }; + }; + "strip-indent-3.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"; + sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; + }; + }; + "strip-json-comments-3.1.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; + }; + }; + "subarg-1.0.0" = { + name = "subarg"; + packageName = "subarg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; + sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg=="; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; + "syntax-error-1.4.0" = { + name = "syntax-error"; + packageName = "syntax-error"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; + sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; + }; + }; + "tar-6.1.11" = { + name = "tar"; + packageName = "tar"; + version = "6.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + }; + }; + "terser-3.17.0" = { + name = "terser"; + packageName = "terser"; + version = "3.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz"; + sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; + }; + }; + "through-2.2.7" = { + name = "through"; + packageName = "through"; + version = "2.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.2.7.tgz"; + sha512 = "JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg=="; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; + }; + }; + "through2-2.0.5" = { + name = "through2"; + packageName = "through2"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + }; + "thunky-1.1.0" = { + name = "thunky"; + packageName = "thunky"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; + sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; + }; + }; + "timers-browserify-1.4.2" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; + sha512 = "PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q=="; + }; + }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; + }; + }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; + "toidentifier-1.0.1" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; + }; + }; + "touch-3.1.0" = { + name = "touch"; + packageName = "touch"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; + sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; + }; + }; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + }; + "transform-ast-2.4.4" = { + name = "transform-ast"; + packageName = "transform-ast"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/transform-ast/-/transform-ast-2.4.4.tgz"; + sha512 = "AxjeZAcIOUO2lev2GDe3/xZ1Q0cVGjIMk5IsriTy8zbWlsEnjeB025AhkhBJHoy997mXpLd4R+kRbvnnQVuQHQ=="; + }; + }; + "trim-newlines-3.0.1" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; + }; + }; + "true-case-path-1.0.3" = { + name = "true-case-path"; + packageName = "true-case-path"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz"; + sha512 = "m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew=="; + }; + }; + "tty-browserify-0.0.1" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; + sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; + }; + }; + "type-check-0.4.0" = { + name = "type-check"; + packageName = "type-check"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; + }; + }; + "type-fest-0.18.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz"; + sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; + }; + }; + "type-fest-0.20.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + }; + "type-fest-0.6.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; + "type-name-2.0.2" = { + name = "type-name"; + packageName = "type-name"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-name/-/type-name-2.0.2.tgz"; + sha512 = "kkgkuqR/jKdKO5oh/I2SMu2dGbLXoJq0zkdgbxaqYK+hr9S9edwVVGf+tMUFTx2gH9TN2+Zu9JZ/Njonb3cjhA=="; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; + }; + }; + "typedarray-to-buffer-3.1.5" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + }; + }; + "uglifyify-5.0.2" = { + name = "uglifyify"; + packageName = "uglifyify"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglifyify/-/uglifyify-5.0.2.tgz"; + sha512 = "NcSk6pgoC+IgwZZ2tVLVHq+VNKSvLPlLkF5oUiHPVOJI0s/OlSVYEGXG9PCAH0hcyFZLyvt4KBdPAQBRlVDn1Q=="; + }; + }; + "umd-3.0.3" = { + name = "umd"; + packageName = "umd"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz"; + sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; + }; + }; + "unbox-primitive-1.0.2" = { + name = "unbox-primitive"; + packageName = "unbox-primitive"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; + sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; + }; + }; + "undeclared-identifiers-1.1.3" = { + name = "undeclared-identifiers"; + packageName = "undeclared-identifiers"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz"; + sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; + }; + }; + "undefsafe-2.0.5" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz"; + sha512 = "WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA=="; + }; + }; + "unicode-canonical-property-names-ecmascript-2.0.0" = { + name = "unicode-canonical-property-names-ecmascript"; + packageName = "unicode-canonical-property-names-ecmascript"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; + sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; + }; + }; + "unicode-match-property-ecmascript-2.0.0" = { + name = "unicode-match-property-ecmascript"; + packageName = "unicode-match-property-ecmascript"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; + sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; + }; + }; + "unicode-match-property-value-ecmascript-2.0.0" = { + name = "unicode-match-property-value-ecmascript"; + packageName = "unicode-match-property-value-ecmascript"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; + sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; + }; + }; + "unicode-property-aliases-ecmascript-2.0.0" = { + name = "unicode-property-aliases-ecmascript"; + packageName = "unicode-property-aliases-ecmascript"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; + sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; + }; + }; + "unique-filename-1.1.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + }; + }; + "unique-slug-2.0.2" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + }; + "unique-string-2.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; + }; + }; + "unix-crypt-td-js-1.1.4" = { + name = "unix-crypt-td-js"; + packageName = "unix-crypt-td-js"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.1.4.tgz"; + sha512 = "8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw=="; + }; + }; + "update-browserslist-db-1.0.4" = { + name = "update-browserslist-db"; + packageName = "update-browserslist-db"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz"; + sha512 = "jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA=="; + }; + }; + "update-notifier-5.1.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz"; + sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; + }; + }; + "upper-case-1.1.3" = { + name = "upper-case"; + packageName = "upper-case"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz"; + sha512 = "WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA=="; + }; + }; + "uri-js-4.4.1" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha512 = "kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ=="; + }; + }; + "url-parse-lax-3.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; + }; + }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha512 = "5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ=="; + }; + }; + "util-0.12.4" = { + name = "util"; + packageName = "util"; + version = "0.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.12.4.tgz"; + sha512 = "bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; + }; + }; + "uuid-3.4.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + }; + }; + "uuid-8.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "8.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; + }; + }; + "v8-compile-cache-2.3.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; + }; + }; + "vm-browserify-1.1.2" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; + }; + }; + "webworkify-1.5.0" = { + name = "webworkify"; + packageName = "webworkify"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz"; + sha512 = "AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g=="; + }; + }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; + "which-boxed-primitive-1.0.2" = { + name = "which-boxed-primitive"; + packageName = "which-boxed-primitive"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; + }; + }; + "which-typed-array-1.1.8" = { + name = "which-typed-array"; + packageName = "which-typed-array"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz"; + sha512 = "Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw=="; + }; + }; + "wide-align-1.1.5" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; + }; + }; + "widest-line-3.1.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; + }; + }; + "wolfy87-eventemitter-5.2.9" = { + name = "wolfy87-eventemitter"; + packageName = "wolfy87-eventemitter"; + version = "5.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz"; + sha512 = "P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw=="; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; + }; + }; + "write-file-atomic-3.0.3" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; + }; + }; + "ws-7.5.3" = { + name = "ws"; + packageName = "ws"; + version = "7.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz"; + sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; + }; + }; + "ws-8.6.0" = { + name = "ws"; + packageName = "ws"; + version = "8.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz"; + sha512 = "AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw=="; + }; + }; + "xdg-basedir-4.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; + }; + }; + "xtend-4.0.2" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + }; + "y18n-5.0.8" = { + name = "y18n"; + packageName = "y18n"; + version = "5.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; + "yargs-17.5.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"; + sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; + }; + }; + "yargs-parser-20.2.9" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; + }; + }; + "yargs-parser-21.0.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "21.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; + }; + }; + }; + args = { + name = "open-stage-control"; + packageName = "open-stage-control"; + version = "1.17.0"; + src = ./.; + dependencies = [ + sources."@ampproject/remapping-2.2.0" + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.6" + (sources."@babel/core-7.18.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."@babel/eslint-parser-7.17.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."@babel/generator-7.18.7" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + ]; + }) + 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.18.6" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.18.6" + sources."@babel/helper-create-regexp-features-plugin-7.18.6" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-environment-visitor-7.18.6" + sources."@babel/helper-explode-assignable-expression-7.18.6" + sources."@babel/helper-function-name-7.18.6" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-member-expression-to-functions-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.18.6" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.6" + sources."@babel/helper-remap-async-to-generator-7.18.6" + sources."@babel/helper-replace-supers-7.18.6" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-wrap-function-7.18.6" + sources."@babel/helpers-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.6" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.6" + sources."@babel/plugin-proposal-async-generator-functions-7.18.6" + 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" + sources."@babel/plugin-proposal-export-namespace-from-7.18.6" + sources."@babel/plugin-proposal-json-strings-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.6" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.0" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.6" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.12.13" + 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-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" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.18.6" + sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-block-scoped-functions-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.6" + sources."@babel/plugin-transform-classes-7.18.6" + sources."@babel/plugin-transform-computed-properties-7.18.6" + sources."@babel/plugin-transform-destructuring-7.18.6" + sources."@babel/plugin-transform-dotall-regex-7.18.6" + sources."@babel/plugin-transform-duplicate-keys-7.18.6" + sources."@babel/plugin-transform-exponentiation-operator-7.18.6" + sources."@babel/plugin-transform-for-of-7.18.6" + sources."@babel/plugin-transform-function-name-7.18.6" + sources."@babel/plugin-transform-literals-7.18.6" + 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.18.6" + sources."@babel/plugin-transform-modules-umd-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.18.6" + 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.6" + 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" + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/plugin-transform-spread-7.18.6" + sources."@babel/plugin-transform-sticky-regex-7.18.6" + sources."@babel/plugin-transform-template-literals-7.18.6" + sources."@babel/plugin-transform-typeof-symbol-7.18.6" + sources."@babel/plugin-transform-unicode-escapes-7.18.6" + sources."@babel/plugin-transform-unicode-regex-7.18.6" + (sources."@babel/polyfill-7.12.1" // { + dependencies = [ + sources."core-js-2.6.12" + ]; + }) + (sources."@babel/preset-env-7.18.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/preset-modules-0.1.5" + sources."@babel/runtime-7.18.6" + sources."@babel/template-7.18.6" + sources."@babel/traverse-7.18.6" + sources."@babel/types-7.18.7" + sources."@electron/remote-2.0.8" + (sources."@eslint/eslintrc-1.3.0" // { + dependencies = [ + sources."globals-13.16.0" + sources."minimatch-3.1.2" + ]; + }) + sources."@gar/promisify-1.1.3" + (sources."@humanwhocodes/config-array-0.9.5" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.1" + sources."@jridgewell/gen-mapping-0.1.1" + sources."@jridgewell/resolve-uri-3.0.8" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" + sources."@npmcli/fs-1.1.1" + (sources."@npmcli/move-file-1.1.2" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."rimraf-3.0.2" + ]; + }) + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@tootallnate/once-1.1.2" + sources."@types/minimist-1.2.2" + sources."@types/normalize-package-data-2.4.1" + sources."JSONStream-1.3.5" + sources."abbrev-1.1.1" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.2" + sources."acorn-node-1.8.2" + sources."acorn-walk-7.2.0" + sources."agent-base-6.0.2" + sources."agentkeepalive-4.2.1" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.6" + sources."ansi-align-3.0.1" + sources."ansi-html-0.0.9" + sources."ansi-regex-5.0.1" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.2" + sources."apache-crypt-1.2.5" + sources."apache-md5-1.1.7" + sources."aproba-2.0.0" + (sources."are-we-there-yet-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."argparse-2.0.1" + sources."array-flatten-2.1.2" + sources."arrify-1.0.1" + sources."asn1-0.2.6" + (sources."asn1.js-5.4.1" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assert-plus-1.0.0" + sources."async-foreach-0.1.3" + sources."asynckit-0.4.0" + sources."available-typed-arrays-1.0.5" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."babel-plugin-dynamic-import-node-2.3.3" + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.5.2" + sources."babel-plugin-polyfill-regenerator-0.3.1" + sources."babelify-10.0.0" + sources."balanced-match-2.0.0" + sources."base64-js-1.5.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bcryptjs-2.4.3" + sources."binary-extensions-2.2.0" + sources."bn.js-5.2.1" + sources."bonjour-git+https://github.com/jean-emmanuel/bonjour" + (sources."boxen-5.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."camelcase-6.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."brace-0.11.1" + (sources."brace-expansion-1.1.11" // { + dependencies = [ + sources."balanced-match-1.0.2" + ]; + }) + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browser-pack-6.1.0" + sources."browser-process-hrtime-0.1.3" + sources."browser-resolve-2.0.0" + sources."browserify-17.0.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + sources."browserify-rsa-4.1.0" + (sources."browserify-sign-4.2.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) + sources."browserify-zlib-0.2.0" + sources."browserslist-4.21.1" + sources."buffer-5.2.1" + sources."buffer-from-1.1.2" + sources."buffer-indexof-1.1.1" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + (sources."cacache-15.3.0" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."rimraf-3.0.2" + ]; + }) + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."cached-path-relative-1.1.0" + sources."call-bind-1.0.2" + sources."callsites-3.1.0" + sources."camel-case-3.0.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."caniuse-lite-1.0.30001363" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chokidar-3.5.3" + sources."chownr-2.0.0" + sources."chroma-js-2.4.2" + sources."ci-info-2.0.0" + sources."cipher-base-1.0.4" + sources."clean-stack-2.2.0" + sources."cli-boxes-2.2.1" + sources."cliui-7.0.4" + sources."clone-response-1.0.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-support-1.1.3" + (sources."combine-source-map-0.8.0" // { + dependencies = [ + sources."convert-source-map-1.1.3" + ]; + }) + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-5.0.1" + sources."console-browserify-1.2.0" + sources."console-control-strings-1.1.0" + sources."constants-browserify-1.0.0" + sources."convert-source-map-1.8.0" + sources."core-js-3.22.5" + (sources."core-js-compat-3.23.3" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) + sources."core-util-is-1.0.3" + sources."cpr-3.0.1" + (sources."create-ecdh-4.0.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-spawn-7.0.3" + sources."crypto-browserify-3.12.0" + sources."crypto-random-string-2.0.0" + sources."dash-ast-1.0.0" + sources."dashdash-1.14.1" + sources."debug-4.3.4" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decompress-response-3.3.0" + sources."deep-equal-1.1.1" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.4" + sources."defer-to-connect-1.1.3" + sources."define-lazy-prop-2.0.0" + sources."define-properties-1.1.4" + sources."defined-1.0.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."deps-sort-2.0.1" + sources."des.js-1.0.1" + sources."destroy-1.2.0" + sources."detective-5.2.1" + sources."diff-match-patch-1.0.5" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.4" + sources."dns-txt-git+https://github.com/jean-emmanuel/dns-txt#v2.0.3" + sources."doctrine-3.0.0" + (sources."dom-serializer-1.4.1" // { + dependencies = [ + sources."domhandler-4.3.1" + ]; + }) + sources."domain-browser-1.2.0" + sources."domelementtype-2.3.0" + sources."domhandler-3.3.0" + (sources."domutils-2.8.0" // { + dependencies = [ + sources."domhandler-4.3.1" + ]; + }) + sources."dot-prop-5.3.0" + sources."duplexer2-0.1.4" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."electron-is-accelerator-0.1.2" + sources."electron-localshortcut-3.2.1" + sources."electron-to-chromium-1.4.179" + (sources."elliptic-6.5.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" + sources."encoding-0.1.13" + sources."end-of-stream-1.4.4" + sources."entities-2.2.0" + sources."env-paths-2.2.1" + sources."err-code-2.0.3" + sources."error-ex-1.3.2" + sources."error-stack-parser-2.1.4" + sources."es-abstract-1.20.1" + sources."es-to-primitive-1.2.1" + sources."escalade-3.1.1" + sources."escape-goat-2.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."escaper-2.5.3" + (sources."eslint-8.16.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."escape-string-regexp-4.0.0" + sources."eslint-scope-7.1.1" + sources."eslint-visitor-keys-3.3.0" + sources."estraverse-5.3.0" + sources."glob-parent-6.0.2" + sources."globals-13.16.0" + sources."has-flag-4.0.0" + sources."minimatch-3.1.2" + sources."supports-color-7.2.0" + ]; + }) + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-9.3.2" // { + dependencies = [ + sources."acorn-8.7.1" + sources."eslint-visitor-keys-3.3.0" + ]; + }) + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + sources."estraverse-4.3.0" + sources."estree-is-member-expression-1.0.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."events-3.3.0" + sources."evp_bytestokey-1.0.3" + (sources."exorcist-2.0.0" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fast-safe-stringify-2.1.1" + sources."fastdom-1.0.10" + sources."file-entry-cache-6.0.1" + sources."file-saver-2.0.5" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."flatted-3.2.6" + sources."for-each-0.3.3" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fresh-0.5.2" + sources."fs-minipass-2.1.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."function.prototype.name-1.1.5" + sources."functional-red-black-tree-1.0.1" + sources."functions-have-names-1.2.3" + sources."gauge-4.0.4" + sources."gaze-1.1.3" + sources."gensync-1.0.0-beta.2" + sources."get-assigned-identifiers-1.2.0" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.2" + sources."get-stdin-4.0.1" + sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" + sources."getpass-0.1.7" + (sources."glob-7.2.3" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) + sources."glob-parent-5.1.2" + sources."global-dirs-3.0.0" + sources."globals-11.12.0" + (sources."globule-1.3.4" // { + dependencies = [ + sources."glob-7.1.7" + sources."minimatch-3.0.8" + ]; + }) + sources."got-9.6.0" + sources."graceful-fs-4.2.10" + sources."gyronorm-2.0.6" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-bigints-1.0.2" + sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" + sources."has-unicode-2.0.1" + sources."has-yarn-2.1.0" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) + sources."hash.js-1.1.7" + sources."hmac-drbg-1.0.1" + sources."hosted-git-info-4.1.0" + sources."htmlescape-1.1.1" + sources."htmlparser2-4.1.0" + sources."http-auth-4.1.9" + sources."http-cache-semantics-4.1.0" + (sources."http-errors-2.0.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + sources."http-proxy-agent-4.0.1" + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."https-proxy-agent-5.0.1" + sources."humanize-ms-1.2.1" + sources."hyperscript-attribute-to-property-1.0.2" + sources."hyperx-2.5.4" + sources."iconv-lite-0.6.3" + sources."ieee754-1.2.1" + sources."ignore-5.2.0" + sources."ignore-by-default-1.0.1" + sources."import-fresh-3.3.0" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-2.0.0" + sources."inline-source-map-0.6.2" + sources."insert-module-globals-7.2.1" + sources."internal-slot-1.0.3" + sources."ip-1.1.8" + sources."is-arguments-1.1.1" + sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.4" + sources."is-binary-path-2.1.0" + sources."is-boolean-attribute-0.0.1" + sources."is-boolean-object-1.1.2" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.4" + sources."is-ci-2.0.0" + sources."is-core-module-2.9.0" + sources."is-date-object-1.0.5" + sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-generator-function-1.0.10" + sources."is-glob-4.0.3" + sources."is-installed-globally-0.4.0" + sources."is-lambda-1.0.1" + sources."is-negative-zero-2.0.2" + sources."is-npm-5.0.0" + sources."is-number-7.0.0" + sources."is-number-object-1.0.7" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.3" + sources."is-plain-obj-1.1.0" + sources."is-regex-1.1.4" + sources."is-regexp-1.0.0" + sources."is-shared-array-buffer-1.0.2" + sources."is-stream-2.0.1" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.9" + sources."is-typedarray-1.0.0" + sources."is-weakref-1.0.2" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."js-base64-2.6.4" + sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" + sources."jsbn-0.1.1" + sources."jsesc-2.5.2" + sources."json-buffer-3.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.4.0" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-2.2.1" + sources."jsondiffpatch-0.4.1" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.2" + sources."keyboardevent-from-electron-accelerator-2.0.0" + sources."keyboardevents-areequal-0.2.2" + sources."keyboardjs-2.6.4" + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."labeled-stream-splicer-2.0.2" + sources."latest-version-5.1.0" + sources."levn-0.4.1" + sources."licensify-3.1.3" + sources."lines-and-columns-1.2.4" + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lodash.debounce-4.0.8" + sources."lodash.memoize-3.0.4" + sources."lodash.merge-4.6.2" + sources."long-4.0.0" + sources."loop-protect-git+https://github.com/jean-emmanuel/loop-protect#v1.0.1" + sources."lower-case-1.1.4" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + sources."magic-string-0.23.2" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."make-fetch-happen-9.1.0" + sources."map-obj-4.3.0" + sources."md5.js-1.3.5" + (sources."meow-9.0.0" // { + dependencies = [ + sources."type-fest-0.18.1" + ]; + }) + sources."merge-source-map-1.0.4" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."mime-1.6.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-response-1.0.1" + sources."min-indent-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + (sources."minimatch-5.1.0" // { + dependencies = [ + sources."balanced-match-1.0.2" + sources."brace-expansion-2.0.1" + ]; + }) + sources."minimist-1.2.6" + sources."minimist-options-4.1.0" + sources."minipass-3.3.4" + 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."mkdirp-0.5.6" + sources."mkdirp-classic-0.5.3" + sources."module-deps-6.2.3" + (sources."mold-source-map-0.4.0" // { + dependencies = [ + sources."through-2.2.7" + ]; + }) + sources."ms-2.1.2" + sources."multicast-dns-git+https://github.com/jean-emmanuel/multicast-dns" + sources."multicast-dns-service-types-1.1.0" + sources."mutexify-1.4.0" + sources."nan-2.16.0" + sources."nanoassert-1.1.0" + (sources."nanobench-2.1.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."nanohtml-1.10.0" + sources."nanoid-3.3.4" + sources."nanomorph-5.4.3" + sources."natural-compare-1.4.0" + sources."negotiator-0.6.3" + sources."no-case-2.3.2" + sources."node-forge-1.3.1" + (sources."node-gyp-8.4.1" // { + dependencies = [ + sources."npmlog-6.0.2" + sources."rimraf-3.0.2" + ]; + }) + sources."node-mouse-0.0.2" + sources."node-releases-2.0.5" + (sources."node-sass-7.0.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."nodemon-2.0.16" // { + dependencies = [ + sources."debug-3.2.7" + sources."minimatch-3.1.2" + sources."semver-5.7.1" + ]; + }) + sources."nopt-5.0.0" + sources."normalize-html-whitespace-0.2.0" + sources."normalize-package-data-3.0.3" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.1" + sources."nosleep.js-0.12.0" + (sources."npmlog-5.0.1" // { + dependencies = [ + sources."are-we-there-yet-2.0.0" + sources."gauge-3.0.2" + sources."readable-stream-3.6.0" + ]; + }) + 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-keys-1.1.1" + sources."object.assign-4.1.2" + sources."offset-sourcemap-lines-1.0.1" + sources."on-finished-2.4.1" + sources."once-1.4.0" + sources."open-8.4.0" + sources."optionator-0.9.1" + sources."os-browserify-0.3.0" + (sources."osc-git+https://github.com/jean-emmanuel/osc.js" // { + dependencies = [ + sources."ws-7.5.3" + ]; + }) + sources."osi-licenses-0.1.1" + sources."oss-license-name-to-url-1.2.1" + sources."p-cancelable-1.1.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-map-4.0.0" + sources."p-try-2.2.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."pako-1.0.11" + sources."parent-module-1.0.1" + sources."parents-1.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.2.0" + sources."parse-srcset-1.0.2" + sources."path-browserify-1.0.1" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-platform-0.11.15" + sources."pbkdf2-3.1.2" + sources."performance-now-2.1.0" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" + (sources."postcss-7.0.39" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."source-map-0.6.1" + ]; + }) + sources."prelude-ls-1.2.1" + sources."prepend-http-2.0.0" + sources."pretty-hrtime-1.0.3" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."promise-retry-2.0.1" + sources."psl-1.9.0" + sources."pstree.remy-1.1.8" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."pump-3.0.0" + sources."punycode-1.4.1" + sources."pupa-2.1.1" + sources."python-shell-3.0.1" + sources."qs-6.5.3" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."queue-tick-1.0.0" + sources."quick-lru-4.0.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + sources."strip-json-comments-2.0.1" + ]; + }) + sources."read-only-stream-2.0.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."string_decoder-1.1.1" + ]; + }) + sources."readdirp-3.6.0" + sources."redent-3.0.0" + sources."regenerate-1.4.2" + sources."regenerate-unicode-properties-10.0.1" + sources."regenerator-runtime-0.13.9" + sources."regenerator-transform-0.15.0" + sources."regexp.prototype.flags-1.4.3" + sources."regexpp-3.2.0" + sources."regexpu-core-5.1.0" + sources."registry-auth-token-4.2.2" + sources."registry-url-5.1.0" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."replacestream-4.0.3" + (sources."request-2.88.2" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + sources."require-directory-2.1.1" + sources."resolve-1.22.1" + sources."resolve-from-4.0.0" + sources."responselike-1.0.2" + sources."retry-0.12.0" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sanitize-html-1.27.5" + sources."sass-graph-4.0.0" + sources."scope-css-1.2.1" + sources."screenfull-5.2.0" + (sources."scss-tokenizer-0.3.0" // { + dependencies = [ + sources."source-map-0.7.4" + ]; + }) + sources."semver-7.3.7" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."send-0.18.0" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."depd-2.0.0" + sources."ms-2.1.3" + ]; + }) + sources."set-blocking-2.0.0" + sources."setprototypeof-1.2.0" + sources."sha.js-2.4.11" + sources."shasum-object-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."shell-quote-1.7.3" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + sources."simple-concat-1.0.1" + sources."slip-1.0.2" + sources."slugify-1.6.5" + sources."smart-buffer-4.2.0" + sources."socks-2.6.2" + sources."socks-proxy-agent-6.2.1" + sources."sortablejs-1.15.0" + sources."source-map-0.5.7" + (sources."source-map-support-0.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."sourcemap-codec-1.4.8" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.11" + sources."sshpk-1.17.0" + sources."ssri-8.0.1" + sources."stack-generator-2.0.10" + sources."stackframe-1.3.4" + (sources."stacktrace-gps-3.1.2" // { + dependencies = [ + sources."source-map-0.5.6" + ]; + }) + sources."stacktrace-js-2.0.2" + sources."statuses-2.0.1" + sources."stdout-stream-1.4.1" + (sources."stream-browserify-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."stream-combiner2-1.1.1" + (sources."stream-http-3.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."stream-splicer-2.0.1" + sources."strictdom-1.0.1" + sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-6.0.1" + sources."strip-css-comments-3.0.0" + sources."strip-indent-3.0.0" + sources."strip-json-comments-3.1.1" + sources."subarg-1.0.0" + sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."syntax-error-1.4.0" + (sources."tar-6.1.11" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + (sources."terser-3.17.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."thunky-1.1.0" + sources."timers-browserify-1.4.2" + sources."to-fast-properties-2.0.0" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" + (sources."touch-3.1.0" // { + dependencies = [ + sources."nopt-1.0.10" + ]; + }) + (sources."tough-cookie-2.5.0" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + (sources."transform-ast-2.4.4" // { + dependencies = [ + sources."is-buffer-2.0.5" + ]; + }) + sources."trim-newlines-3.0.1" + sources."true-case-path-1.0.3" + sources."tty-browserify-0.0.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.4.0" + sources."type-fest-0.20.2" + sources."type-name-2.0.2" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + (sources."uglifyify-5.0.2" // { + dependencies = [ + sources."convert-source-map-1.1.3" + sources."minimatch-3.1.2" + ]; + }) + sources."umd-3.0.3" + sources."unbox-primitive-1.0.2" + sources."undeclared-identifiers-1.1.3" + sources."undefsafe-2.0.5" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."unique-string-2.0.0" + sources."unix-crypt-td-js-1.1.4" + sources."update-browserslist-db-1.0.4" + (sources."update-notifier-5.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."upper-case-1.1.3" + (sources."uri-js-4.4.1" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-parse-lax-3.0.0" + sources."util-0.12.4" + sources."util-deprecate-1.0.2" + sources."uuid-8.3.2" + sources."v8-compile-cache-2.3.0" + sources."validate-npm-package-license-3.0.4" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) + sources."vm-browserify-1.1.2" + sources."webworkify-1.5.0" + sources."which-2.0.2" + sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.8" + sources."wide-align-1.1.5" + sources."widest-line-3.1.0" + sources."wolfy87-eventemitter-5.2.9" + sources."word-wrap-1.2.3" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."ws-8.6.0" + sources."xdg-basedir-4.0.0" + sources."xtend-4.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + (sources."yargs-17.5.1" // { + dependencies = [ + sources."yargs-parser-21.0.1" + ]; + }) + sources."yargs-parser-20.2.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Libre and modular OSC / MIDI controller"; + homepage = "http://openstagecontrol.ammd.net/"; + license = "GPL-3.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +in +{ + args = args; + sources = sources; + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; + nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { + src = stdenv.mkDerivation { + name = args.name + "-package-json"; + src = nix-gitignore.gitignoreSourcePure [ + "*" + "!package.json" + "!package-lock.json" + ] args.src; + dontBuild = true; + installPhase = "mkdir -p $out; cp -r ./* $out;"; + }; + }); +} diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index feaf9ed70cfb7..50455328f3a40 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation { ''; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Time domain pitch tracker for Pure Data"; homepage = "http://www.katjaas.nl/helmholtz/helmholtz.html"; license = lib.licenses.bsd3; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index f76720aff9074..10362e04d5506 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas +{ lib, stdenv, fetchurl, fetchpatch, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkg-config, openssl }: @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toollchain support: + # https://github.com/petri-foo/Petri-Foo/pull/43 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/petri-foo/Petri-Foo/commit/6a3256c9b619b1fed18ad15063f110e8d91aa6fe.patch"; + sha256 = "05yc4g22iwnd054jmvihrl461yr0cxnghslfrbhan6bac6fcvlal"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsa-lib gtk2 libjack2 libgnomecanvas libpthreadstubs diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 340ba32a53d54..481f151ed5617 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -18,13 +18,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.7.3"; + version = "2.8.1"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; - rev = "release-${version}"; - sha256 = "1f589nc2zxl9cjw0qh164z9sfq4xl052ihf2gn2dgr35g3ny16kh"; + rev = "refs/tags/release-${version}"; + sha256 = "sha256-KEKOouTNmmZiPyKo8xCQv6Zkreidtz2DaEbHjuwJJvY="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 76ef7b366ef22..e6bca6869dd29 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib , wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection , libnotify, libsecret, gst_all_1 }: @@ -28,6 +28,7 @@ pythonPackages.buildPythonApplication rec { (with pythonPackages; [ pygobject3 pylast ]); meta = with lib; { + broken = stdenv.isDarwin; description = "Pandora Internet Radio player for GNOME"; homepage = "https://pithos.github.io/"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index e209d98ec7115..abfda0f022e3d 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://github.com/cth103/plugin-torture"; description = "A tool to test LADSPA and LV2 plugins"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 46625253d0f6a..7b7bf50a2f83f 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pocket Casts webapp, packaged for the Linux Desktop"; homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index 4656db7257eb5..5e7c3f2b85ce7 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; @@ -40,6 +40,7 @@ mkDerivation rec { ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A soundfont editor for creating musical instruments"; homepage = "https://www.polyphone-soundfonts.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index d2d4927c1135b..5d41661b6d538 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -2,22 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2022-01-25"; + version = "unstable-2022-05-19"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "1627cd4a301dd51e9ee3034294cd7b0d94d02ddc"; - sha256 = "sha256-kepvYhmieXx6Hj79aqaA7tYUnueaBsNx0U4lV7K6LuU="; + rev = "e403609e0916fe664fb1f28c7a259d01fa69b0e9"; + sha256 = "sha256-hpAP/m9aJsfh9FtwLqaKFZllnCQn9OSYLWuNZakZJnk="; }; - cargoSha256 = "sha256-DcdlQudGyWUUAacV7pAOLDvhd1fgAkEesdxDkHSYm4M="; + cargoSha256 = "sha256-gQ0iI2wTS5n5pItmQCmFXDs5L8nA2w5ZrZyZtpMlUro="; # specify the subdirectory of the binary crate to build from the workspace buildAndTestSubdir = "psst-gui"; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib @@ -30,10 +28,14 @@ rustPlatform.buildRustPackage rec { pango ]; + postInstall = '' + install -Dm444 psst-gui/assets/logo_512.png $out/share/icons/${pname}.png + ''; + meta = with lib; { description = "Fast and multi-platform Spotify client with native GUI"; homepage = "https://github.com/jpochyla/psst"; license = licenses.mit; - maintainers = [ maintainers.vbrandl ]; + maintainers = with maintainers; [ vbrandl peterhoeg ]; }; } diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 936fb2f54ecae..7af2735642934 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -25,13 +25,13 @@ let in python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "puddletag"; repo = "puddletag"; - rev = version; - hash = "sha256-eilETaFvvPMopIbccV1uLbpD55kHX9KGTCcGVXaHPgM="; + rev = "refs/tags/${version}"; + hash = "sha256-KaFfpOWI9u2ZC/3kuCLneWOOKSmAaIuHPFHptkKMH/g="; }; postPatch = '' diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 3a0a3f0a4cf26..9309ea2f8152f 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -1,26 +1,32 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.17"; - - propagatedBuildInputs = with python3Packages; [ - requests - psutil - dnspython - ]; + version = "0.8.9.22"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-lfDSD1+xbA6tAKeHKciq/n6YHWS4JTOvjIqOn+FQ2yA="; + sha256 = "sha256-QBgXg2SNEQX1ngY+cEWqStC0zsFZ0Er81tuhTszbHWM="; }; + nativeBuildInputs = [ installShellFiles ]; + + propagatedBuildInputs = with python3Packages; [ + requests + psutil + dnspython + ]; + checkPhase = '' $out/bin/pyradio --help ''; + postInstall = '' + installManPage *.1 + ''; + meta = with lib; { homepage = "http://www.coderholic.com/pyradio/"; description = "Curses based internet radio player"; diff --git a/pkgs/applications/audio/quadrafuzz/default.nix b/pkgs/applications/audio/quadrafuzz/default.nix index 1432c0b81011c..4f0ea946832e5 100644 --- a/pkgs/applications/audio/quadrafuzz/default.nix +++ b/pkgs/applications/audio/quadrafuzz/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://github.com/jpcima/quadrafuzz"; description = "Multi-band fuzz distortion plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 6c8ad8225f0b7..49b320703d13c 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -9,11 +9,11 @@ let optionals = lib.optionals; in python3.pkgs.buildPythonApplication rec { pname = "quodlibet${tag}"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "sha256-oDMY0nZ+SVlVF2PQqH+tl3OHr3EmCP5XJxQXaiS782c="; + sha256 = "sha256-MBYVgp9lLLr+2zVTkjcWKli8HucaVn0kn3eJ2SaCRbw="; }; nativeBuildInputs = [ wrapGAppsHook gettext ]; diff --git a/pkgs/applications/audio/radioboat/default.nix b/pkgs/applications/audio/radioboat/default.nix new file mode 100644 index 0000000000000..f96339848dda8 --- /dev/null +++ b/pkgs/applications/audio/radioboat/default.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, mpv +, makeWrapper +, installShellFiles +, nix-update-script +, testers +, radioboat +}: + +buildGoModule rec { + pname = "radioboat"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "slashformotion"; + repo = "radioboat"; + rev = "v${version}"; + sha256 = "sha256-ZAKTWmK3hCJxm/578cjtdgMA2ZRhCFtzfGdta0gmuFY="; + }; + + vendorSha256 = "sha256-X3KiqaiOQYQBfVckh50C+4oxIVN6gXyNuQtBwGvjdFQ="; + + ldflags = [ + "-s" + "-w" + "-X github.com/slashformotion/radioboat/internal/buildinfo.Version=${version}" + ]; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + preFixup = '' + wrapProgram $out/bin/radioboat --prefix PATH ":" "${lib.makeBinPath [ mpv ]}"; + ''; + + postInstall = '' + installShellCompletion --cmd radioboat \ + --bash <($out/bin/radioboat completion bash) \ + --fish <($out/bin/radioboat completion fish) \ + --zsh <($out/bin/radioboat completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + tests.version = testers.testVersion { + package = radioboat; + command = "radioboat version"; + version = version; + }; + }; + + meta = with lib; { + description = "A terminal web radio client"; + homepage = "https://github.com/slashformotion/radioboat"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 820475be0c65b..47a50f2a855ab 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -11,19 +11,21 @@ , xdg-utils , which -, jackSupport ? true, libjack2 -, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio +, jackSupport ? true +, jackLibrary +, pulseaudioSupport ? config.pulseaudio or true +, libpulseaudio }: stdenv.mkDerivation rec { pname = "reaper"; - version = "6.47"; + version = "6.61"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; hash = { - x86_64-linux = "sha256-31HmIx/ohbrzu5uj8KOOZiHNCmXwng9h+fIGaJfYyqA="; - aarch64-linux = "sha256-CMmcBpaZ6BEZJ1144aQhOJ/o2NrGD7/8aq+ObLVMXYE="; + x86_64-linux = "sha256-Lp2EVky1+ruc86LdMmvhZIisoYl0OxdkVnN3h/u09IQ="; + aarch64-linux = "sha256-sPLCMA//xAdWXjY7++R6eLWS56Zi0u+9ju7JlICGvVc="; }.${stdenv.hostPlatform.system}; }; @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ gtk3 # libSwell needs libgdk-3.so.0 ] - ++ lib.optional jackSupport libjack2 + ++ lib.optional jackSupport jackLibrary ++ lib.optional pulseaudioSupport libpulseaudio; dontBuild = true; @@ -76,8 +78,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer ]; + maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer viraptor ]; }; } diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix index 45ee78917ace3..41254cc9e50ee 100644 --- a/pkgs/applications/audio/redux/default.nix +++ b/pkgs/applications/audio/redux/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sample-based instrument, with a powerful phrase sequencer"; homepage = "https://www.renoise.com/products/redux"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mihnea-s ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index acd1d80c86d57..1be3f53dce5f9 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 0ba86567c7c8c..853613c9a5f59 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -29,29 +28,21 @@ , json-glib , itstool , wrapGAppsHook +, desktop-file-utils , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] +, check }: stdenv.mkDerivation rec { pname = "rhythmbox"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo="; + sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ="; }; - patches = [ - # Fix stuff linking against rhythmdb not finding libxml headers - # included by rhythmdb.h header. - # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch"; - sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg="; - }) - ]; - nativeBuildInputs = [ pkg-config meson @@ -60,6 +51,7 @@ stdenv.mkDerivation rec { glib itstool wrapGAppsHook + desktop-file-utils ]; buildInputs = [ @@ -95,9 +87,16 @@ stdenv.mkDerivation rec { libnotify ] ++ gst_plugins; - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; + checkInputs = [ + check + ]; + + mesonFlags = [ + "-Dtests=disabled" + ]; + + # Requires DISPLAY + doCheck = false; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix index 92d3151c835c0..06e711941a637 100644 --- a/pkgs/applications/audio/rymcast/default.nix +++ b/pkgs/applications/audio/rymcast/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Player for Mega Drive/Genesis VGM files"; homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ astsmtl ]; diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index aed27ecdba5ed..1a35fe8830f4a 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "http://www.drpetter.se/project_sfxr.html"; description = "A videogame sound effect generator"; license = licenses.mit; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index b41bea58453ce..26825f2dcc70c 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -2,7 +2,6 @@ , lib , qtbase , fetchFromGitHub -, fftwSinglePrec , ruby , erlang , aubio @@ -14,14 +13,11 @@ , boost , bash , jack2 -, supercollider +, supercollider-with-sc3-plugins , qwt }: let - - supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; }; - pname = "sonic-pi"; version = "3.3.1"; src = fetchFromGitHub { @@ -62,7 +58,7 @@ mkDerivation rec { qwt ruby aubio - supercollider_single_prec + supercollider-with-sc3-plugins boost erlang alsa-lib @@ -122,18 +118,18 @@ mkDerivation rec { dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/sonic-pi" \ - --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang] } + --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang] } makeWrapper \ $out/app/server/ruby/bin/sonic-pi-server.rb \ $out/bin/sonic-pi-server \ - --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang ] } + --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang ] } ''; meta = { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt ]; + maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index e5e875f6df394..4da290791758d 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "http://openavproductions.com/sorcer/"; description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/soundwireserver/default.nix b/pkgs/applications/audio/soundwireserver/default.nix index db8d28989b27a..b296ebdad602a 100755 --- a/pkgs/applications/audio/soundwireserver/default.nix +++ b/pkgs/applications/audio/soundwireserver/default.nix @@ -35,6 +35,7 @@ qt5.mkDerivation { homepage = "https://georgielabs.net/"; maintainers = with maintainers; [ mkg20001 ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; }; } diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index c6536c4d20fb1..466457c607dcf 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Speech denoise lv2 plugin based on RNNoise library"; homepage = "https://github.com/lucianodato/speech-denoiser"; license = licenses.lgpl3; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 65cf657d8a408..ecbdaec7f28af 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: @@ -26,7 +26,7 @@ let atk cairo cups - curl + curlWithGnuTls dbus expat ffmpeg @@ -167,6 +167,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.spotify.com/"; description = "Play music from the Spotify music service"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index 7d12c6cbf34c0..b9ca1a1790de8 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://github.com/jpcima/stone-phaser"; description = "A classic analog phaser effect, made with DPF and Faust"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 1ea01353f80ab..fc02833207efa 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -37,15 +37,21 @@ mkDerivation rec { pname = "strawberry"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-wa7r6maHAgCTD/TFjqtMuoRt1BqQ38T8KpbMUOoS2ZE="; + hash = "sha256-6d7oB54IPI+G5Mhkj+PdQQY93r1SBE2R06qSGIacj8Q="; }; + # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead + postPatch = '' + substituteInPlace src/context/contextalbum.cpp \ + --replace pictures/strawberry.png pictures/strawberry-grey.png + ''; + buildInputs = [ alsa-lib boost diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 503079b9ed4b8..1bde46cdc944c 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; homepage = "http://www.warmplace.ru/soft/sunvox/"; maintainers = with maintainers; [ puffnfresh ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index d9effb3f1afe0..1809aa52e2131 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -5,6 +5,7 @@ , python3Packages , ffmpeg , flac +, libjxl , librsvg , gobject-introspection , gtk3 @@ -14,6 +15,7 @@ , mpg123 , libopenmpt , opusfile +, wavpack , pango , pulseaudio , withDiscordRPC ? false @@ -21,13 +23,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.1.3"; + version = "7.2.1"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-UadE8qsQxRjE+POHLAUY1tRUInNXsMEqTAP02zSDSZ4="; + sha256 = "sha256-wEGdqMKLhKjnxNTgqNQpUpYkMk/FuRAKsWX+P/9nUG4="; }; postPatch = '' @@ -70,6 +72,7 @@ stdenv.mkDerivation rec { opusfile pango pulseaudio + wavpack ]; pythonPath = with python3Packages; [ @@ -77,12 +80,15 @@ stdenv.mkDerivation rec { gst-python dbus-python isounidecode + libjxl musicbrainzngs mutagen + natsort pillow plexapi pulsectl pycairo + PyChromecast pylast pygobject3 pylyrics diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index a8889cab69773..3d89289c747af 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.6.15"; + version = "0.6.17"; src = fetchCrate { inherit pname version; - sha256 = "sha256-e4hCo5a54EPp6/sd1/ivwHePu+e6MqbA9tvPWf41EhQ="; + sha256 = "sha256-diZl+izb55EFQaL6soLVNrFhoi7AOFkFnVcAU2XlI+c="; }; - cargoHash = "sha256-kQjLmASJpo7+LT73vVjbPWhNUGJ1HI6S/8W6gJskJXE="; + cargoHash = "sha256-VW+tMnjuVnf/PsBAoMnOxbyNna1UpGB/5V52XSzBJr8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix new file mode 100644 index 0000000000000..09b5c3f410c10 --- /dev/null +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -0,0 +1,119 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, ffmpeg +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libappindicator-gtk3 +, libdbusmenu +, libdrm +, libnotify +, libpulseaudio +, libsecret +, libuuid +, libxkbcommon +, mesa +, nss +, pango +, systemd +, xdg-utils +, xorg +}: + +stdenv.mkDerivation rec { + pname = "tidal-hifi"; + version = "4.0.1"; + + src = fetchurl { + url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; + sha256 = "1azxdr2m84ci6ppzy0j17wmza7prlnw055fks6s4i77sjw45rhlq"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + ffmpeg + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + pango + systemd + mesa # for libgbm + nss + libuuid + libdrm + libnotify + libsecret + libpulseaudio + libxkbcommon + libappindicator-gtk3 + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libxshmfence + xorg.libXtst + ]; + + runtimeDependencies = + [ (lib.getLib systemd) libnotify libdbusmenu xdg-utils ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + runHook postInstall + ''; + + postFixup = '' + makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ + "''${gappsWrapperArgs[@]}" + ''; + + meta = with lib; { + description = "The web version of Tidal running in electron with hifi support thanks to widevine"; + homepage = "https://github.com/Mastermindzh/tidal-hifi"; + changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ alternateved ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index a0b3cf2879e6b..682627c0e8218 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass."; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 orivej ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 17b3b1197f458..9229cba4839a2 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Jam – the learning and practice software for guitar players"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix index 9acb6982c6a72..29c5cb6a3f24e 100644 --- a/pkgs/applications/audio/tonelib-metal/default.nix +++ b/pkgs/applications/audio/tonelib-metal/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index 41539503e0203..74fe8645acf3c 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index 7a7ec1e41880e..112d84a08b112 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: tcextract-extract_pcm.o:/build/transcode-1.1.7/import/extract_pcm.c:36: multiple definition of + # `audio'; tcextract-extract_ac3.o:/build/transcode-1.1.7/import/extract_ac3.c:337: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + meta = with lib; { description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats"; homepage = "http://www.transcoding.org/"; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index d10a0d8794180..06f0d47d8a2cd 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { conventional music players. ''; homepage = "https://www.seventhstring.com/xscribe/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 789b97507a180..71174d599976a 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,50 +1,107 @@ -{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config -, alsa-lib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi -, libzip, rtaudio, rtmidi, speex, libsamplerate }: +{ alsa-lib +, copyDesktopItems +, curl +, fetchFromBitbucket +, fetchFromGitHub +, fetchzip +, ghc_filesystem +, glew +, glfw +, gnome +, gtk3-x11 +, imagemagick +, jansson +, jq +, lib +, libarchive +, libicns +, libjack2 +, libpulseaudio +, libsamplerate +, libXext +, libXi +, makeDesktopItem +, makeWrapper +, pkg-config +, rtaudio +, rtmidi +, speex +, stdenv +, wrapGAppsHook +, zstd +}: let # The package repo vendors some of the package dependencies as submodules. - # Others are downloaded with `make deps`. Due to previous issues with the - # `glfw` submodule (see above) and because we can not access the network when - # building in a sandbox, we fetch the dependency source manually. - pfft-source = fetchzip { - url = "https://vcvrack.com/downloads/dep/pffft.zip"; - sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1"; + # Unfortunately, they are not pinned, so we have no guarantee that they + # will be stable, and therefore, we can't use them directly. Instead + # we'll have to fetch them separately ourselves. + pffft-source = fetchFromBitbucket { + owner = "jpommier"; + repo = "pffft"; + rev = "988259a41d1522047a9420e6265a6ba8289c1654"; + sha256 = "Oq5N02UNXsbhcPUfjMtD0cgqAZsGx9ke9A+ArrenzGE="; + }; + fuzzysearchdatabase-source = fetchFromBitbucket { + owner = "j_norberg"; + repo = "fuzzysearchdatabase"; + rev = "fe62479811e503ef3c091f5a859d27bfcf0a44da"; + sha256 = "zgeUzuuInHPeveBIjlivRGIz+NSb7cW/9hMndxm6qOA="; }; nanovg-source = fetchFromGitHub { - owner = "memononen"; + owner = "VCVRack"; repo = "nanovg"; - rev = "1f9c8864fc556a1be4d4bf1d6bfe20cde25734b4"; - sha256 = "08r15zrr6p1kxigxzxrg5rgya7wwbdx7d078r362qbkmws83wk27"; + rev = "0bebdb314aff9cfa28fde4744bcb037a2b3fd756"; + sha256 = "HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg="; }; nanosvg-source = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; - rev = "25241c5a8f8451d41ab1b02ab2d865b01600d949"; - sha256 = "114qgfmazsdl53rm4pgqif3gv8msdmfwi91lyc2jfadgzfd83xkg"; + rev = "ccdb1995134d340a93fb20e3a3d323ccb3838dd0"; + sha256 = "ymziU0NgGqxPOKHwGm0QyEdK/8jL/QYk5UdIQ3Tn8jw="; }; osdialog-source = fetchFromGitHub { owner = "AndrewBelt"; repo = "osdialog"; - rev = "e5db5de6444f4b2c4e1390c67b3efd718080c3da"; - sha256 = "0iqxn1md053nl19hbjk8rqsdcmjwa5l5z0ci4fara77q43rc323i"; + rev = "21b9dcc2a1bbdacb9b46da477ffd82a4ce9204b9"; + sha256 = "+4VCBuQvfiuEUdjFu3IB2FwbHFrDJXTb4vcVg6ZFwSM="; }; oui-blendish-source = fetchFromGitHub { owner = "AndrewBelt"; repo = "oui-blendish"; - rev = "79ec59e6bc7201017fc13a20c6e33380adca1660"; - sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64"; + rev = "2fc6405883f8451944ed080547d073c8f9f31898"; + sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; + }; + fundamental-source = fetchFromGitHub { + owner = "VCVRack"; + repo = "Fundamental"; + rev = "533397cdcad5c6401ebd3937d6c1663de2473627"; # tip of branch v2 + sha256 = "QnwOgrYxiCa/7t/u6F63Ks8C9E8k6T+hia4JZFhp1LI="; }; in -with lib; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "VCV-Rack"; - version = "1.1.6"; + version = "2.0.6"; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = pname; + desktopName = "VCV Rack"; + genericName = "Eurorack simulator"; + comment = "Create music by patching together virtual synthesizer modules"; + exec = "Rack"; + icon = "Rack"; + categories = [ "AudioVideo" "AudioVideoEditing" "Audio" ]; + keywords = [ "music" ]; + }) + ]; src = fetchFromGitHub { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "0ji64prr74qzxf5bx1sw022kbslx9nzll16lmk5in78hbl137b3i"; + sha256 = "vvGx8tnE7gMiboVUTywIzBB1q/IfiJ8TPnSHvmfHUQg="; }; patches = [ @@ -56,46 +113,101 @@ with lib; stdenv.mkDerivation rec { # above), we do it here manually mkdir -p dep/include - cp -r ${pfft-source} dep/jpommier-pffft-source + cp -r ${pffft-source}/* dep/pffft + cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase cp -r ${nanovg-source}/* dep/nanovg cp -r ${nanosvg-source}/* dep/nanosvg cp -r ${osdialog-source}/* dep/osdialog cp -r ${oui-blendish-source}/* dep/oui-blendish - cp dep/jpommier-pffft-source/*.h dep/include + cp dep/pffft/*.h dep/include + cp dep/fuzzysearchdatabase/src/*.hpp dep/include cp dep/nanosvg/**/*.h dep/include cp dep/nanovg/src/*.h dep/include cp dep/osdialog/*.h dep/include cp dep/oui-blendish/*.h dep/include - substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>" - substituteInPlace compile.mk --replace "-march=nocona" "" + # Build and dist the Fundamental plugins + cp -r ${fundamental-source} plugins/Fundamental/ + chmod -R +rw plugins/Fundamental # will be used as build dir + substituteInPlace plugin.mk --replace ":= all" ":= dist" + + # Fix reference to zenity + substituteInPlace dep/osdialog/osdialog_zenity.c \ + --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${gnome.zenity}/bin/zenity"' ''; enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ alsa-lib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; + nativeBuildInputs = [ + copyDesktopItems + imagemagick + jq + libicns + makeWrapper + pkg-config + wrapGAppsHook + ]; + buildInputs = [ + alsa-lib + curl + ghc_filesystem + glew + glfw + gnome.zenity + gtk3-x11 + jansson + libarchive + libjack2 + libpulseaudio + libsamplerate + rtaudio + rtmidi + speex + zstd + ]; - buildFlags = [ "Rack" ]; + makeFlags = [ "all" "plugins" ]; installPhase = '' + runHook preInstall + install -D -m755 -t $out/bin Rack + install -D -m755 -t $out/lib libRack.so mkdir -p $out/share/vcv-rack - cp -r res Core.json template.vcv LICENSE* cacert.pem $out/share/vcv-rack + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack + cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin + + # Extract pngs from the Apple icon image and create + # the missing ones from the 1024x1024 image. + icns2png --extract icon.icns + for size in 16 24 32 48 64 128 256 512 1024; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ ! -e icon_"$size"x"$size"x32.png ] ; then + convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png + fi + install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png + done; + + runHook postInstall + ''; - # Override the default global resource file directory - wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack" + dontWrapGApps = true; + postFixup = '' + # Wrap gApp and override the default global resource file directory + wrapProgram $out/bin/Rack \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "-s $out/share/vcv-rack" ''; meta = with lib; { description = "Open-source virtual modular synthesizer"; homepage = "https://vcvrack.com/"; - # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a + # The source is GPL3+ licensed, some of the art is CC-BY-NC 4.0 or under a # no-derivatives clause - license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ]; - maintainers = with maintainers; [ moredread nathyong ]; + license = with licenses; [ gpl3Plus cc-by-nc-40 unfreeRedistributable ]; + maintainers = with maintainers; [ nathyong jpotier ddelabru ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch index d310d57835e42..506ab6053053b 100644 --- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch @@ -1,13 +1,12 @@ diff -ru a/Makefile b/Makefile ---- a/Makefile 1970-01-01 01:00:01.000000000 +0100 -+++ b/Makefile 1970-01-01 01:00:01.000000000 +0100 -@@ -21,8 +21,8 @@ - build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0) +--- a/Makefile 1970-01-01 01:00:01.000000000 +0100 ++++ b/Makefile 1970-01-01 01:00:01.000000000 +0100 +@@ -36,7 +36,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+- - LDFLAGS += -rdynamic \ -- dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a \ -+ -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -lzip -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio \ - -lpthread -lGL -ldl -lX11 -lasound -ljack \ - $(shell pkg-config --libs gtk+-2.0) - TARGET := Rack - endif + LDFLAGS += -Wl,--whole-archive + LDFLAGS += -static-libstdc++ -static-libgcc +- LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a ++ LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio + LDFLAGS += -Wl,--no-whole-archive + LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple + LDFLAGS += $(shell pkg-config --libs gtk+-3.0) diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/applications/audio/vgmplay-libvgm/default.nix new file mode 100644 index 0000000000000..9647eef681ac9 --- /dev/null +++ b/pkgs/applications/audio/vgmplay-libvgm/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, cmake +, pkg-config +, zlib +, libvgm +, inih +}: + +stdenv.mkDerivation rec { + pname = "vgmplay-libvgm"; + version = "unstable-2022-03-17"; + + src = fetchFromGitHub { + owner = "ValleyBell"; + repo = "vgmplay-libvgm"; + rev = "a2c21cb134b58043a013ac2efc060144cdecf13d"; + sha256 = "0g251laqjvvzblyflkg8xac424dbxm1v35ckfazsfchmcqiaqfw4"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ zlib libvgm inih ]; + + postInstall = '' + install -Dm644 ../VGMPlay.ini $out/share/vgmplay/VGMPlay.ini + ''; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/ValleyBell/vgmplay-libvgm.git"; + }; + + meta = with lib; { + mainProgram = "vgmplay"; + homepage = "https://github.com/ValleyBell/vgmplay-libvgm"; + description = "New VGMPlay, based on libvgm"; + license = licenses.unfree; # no licensing text anywhere yet + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index c1e41e41284d3..07f006aa0cc1a 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA. ''; homepage = "https://warmplace.ru/soft/ans/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.free; # I cannot test the Darwin version, so I'll leave it disabled platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index d08df27e04c05..4372944080ec0 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { ''; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "ReplayGain for wave files"; homepage = "https://github.com/MestreLion/wavegain"; license = lib.licenses.lgpl21; diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index d698ef68da5c4..be1b25ceb14aa 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; homepage = "https://x42-plugins.com/x42/x42-avldrums"; maintainers = with maintainers; [ magnetophon orivej ]; diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index cde67908fdeba..90db8754ca2ff 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Chris Colins' General User soundfont player LV2 plugin"; homepage = "https://x42-plugins.com/x42/x42-gmsynth"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index fe9da33e5cae7..1f47a456c9497 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -20,8 +20,6 @@ , zlib }: -assert stdenv ? glibc; - stdenv.mkDerivation rec { pname = "yoshimi"; version = "2.1.2.2"; @@ -60,7 +58,7 @@ stdenv.mkDerivation rec { zlib ]; - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ]; + cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.cc.libc}/lib/libm.so" ]; meta = with lib; { description = "High quality software synthesizer based on ZynAddSubFX"; diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix index 9dd5b583817d4..1c9cb0a463dc8 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , bison , git , python2 @@ -71,6 +72,14 @@ stdenv.mkDerivation rec { patches = [ ./force-gcc-as-linker.patch ./system-libuv.patch + + # Pull upstream fix for -fno-common toolchains: + # https://github.com/mruby-zest/mruby-zest-build/issues/25 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/mruby-zest/mruby-zest-build/commit/4eb88250f22ee684acac95d4d1f114df504e37a7.patch"; + sha256 = "0wg7qy1vg0mzcxagf35bv35dlr0q17pxjicigpf86yqppvgrzrsb"; + }) ]; # Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index e2b208f891a8f..9055b46284c0c 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -7,6 +7,7 @@ , vala , gettext , itstool +, desktop-file-utils , glib , gtk4 , coreutils @@ -21,14 +22,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "43.2"; + version = "43.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "sha256-iFrPx/m/nTdm7xVVd1SZh5QNpSqI+TCbMfx0/jLgc1c="; + sha256 = "sha256-8eqrBQrMvS4cta5RP0ibo4Zc3B8hlkftxaRyvb6JuEY="; }; patches = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { vala gettext itstool + desktop-file-utils wrapGAppsHook4 ]; diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index a8524dea91be2..868241b92326b 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , rustPlatform , substituteAll , desktop-file-utils @@ -19,20 +18,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-vQ0hlwsrY0WOUc/ppleE+kKRGHPt/ScEChXrkukln3U="; + hash = "sha256-D5QkNgscvNaPEykbcR451Wx8Mvn7HTuQE/22lp95Kbo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-IKUh5gkXTpmMToDaec+CpCIQqJjwJM2ZrmGQhZeTDsg="; + hash = "sha256-c4nYlPyc7D1AMOfHjhoDJox+i83+H1YKfWzR3i6bmng="; }; patches = [ @@ -40,11 +39,6 @@ stdenv.mkDerivation rec { src = ./borg-path.patch; borg = "${borgbackup}/bin/borg"; }) - (fetchpatch { - name = "use-gtk4-update-icon-cache.patch"; - url = "https://gitlab.gnome.org/World/pika-backup/-/merge_requests/64.patch"; - hash = "sha256-AttGQGWealvTIvPwBl5M6FiC4Al/UD4/XckUAxM38SE="; - }) ]; postPatch = '' diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix new file mode 100644 index 0000000000000..0a6a9bf38865d --- /dev/null +++ b/pkgs/applications/backup/timeshift/default.nix @@ -0,0 +1,33 @@ +{ callPackage +, timeshift-unwrapped +, lib +, rsync +, coreutils +, mount +, umount +, psmisc +, cron +, btrfs-progs +, grubPackage +}: +let + timeshift-wrapper = callPackage ./wrapper.nix { }; +in +(timeshift-wrapper timeshift-unwrapped ([ + rsync + coreutils + mount + umount + psmisc + cron + btrfs-progs + grubPackage +])).overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + description = oldAttrs.meta.description; + longDescription = oldAttrs.meta.longDescription + '' + This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and (optionally) btrfs. + If you want to use the commands provided by the system, override the propagatedBuildInputs or use timeshift-minimal instead + ''; + }; +}) diff --git a/pkgs/applications/backup/timeshift/minimal.nix b/pkgs/applications/backup/timeshift/minimal.nix new file mode 100644 index 0000000000000..96946fa72e053 --- /dev/null +++ b/pkgs/applications/backup/timeshift/minimal.nix @@ -0,0 +1,15 @@ +{ callPackage +, timeshift-unwrapped +}: +let + timeshift-wrapper = callPackage ./wrapper.nix { }; +in +(timeshift-wrapper timeshift-unwrapped [ ]).overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + description = oldAttrs.meta.description + " (without runtime dependencies)"; + longDescription = oldAttrs.meta.longDescription + '' + This package is a wrapped version of timeshift-unwrapped + without runtime dependencies of command utilities. + ''; + }; +}) diff --git a/pkgs/applications/backup/timeshift/timeshift-launcher.patch b/pkgs/applications/backup/timeshift/timeshift-launcher.patch new file mode 100644 index 0000000000000..765c101e1629b --- /dev/null +++ b/pkgs/applications/backup/timeshift/timeshift-launcher.patch @@ -0,0 +1,26 @@ +diff --git a/src/timeshift-launcher b/src/timeshift-launcher +index 29b8fc4..5f6cb17 100755 +--- a/src/timeshift-launcher ++++ b/src/timeshift-launcher +@@ -1,6 +1,6 @@ + #!/bin/bash + +-app_command='timeshift-gtk' ++app_command=''"$(realpath "$(dirname "$0")")"'/timeshift-gtk' + + if [ "$(id -u)" -eq 0 ]; then + # user is admin +@@ -14,11 +14,11 @@ else + # script is running in non-interactive mode + if [ "$XDG_SESSION_TYPE" = "wayland" ] ; then + xhost +SI:localuser:root +- pkexec ${app_command} ++ pkexec env DISPLAY="$DISPLAY" XAUTHORITY="$XAUTHORITY" "${app_command}" + xhost -SI:localuser:root + xhost + elif command -v pkexec >/dev/null 2>&1; then +- pkexec ${app_command} ++ pkexec env DISPLAY="$DISPLAY" XAUTHORITY="$XAUTHORITY" "${app_command}" + elif command -v sudo >/dev/null 2>&1; then + x-terminal-emulator -e "sudo ${app_command}" + elif command -v su >/dev/null 2>&1; then diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix new file mode 100644 index 0000000000000..65db240626203 --- /dev/null +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, gettext +, pkg-config +, vala +, which +, gtk3 +, json-glib +, libgee +, util-linux +, vte +, xapps +}: + +stdenv.mkDerivation rec { + pname = "timeshift"; + version = "22.06.1"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "timeshift"; + rev = "v${version}"; + sha256 = "XcxwVBKMv2YwbrI3FFWDQFs8hHruhkZq3YqzkptE6KE="; + }; + + patches = [ + ./timeshift-launcher.patch + ]; + + postPatch = '' + while IFS="" read -r -d $'\0' FILE; do + substituteInPlace "$FILE" \ + --replace "/sbin/blkid" "${util-linux}/bin/blkid" + done < <(find ./src -mindepth 1 -name "*.vala" -type f -print0) + substituteInPlace ./src/Utility/IconManager.vala \ + --replace "/usr/share" "$out/share" + substituteInPlace ./src/Core/Main.vala \ + --replace "/etc/timeshift/default.json" "$out/etc/timeshift/default.json" \ + --replace "file_copy(app_conf_path_default, app_conf_path);" "if (!dir_exists(file_parent(app_conf_path))){dir_create(file_parent(app_conf_path));};file_copy(app_conf_path_default, app_conf_path);" + ''; + + nativeBuildInputs = [ + gettext + pkg-config + vala + which + ]; + + buildInputs = [ + gtk3 + json-glib + libgee + vte + xapps + ]; + + preBuild = '' + makeFlagsArray+=( \ + "-C" "src" \ + "prefix=$out" \ + "sysconfdir=$out/etc" \ + ) + ''; + + meta = with lib; { + description = "A system restore tool for Linux"; + longDescription = '' + TimeShift creates filesystem snapshots using rsync+hardlinks or BTRFS snapshots. + Snapshots can be restored using TimeShift installed on the system or from Live CD or USB. + ''; + homepage = "https://github.com/linuxmint/timeshift"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix new file mode 100644 index 0000000000000..e72052fda1ba8 --- /dev/null +++ b/pkgs/applications/backup/timeshift/wrapper.nix @@ -0,0 +1,45 @@ +{ stdenvNoCC +, lib +, wrapGAppsHook +, gdk-pixbuf +, librsvg +, xorg +, shared-mime-info +}: + +timeshift-unwrapped: +runtimeDeps: +stdenvNoCC.mkDerivation { + inherit (timeshift-unwrapped) pname version; + + dontUnpack = true; + + nativeBuildInputs = [ + xorg.lndir + wrapGAppsHook + ]; + + installPhase = '' + runHook preInstall + mkdir -p "$out" + lndir "${timeshift-unwrapped}" "$out" + runHook postInstall + ''; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs=( + --prefix PATH : "${lib.makeBinPath runtimeDeps}" + ) + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ gdk-pixbuf librsvg shared-mime-info ]}" + "''${makeWrapperArgs[@]}" + ) + wrapProgram "$out/bin/timeshift" "''${makeWrapperArgs[@]}" + wrapProgram "$out/bin/timeshift-gtk" "''${gappsWrapperArgs[@]}" + ''; + + inherit (timeshift-unwrapped) meta; +} diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 8e551f3db0347..32d989e7a253a 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.8.4"; + version = "0.8.7"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "refs/tags/v${version}"; - sha256 = "sha256-eS/+7s9KgGCEhA6NgIzPlGM1daP+Ir2d1mmqse4YbIE="; + sha256 = "sha256-9SfHZbNM+lRtwLO/0dE9C4cHb3pSPkxBUITYNEdPMQw="; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 8eb52f26cdbaf..e43fbec5d9a75 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-P+usJCzf92WZ46mdaDbej59/RUzmFcMvlYXVe2VpgY0="; + sha256 = "sha256-mwiG9DwnCX/9REq/oNHi2n/l829Ozgum/WygIb+FV04="; }; - cargoSha256 = "sha256-N5qHu0sCmIWtDYerWqMlD3qr8QtXLvEC7VqPEvnW2cw="; + cargoSha256 = "sha256-ylSVyrI9LuctuoMZsZpIH7loBBjxE2onk6L19uV8zCQ="; checkFlags = [ # these want internet access, disable them diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index b8c878755efef..d91f201f66bd7 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.8.4"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid"; + sha256 = "0gzfcp255z542adk1g6gsmfpp5zpivv6n1f5kzqgwgm5qmr24049"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A decentralized bitcoin exchange network"; homepage = "https://bisq.network"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ juaningan emmanuelrosa ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 5ecbf4fc9790c..cb7355aac17a3 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -74,6 +74,10 @@ stdenv.mkDerivation rec { "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; + # fix "Killed: 9 test/test_bitcoin" + # https://github.com/NixOS/nixpkgs/issues/179474 + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + checkInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 8b6812c66d33d..59879df61677c 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,19 +3,18 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.5.1"; + version = "1.5.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-DcxRrVUen+JxMpiLDPfknpwCe962ifaekBeBnxJ0y88="; + sha256 = "sha256-8GMk7xBMhml0X/8YRuN3FsEF2TWDxtb0eoP/cduKXNg="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; buildType = if altcoinSupport then "Altcoins-Release" else "Release"; @@ -27,7 +26,7 @@ buildDotnetModule rec { meta = with lib; { description = "Self-hosted, open-source cryptocurrency payment processor"; homepage = "https://btcpayserver.org"; - maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index ceefa656de305..0a070407a6009 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,43 +31,43 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.All"; - version = "1.3.6"; - sha256 = "0jdpqy6kxg0lyh4n88wsvrcqc0kk7s7zn5lw7ivwys716m69qrdl"; + version = "1.3.8"; + sha256 = "0xjhxxp8gc06ivbxjbmcacq4pq1c3l3b03pwd785kblxbh7d8zxj"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; - version = "1.3.2"; - sha256 = "0v5rss6dg7297kq1frhn2pj9gd0rd8g1p5d316x5wkd4w7pmrm2w"; + version = "1.3.4"; + sha256 = "1ic2kz9mpgcjkmj6a0kscn3iqqp905a4768bn2fx454swpn2w6f9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; - version = "1.3.2"; - sha256 = "0qs5p6pm54il23j8yysw0pzvrki37y6z8cd2gdknpz2f3wg7slm9"; + version = "1.3.5"; + sha256 = "0k9v28h0kvcbwxrjmalk14sna505li125i9aigcj6lddsg1d3xr7"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.2.7"; - sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6"; + version = "1.3.2"; + sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.3.2"; - sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0"; + version = "1.3.4"; + sha256 = "1bic7hxw731c0mkjgak0pwlrc7a4yqsr1xi7r3x04cz98nvdlqfc"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; - version = "1.3.2"; - sha256 = "08gw1gqng1khxzvvhlwsg6lw1w56ylilg738wi6cbcwy7vl7f6bb"; + version = "1.3.4"; + sha256 = "0im3nzr7ki0nlr5miy7i7b9869vi7frq5g1idwfshqincpgps05g"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; - version = "1.3.4"; - sha256 = "1vyz63pi5j31y8pz0b4hp9c4j249rszzfcymk3z3b2clwq32s4i4"; + version = "1.3.6"; + sha256 = "08myhnk41l1zc3ih1h8l6583g4spgfgl1i65sjp02ab9v4i9lalw"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; - version = "1.3.3"; - sha256 = "137azpxxmp2q69bp07ky1jsgnfy9lf0dg5ba8l654flvvrgxaq6y"; + version = "1.3.5"; + sha256 = "1k5i4x382hx3zwczpjvzpxv4nmmlnnlaxcy018bz7b4hvd0l49wq"; }) (fetchNuGet { pname = "BuildBundlerMinifier"; @@ -181,8 +181,8 @@ }) (fetchNuGet { pname = "LNURL"; - version = "0.0.15"; - sha256 = "1fy6ywzqs5y9c6d156v08dg8c6689d5xb4y1ar7gqgz6f3cl842n"; + version = "0.0.18"; + sha256 = "1dy0if091s8j0klv58v8xy0lnwyw0mxl89m09wkfcs0d4kzmjsrj"; }) (fetchNuGet { pname = "MailKit"; @@ -210,6 +210,11 @@ sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; }) (fetchNuGet { + pname = "Microsoft.AspNet.WebApi.Client"; + version = "5.2.8"; + sha256 = "1dbwdbxr6npyc82zwl0g9bhifkpcqfzyhx1ihd8rzcmzprw70yfj"; + }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "3.1.10"; sha256 = "05drcgbpzq700kvxnfxha10w3jgfp2jp0r2h4hpczjxj6cywbbi6"; @@ -351,11 +356,6 @@ }) (fetchNuGet { pname = "Microsoft.CSharp"; - version = "4.3.0"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; - }) - (fetchNuGet { - pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) @@ -836,11 +836,6 @@ }) (fetchNuGet { pname = "NBitcoin"; - version = "6.0.3"; - sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f"; - }) - (fetchNuGet { - pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) @@ -881,11 +876,6 @@ }) (fetchNuGet { pname = "Newtonsoft.Json"; - version = "10.0.3"; - sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) @@ -1081,18 +1071,18 @@ }) (fetchNuGet { pname = "Selenium.Support"; - version = "3.141.0"; - sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib"; + version = "4.1.1"; + sha256 = "1bcvvcybbw22yv9bz10jdms5za2ajczil9kzwjh9zs6yy41gqnwl"; }) (fetchNuGet { pname = "Selenium.WebDriver.ChromeDriver"; - version = "100.0.4896.6000"; - sha256 = "1pfdvxjy4xiw1j7787lf07w9nr0dmj589vf6p4aqmk2cfz8j35c6"; + version = "101.0.4951.4100"; + sha256 = "0iqkcmfgzvir4h24qz3namgv7pc14hancb26gqa9j3izb1813ndf"; }) (fetchNuGet { pname = "Selenium.WebDriver"; - version = "3.141.0"; - sha256 = "09g0zhz6n7yhxmxlrpzjdykfavr3m4z1gb4cmq304dw0gr8s89mq"; + version = "4.1.1"; + sha256 = "0gavlsanyiff9rxn34cinv0q2m3a8wh66ynlm9mxwkmmybzbbqz4"; }) (fetchNuGet { pname = "Serilog.AspNetCore"; @@ -1210,16 +1200,6 @@ sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (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.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; @@ -1230,21 +1210,6 @@ sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (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.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.5.0"; sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; @@ -1305,11 +1270,6 @@ sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { - pname = "System.Dynamic.Runtime"; - version = "4.3.0"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; @@ -1670,21 +1630,11 @@ 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.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; @@ -1960,11 +1910,6 @@ sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) (fetchNuGet { - pname = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.0.1"; sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/applications/blockchains/clboss/default.nix new file mode 100644 index 0000000000000..c6ffe8e07f983 --- /dev/null +++ b/pkgs/applications/blockchains/clboss/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, curlWithGnuTls +, libev +, sqlite +}: + +stdenv.mkDerivation rec { + pname = "clboss"; + version = "0.12"; + + src = fetchurl { + url = "https://github.com/ZmnSCPxj/clboss/releases/download/${version}/clboss-${version}.tar.gz"; + hash = "sha256-UZcSfbpp3vPsD3CDukp+r5Z60h0UEWTduqF4DhJ+H2U="; + }; + + nativeBuildInputs = [ pkg-config libev curlWithGnuTls sqlite ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Automated C-Lightning Node Manager"; + homepage = "https://github.com/ZmnSCPxj/clboss"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 2cf31ae3c95fb..27e2fea2845ec 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "0vsh6gpv3458pfc5cggay9pw7bxjzyxpcniks9b2s3y1rxwk15xi"; + sha256 = "09qqfnj809dpwar9ijm3ic5cv4019hsnvh2h6sfpdqp1smf9igxs"; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index cb39e26789b35..1ebcf47146fe2 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 = "4.0.23"; + version = "4.0.30"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-ZpBTfL8ghLOo8C9yDUfKelblpIlwdVAOgYVvqmxJQXo="; + sha256 = "sha256-Jeufmt2Dso13Z/TQnSA8IPNxTfha+wcklKZb+BF/dNE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open protocol that implements modern scientific ideas in the blockchain area"; homepage = "https://ergoplatform.org/en/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.cc0; platforms = platforms.all; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 22f2c97093532..0f127c4f0d47b 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,16 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2022.02.04"; + version = "2022.07.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-86a1VtVyTRKpY41fAHskUfPZpXUutpyvxlRLhkiHTZ0="; + sha256 = "sha256-/aT8E60dCk5spj5l5Zw/8FL1LfzXWYi7agiLflLYI5c="; + fetchSubmodules = true; }; - vendorSha256 = "sha256-P3jdK+ubBHusTL4eWlA/TDJIrbuV17tL8Cv6c3ubjlc="; + vendorSha256 = "sha256-NBWK0wsUbv4bFbmW3xGaQ7LCgmgfRF5zbc/awm8ZZZY="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index d13278b7deecd..654da25261d3f 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.exodus.io/"; description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ mmahut rople380 ]; diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index 35b5f05b38367..d9085ff734d86 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-oywxGg+Ss7qBITI2PBXQs5ph7PZbJ3c1smtT/TcVoLI="; + sha256 = "sha256-FIa6eAE6yyJR5UdlCXB2Gx3DqN528POxb0eYOCpVjJk="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 661a25c8314b4..767d8e7ba00c3 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.17"; + version = "1.10.20"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GBlrg4wOiqEQTZC3CtfAZbIvS16/pSjEedEDrPGNUtY="; + sha256 = "sha256-PIQP08QxGJmla7LKEtnEXmwJxDYh02q4fmRHZsYtthU="; }; - vendorSha256 = "sha256-D4odWuGFipSvbKbNlA6PkTo3rWGTCptJcn/7V7ZA7qs="; + vendorSha256 = "sha256-AlXfKytDrQrp0gvnC5/gTlJAVJBAQNHm4MoBu9O9jM4="; doCheck = false; diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index b14076f808d7a..57b6f719505cb 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -24,7 +24,7 @@ }: let - version = "22.0"; + version = "23.0"; desktop = fetchurl { url = "https://raw.githubusercontent.com/Groestlcoin/packaging/${version}/debian/groestlcoin-qt.desktop"; sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "104zzcigpk976iqyinjn6mw3l36zb1if7249iz44ds1zaxv3g1v1"; + sha256 = "1ag7wpaw4zssx1g482kziqr95yl2vk9r332689s3093xv9i9pz4s"; }; nativeBuildInputs = [ autoreconfHook pkg-config ] diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 84f6df6350f64..d9bde2a543020 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,16 +2,15 @@ let pname = "ledger-live-desktop"; - version = "2.41.3"; - name = "${pname}-${version}"; + version = "2.44.0"; src = fetchurl { - url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-Bh3wB5AAgY6l1W3UtWUHW+lJgJ0w6gw23WvEe3/Xs1g="; + url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; + hash = "sha256-STUkvQ22WnMm8AApz9zjfNeFXhtEUsl/OJIZkFgkd5s="; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; # Hotplug events from udevd are fired into the kernel, which then re-broadcasts them over a @@ -25,12 +24,12 @@ let }); in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraPkgs = pkgs: [ systemdPatched ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png @@ -43,7 +42,7 @@ appimageTools.wrapType2 rec { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ]; + maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal WeebSorceress ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index 6e99e8fe4122c..7efba6de079d9 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.18.0-beta"; + version = "0.19.1-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "1kg5nlvb4lb3cjn84wcylhq0l73d2n6rg4n1srnxmgs96v41y78f"; + sha256 = "08jn1ybh9l9qy4j9b3psvgk7b869aaabpxh73v81980qflb9snnc"; }; - vendorSha256 = "0q3wbjfaqdj29sjlhx6fhc0p4d12aa31s6ia36jalcvf659ybb0l"; + vendorSha256 = "0wirlf43jl888bh2qxis1ihsr1g2lp2rx7p100dsb3imqbm25q3b"; subPackages = [ "cmd/loop" "cmd/loopd" ]; diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index 0a82ca0ce2c38..736cd9637da93 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -35,6 +35,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' Litecoin is a peer-to-peer Internet currency that enables instant payments @@ -48,7 +49,6 @@ mkDerivation rec { homepage = "https://litecoin.org/"; platforms = platforms.unix; license = licenses.mit; - broken = stdenv.isDarwin; maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index baf2e20aae792..aa8673351c34a 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.14.3-beta"; + version = "0.15.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "sha256-ZTvGFmjhQBIWqMGatMAlX59uVyl1oUKo7L5jiz571Gc"; + sha256 = "sha256-v8nLsnd6dus+og75U9VIO1K5IuyNh+VYdQfbfbYeox0="; }; - vendorSha256 = "sha256-shDmJcEyobY7Ih1MHMEY2GQnzAffsH/y4J1bme/bT7I="; + vendorSha256 = "sha256-fx3WsyLyES+ezJGDe3SjFTeGlPMmqKEtWlYGkWpxODc="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/applications/blockchains/lndconnect/default.nix index f1745655a56e3..9a3aa137453b4 100644 --- a/pkgs/applications/blockchains/lndconnect/default.nix +++ b/pkgs/applications/blockchains/lndconnect/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testVersion, lndconnect }: +{ lib, buildGoModule, fetchFromGitHub, lndconnect }: buildGoModule rec { pname = "lndconnect"; version = "0.2.1"; diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix new file mode 100644 index 0000000000000..728f28dee8669 --- /dev/null +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: + +buildGoModule rec { + pname = "lndhub-go"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "getAlby"; + repo = "lndhub.go"; + rev = "${version}"; + sha256 = "sha256-QtLSI5xjXevTTr85Zsylabhay52ul8jFq1j6WzgSLcs="; + }; + + vendorSha256 = "sha256-12RTaXStvx29JjE1u3AjBTrPf6gKfLHJHMJpbQysEew="; + + doCheck = false; # tests require networking + + meta = with lib; { + description = "Accounting wrapper for the Lightning Network"; + homepage = "https://github.com/getAlby/lndhub.go"; + license = licenses.gpl3; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index c263b65601870..3810d6f2251ce 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -2,19 +2,18 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.20"; + version = "2.3.26"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-cAko5s1bFSI7HOcXg/tZtdMMe0S9zkRBeZ6bispxgwc="; + sha256 = "sha256-PaunSwbIf9hGmZeS8ZI4M0C6T76bLCalnS4/x9TWrtY="; }; projectFile = "NBXplorer/NBXplorer.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; postFixup = '' @@ -23,7 +22,7 @@ buildDotnetModule rec { meta = with lib; { description = "Minimalist UTXO tracker for HD Cryptocurrency Wallets"; - maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh index 2d3f41f25866c..2a862c31c881e 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p dotnet-sdk_3 +#!nix-shell -i bash -p dotnet-sdk_6 set -euo pipefail # Writes deps for dotnet package in $pkgSrc to $depsFile. diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index 1ca9ef3444b5e..ee52389448674 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -1,11 +1,13 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nixFlakes +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_6 git gnupg nixFlakes set -euo pipefail # This script uses the following env vars: # getVersionFromTags # refetch +trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR + pkgName=$1 depsFile=$2 customFlags=$3 @@ -52,6 +54,8 @@ git clone --depth 1 --branch v${newVersion} -c advice.detachedHead=false https:/ export GNUPGHOME=$tmpdir # Fetch Nicolas Dorier's key (64-bit key ID: 6618763EF09186FE) gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys AB4CFA9895ACA0DBE27F6B346618763EF09186FE 2> /dev/null +# Fetch Andrew Camilleri's key (64-bit key ID: 8E5530D9D1C93097) +gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 836C08CF3F523BB7A8CB8ECF8E5530D9D1C93097 2> /dev/null echo echo "Verifying commit" git -C $repo verify-commit HEAD diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 264d53fc56a53..2c5f97c9c78ed 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.26.0"; + version = "1.27.0"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec { repo = "nearcore"; # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-N3A+hy5I1/yJ3IN9gDw3m1IZ9qK8LNhn3fuXLMn23bg="; + sha256 = "sha256-B9HqUa0mBSvsCPzxPt4NqpV99rV4lmQ9Q/z9lxob9oM="; }; - cargoSha256 = "sha256-g07liit048TSL73wFyDK+eKu33Z6fPJcJ+VeGgTtuS8="; + cargoSha256 = "sha256-6GIt3J6y/O8XaHQJKRSPRgK2XbghMLif4e2Btdww9Ng="; postPatch = '' substituteInPlace neard/build.rs \ diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index e9f5374f6ee4d..a1b9f8348b6a1 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec { checkFlags = "--skip configuration::tests::should_resolve_external_nat_hosts"; meta = with lib; { + broken = stdenv.isDarwin; description = "Fast, light, robust Ethereum implementation"; homepage = "http://parity.io/ethereum"; license = licenses.gpl3; diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index c9fb1a458692b..2bcc6c62be945 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription = '' An open source, decentralized privacy platform built for global person to person eCommerce. diff --git a/pkgs/applications/blockchains/pivx/default.nix b/pkgs/applications/blockchains/pivx/default.nix index 75d0aa7ebfc2f..55fa6f96a7514 100644 --- a/pkgs/applications/blockchains/pivx/default.nix +++ b/pkgs/applications/blockchains/pivx/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "An open source crypto-currency focused on fast private transactions"; longDescription = '' PIVX is an MIT licensed, open source, blockchain-based cryptocurrency with diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index 662164a9f6f3d..e3b54a7465634 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -20,11 +20,11 @@ let pname = "sparrow"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1wdibpbhv3g6qk42ddfc5vyqkkwprczy45w5wi115qg3g1rf1in7"; + sha256 = "0zk33w664fky3ir6cqm6walc80fjhg9s0hnrllrc2hrxrqnrn88p"; }; launcher = writeScript "sparrow" '' @@ -225,6 +225,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability."; homepage = "https://sparrowwallet.com"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.asl20; maintainers = with maintainers; [ emmanuelrosa _1000101 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/tessera/default.nix b/pkgs/applications/blockchains/tessera/default.nix index 5b13925255342..a0facc33b7dd3 100644 --- a/pkgs/applications/blockchains/tessera/default.nix +++ b/pkgs/applications/blockchains/tessera/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Enterprise Implementation of Quorum's transaction manager"; homepage = "https://github.com/jpmorganchase/tessera"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ mmahut ]; }; diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index df30302bc6c50..e4e97cae21a0d 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -43,6 +43,7 @@ buildDotnetModule rec { meta = with lib; { description = "Backend for the Wasabi Wallet"; homepage = "https://wasabiwallet.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; 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 782f183da07ed..273f2a5eafd78 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -1,8 +1,7 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "0akdzi35497v8yxr3a9q1g26cnx9vxnwv81kwxi293jklwnx8gsr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "16kya6xvi7k42sr8bxgpbz9116dj7g3i18ylpvji9qngdx41891v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.26"; sha256 = "0rib2121wri6wj6h4f6w4yqw9qp2xsad3ind63fmp1sr649jifyh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.26"; sha256 = "0z29rrhc87g0bi273lcqd608f7ngd16nv85v8549231yvf99n60x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.26"; sha256 = "0pbm6hpibsvq5w8hyvvllz4qns287x3l8bc07krffv23yfbv8zwy"; }) (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.Build"; version = "15.3.409"; sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; }) @@ -19,13 +18,11 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.NETCore.App"; version = "2.0.5"; sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.21"; sha256 = "0dl4yakfmdkx6xr18f09cdnl11b4fyp23jg3msr8a25zqdqvcr29"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "1p7fpcmx4m2374zjfh53i3mv4lkr8xrkz5lnawv95s7j005m07pc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "02zgxzf8l607mh17900n7msga0yfcnqgd70rj1rlwj23plifykx1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.26"; sha256 = "1vk4dr2z72nmjg2skqvy2m2h5brqp21v51pnd7ldpm7asgr5ck8n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.26"; sha256 = "0l5yfnpbd36n38rjlmhsnq4bniq1fcssv4qh8kb9h3qigz40qxj9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.26"; sha256 = "1h9b8fwgwbycvn1ngxnpdz3s1zh59wi2iy8n4y2nfkmz2rbldrrm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.26"; sha256 = "0y06qz4pgflwia222mljg19nlfmhcg0qs1a8wm3zwj602wzy3nll"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.26"; sha256 = "1half7rywhxb1x19gzddvjqbll4whx9wmwdlk57iy68djas95lmy"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "2.0.5"; sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "2.0.5"; sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "2.0.5"; sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; }) @@ -69,9 +66,9 @@ (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 = "runtime.win7.System.Private.Uri"; version = "4.0.1"; sha256 = "1ibrwabavdpqapnplm5kh6nz9vgcwv0wn61w1p60v262kif6sglp"; }) (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "1ylkj4v7aq00svij7aq82d86afpwqgrqf2kpikabxl26p19ry9wm"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "1zmx2msa04ka8mgh8viahi4pqpp86vdhzij2rg1jg131bwlv59yw"; }) + (fetchNuGet { pname = "runtime.win7.System.Private.Uri"; version = "4.0.1"; sha256 = "1ibrwabavdpqapnplm5kh6nz9vgcwv0wn61w1p60v262kif6sglp"; }) (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"; }) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index e3cea78629f41..71ee383282390 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Privacy focused Bitcoin wallet"; homepage = "https://wasabiwallet.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 9efdd6c56dfd0..61945895eef7a 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://wownero.org/"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ fuwa ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index ab9fcfe1ba4a8..25dffad43bb98 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -222,9 +222,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ ]; - beta = [ ]; - canary = [ ]; + stable = [ alapshin ]; + beta = [ alapshin ]; + canary = [ alapshin ]; dev = canary; }."${channel}"; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index cfd81fdfe5a2c..b25ee1ac6cdc1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)" - sha256Hash = "1kxb19qf7bs5lyfgr8vamakp1nf2wlxlwwni1kihza67ib6hcxdk"; + version = "2021.2.1.15"; # "Android Studio Chipmunk (2021.2.1)" + sha256Hash = "ABjg38DdKSFwBRb3osRDN3xVd4jaf7CkUkPstDAHRb4="; }; betaVersion = { - version = "2021.2.1.11"; # "Android Studio Chipmunk (2021.2.1) Beta 4" - sha256Hash = "0in8x6v957y9hsnz5ak845pdpvgvnvlm0s6r9y8f27zkm947vbjd"; + version = "2021.3.1.14"; # "Android Studio Dolphin (2021.3.1) Beta 5" + sha256Hash = "k1Qt54u45rwHsQNz9TVqnFB65kBKtfFZ3OknpfutKPI="; }; latestVersion = { # canary & dev - version = "2021.3.1.7"; # "Android Studio Dolphin (2021.3.1) Canary 7" - sha256Hash = "02jwy3q2ccs7l3snm8w40znzk54v2h1sljdr3d0yh7sy0qyn32k1"; + version = "2022.1.1.8"; # "Android Studio Electric Eel (2022.1.1) Canary 8" + sha256Hash = "0bZXx4YpMztLAnwuBaSaNT3GJNfYnqCDanwR+Q7qyUc="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index ce8d32f465e29..fc6ddd93567c4 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -13,14 +13,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitLab { owner = "World"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "sha256-At3kaVJE07j/QWXerYnvxleE2Cbn0FjlBXH69tkuFys="; + sha256 = "sha256-RBrrG1TO810LidIelYGNaK7PjDq84D0cA8VcMojAW3M="; }; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 84704e71cea8a..29c4bb6c884c9 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.58.0"; - sha256 = "sha256-QxDhr4gwlS9O/lk0nfqsw5sFiPckSTFL15XtRpQh0tU="; + version = "1.60.0"; + sha256 = "sha256-XHwCWQYrnUkR0lN7/Or/Uxb53hEWmIQKkNfNSX34kaY="; }; atom-beta = { - version = "1.59.0"; + version = "1.61.0"; beta = 0; - sha256 = "sha256-s1XHR2e4JPywdLiIcjTqMRILARDthHxBeTQOCIkhmXE="; + sha256 = "sha256-viY/is7Nh3tlIkHhUBWtgMAjD6HDiC0pyJpUjsP5pRY="; broken = true; }; }; @@ -86,6 +86,7 @@ let meta = with lib; { description = "A hackable text editor for the 21st Century"; homepage = "https://atom.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ offline ysndr ]; platforms = platforms.x86_64; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index e59b03beba853..a5ca5775aae3f 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,13 +1,13 @@ { stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr -, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk +, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr +, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk , at-spi2-core, libdbusmenu, libdrm, mesa }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gconf nss + stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype + fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index 552358319e15c..a78cc65aa2108 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; maintainers = with maintainers; [ chvp ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 9a872c91c95a3..d966db2027aa0 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.164.0"; + version = "1.166.5"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-LKLWZiA3Ya8xI2QvNW2f+5akndBloj5pQ7QNaVMoYSI="; + sha256 = "sha256-mFSVYC6a9iAiUcWZOlxuVxFwuwIgH8eQmh8YKaMw2Wg="; }; postPatch = '' @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: '' - cp -r --no-preserve=mode ${dep} ${name} + ln -s ${dep} ${name} '') deps) + '' lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -Dm755 app/cudatext $out/bin/cudatext + install -Dm755 app/cudatext -t $out/bin install -dm755 $out/share/cudatext cp -r app/{data,py,settings_default} $out/share/cudatext diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 0eac78393711e..89e6a0f79cec7 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,38 +1,38 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2022.04.18", - "sha256": "sha256-UV07a9qNzd0JQWCq/eD0K9fA7kxAKj5OP7dOpECo8xw=" + "rev": "2022.06.19", + "sha256": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2022.04.16", - "sha256": "sha256-7ye73KSpoPvvxBNwBC3uloufFE+448RDyNScumk1ViE=" + "rev": "2022.06.14", + "sha256": "sha256-3QhARraYURW5uCf2f4MZfUbxdbsg9h7BlXUxKcz4jwA=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.05.06", - "sha256": "sha256-mYZ3mgtUpQ8sry5WmdluHca/CR7RqR9GRrxIoeZFLes=" + "rev": "2022.06.19", + "sha256": "sha256-4pkwgg2U6NAGv+fVFKIli2Qe3fyDMiliFLJSgsh1hsQ=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.05.09", - "sha256": "sha256-bzBO9Uf8Zkt/kFouQuiPagL7e+86ezH/mOpDCuInJlE=" + "rev": "2022.07.01", + "sha256": "sha256-Il8NMBoShJtY5itDr9EBJ8NpfiPux/pNzs9LUc/nn30=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2022.01.21", - "sha256": "sha256-el5YtzewnHV0fRPgVhApZUVP7huSQseqrO2ibvm6Ctg=" + "rev": "2022.05.04", + "sha256": "sha256-6O4RijSejPogokLSBuC6pKrOpihMi/ykS06YyV64Sak=" }, "EControl": { "owner": "Alexey-T", - "rev": "2022.05.06", - "sha256": "sha256-ppm8Wuxhi5N3Er0f0h9d+v2spwEMr7ksf9tz4vI42+M=" + "rev": "2022.06.14", + "sha256": "sha256-P21Tb/hhQvXvT3LhM3lw4B0joQ2cFxsOXjljKaut6OM=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.05.08", - "sha256": "sha256-mAxqJ3PO1BCOYNctKfw/4fKbJsI7Ckb5PVcKdALZu0Q=" + "rev": "2022.06.14", + "sha256": "sha256-Kcl3y5SN9DKUDL3ozjMrlsObsMVtGuU5iWrpLoMbPz4=" }, "Python-for-Lazarus": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.4", - "sha256": "sha256-jZL8lzjua033E76IL0HIk/fihC73ifCb4LqMni7vvb0=" + "rev": "v11.5", + "sha256": "sha256-Pevh+yhtN3oSSvbQfnO7SM6UHBVe0sSpbK8ss98XqcU=" } } diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/applications/editors/cudatext/update.sh index f7aae6ff8b494..5cee9d709a0ba 100755 --- a/pkgs/applications/editors/cudatext/update.sh +++ b/pkgs/applications/editors/cudatext/update.sh @@ -4,7 +4,17 @@ set -euo pipefail cd "$(dirname "$0")" +nixpkgs="$(git rev-parse --show-toplevel)" + +oldVersion=$(nix-instantiate --eval -E "(import \"$nixpkgs\" { config = {}; overlays = []; }).cudatext.version" | tr -d '"') version=$(curl -s https://api.github.com/repos/Alexey-T/CudaText/releases/latest | jq -r '.tag_name') + +if [[ $version == $oldVersion ]]; then + echo "Already at latest version $version" + exit 0 +fi +echo "New version: $version" + url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) sriHash=$(nix hash to-sri --type sha256 $hash) diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 3b497f34a439a..19a2e378f30a7 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { tar xfvz $src -C $out # Patch binaries. - interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://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 ea763ecb39ad8..b91d12401917f 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -6,8 +6,6 @@ , callPackage }: -assert stdenv ? glibc; - # https://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions # diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index c1217e2123c4b..2571f4e0b4950 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -108,6 +108,7 @@ rec { meta = with lib; { homepage = "https://github.com/tobiasmelcher/EclipseAceJump"; description = "Provides fast jumps to text based on initial letter"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.all; }; @@ -130,6 +131,7 @@ rec { meta = with lib; { homepage = "https://mihai-nita.net/java/#ePluginAEC"; description = "Adds support for ANSI escape sequences in the Eclipse console"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; }; @@ -152,6 +154,7 @@ rec { meta = with lib; { description = "A powerful parser generator for processing structured text or binary files"; homepage = "https://www.antlr.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.all; }; @@ -174,6 +177,7 @@ rec { meta = with lib; { description = "A powerful parser generator for processing structured text or binary files"; homepage = "https://www.antlr.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.all; }; @@ -181,21 +185,22 @@ rec { anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; - version = "2.7.1.201709201439"; + version = "2.7.2.202006062100"; srcFeature = fetchurl { - url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar"; - sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh"; + url = "https://github.com/iloveeclipse/plugins/blob/latest/features/AnyEditTools_${version}.jar"; + sha256 = "0dwwwvz8by10f5gnws1ahmg02g6v4xbaqcwc0cydvv1h52cyb40g"; }; srcPlugin = fetchurl { - url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar"; - sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q"; + url = "https://github.com/iloveeclipse/plugins/blob/latest/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar"; + sha256 = "1ip8dk92ka7bczw1bkbs3zkclmwr28ds5q1wrzh525wb70x8v6fi"; }; meta = with lib; { - homepage = "http://andrei.gmxhome.de/anyedit/"; + homepage = "https://github.com/iloveeclipse/plugins"; description = "Adds new tools to the context menu of text-based editors"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -218,6 +223,7 @@ rec { meta = with lib; { homepage = "https://github.com/cypher256/eclipse-encoding-plugin"; description = "Show file encoding and line ending for the active editor in the eclipse status bar"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -225,21 +231,22 @@ rec { bytecode-outline = buildEclipsePlugin rec { name = "bytecode-outline-${version}"; - version = "2.5.0.201711011753-5a57fdf"; + version = "1.0.1.202006062100"; srcFeature = fetchurl { - url = "http://andrei.gmxhome.de/eclipse/features/de.loskutov.BytecodeOutline.feature_${version}.jar"; - sha256 = "0yciqhcq0n5i326mwy57r4ywmkz2c2jky7r4pcmznmhvks3z65ps"; + url = "https://github.com/iloveeclipse/plugins/blob/latest/features/org.eclipse.jdt.bcoview.feature_${version}.jar"; + sha256 = "0zbcph72lgv8cb5n4phcl3qsybc5q5yviwbv8yjv4v12m4l15wpk"; }; srcPlugin = fetchurl { - url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.BytecodeOutline_${version}.jar"; - sha256 = "1vmsqv32jfl7anvdkw0vir342miv5sr9df7vd1w44lf1yf97vxlw"; + url = "https://github.com/iloveeclipse/plugins/blob/latest/plugins/org.eclipse.jdt.bcoview_${version}.jar"; + sha256 = "1bx860k4haqcnhy8825kn4df0pyzd680qbnvjmxfrlxrqhr66fbb"; }; meta = with lib; { - homepage = "http://andrei.gmxhome.de/bytecode/"; + homepage = "https://github.com/iloveeclipse/plugins"; description = "Shows disassembled bytecode of current java editor or class file"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd2; platforms = platforms.all; }; @@ -259,6 +266,7 @@ rec { meta = with lib; { homepage = "https://eclipse.org/cdt/"; description = "C/C++ development tooling"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; @@ -278,6 +286,7 @@ rec { meta = with lib; { homepage = "https://eclipse-cs.sourceforge.net/"; description = "Checkstyle integration into the Eclipse IDE"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21; platforms = platforms.all; }; @@ -301,6 +310,7 @@ rec { meta = with lib; { homepage = "http://eclipsecolorthemes.org/"; description = "Plugin to switch color themes conveniently and without side effects"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -333,6 +343,7 @@ rec { meta = with lib; { homepage = "http://www2.cs.tum.edu/projects/cup/eclipse.php"; description = "IDE for developing CUP based parsers"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; @@ -358,6 +369,7 @@ rec { meta = with lib; { homepage = "https://www.drools.org/"; description = "Drools is a Business Rules Management System (BRMS) solution"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; }; }; @@ -375,6 +387,7 @@ rec { meta = with lib; { homepage = "https://www.eclemma.org/"; description = "EclEmma is a free Java code coverage tool for Eclipse"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -397,6 +410,7 @@ rec { meta = with lib; { homepage = "http://findbugs.sourceforge.net/"; description = "Plugin that uses static analysis to look for bugs in Java code"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -415,6 +429,7 @@ rec { meta = with lib; { homepage = "https://github.com/ddekany/jbosstools-freemarker"; description = "Plugin that provides an editor for Apache FreeMarker files"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; }; @@ -431,6 +446,7 @@ rec { meta = with lib; { homepage = "http://gnuarmeclipse.livius.net/"; description = "GNU ARM Eclipse Plug-ins"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; @@ -469,6 +485,7 @@ rec { meta = with lib; { description = "Adds support for JSON files to Eclipse"; homepage = "https://github.com/boothen/Json-Eclipse-Plugin"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -491,6 +508,7 @@ rec { meta = with lib; { homepage = "https://github.com/angelozerr/jdt-codemining"; description = "Provides JDT Java CodeMining"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -516,6 +534,7 @@ rec { meta = with lib; { homepage = "https://github.com/RustDT"; description = "Rust development tooling"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -533,6 +552,7 @@ rec { meta = with lib; { homepage = "http://scala-ide.org/"; description = "The Scala IDE for Eclipse"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.all; }; @@ -551,6 +571,7 @@ rec { meta = with lib; { homepage = "https://spotbugs.github.io/"; description = "Plugin that uses static analysis to look for bugs in Java code"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21; platforms = platforms.all; }; @@ -573,6 +594,7 @@ rec { meta = with lib; { homepage = "https://testng.org/doc/"; description = "Eclipse plugin for the TestNG testing framework"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; }; @@ -594,6 +616,7 @@ rec { meta = with lib; { homepage = "https://github.com/vrapper/vrapper"; description = "A wrapper to provide a Vim-like input scheme for moving around and editing text"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.stumoss ]; @@ -617,6 +640,7 @@ rec { meta = with lib; { homepage = "https://github.com/oyse/yedit"; description = "A YAML editor plugin for Eclipse"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -634,6 +658,7 @@ rec { meta = with lib; { homepage = "https://www.eclipse.org/gef/zest/"; description = "The Eclipse Visualization Toolkit"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; @@ -656,6 +681,7 @@ rec { meta = with lib; { homepage = "https://ant.apache.org/ivy/ivyde/index.html"; description = "A plugin which integrates Apache Ivy's dependency management"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.r3dl3g ]; @@ -683,6 +709,7 @@ rec { Apache IvyDE Resolve Visualizer is an optional dependency of Apache IvyDE since it requires additional plugins to be installed (Zest). ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.r3dl3g ]; @@ -706,6 +733,7 @@ rec { meta = with lib; { homepage = "https://ant.apache.org/ivy/index.html"; description = "A popular dependency manager focusing on flexibility and simplicity"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.r3dl3g ]; @@ -729,6 +757,7 @@ rec { meta = with lib; { homepage = "https://ant.apache.org/ivy/ivyde/index.html"; description = "Ant Tasks integrated into Eclipse's Ant runtime"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.r3dl3g ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 0cee33fc81e4a..5ae2c51a8da06 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -767,16 +767,16 @@ license = lib.licenses.free; }; }) {}; - consult = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + consult = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "consult"; ename = "consult"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.17.tar"; - sha256 = "16yrp6scxg93anxrp5nww08ixxqk8ra9dn9zm8w5dry997kmkasa"; + url = "https://elpa.gnu.org/packages/consult-0.18.tar"; + sha256 = "0nvi8f0jrji26sjmji8f7rvc8gr1zq49kliq39z7h970d8p10cx2"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/consult.html"; license = lib.licenses.free; @@ -801,10 +801,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.23"; + version = "0.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.23.tar"; - sha256 = "1l988jmvn3x1x77sc89pg5ivwl9i4r2v4k74ymkplgcc9wpffm1v"; + url = "https://elpa.gnu.org/packages/corfu-0.25.tar"; + sha256 = "1ix65l80q8id8vxkvx4wd780cav53lws2z1x3pnj4wmm0n4qwyd9"; }; packageRequires = [ emacs ]; meta = { @@ -861,10 +861,10 @@ elpaBuild { pname = "cpupower"; ename = "cpupower"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cpupower-1.0.4.tar"; - sha256 = "12910d3qbkapr4bvqv88lr85fz6rkim0zrc24nxnvkhkh3yi8qvd"; + url = "https://elpa.gnu.org/packages/cpupower-1.0.5.tar"; + sha256 = "1hg5jwdkxl6mx145wwdmnhc8k3z3srvpm757kppj1ybmvjbpxx0y"; }; packageRequires = []; meta = { @@ -921,10 +921,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.19"; + version = "1.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.19.tar"; - sha256 = "0sslxlnw10ba6m711p4ps4zsfjz56dsp2945ga5z0y8d860pliqh"; + url = "https://elpa.gnu.org/packages/csv-mode-1.20.tar"; + sha256 = "08im1llz04s3ckpj3c3j4wxq4g00fyld2m8ylnh878ss5izzs0lg"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1037,6 +1037,21 @@ license = lib.licenses.free; }; }) {}; + detached = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "detached"; + ename = "detached"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/detached-0.7.tar"; + sha256 = "1a2w6cmzy7c861rih9k2qbnmizyybrs1kwqp6lbz3wfs2h0zisrw"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/detached.html"; + license = lib.licenses.free; + }; + }) {}; devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "devdocs"; @@ -1202,16 +1217,16 @@ license = lib.licenses.free; }; }) {}; - dtache = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + dtache = callPackage ({ detached, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dtache"; ename = "dtache"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dtache-0.6.tar"; - sha256 = "1nv5hzn4rnm8pzfr5i209djaafj4ymg5j886yq2j19zkjadc8yx3"; + url = "https://elpa.gnu.org/packages/dtache-0.7.tar"; + sha256 = "0cws662f53f2j1viicrwijmniiqxz1n4mh6kwck25pl954xa61gf"; }; - packageRequires = [ emacs ]; + packageRequires = [ detached emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/dtache.html"; license = lib.licenses.free; @@ -1326,10 +1341,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220416"; + version = "20220605"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220416.tar"; - sha256 = "174hwb3cyiqimzcsl62yhq51hb4gxmj5wni6w5ng4m24bfkx87nc"; + url = "https://elpa.gnu.org/packages/eev-20220605.tar"; + sha256 = "1d8bmps72519hv3raqyjx1sbd7vmihckq8qrzd2v0rglx4smikdk"; }; packageRequires = [ emacs ]; meta = { @@ -1444,10 +1459,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.16.tar"; - sha256 = "1fgsy4nqwl1cah287fbabpi9lwmbiyn36c4z918514iwr5hgrmfi"; + url = "https://elpa.gnu.org/packages/embark-0.17.tar"; + sha256 = "05r5z59sv0j4sawybd4353ziya87q6yzx4l8sjklybcn2mslpp1q"; }; packageRequires = [ emacs ]; meta = { @@ -1464,10 +1479,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.5.tar"; - sha256 = "1z4n5gm30yan3gg2aqwb1ygql56v9sg2px1dr0gdl32lgmn9kvg6"; + url = "https://elpa.gnu.org/packages/embark-consult-0.6.tar"; + sha256 = "1c8rx9ikazbnap293ab6s26djikdy85i7z330wdwwrgmipkfawaj"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1714,10 +1729,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-0.2.1.tar"; - sha256 = "11g03gaiypqf0xi7s3xyjnbi2w154lkd7j0ybmn8scs6pbzdyl95"; + url = "https://elpa.gnu.org/packages/fontaine-0.2.2.tar"; + sha256 = "14q10r5086pyknpm8kd9f0scwwbgygqjp8b08k6a4f30a3pl3rqi"; }; packageRequires = [ emacs ]; meta = { @@ -2144,6 +2159,21 @@ license = lib.licenses.free; }; }) {}; + inspector = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "inspector"; + ename = "inspector"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/inspector-0.5.tar"; + sha256 = "19f2a0fw0zcrfirjhq7my910jiqxqkishyjprj87cahpksdp4cp9"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/inspector.html"; + license = lib.licenses.free; + }; + }) {}; ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ioccur"; @@ -2558,10 +2588,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "0.3.2"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/logos-0.3.2.tar"; - sha256 = "1qpbp9f9lz7yrky42cq8b4k295593s7l892zsrdyifnqcgs50bfd"; + url = "https://elpa.gnu.org/packages/logos-0.4.0.tar"; + sha256 = "12yypzfd6lf71qyix0a1088vkamh9ilq8inpmv2882w3r5dii345"; }; packageRequires = [ emacs ]; meta = { @@ -2772,10 +2802,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "2.3.0"; + version = "2.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-2.3.0.tar"; - sha256 = "028c1z4p1bbgf34fml4i0prihxn44x288iyprz9gxrp7x3gl05n8"; + url = "https://elpa.gnu.org/packages/modus-themes-2.4.1.tar"; + sha256 = "0wm4wj2dsv93p8yq7byrwni079caxny9cgn8d5xz0a6g1igqzx4q"; }; packageRequires = [ emacs ]; meta = { @@ -2821,10 +2851,10 @@ elpaBuild { pname = "multishell"; ename = "multishell"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/multishell-1.1.9.tar"; - sha256 = "0gi5qmx27v7kaczr9b3sic69br3l7mcws3sdrs8c14iipcyl5qhb"; + url = "https://elpa.gnu.org/packages/multishell-1.1.10.tar"; + sha256 = "1ipn9rlh9jg55i04adjy32n8dkjhhw1bcd72w97mlsdk66g8j6l3"; }; packageRequires = [ cl-lib ]; meta = { @@ -2931,10 +2961,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "0.7"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-0.7.tar"; - sha256 = "1fsjzbdawkn4vmk6zs6az1b42mx5ka7a618fgx5zdncr79wl0vjw"; + url = "https://elpa.gnu.org/packages/nano-modeline-0.7.1.tar"; + sha256 = "18a4mp27z6pj87yhp81x5a79g0kv6mzzd0axq2p31003r675l0hx"; }; packageRequires = [ emacs ]; meta = { @@ -2957,6 +2987,21 @@ license = lib.licenses.free; }; }) {}; + nftables-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "nftables-mode"; + ename = "nftables-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar"; + sha256 = "0wcd31frnvxzkns4jdfxraai0bfi1184wcn64r8lg73h933p47iz"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nftables-mode.html"; + license = lib.licenses.free; + }; + }) {}; nhexl-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -3130,10 +3175,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.5.3"; + version = "9.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.5.3.tar"; - sha256 = "0i8lx7gsdz79qv0h3qdbwqd0m91z6ky33wjmkcbify75giixiv25"; + url = "https://elpa.gnu.org/packages/org-9.5.4.tar"; + sha256 = "1rcr1kyvd2l5h1i22z40x998jm4b6vk47i77y376blcrcx2dp26m"; }; packageRequires = [ emacs ]; meta = { @@ -3190,10 +3235,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-remark-1.0.4.tar"; - sha256 = "1mbsp92vw8p8l2pxs53r7wafrplrwfx0rmfk723cl9hpvghvl9vf"; + url = "https://elpa.gnu.org/packages/org-remark-1.0.5.tar"; + sha256 = "01pgfg9j5wrhggjklkc9nbfiwjd5qnmhcbcccc06jz3hmd0rnxr2"; }; packageRequires = [ emacs org ]; meta = { @@ -3265,10 +3310,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-0.7.tar"; - sha256 = "0k2phmh2sl50vx88cgndghcjfz0i20mjs2hg4mlh4hb5q9yjpcj4"; + url = "https://elpa.gnu.org/packages/osm-0.8.tar"; + sha256 = "1vvd149n4pa6jy7xk5dmhi0nfwcjd4rvxn283f1jxp5jvv47m202"; }; packageRequires = [ emacs ]; meta = { @@ -3340,10 +3385,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.1.5.tar"; - sha256 = "06cl9whk321l1q5xcjmgq5c59l10ybwcdsmmbrkrllnbpqxy23bj"; + url = "https://elpa.gnu.org/packages/parser-generator-0.1.6.tar"; + sha256 = "0qql5klnh8fbnbkb4mhv6axxvw4qv09cy1h556m0qzg30sckxas1"; }; packageRequires = [ emacs ]; meta = { @@ -3400,10 +3445,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.20"; + version = "0.4.22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.20.tar"; - sha256 = "0xb4i3s6yira1kfqwrs72ajvpqc6pw7gqlxmfmdhyyvib6p93l6m"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.22.tar"; + sha256 = "1094dmvihx0ff7fyjldd2zfn47nq89p6bjp90ma0xf01hf6ggn6c"; }; packageRequires = [ emacs ]; meta = { @@ -3535,10 +3580,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-4.2.0.tar"; - sha256 = "1yb6yv92987kq0ls38d0fqwbj5jrf4cg3jvdbwjzr61gg3izf414"; + url = "https://elpa.gnu.org/packages/pyim-4.2.1.tar"; + sha256 = "15hsz1ji8xa7zqzzmbi0vk95vgsvl4dsd1rann04vfaz30a1rdzv"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3550,10 +3595,10 @@ elpaBuild { pname = "pyim-basedict"; ename = "pyim-basedict"; - version = "0.5.0"; + version = "0.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.0.tar"; - sha256 = "0h946wsnbbii32kl2kpv0k1kq118ymvpd5q1mphfsf126dz9sv78"; + url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.3.tar"; + sha256 = "1x3zmcbp5yck5dxfms8d9ym0fdbvwr40fn8wrq0qfl9a58k8i5bx"; }; packageRequires = []; meta = { @@ -3815,10 +3860,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.8.3.tar"; - sha256 = "0lkmvvdj4xx3qhxqggizrcdawav0accyrza2wmhfdq88g2zh5575"; + url = "https://elpa.gnu.org/packages/rec-mode-1.8.4.tar"; + sha256 = "03n0g6inhj0mqqcqimh6nfi6rdzgh4w59vdjicvn880r5n8zwn4d"; }; packageRequires = [ emacs ]; meta = { @@ -4260,10 +4305,10 @@ elpaBuild { pname = "sql-beeline"; ename = "sql-beeline"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-beeline-0.1.tar"; - sha256 = "0yvj96aljmyiz8y6xjpypqjfrl1jdcrcc4jx4kbgl6mkv4z2aq1g"; + url = "https://elpa.gnu.org/packages/sql-beeline-0.2.tar"; + sha256 = "1bqzs53x506bzgchvjfr1ljqxbb9y041n7aj9n7ajb2634i7lllr"; }; packageRequires = []; meta = { @@ -4301,6 +4346,21 @@ license = lib.licenses.free; }; }) {}; + srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: + elpaBuild { + pname = "srht"; + ename = "srht"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/srht-0.1.tar"; + sha256 = "1cdylp2hma83iv062nf7qyz21a3r8562gwx2lk6cf45k2kh3hbv8"; + }; + packageRequires = [ emacs plz ]; + meta = { + homepage = "https://elpa.gnu.org/packages/srht.html"; + license = lib.licenses.free; + }; + }) {}; ssh-deploy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ssh-deploy"; @@ -4553,10 +4613,10 @@ elpaBuild { pname = "tmr"; ename = "tmr"; - version = "0.2.3"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tmr-0.2.3.tar"; - sha256 = "0lys6g96cvfyhwr7z0yv9cx2ykzyixjppv5fh29qzq3h3dywx5wb"; + url = "https://elpa.gnu.org/packages/tmr-0.3.0.tar"; + sha256 = "1cv90hg7hsaffkcxryp9d5cyjvmfpxcmrw5knipad77yxzaf4s6b"; }; packageRequires = [ emacs ]; meta = { @@ -4583,10 +4643,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.2.4"; + version = "2.5.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.2.4.tar"; - sha256 = "0ap1d34p1akrrm8z1r7ln6mj13xg2nrvjln2v3g8plhhp354jldz"; + url = "https://elpa.gnu.org/packages/tramp-2.5.2.5.tar"; + sha256 = "05f59x7jl4m187y2cidhnfz7p8q85gav4xpipazfvm5dicxz4j7c"; }; packageRequires = [ emacs ]; meta = { @@ -4802,10 +4862,10 @@ elpaBuild { pname = "vc-got"; ename = "vc-got"; - version = "1.1"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-got-1.1.tar"; - sha256 = "1myck30ybq8ggf4yk3s2sqjqj8m1kfl8qxygkk3ynfa6jxxy4x1r"; + url = "https://elpa.gnu.org/packages/vc-got-1.1.1.tar"; + sha256 = "0f8rwd4scvlyn9i9xq7d2sly7r0ddzi8z565jx1h2lkcs5nbihcb"; }; packageRequires = [ emacs ]; meta = { @@ -4894,10 +4954,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.23"; + version = "0.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.23.tar"; - sha256 = "1d2r2y1bhvipn4xqzla5rv09cdpg7f19m9hrnv1pqypjvbgqv1m2"; + url = "https://elpa.gnu.org/packages/vertico-0.24.tar"; + sha256 = "17vsx1yijx9clly977lvc6y296kq8g859hqwwq1v8zh4k0wqr9hc"; }; packageRequires = [ emacs ]; meta = { @@ -4947,10 +5007,10 @@ elpaBuild { pname = "visual-filename-abbrev"; ename = "visual-filename-abbrev"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.1.tar"; - sha256 = "1l2wq7q28lcl78flxqvsxc9h96whpynqq8kpmbiy3nzlw2mrgr8g"; + url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.2.tar"; + sha256 = "0sipyqrgf723ii2zd6r8hvihn5kax5qd0dwwrrxqy6f58wnhyq1r"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix index 139bddffa87a2..df3b2a56519e6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix @@ -5,19 +5,23 @@ trivialBuild { pname = "header-file-mode"; - version = "unstable-2022-05-13"; + version = "unstable-2022-05-25"; src = fetchFromGitHub { owner = "aidalgol"; repo = "header-file-mode"; - rev = "bcfd19a2c70030ebf5fa68e87aca4b3db8fad13e"; - sha256 = "sha256-XMXOU+vWJ/0e0ny4Dz3DxWpdEfSNXGzm03sBke32Dwc="; + rev = "cf6ce33b436ae9631aece1cd30a459cb0f89d1cd"; + sha256 = "sha256-+TDJubmBc0Hl+2ms58rnOf3hTaQE3ayrIpGWl4j39GQ="; }; postUnpack = '' sourceRoot="$sourceRoot/lisp" ''; + postBuild = '' + emacs -L . --batch -l package --eval '(package-generate-autoloads "header-file" ".")' + ''; + meta = { description = '' A major mode that, when associated with the .h file extension, will put diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index f85120c0c21d1..b3303d3dfd698 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -49,10 +49,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.5.4.tar"; - sha256 = "1d11q4ddc2rw7n8jrxdddc5h42hf16sbc1l4v6zmmsriahxhgfdd"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.6.0.tar"; + sha256 = "12843875nvrw5cs2pzag9i2k4vgajbs4rr56js7h6mx9w6jmg8hc"; }; packageRequires = []; meta = { @@ -258,10 +258,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.4.0.tar"; - sha256 = "11a3ysvrywp79pp1yivpsgi8azgzbg7ayiai94p1dyd3viy29qn0"; + url = "https://elpa.nongnu.org/nongnu/cider-1.4.1.tar"; + sha256 = "0l36pqmjqzv6ykmw593h6qd24pygq7171qfinvlp2fh8897ac2nj"; }; packageRequires = [ clojure-mode @@ -325,6 +325,26 @@ license = lib.licenses.free; }; }) {}; + corfu-terminal = callPackage ({ corfu + , elpaBuild + , emacs + , fetchurl + , lib + , popon }: + elpaBuild { + pname = "corfu-terminal"; + ename = "corfu-terminal"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.4.tar"; + sha256 = "1rmfj2lzdab2s49k9ja79i7xcw74r9cr5kv7rgrisqxwgcnvsi95"; + }; + packageRequires = [ corfu emacs popon ]; + meta = { + homepage = "https://elpa.gnu.org/packages/corfu-terminal.html"; + license = lib.licenses.free; + }; + }) {}; crux = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "crux"; @@ -598,16 +618,16 @@ license = lib.licenses.free; }; }) {}; - evil-matchit = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }: + evil-matchit = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "evil-matchit"; ename = "evil-matchit"; - version = "2.4.4"; + version = "3.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.4.tar"; - sha256 = "1p8xsi0068wabsfn3jwhyinkk2684xp9hlapcbj6y58wkpzqj0f6"; + url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.0.tar"; + sha256 = "036zf7l8pkhbyk7gz91r00v4fqi2wfdnqv95xkh7jpm2i9xcgg5p"; }; - packageRequires = [ emacs evil ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/evil-matchit.html"; license = lib.licenses.free; @@ -673,6 +693,27 @@ license = lib.licenses.free; }; }) {}; + flymake-popon = callPackage ({ elpaBuild + , emacs + , fetchurl + , flymake ? null + , lib + , popon + , posframe }: + elpaBuild { + pname = "flymake-popon"; + ename = "flymake-popon"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.2.tar"; + sha256 = "08wpfia4q12nhc6l0xmdc54f1s73c0ds6hxwgkk5hjw906rpgn4a"; + }; + packageRequires = [ emacs flymake popon posframe ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-popon.html"; + license = lib.licenses.free; + }; + }) {}; forth-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "forth-mode"; @@ -1270,10 +1311,10 @@ elpaBuild { pname = "kotlin-mode"; ename = "kotlin-mode"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/kotlin-mode-1.0.0.tar"; - sha256 = "0ajnnsh6a8psfh7gd34d2wfii08jxr7x7k6na0assjldsxy7afwj"; + url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar"; + sha256 = "0q1pfjcsk6c17hs5xg7wb6f4i29hn3zxgznjcr3v11dm4xmrj9iv"; }; packageRequires = [ emacs ]; meta = { @@ -1524,14 +1565,29 @@ license = lib.licenses.free; }; }) {}; + org-auto-tangle = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "org-auto-tangle"; + ename = "org-auto-tangle"; + version = "0.4.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.4.1.tar"; + sha256 = "169i1agnv66gkpgn5wxxri42610n2dp1gz9bfafk2n2a8b08mhn1"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-auto-tangle.html"; + license = lib.licenses.free; + }; + }) {}; org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.3.tar"; - sha256 = "0fqhyby7624drskfsasgvzyxbgjb42rd6vw8l6xgb3h22kaprl0q"; + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.tar"; + sha256 = "05r7w0h9v1vfhv1dd2vaabq2gm8ra70s1cirlp75s343b0z28ca6"; }; packageRequires = [ emacs org ]; meta = { @@ -1579,10 +1635,10 @@ elpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "0.2.6"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.6.tar"; - sha256 = "1l6mniyhmw3vbkvahw24038isd4ysbx505c3r0ar1rh7fbdf58cf"; + url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.1.tar"; + sha256 = "0dm7addyc98kh1lm4d8x7nvnkh6bwkw300ms2zlwm1ii91jzfkkg"; }; packageRequires = [ emacs ]; meta = { @@ -1745,6 +1801,21 @@ license = lib.licenses.free; }; }) {}; + popon = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "popon"; + ename = "popon"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/popon-0.4.tar"; + sha256 = "1c3brjhkdnpawi8jsc20jvhc1vl3l39da12rn3lfx2bfxvjvz76w"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/popon.html"; + license = lib.licenses.free; + }; + }) {}; popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "popup"; @@ -1918,10 +1989,10 @@ elpaBuild { pname = "shellcop"; ename = "shellcop"; - version = "0.0.9"; + version = "0.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.9.tar"; - sha256 = "0rv98s3w3pd2l477100d8kn2kqx21xn3axzcfbxbkgl8bc78mvci"; + url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar"; + sha256 = "0z0aml86y1m11lz8a8wdjfad5dzynjsqw69qin0a4vv2b8gy8mhr"; }; packageRequires = [ emacs ]; meta = { @@ -2064,6 +2135,21 @@ license = lib.licenses.free; }; }) {}; + swsw = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "swsw"; + ename = "swsw"; + version = "2.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/swsw-2.1.1.tar"; + sha256 = "0k6cysa4pmxv1kmpn0fqvardbdfayj92cq0r3gxrx9pgqxlqwfix"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/swsw.html"; + license = lib.licenses.free; + }; + }) {}; systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "systemd"; @@ -2209,10 +2295,10 @@ elpaBuild { pname = "vc-fossil"; ename = "vc-fossil"; - version = "20210928"; + version = "20220707"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/vc-fossil-20210928.tar"; - sha256 = "0n4h1cj1336mv5cswq0139bkry5gnv4hrrwzd4bqhrxp5kbhqa5y"; + url = "https://elpa.nongnu.org/nongnu/vc-fossil-20220707.tar"; + sha256 = "0l33y8mij6rw4h47ryqpjxr1i2xzis98rbi230izkvsc6w7qf89q"; }; packageRequires = []; meta = { @@ -2220,14 +2306,29 @@ license = lib.licenses.free; }; }) {}; + vcomplete = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "vcomplete"; + ename = "vcomplete"; + version = "1.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/vcomplete-1.2.1.tar"; + sha256 = "1fcchgv4kdmhzgincfy1jm625lwj3qrjskd0cswag5z15by6b5xf"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vcomplete.html"; + license = lib.licenses.free; + }; + }) {}; visual-fill-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "2.4"; + version = "2.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.4.tar"; - sha256 = "0100v17s9w9nqjpr7h3zianfy1i4i71idk2qrlzqzcd8qn1m3vjx"; + url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.tar"; + sha256 = "0mqhm7xkxpzjk96n6qybqg2780kbjg1w7ash88zhnbp8kvy0rrwi"; }; packageRequires = [ emacs ]; meta = { @@ -2239,10 +2340,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.2.0"; + version = "17.2.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.0.tar"; - sha256 = "15m7rx7sz7f6h0x90811bcl8gdcpn216ia48nmkqhqrm85synlja"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.2.tar"; + sha256 = "19ajwjcxv7vqysk085jyys77vry8nw7rzc7c43khyxb54qvg36i3"; }; packageRequires = [ emacs ]; meta = { @@ -2337,10 +2438,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "17.7.20220429090059"; + version = "17.13.20220526011611"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.7.20220429090059.tar"; - sha256 = "006lqjx88b0g0szxai82qdn3bv8qajp2x281arpmp3rpb7faggvq"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.13.20220526011611.tar"; + sha256 = "1lg8805s5y61jr6yrm44zdjm0nad6adc5xr78zm0i0qzigbhhdcq"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index bc3466f4890f6..fdf580cd81a74 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -273,8 +273,8 @@ 20210923, 950 ], - "commit": "0d6aace2ffd184137618a0c6e7f29826cbd8d1f9", - "sha256": "1rf989ll07xqmamdigzqmamhfscx7wk0xh5yaqam1q3hj13yywm5" + "commit": "9c8c26c0de493f21cf4a68abad49f944d427bd88", + "sha256": "18lidpmi0sp9za6ykidgnssdvnx1p7kyr51k4b21cqjrnal606zl" } }, { @@ -939,8 +939,8 @@ }, { "ename": "ac-math", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "02c821zabxp9qkwx252pxjmssdbmas0iwanw09r03bmiby9d4nsl", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "16qsbx65q8z6dsq7z1mvfqw2bjwdrnhsfsc0sl8awm5f4463bi10", "fetcher": "github", "repo": "vspinu/ac-math", "unstable": { @@ -1810,8 +1810,8 @@ }, { "ename": "ado-mode", - "commit": "337f21eb8f4af233b4c0bc658cd82e8479b49aaa", - "sha256": "1gybsnj7s21vm1iakz4hy5d6skzcfi6455wnikv9dpwy1069rw32", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "0x070d95krvmq08hknclx8qj8zsm2afmiw3nv891ks8dg211glnj", "fetcher": "github", "repo": "louabill/ado-mode", "unstable": { @@ -1834,20 +1834,20 @@ }, { "ename": "adoc-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c", + "commit": "221950c9703432a8e3c2a99f2cc709dff7bcbdbb", + "sha256": "13d2mj9bf9z5ky7gi1dajky210h1kzr2bh1vvl5cvq7slsrjfazi", "fetcher": "github", - "repo": "sensorflo/adoc-mode", + "repo": "emacsorphanage/adoc-mode", "unstable": { "version": [ - 20160314, - 2130 + 20220529, + 551 ], "deps": [ "markup-faces" ], - "commit": "745884359a1b8826ede2c4cfd2f0b5478953ac40", - "sha256": "199da15f6p84809z33w3m35lrk9bgx8qpgnxsxgisli373mpzvd8" + "commit": "cacd4e8f6773da85ebe17b733eb5e74f2f7c379c", + "sha256": "08w8xirp2frkap74d646j6pbaby72j1233hlz0nk3pzlh0lglzc0" }, "stable": { "version": [ @@ -1893,14 +1893,14 @@ "repo": "minad/affe", "unstable": { "version": [ - 20220407, - 2313 + 20220603, + 548 ], "deps": [ "consult" ], - "commit": "a61d593d0cbff65a93111be96b9f53d3e640cf8d", - "sha256": "1pkqr7asz6h4gjkrg8mc8qikxy4agiv0x6ragbasy0xm3q4wxm0h" + "commit": "e8cb221892ae4d82fc52fffb72b45b5b89ada334", + "sha256": "0gwg60c3f2ypjwpai3j4dhzdjn29lxskf3s0nw75pnipngf0sh9r" }, "stable": { "version": [ @@ -2062,11 +2062,11 @@ "url": "https://bitbucket.org/agriggio/ahg", "unstable": { "version": [ - 20210412, - 847 + 20220529, + 1200 ], - "commit": "77bc2a628df006dcd2dc359ac12acdf8091a1356", - "sha256": "1wmvz9d40aznqh2y078v8k7n3l66m48vnf873vifi8rwg6158kqh" + "commit": "d93cc73f79f6c29d533c468112181cd4c7b11935", + "sha256": "1jq411g0ryxkqw4wig6mlm0dpjzx87cw3x277bcj796s3nxl95ln" } }, { @@ -2489,11 +2489,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220427, - 1911 + 20220521, + 816 ], - "commit": "68365b48f142d75ef4bdc3a274256d97752e3b65", - "sha256": "1nf6z5i9gpbv1qdrm7r0qb0mbzipdn9mnfwc478rrazmn2l0m5cs" + "commit": "ca1ef30004d3fb76aaa70bd47cb83e9fe017a7f7", + "sha256": "149i1wh2wk4j6x8zyz8macz6pfhkmpvf9j6xqhn3psnbdpikjvqp" }, "stable": { "version": [ @@ -2641,15 +2641,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220510, - 752 + 20220607, + 1820 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "7c382ccbc8b1b2d0e18d280b24ee2029dca070d8", - "sha256": "0145agd3kg1m7ylishf4ypg6bc01jrps17rwxw0kdqrh3gp7xvg3" + "commit": "e489b08aeae53c0288474495b5c0e6847ba1005d", + "sha256": "150p4aqg7dd3k277518ia3zsjkyn8f8a5msmgh9x812gypcrgcpm" }, "stable": { "version": [ @@ -2715,8 +2715,8 @@ 20220212, 1526 ], - "commit": "45deed4b9aadcd5e2a5482b0fe5110bb78ba1dd6", - "sha256": "0g77kdr0lhv2w4gdcmc2bf4ix5kpjg9g358v0kjn26gr36m843j6" + "commit": "e79c3762130749b02689d1274adce8b93aac9b7a", + "sha256": "0vpcran6yxp9vyy9xhwc9kj7hw3shsvz6igy4yvj0i4xkpkib4p8" }, "stable": { "version": [ @@ -2846,14 +2846,14 @@ "url": "https://repo.or.cz/amread-mode.git", "unstable": { "version": [ - 20220210, - 1354 + 20220519, + 45 ], "deps": [ "cl-lib" ], - "commit": "a3358645582148e81bff54e18877451b747173bb", - "sha256": "0nl1w5ysq90bxl16jrdh87wyp6ffawbjc3c6zrbhsfmfd24jiq28" + "commit": "21f3cf796c08625cf70d534a990f4ae2273a5d4f", + "sha256": "1rs5ybxh779fzb2xr0y8rhh4qzdpgrfgir4r81rpfxyhksls88xx" } }, { @@ -3229,11 +3229,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20220428, - 1339 + 20220603, + 1023 ], - "commit": "e982a7b74a681a8c2c823d8dcaafd185ab5f719e", - "sha256": "13vnc9qkz2n121yf482sj19daxa262pnp49cy8p5cvrr75narh1r" + "commit": "7f48fad362b15546da7b015b533609a2452497b0", + "sha256": "01kv6bjsnsarnmmy7jrbs74q1pdabz2k4p0330hcny7nl9xp51jj" }, "stable": { "version": [ @@ -3271,8 +3271,8 @@ 20200914, 644 ], - "commit": "9a5f2b4a8cd14edbde9d16dcdfcb8db2a91be0d8", - "sha256": "1pn3w2prmz9ibhy5l22c6mmccr7lfy561gkd2s41hlcjsyd4ar00" + "commit": "6385f850a185523bb5241a71f5a7614a148f6b53", + "sha256": "0dllhhbr265dm12nkiil0s7cb24l7pjdjgfwgcsy98imn8pl8z4p" }, "stable": { "version": [ @@ -3624,19 +3624,19 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20220512, - 1952 + 20220604, + 2239 ], - "commit": "b5dbab53eadf64529a0bfe217c7750f1d7d85fce", - "sha256": "1w7x7k5mrvp5yq5ppq9zps5z2c7h67yjxyaxcvbkjibvswb0c616" + "commit": "67853e98b190cc735a8ad31bd1de64f76f2990c4", + "sha256": "1jbidfz0s7lz190hzwvj7qxh2f3lmbwaynqrarr183pksja4jqwc" }, "stable": { "version": [ - 2, + 3, 0 ], - "commit": "84b04329d7c0ddf41e41433b3f732714995a2bfd", - "sha256": "0kd0aydpfvxzq8qc6cknx11hcc6vwp7lxzjwbkcr5w4jynza59v1" + "commit": "18ccacc5cf0806ecf11d0a3d462de1803e46a9ad", + "sha256": "0fpqh4wv69msfsnv3k88cai3nbja70ab5c02xf8gwfgg3613pjdd" } }, { @@ -3741,8 +3741,8 @@ 20210802, 1715 ], - "commit": "ea9a32aa33580b0695e7298d56c3d5f050a02b87", - "sha256": "13wm9g184lxzf55cwx1cc88d5a17yghbfqsqvyihsb7yv2i2xg8i" + "commit": "9b84a7cb74d687745df37ba15113933fc6256274", + "sha256": "0ng2wzfmardlfjga60850izq7xh22qcc1i69n4ap6f74s334k8iq" }, "stable": { "version": [ @@ -3892,11 +3892,11 @@ "repo": "nbarrientos/archive-rpm", "unstable": { "version": [ - 20220314, - 1647 + 20220527, + 632 ], - "commit": "515d2230352fffcc982ae2e322d95cbee6aca760", - "sha256": "1x8mwhfwcpbwaha5qb5hnl6ga29cbi27a26m0q4840agpr53s1km" + "commit": "cb48fee04cb0cbb26f760a3b95649f7dac78c6ec", + "sha256": "088rcqlwhdcaal99cbwsfg93nvzil2kix28zib2lxv6lfapjpzwp" }, "stable": { "version": [ @@ -4036,6 +4036,25 @@ } }, { + "ename": "arxiv-citation", + "commit": "92d5032fee7e103ccf1517b7bbc18e4c5059eba7", + "sha256": "1n5v28s071gdgd6yzv0ywa9vhkc2x21ax3b3b1x7z3y8xvqwrr2s", + "fetcher": "gitlab", + "repo": "slotThe/arxiv-citation", + "unstable": { + "version": [ + 20220601, + 652 + ], + "deps": [ + "dash", + "s" + ], + "commit": "ce4bf6958109b3b15bfc3f808ba4882b41fcb3ff", + "sha256": "0q74qgsdy2dahzvxlv9mayd6f6fgyf1q4lf6gvwc0xm9ms5qwf4c" + } + }, + { "ename": "arxiv-mode", "commit": "1207f9108fae0bdb11b74971dbb6b6d9ec25e5c0", "sha256": "01am6h9h2m0fqsmxgk9c36jwraznh5wp2k1ajmwawplx4cshhx1x", @@ -4280,10 +4299,10 @@ }, { "ename": "async-backup", - "commit": "79cfb4a1c6b89cc5d93020089804b5e6ae711387", - "sha256": "0w56q76x2b31adhjjsqm38jfgxi2305s9lxvwbq8w13693i5fv8a", + "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3", + "sha256": "1m1kj4bj1a9514pprd43i15bgshkm1lcqq44h7grg8pxxxks1xxw", "fetcher": "git", - "url": "https://tildegit.org/contrapunctus/async-backup.git", + "url": "https://codeberg.org/contrapunctus/async-backup.git", "unstable": { "version": [ 20220131, @@ -4336,8 +4355,8 @@ 20201026, 339 ], - "commit": "43ca538ecece4e14bb9bcd887854aeb14b3d45f4", - "sha256": "05l6wbhyh2jy5cqmy0b3bg5klafcc1fcfp5944r9wdah0lpg169k" + "commit": "d407daa17e0557f366d485c7c39880d2cd19938a", + "sha256": "1hmf0n6gm95ajr15s3vmd1ybk28zklna2n5xp0hrn9q5vj6wv7a5" }, "stable": { "version": [ @@ -4360,8 +4379,8 @@ 20210731, 609 ], - "commit": "e0d11744d9b2bca780322b1b282fb5ffb18cfd75", - "sha256": "1va7fhh4ppb9aily009m6nf43z5l8fdwinsqy46qj81w5apmbpg5" + "commit": "bac60d0c76f0fe48b5f634502c79e87d7ab057b6", + "sha256": "1yldbkxywmybzv80ynisklzl8qyb7xb5wxlb4q7i355v6654ciap" }, "stable": { "version": [ @@ -4661,8 +4680,8 @@ "keytar", "s" ], - "commit": "5c6f0952f28ce722f4a75139f3dc1afc99e12396", - "sha256": "0v83s1gfyh1zbaaqgj2q9vg193k705kr18mszp6p8rdyffdw5fqi" + "commit": "66ee3b73b7739fd35d848fabbeec0b2c44b0b532", + "sha256": "16gkm4ysh0pgg9ag0b6q4xpx8mr1gk6sghr236hjkvjvca5b85sj" }, "stable": { "version": [ @@ -4767,15 +4786,15 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20220422, - 1600 + 20220517, + 1501 ], "deps": [ "compat", "packed" ], - "commit": "16de66c381dab3c1fb7bc248e0f81ef68966bd7d", - "sha256": "0ls5n124rl8s3dyj0kr7n1sv3dkn9bw7k61s2f2ads43gp3744qp" + "commit": "b204e2f85aaa4d41af4eb1819633c9613f5172bf", + "sha256": "0wqiypznwg7pcqb1qvf4ba2kx4f8x01ms8zxbxy134j9idm4g39f" }, "stable": { "version": [ @@ -4805,8 +4824,8 @@ "cl-lib", "popup" ], - "commit": "d546b18c3e83e38686d9b7316c6c705597e1a8b3", - "sha256": "1fwg2zn7digz22vf22h4kim3wkz2i2wvs42ak12lxg8aa3w6wn94" + "commit": "72c44902f893bfffe4ff0075e992541d79cfbb5d", + "sha256": "0rbawimh6540mj0m0xapj7swhz119921vdwgvxrvpyd8n3alww4g" }, "stable": { "version": [ @@ -5148,8 +5167,8 @@ "deps": [ "ht" ], - "commit": "e31a2d2bb97ffcbeb493f3501311b30c3f10952f", - "sha256": "0md8dlx1g5lxb4f5yxhm617kj49zysya9y6awjrvpj30crp78g5z" + "commit": "26ad2261866d19994f8927002dcc53a80540ffd3", + "sha256": "0zakrvsnbliv0rsm6pm0d98bpf1llbl97cw8r55g7g8r79mjjxrp" }, "stable": { "version": [ @@ -5298,8 +5317,8 @@ 20210805, 1344 ], - "commit": "85b02fa6ce76ab872c025a82c2f14614af3d89e1", - "sha256": "1rnigp11xlxhzrfwqna0dqrd0a655gs0qf5m6bkzq41ssdvvdis8" + "commit": "ba5e28cd4ca7515f7d7a8c243f913d571ca976d6", + "sha256": "00cv35q52nprj12396c1447bpbi710sapqw3s9v5jm5m3x7w4z9m" }, "stable": { "version": [ @@ -5503,11 +5522,11 @@ "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ - 20220215, - 1204 + 20220526, + 1846 ], - "commit": "c439cbe029f7ffeca6de0ea72258069c41350509", - "sha256": "1r7qan2v3kaykacnf98s2zcfb5ryk4jqpw7acrfvajgvdn3w03sh" + "commit": "5fae83ac0501a26c92e022218341c21cc71e463c", + "sha256": "01ib6lzywssm81mwi72aaavkp078kkbgvnhi0gl09vgn2pba78va" } }, { @@ -5567,8 +5586,8 @@ 20190331, 2230 ], - "commit": "09166f32d3ece2b297da036f0abbeba63329580e", - "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d" + "commit": "7725c08f00a463ba7210efcb759c934223c85b00", + "sha256": "1dqascm5ds9jzp4m4hdb4l9wwfcnkc1ba3y4m24ybx43gjj38sxn" } }, { @@ -5711,20 +5730,20 @@ "avy", "embark" ], - "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1", - "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc" + "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487", + "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a" }, "stable": { "version": [ 0, - 16 + 17 ], "deps": [ "avy", "embark" ], - "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", - "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" + "commit": "97270d725761ee02db461b45b18ec16ae31f203e", + "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" } }, { @@ -5925,8 +5944,8 @@ 20220512, 1931 ], - "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2", - "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6" + "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56", + "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p" } }, { @@ -6271,25 +6290,25 @@ }, { "ename": "base16-theme", - "commit": "30862f6be74882cfb57fb031f7318d3fd15551e3", - "sha256": "115dhr3gfvdz5wv76fwpv3b4dywiwbk69qrhkfhij8vpcfybrpzx", + "commit": "a91349e3285531fd7040b8bf192c15cccbcac8d1", + "sha256": "1j49gan9i0wqr2zvc23811yiv72gyiwiqyf4jckik4vcfx3gsk1f", "fetcher": "github", - "repo": "belak/base16-emacs", + "repo": "base16-project/base16-emacs", "unstable": { "version": [ - 20220510, - 423 + 20220526, + 1015 ], - "commit": "43f3257aaf53e9c50f5db11b81fd66ec41ab2883", - "sha256": "07k73bgjb6ixfgbiwf8zswf6n0kb3bf1ka1pcv88h3a9hhndvgv5" + "commit": "26b84fc93505219517a512eb01e6370365174989", + "sha256": "0qp71j77zg8gippcn277s0j5a9n6dbwv3kdp2nya6li4b412vgba" }, "stable": { "version": [ - 2, - 4 + 3, + 0 ], - "commit": "7b2bb8d05562fa8d75366e82eef895c03ab7b31c", - "sha256": "1jgqq52q2q7sgf46xip0sfpwyi8k43v2l688hx7p0whncjhd7cmr" + "commit": "26b84fc93505219517a512eb01e6370365174989", + "sha256": "0qp71j77zg8gippcn277s0j5a9n6dbwv3kdp2nya6li4b412vgba" } }, { @@ -6300,11 +6319,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20220328, - 844 + 20220531, + 1104 ], - "commit": "29b5fc860a5b0db9828acfceca09b773fbdb8e8a", - "sha256": "1gj62v4j3s21kbm1zapb7scv1zh4q9k1jjpgrr4wy0fqk7gzfprq" + "commit": "8e9c20dbfe01d8bf6c61db231593623a201c75c6", + "sha256": "1jq6nx5kpln15yv0k9njql8xl7id7yswdl7hkkbwha99i1cn0nqd" }, "stable": { "version": [ @@ -6534,8 +6553,8 @@ }, { "ename": "bbdb", - "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86", - "sha256": "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "0gnjdlb338gxpsmdx8scj5vb1rbvfkmm71xq37sahy0m4r402al1", "fetcher": "git", "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { @@ -6543,6 +6562,9 @@ 20220416, 405 ], + "deps": [ + "cl-lib" + ], "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47", "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy" }, @@ -6553,6 +6575,9 @@ 2, 2 ], + "deps": [ + "cl-lib" + ], "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47", "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy" } @@ -6938,8 +6963,8 @@ 20210715, 1004 ], - "commit": "f04dad824b9879f7382f36780a0151e4ef544815", - "sha256": "1a3s6za2dlavknpmcbkbrdf4a75a1a0qgni3igq1657xfxk658gw" + "commit": "72dae979d4cf33ac1b63c73df337fcc2c2aafd72", + "sha256": "08cn2pvg8gxb6a88z8fiklcyyf3sagl9h5x7k7f44jfyqwqzpky7" }, "stable": { "version": [ @@ -7022,8 +7047,8 @@ "deps": [ "reformatter" ], - "commit": "b4003950a925d1c659bc359ab5e88e4441775d77", - "sha256": "1x5hbs9j4ms93p080267kjyqpk81il3x7q87awf6qzz5xhc20d3b" + "commit": "94bc804220248b43b68c073545858692816d307a", + "sha256": "1ad4fil4x55p1vba2vb7065pggm0yj8mbzvrgwzwxgihhqzaln0p" }, "stable": { "version": [ @@ -7133,8 +7158,8 @@ "a", "pdf-tools" ], - "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86", - "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri" + "commit": "4359c640c7822a23976e9a5ca4ce63452d796912", + "sha256": "176qjbhvdg1bqy45qk6zf5ij12qif6xkd3ppd1a5wg67p2rv21z8" } }, { @@ -7592,11 +7617,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20220110, - 1841 + 20220529, + 1541 ], - "commit": "563c744f545552cb92e8e84d5be4e2cdbabc93ca", - "sha256": "0pf9yllx0h78m925sdrg6hbv54ky2pi7cpkdsnx891qjsahvjnpy" + "commit": "764912ada13c3bf57e770fcd978c81a1ce26666a", + "sha256": "1s2wml00wdgzxf8zp3gl0zxgmsfjflf90j04zqnp5jzsp6cmifsq" }, "stable": { "version": [ @@ -7639,20 +7664,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220404, - 1917 + 20220531, + 1900 ], - "commit": "f5c0b5ef2ae46062ba13dd03215cdfc49d0fd30b", - "sha256": "1acwh5xcfizmd6m4kwlvpyysznknjwzqmgppc33khldqiv3ga9sp" + "deps": [ + "posframe" + ], + "commit": "b86822f460a54c60fdfede62d4a86bd4991baa21", + "sha256": "1vqfqzjgip1a3mcbd22dgkp1wc2x4r375npbwjs99jn7br1d73ny" }, "stable": { "version": [ 0, - 4, - 6 + 5, + 0 ], - "commit": "f5c0b5ef2ae46062ba13dd03215cdfc49d0fd30b", - "sha256": "1acwh5xcfizmd6m4kwlvpyysznknjwzqmgppc33khldqiv3ga9sp" + "deps": [ + "posframe" + ], + "commit": "330c0ac2e3bbc242c2e769655bb6b68555aada70", + "sha256": "1wmz3kp5k7n5xj2yx4rz7f7a5khvhll1jvda40b3c8x6mx9n416f" } }, { @@ -7827,11 +7858,11 @@ "repo": "kennethloeffler/blox", "unstable": { "version": [ - 20210225, - 1900 + 20220521, + 807 ], - "commit": "2bf0e618451fb1da11263d8a35ffcd9210590c0a", - "sha256": "0lkhdm9jhy8wlmrmd9nqrbrczh5k75q38n6bq3gfhppycmysh9d5" + "commit": "9ebebb65fb38b5570ba8dfbb5ec835633c06b67d", + "sha256": "0cbmqzhv8bnfjracdc7xc5ba7cr8fqfh8l617sxarw51daallxri" }, "stable": { "version": [ @@ -8147,21 +8178,21 @@ }, { "ename": "borg", - "commit": "325cca8031b99c6abe2ee9858a6b547d1af0cdde", - "sha256": "0rklhjm6zpmyjvw39475fsfn5n5mxkf33b8hkfx0pjjdp0ylr21n", + "commit": "af5c1593052d63146e850683c461a760ab166033", + "sha256": "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr", "fetcher": "github", "repo": "emacscollective/borg", "unstable": { "version": [ - 20220511, - 1643 + 20220527, + 2237 ], "deps": [ "epkg", "magit" ], - "commit": "55271c12e05c14e30102bd64bd609af29d58846e", - "sha256": "104kf3km7450jj7brgjhmw5idrvk3s1qjxclzpv7xypyvi53ab8l" + "commit": "1f87dfcca69decc9db651af6b9f38034ab9fbd51", + "sha256": "1k2lp2g6nsm843gf3a5ddck75pg62dpvnnpjpwbxzjhraswr9z5c" }, "stable": { "version": [ @@ -8238,8 +8269,8 @@ }, { "ename": "bpe", - "commit": "1a99263c2672d4c2433835cf948101130126e14b", - "sha256": "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0lbbbfd66p5hdxv083k6370c4hkaydh2vq35753i25gnhzxs9hhl", "fetcher": "github", "repo": "yuutayamada/bpe", "unstable": { @@ -8652,11 +8683,11 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20220506, - 1506 + 20220606, + 1330 ], - "commit": "7b7e5c2a79ad3b31b465387df0ccc18a5809f9d1", - "sha256": "1r4lbz5hadsxw9dkhi10xr54zmsgknmklfmb78yxnvqhwl30kk20" + "commit": "fc98ca9e2a8b6edcec7199bf52eaf1848bd3e35c", + "sha256": "1i629jdlp3lxjk3awarx64s7czbzg15yy101ns9hrjk914bvskbc" } }, { @@ -8854,8 +8885,8 @@ 20200924, 345 ], - "commit": "b918ba023212b0e223a7ca7df3a2ec12a7c54206", - "sha256": "0xj9k2i7dmnqg99k1kraq58fc1kzgvriy08g46zhka3dz2l2m5br" + "commit": "124529e089c7ea70877cfa881e55b3a21f28ffd1", + "sha256": "1g7nizs3iy4avaifnw91fps72i2iifkbrlh8fkdymcynnmhkqdvf" }, "stable": { "version": [ @@ -8906,8 +8937,8 @@ }, { "ename": "bufshow", - "commit": "543a734795eed11aa47a8e1348d14e362b341af0", - "sha256": "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "01ywg76zvkwv67li5phyz797gdn866bnxxqfwg4adzakhhbc8pzm", "fetcher": "github", "repo": "pjones/bufshow", "unstable": { @@ -9756,8 +9787,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20220511, - 1104 + 20220604, + 1655 ], "deps": [ "dash", @@ -9767,8 +9798,8 @@ "s", "transient" ], - "commit": "232fa1cf3af08200af439d1cbb5a131f38286183", - "sha256": "1ncyrrzk0a1wfyr3khvznda7l59g4vg9h3nglzbihnbvfkxqh6cn" + "commit": "e4ce01a08f0e9cbbaea03ab5259d0cc029e9f2ad", + "sha256": "0jd5d9inxhiymzphf4gw11wwg5lv4jp3hflj9w24grcd77i6wkdg" }, "stable": { "version": [ @@ -9796,16 +9827,16 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20220506, - 1214 + 20220528, + 27 ], "deps": [ "hierarchy", "ivy", "tree-mode" ], - "commit": "42023e5d1781c75f425e8c72b63b28e53dae6e9c", - "sha256": "029ssw7k9prmh7rv4drjmwzcykrihpqkmkylz0fla40l7ycmdr5c" + "commit": "b37836ed04a1268301c0ef84496f165c671f55e4", + "sha256": "1vy8l4ra6pwvchn9fb0z8hskn744kbl1djya8l44hir4ma75kxhh" }, "stable": { "version": [ @@ -9934,11 +9965,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220506, - 1814 + 20220607, + 1615 ], - "commit": "e72edf2d6357beb64798ef1894cc807190f80901", - "sha256": "0l6slrbh7sr3r3zgxh4r1r0g2131mvpmy2vd1hrkjf9q9c5hpqq0" + "commit": "67c48f1c3609f1426f02c5d8b81e23b1e8b89659", + "sha256": "15cq18pc97lhibz4nyyjavhgyalyg8wrc6wc9pzg2iq1gp0yrq2x" }, "stable": { "version": [ @@ -9960,17 +9991,17 @@ 20210707, 2310 ], - "commit": "02dc92c900babbd232fbcdd14f7ccf44d234ee77", - "sha256": "0gar2j9vis9b2wj1fhqahcrmaw867z3pmsn5d70bb8mdr3xq3dmm" + "commit": "81b25899ca8321f507f204b4777f223c26e4d6ab", + "sha256": "1a2fx5zf36770bim9spnhlvdv8mjbhpyg3mvwni5mgjdn4zidb2g" }, "stable": { "version": [ 0, - 9, + 10, 1 ], - "commit": "b49431c48d40490ef979247d308af63345376cee", - "sha256": "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5" + "commit": "5cff5efc2bbb19b2512b940f79c8c696e0737424", + "sha256": "1cf76mllnm43wndzl26rrlfg2bc7r2a0ig6v9lm41nil9x6simsm" } }, { @@ -10120,8 +10151,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20220504, - 1421 + 20220605, + 2031 ], "deps": [ "ansi", @@ -10132,8 +10163,8 @@ "s", "shut-up" ], - "commit": "2eb520e64c2e1047319761df0bcc6fa5149f8cd6", - "sha256": "1fg8c8wksban6kblrdsp008ga8srhyp7dbhzbk46dgmprvwmxbwn" + "commit": "f2c6609590380bf4791fa18b7581ed6a8db2cbbb", + "sha256": "1zvibg876q5zi7fh72wfl6avskgvvn4az75gjc3bkdckv9rpy43a" }, "stable": { "version": [ @@ -10283,11 +10314,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20220330, - 1021 + 20220515, + 435 ], - "commit": "352ebf62099e95cb4a71060a7d4a228f00358b97", - "sha256": "01qh2q0vlgpni66mks4xzvdzm22yq314n5n4jx20bdknbhlvb8rq" + "commit": "784684c54a0d94c4a1cff8a69fcbdcd5d916e0a5", + "sha256": "0f7nm16fmb9chpc1cii4y035ykhq5mhbzq0m9xp0hdi7pjmarf3l" } }, { @@ -10563,8 +10594,8 @@ 20200507, 1529 ], - "commit": "4093821cc9759ca5a3c6e527d4cc915fc3a5ad74", - "sha256": "0r6dzhhlpbkh2n9dmb7iyd78b5rsnkxhk84wm0kgqjy541gfvbhk" + "commit": "ebaeb80fba0bafdf6f95706308123dec2cf4b99f", + "sha256": "0rf6csfn3sprr4mlwq5gzl5di9xyhd4v46927vjhjj3k1qahvmpb" } }, { @@ -10631,6 +10662,30 @@ } }, { + "ename": "cern-root-mode", + "commit": "c4f2e661e24ff3320b45cbebbc51a7b45ce3520c", + "sha256": "18srgi3695j4dpbcwjfj1ccc1ppn0idv9y5skgyssnrin8s3cb3g", + "fetcher": "github", + "repo": "jaypmorgan/cern-root-mode", + "unstable": { + "version": [ + 20220531, + 1304 + ], + "commit": "0227ab66f67276d3142a95cfc858bf621f501346", + "sha256": "1h0kjf92qxvw0128igsj8x7qyxhdkcjvlcxa29hpl97ad774qqnq" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "2df8781df1d807bf522eb19ac7b03b4bfaeb89c0", + "sha256": "159q50m8sr4adw7czkq0mq6hq43svkk2psx0wnmmb1aa8ivhwyip" + } + }, + { "ename": "ceylon-mode", "commit": "09cd1a2ccf33b209a470780a66d54e1b1d597a86", "sha256": "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4", @@ -10664,8 +10719,8 @@ 20171115, 2108 ], - "commit": "0d98e5a6f0c08e2b1d2c8e96c3dfc7e619210f72", - "sha256": "1i5icnrvfi83kxf4n6a83aksllnaddb653kcjnmg3n70q5mffavf" + "commit": "798512dd6a94abd432e9f1712147a39f623ea718", + "sha256": "1bg2dzr8bqwg3y78r9smllx6bji4gyl3hbbp08ff7q0va0b9zmnd" }, "stable": { "version": [ @@ -10820,8 +10875,8 @@ 20220318, 1007 ], - "commit": "0a526709f55f8074f8846f8e7b9090431f1d6a47", - "sha256": "118pc03zpv9c7haxvmf4xkd6lby7xrxsal6pwq5lw5sw840g1nhr" + "commit": "c44b4e950af73dd82805181da5473db2c93e2eaf", + "sha256": "0jbpl17f5jdil9slv92ldvq4b60zpgr60cv0rk4qf3nwm4ijpk21" }, "stable": { "version": [ @@ -10868,8 +10923,8 @@ }, { "ename": "chapel-mode", - "commit": "f84c693e9e90069b028be6149dd730f2ba5f4aff", - "sha256": "0yi1xjm1myxywjdb3n1505mz7vnylrvpd067aibjc4vgq0gqvq6f", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1a870d100d9x2lnb9c4lc6b2g912pznw784fyv0rhk7jq5jkafa5", "fetcher": "github", "repo": "damon-kwok/chapel-mode", "unstable": { @@ -11110,8 +11165,8 @@ 20210601, 1653 ], - "commit": "ae36c823ca151f1dc6144ec96b2f5e98181c0dbb", - "sha256": "1n01h4lwfcm0skf0pgh7p87bmk4x3r6qsr5jcgm1ldafsx35x60g" + "commit": "af591400c55dc2a427a85cbca28e3f9b5361f14b", + "sha256": "0qgwvnqldbf9w95vbm6spkzx6x07hvlhkdky4vicakikh1g0zmwc" } }, { @@ -11125,8 +11180,8 @@ 20210713, 1551 ], - "commit": "05fc1449db497e715b33b8e08359fa17c3148c7b", - "sha256": "16sdhias8ws93lhfhbf5hm05gff1r3imphk7gdziy51xfgyml619" + "commit": "151594b11fa6555c73b998ed1f15ee9b5f979f67", + "sha256": "1f4fas6z2d7zn505nmnlgv4b66k495zq3358php44jblhc1vrg8v" } }, { @@ -11218,8 +11273,8 @@ }, { "ename": "chinese-word-at-point", - "commit": "c9b7785eca577218feade982c979694389f37ec3", - "sha256": "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "05h047nzy2v0d6lxsm2f6jqkp51j6h4b517q4wkxwkiw0a9q4p5v", "fetcher": "github", "repo": "xuchunyang/chinese-word-at-point.el", "unstable": { @@ -11329,22 +11384,22 @@ }, { "ename": "chronometrist", - "commit": "1cead898505916ff42bbc5c2d978df55dc09da69", - "sha256": "1nvgbddhci7bpznq2s3yakk3qpd1f8fzskrf3klnc88d5v6xj3qi", + "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3", + "sha256": "10hab6h4pjgkldq0qlsyr69hq40g9hfsmhaxngfjl4yra355zr6b", "fetcher": "git", - "url": "https://tildegit.org/contrapunctus/chronometrist.git", + "url": "https://codeberg.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220415, - 1213 + 20220604, + 344 ], "deps": [ "dash", "seq", "ts" ], - "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", - "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" + "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965", + "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36" }, "stable": { "version": [ @@ -11363,10 +11418,10 @@ }, { "ename": "chronometrist-goal", - "commit": "d5c27f29f3ab4633e6a1d69b3a82e47ba216bf39", - "sha256": "05z9jwjf9py0bfxgilh2x05pqjyg9zamf4zl6s6fb7fiz7mfm9k5", + "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3", + "sha256": "0wd64bz1qfwqzfkj2yf0sxwvakmych1h4rhakjqixvjpx75nm658", "fetcher": "git", - "url": "https://tildegit.org/contrapunctus/chronometrist-goal.git", + "url": "https://codeberg.org/contrapunctus/chronometrist-goal.git", "unstable": { "version": [ 20210510, @@ -11382,10 +11437,10 @@ }, { "ename": "chronometrist-key-values", - "commit": "1cead898505916ff42bbc5c2d978df55dc09da69", - "sha256": "0xh06qd76na7vxr4v8v5nn37vq4v3v6cbbyzvrbg90nmkki0hhwr", + "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3", + "sha256": "17fjmdgm8n9za3mwkahqhvz1d69lwhc7yqqryx16myn4kyg0i835", "fetcher": "git", - "url": "https://tildegit.org/contrapunctus/chronometrist.git", + "url": "https://codeberg.org/contrapunctus/chronometrist.git", "unstable": { "version": [ 20220414, @@ -11394,8 +11449,8 @@ "deps": [ "chronometrist" ], - "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", - "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" + "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965", + "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36" }, "stable": { "version": [ @@ -11412,10 +11467,10 @@ }, { "ename": "chronometrist-spark", - "commit": "14000772028841fc06aa3baf3545ea193d5705c6", - "sha256": "04gm5srg62zb80av5b5i2k1d790cf9xb6zn0bisf7l4i7cvjxafk", + "commit": "b4de903fe96f70798f0c5668c9845eb78907e50b", + "sha256": "1kkvwk964sddzw6wmlvfcqfaazzhikjkynbhrzffy6qacfbi5rsv", "fetcher": "git", - "url": "https://tildegit.org/contrapunctus/chronometrist.git", + "url": "https://codeberg.org/contrapunctus/chronometrist.git", "unstable": { "version": [ 20220321, @@ -11425,8 +11480,8 @@ "chronometrist", "spark" ], - "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", - "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" + "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965", + "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36" }, "stable": { "version": [ @@ -11498,8 +11553,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220507, - 1357 + 20220531, + 616 ], "deps": [ "clojure-mode", @@ -11509,14 +11564,14 @@ "sesman", "spinner" ], - "commit": "69d374818bd0af1489ee8828b258c689ccc24a66", - "sha256": "0r585myfkdsqrmd7fydbfdakwsfh4wq4bkjgngyag8mkam88ms16" + "commit": "b9e1cc26e2afda003a4b6c1f2a26e04f1c45f3d0", + "sha256": "15a9khkd21dfrw9r435x46533cs3246l1dgjg86cvkgjjhl21f9z" }, "stable": { "version": [ 1, 4, - 0 + 1 ], "deps": [ "clojure-mode", @@ -11526,8 +11581,8 @@ "sesman", "spinner" ], - "commit": "b2cee7fc301735b403920583cc2c23dcf70990a3", - "sha256": "08gj8nm6qjjgn75aijhkbdhpwfd1qx6fy2c77m8ca99pbqvabmcq" + "commit": "11156e7b0cab470f4aab39d3af5ee3cb1e0b09d0", + "sha256": "08635ln514nrglx6qyhaq1x7y7lw4mcd659ba8zs071yjiariarm" } }, { @@ -11662,8 +11717,8 @@ "deps": [ "flycheck" ], - "commit": "794821e129ea47b04fdeedc61d9ccb3c4240c72d", - "sha256": "0yvh3f165j3i4qk4qixk7xnqvfckz4dh5z7sdm3940f3wgk2g2mv" + "commit": "2f33f991c726d5214d6a17bbbd19836302a8e423", + "sha256": "0jpq67q7vhmgvsjh4qqk5lb40w9rkdr2v8bd5gh32k8wkbgykpgg" }, "stable": { "version": [ @@ -11730,14 +11785,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20220421, - 1956 + 20220526, + 1206 ], "deps": [ "cl-lib" ], - "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", - "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" + "commit": "41cdc116b09818d33f5cb0fc1d72c025c23aa2f1", + "sha256": "0hmclqaagnqvyvxb93vi1qdyvqm53hsyjyv1b4zh79hwzvn6s8g3" }, "stable": { "version": [ @@ -11802,35 +11857,36 @@ }, { "ename": "citar", - "commit": "b2aa35ca3930920d61e50dd75394f70ccd1c737b", - "sha256": "0x66iwimvrihyxs5h816f2k2f2wgdn1kmiahvh5nfff6kx1xdplj", + "commit": "d96246c6f08d0ab2ccd2b04222e304c7ab8914ca", + "sha256": "1arf0fki9by8zx12vgdj1jvvaz9sq32jn9yv6xb2qkx5pzg4sw6j", "fetcher": "github", - "repo": "bdarcus/citar", + "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220509, - 2336 + 20220602, + 2157 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "9a6fc6da11ad2b475244cc4cbd51c77615e9aad3", - "sha256": "0q1hl8xsqb64lx10kcc4az3azaa8j3zly3pkf3lixh0qrc74bil2" + "commit": "1976f2938b3fc2ebb963429dce78f2372edb483c", + "sha256": "0fdasl6nzrp8q29njda5z4x79fjlfigjyx4xxgpq0wkq41kw3zy0" }, "stable": { "version": [ 0, - 9 + 9, + 5 ], "deps": [ + "citeproc", "org", - "parsebib", - "s" + "parsebib" ], - "commit": "348ffb9853e04fbe3e0cbc25185236ecf65ccb35", - "sha256": "15jhpl2j4rm97cvvqzlfzxarvxvcsg64raz068psrsd2y7y2zh4c" + "commit": "d55cac7a2b8b848990ebd713de8667bf3fe93c6b", + "sha256": "04asi5gr4p1d8llra3qwly2jp1ll3zs0hjcysrrvdcax0jcr473b" } }, { @@ -11920,19 +11976,20 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20220427, - 1203 + 20220523, + 745 ], - "commit": "87e2cbf3b2ae6d59ec919a2dcb38e56ccfa5ec14", - "sha256": "1wycbcwmls7lf1vn83pwfrb1bhxf8d5p7w25b1c9lrzq7l769i2k" + "commit": "1c0ca637c7993559a0175e3001941457b8c71211", + "sha256": "0ybv61akxv7nrxpc5zfjbbxrv8xs38sgrbsbslx2mqzcv9915q2i" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], - "commit": "32b79a94db62194d96e73064ab804b7efa920795", - "sha256": "10lryjy3771hs8lavh7818a5ia9ia1qwrhzfmgr5sb4c0gn36wcg" + "commit": "1c0ca637c7993559a0175e3001941457b8c71211", + "sha256": "0ybv61akxv7nrxpc5zfjbbxrv8xs38sgrbsbslx2mqzcv9915q2i" } }, { @@ -12198,20 +12255,20 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20210813, - 750 + 20220525, + 1034 ], - "commit": "a794c95e2f70a9b042af7bd07e2483fde75f2a2e", - "sha256": "0rbgg6vrvsmjlgwq0v450g41qx4gx9ixx4j30aa4i78ryxz4d76r" + "commit": "d02b97a2aa0da13711d9a6f845649115de8ac11b", + "sha256": "05s8lqfbsq3m0k4fx3ap4506f3gnmsxb9lv8hc095i9xsk7mvaab" }, "stable": { "version": [ 0, 6, - 2 + 3 ], - "commit": "a794c95e2f70a9b042af7bd07e2483fde75f2a2e", - "sha256": "0rbgg6vrvsmjlgwq0v450g41qx4gx9ixx4j30aa4i78ryxz4d76r" + "commit": "d02b97a2aa0da13711d9a6f845649115de8ac11b", + "sha256": "05s8lqfbsq3m0k4fx3ap4506f3gnmsxb9lv8hc095i9xsk7mvaab" } }, { @@ -12456,8 +12513,8 @@ }, { "ename": "clocker", - "commit": "dadd3f5abad2e1f7863c4d654ff065f641395f64", - "sha256": "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1gjp66pvmzkqb40js6nas5gr9pipw6qcq21z8wbb365k5jcswzlg", "fetcher": "github", "repo": "roman/clocker.el", "unstable": { @@ -12488,6 +12545,40 @@ } }, { + "ename": "clockodo", + "commit": "7e69c0409dbe1fa03956027a549b651e652be9a5", + "sha256": "09aapriw3fp82m6cna1nsz6al8jd313r8zfpljr09jgqaagplx3z", + "fetcher": "github", + "repo": "santifa/clockodo-el", + "unstable": { + "version": [ + 20220604, + 2049 + ], + "deps": [ + "org", + "request", + "ts" + ], + "commit": "6329aaebc4373edaa4cd1d046582a4cc36db4888", + "sha256": "03n11mr39wj3nyabs24l5caqbzc7lm0wp4wazcsrsxwm7pij9vrs" + }, + "stable": { + "version": [ + 0, + 8, + 0 + ], + "deps": [ + "org", + "request", + "ts" + ], + "commit": "6329aaebc4373edaa4cd1d046582a4cc36db4888", + "sha256": "03n11mr39wj3nyabs24l5caqbzc7lm0wp4wazcsrsxwm7pij9vrs" + } + }, + { "ename": "clojars", "commit": "7f766319c3e18a41017684ea503b0382e96ab31b", "sha256": "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1", @@ -12912,17 +13003,17 @@ 20220322, 1258 ], - "commit": "a1c61a7e1a9f7a019809010e097f1e4c42c50022", - "sha256": "1qabbyqn450lhb5f1kaxqwv37fc9ahj89rka5c374kgzscjgjdna" + "commit": "aaf5353c47965cae7e12aa03884be3ae67e9b09a", + "sha256": "00201mylx581g4q2j81v4x39x2axx5xq7himpk9ywxpvygh1r0dv" }, "stable": { "version": [ 3, 23, - 1 + 2 ], - "commit": "efe08e289466683b0945a5396f6848064dec5ae0", - "sha256": "1sm70am8h6fxbpxv7ky2vnx394i3qvg0vl215hg2lqaf9p9ll0ld" + "commit": "a8bd06dfd47a56e09e660de5e58f26579105d2d4", + "sha256": "09kk81nd4m6p07k7rwg2cfjv2rrwcmkmsz6xi58milq2byqw1n3j" } }, { @@ -12984,8 +13075,8 @@ }, { "ename": "cnfonts", - "commit": "0d5787ffeeee68ffa41f3e777071815084e0ed7a", - "sha256": "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "026jayflpi4k0xydh9farn2b5ap6gc8bnj31pdnx7hb0hr4svzjc", "fetcher": "github", "repo": "tumashu/cnfonts", "unstable": { @@ -13074,11 +13165,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20220305, - 1320 + 20220606, + 852 ], - "commit": "8660bdeedee360e5eb632f1eb1356eb09d7dfbee", - "sha256": "0mvfsdlhc3znc0d2p8vm7apkbpvbs688wmwvd0sms33qly53f546" + "commit": "27ac22bc0be905f31abf8c09e63d371b0b0059d3", + "sha256": "1j704wncimabcydxazbllsqlp4wlh2mwv2zdf7kpcaychsw9990c" } }, { @@ -13574,8 +13665,8 @@ "deps": [ "s" ], - "commit": "fa85a6b9d852d725730a6ad1cc5afeb4ede93ca7", - "sha256": "1xmr4gxj3k4vy654270jgs3x8nv72q4hyk7q8zixycnymbqvby5f" + "commit": "902b30b6577ffd14d8b5169c85249033581c4f1a", + "sha256": "03nildwfjrbkcp25whbcklgm4gaqbwj6c65j1ngmykd2a1l1ghw7" }, "stable": { "version": [ @@ -13861,14 +13952,14 @@ "repo": "ddoherty03/commify", "unstable": { "version": [ - 20210904, - 1106 + 20220531, + 1301 ], "deps": [ "s" ], - "commit": "d6656bd3a909917a51ba033a11d4ab5f5fe55f83", - "sha256": "1zbk2nc1qnryapsj68hlqmkn0ab7llzpmnls6y3s2656lxcn2b0k" + "commit": "c4aeccae5b4a073fc3f4e8bd780a2ebbb7d5e533", + "sha256": "0ph5z31hibsjy6711gwfxa1qmlyyg3fh3wvgsafsgnkg6mlf2h3h" } }, { @@ -14051,8 +14142,8 @@ "axiom-environment", "company" ], - "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2", - "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6" + "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56", + "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p" } }, { @@ -14367,8 +14458,8 @@ "emojify", "ht" ], - "commit": "6f095b419468b0443e1dcd8537ef4b84092f155c", - "sha256": "1ssjzhbngb5v7wzh40zzh1j0pfzv0paqync8jvd0diwaz983rwzx" + "commit": "464b0a8e877ef2c80180336be4afe0d8c0b4c72d", + "sha256": "0cdp159qk4cq1fbqymh3v4sjnkj1ijk9x0picj6fqqr7wnqn1gwa" }, "stable": { "version": [ @@ -14471,8 +14562,8 @@ "ht", "s" ], - "commit": "e2e8a39976506cbf149f9c62a69c7a438be09579", - "sha256": "1lra119f4bbx6rhpm118yml6qnqy7s1lj2w1dnm8vbl68r255zyp" + "commit": "1f9c92a27bbf50783275a16dd3988666d1ecb023", + "sha256": "1c4bh80gwrdvy98xm92g7qqvi5lnaki5y4ng317px0zg3frj1i24" }, "stable": { "version": [ @@ -14824,8 +14915,8 @@ "maxima", "seq" ], - "commit": "ce5fd160c193e387d9e2bacdba4065c4b4262cb1", - "sha256": "18bjr4n1m1y76kh0pp6ci7ywklrmw611ka3avrj23lb0wwrljf86" + "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", + "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" }, "stable": { "version": [ @@ -15167,27 +15258,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20220509, - 2300 + 20220601, + 1652 ], "deps": [ "company", "prescient" ], - "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484", - "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c" + "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e", + "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk" }, "stable": { "version": [ 5, - 2 + 2, + 1 ], "deps": [ "company", "prescient" ], - "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7", - "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5" + "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e", + "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk" } }, { @@ -15256,8 +15348,8 @@ "company-quickhelp", "popup" ], - "commit": "75a2f5c7669833646fc653cabd531737b52fb469", - "sha256": "0zkjicfa5dlzq2834p70ks3mr48086lf0dlr0r5df7jrw8wrw8c9" + "commit": "a34e0d8c7eca37e99c135e4b7fa5aaff8a15f576", + "sha256": "0l9syc32jsx75jhkphbv506gmilvl3vianja8f732wj3y694bnza" }, "stable": { "version": [ @@ -15381,8 +15473,8 @@ }, { "ename": "company-shell", - "commit": "bbaa05d158f3806b9f79a2c826763166dbee56ca", - "sha256": "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1j918rbgxs7jclmd6qqgwrxi8djdpcl796wn700ky5jijhahjalp", "fetcher": "github", "repo": "Alexander-Miller/company-shell", "unstable": { @@ -15844,11 +15936,11 @@ "repo": "paldepind/composable.el", "unstable": { "version": [ - 20201024, - 1458 + 20220608, + 1148 ], - "commit": "6f2efaa7018feb854720cc2518e4274ad708f793", - "sha256": "101shj0z8piww7idb6ha67synhw12x1lwgp3w48w1khrcw43zq7f" + "commit": "205a69c64ea95ef67070423c31ed70ec44ec980c", + "sha256": "0wlqfdiab60ciznrl9ny4rspva7xdwl8w9k8jxd2gpcb11fy1nn0" }, "stable": { "version": [ @@ -15952,8 +16044,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20220315, - 1533 + 20220604, + 1727 ], "deps": [ "dash", @@ -15961,14 +16053,14 @@ "pythonic", "s" ], - "commit": "9c28d7a853b4b4bd00215cf7f07856c1563f2ad7", - "sha256": "03r9f2pvxxv6nlxgljnd5cmnlvsykypdl38cfi79iw3spr0lcrxn" + "commit": "e4154db0dbfb7faf46b645eddfaad9326e4ea18d", + "sha256": "1ily4abrn85fwy90hfm1nq9kwazb80amdgx4disaa2s62yx6k62j" }, "stable": { "version": [ 0, 0, - 11 + 12 ], "deps": [ "dash", @@ -15976,8 +16068,8 @@ "pythonic", "s" ], - "commit": "78e1aad076f6cefc6aa7cc77d08e174b13050994", - "sha256": "02l9m5wx0z865w3cdwbw7c22fmdjbsw4svivqg72nbl7yrq7rv5v" + "commit": "e4154db0dbfb7faf46b645eddfaad9326e4ea18d", + "sha256": "1ily4abrn85fwy90hfm1nq9kwazb80amdgx4disaa2s62yx6k62j" } }, { @@ -16116,22 +16208,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220508, - 928 + 20220603, + 1902 ], "deps": [ "compat" ], - "commit": "1dfdf55f3d941f08089e5d0e611cd9daa8a44b19", - "sha256": "1hsxavf55xmy91xmv8yh6fb4aphv6sv947hs35ghvfm5s74sk47v" + "commit": "b816d1c42f420411c31fe0968ddc868aa2186de7", + "sha256": "014sbc3d2w7p5a8jsyag7qxlmixvs7zycpdrylxxbs9gkivfyyxw" }, "stable": { "version": [ 0, - 17 + 18 + ], + "deps": [ + "compat" ], - "commit": "f517b70dd8a3be0b8c883633f2a7721448b40f0f", - "sha256": "08l3h7b5j1q9nwcq660667b245qspl20ikhfdvd9k3g3n2p6p5kz" + "commit": "0f55ad146b327d82a4a6dfa674349bfbbf3820e4", + "sha256": "0sy4rn1vjk1g50r8z14hzj8lds6s7ij2zkjqfi6mfash5il75wnq" } }, { @@ -16250,8 +16345,8 @@ }, { "ename": "consult-flycheck", - "commit": "5a141c728f28e53b9f92ccbbff07c2af1dde3706", - "sha256": "1cwbm7qsni8ycasx2v20yd1749lmlhf98kz28i1p8m0yqkjc3my0", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "12zwy7jwbg7njm009c1rns0q382rv5lmbzjb4giy4wwwpjg3nfgf", "fetcher": "github", "repo": "minad/consult-flycheck", "unstable": { @@ -16388,15 +16483,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20220421, - 717 + 20220513, + 1647 ], "deps": [ "consult", "notmuch" ], - "commit": "16eb2c100ca144140f07014c32e99487c6a73e18", - "sha256": "0ynla60n7aksp8fqikpsxv45li68ccgklr3xq601z3zyiyjg54a2" + "commit": "4138855cddee0ef126cff6a5fc5ca9c49fd2682d", + "sha256": "1wqp0pp408bxywxzq3gk1hk5vr19k4vsz5b979b4gbk89i1gxamb" }, "stable": { "version": [ @@ -16462,8 +16557,8 @@ }, { "ename": "consult-projectile", - "commit": "ba7bac7fc95ba11094d3ad64d658be0ec7a16817", - "sha256": "03v8srjc8glybfmnfh9nwxz9fkvkrbyji19xvglzl0cy4dwivca9", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1yic707260ld5l1i8ll7sxpz07835hsn0ka4q670zpygazy3jiy0", "fetcher": "gitlab", "repo": "OlMon/consult-projectile", "unstable": { @@ -16548,10 +16643,10 @@ }, { "ename": "contextual", - "commit": "de20db067590624bbd2ca5a7a537b7f11ada84f2", - "sha256": "1xwjjchmn3xqxbgvqishh8i75scc4kjgdzlp5j64d443pfgyr56a", + "commit": "7325c1a705d07d6916d55a1fc2bb7012e22504fd", + "sha256": "0zsyshy2n17zmk3l2shpd4ci9l0xwyx3bmv0psqlpcd0zcjdsfdv", "fetcher": "github", - "repo": "e-user/contextual", + "repo": "outergod/contextual", "unstable": { "version": [ 20180726, @@ -16819,14 +16914,14 @@ "repo": "galeo/corfu-doc", "unstable": { "version": [ - 20220429, - 1348 + 20220606, + 1654 ], "deps": [ "corfu" ], - "commit": "5a6f4f879de6dc2ca6e22789878d416e88e85905", - "sha256": "1rvymrs2vgcqr05xij719fyv5hd3bi34f8aragcabbiwbmjfhz7z" + "commit": "616a2a9fc6fb3222ea2273435ddbc63eba72670d", + "sha256": "0hkcpwkwz9ls2yawlpi2zx2zvrggyqc5qrnl1q4fc3dajnkl1gy4" } }, { @@ -16907,15 +17002,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20220402, - 953 + 20220529, + 1130 ], "deps": [ "ivy", "swiper" ], - "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", - "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" + "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", + "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" }, "stable": { "version": [ @@ -17145,26 +17240,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20220405, - 510 + 20220526, + 1436 ], "deps": [ "counsel" ], - "commit": "c74ae94297c4a2dc0b6878c2e9460a4f386158d4", - "sha256": "01a11dij88ysnrpmrs0flc9m43mlbc41zcahwmaqdp58rvgc24ji" + "commit": "05d364b556aadcfe49df727c0729abc3f0c14372", + "sha256": "1v77lpp0nij1rjg2k9wj42kqk7xqg1dzs9vmadha6f2j8j6375m8" }, "stable": { "version": [ 1, 10, - 0 + 1 ], "deps": [ "counsel" ], - "commit": "dc7b9f9b381dffd19c79cb7ee53b79034590d309", - "sha256": "1zmx7vfi02c8k9wnbsmka5yx3ci8fv9wl8r0cc28jn40vgrivn8c" + "commit": "05d364b556aadcfe49df727c0729abc3f0c14372", + "sha256": "1v77lpp0nij1rjg2k9wj42kqk7xqg1dzs9vmadha6f2j8j6375m8" } }, { @@ -17175,14 +17270,14 @@ "repo": "CsBigDataHub/counsel-fd", "unstable": { "version": [ - 20210606, - 1724 + 20220514, + 2227 ], "deps": [ "counsel" ], - "commit": "e9513a3c7f6cdbdf038f951e828e631c0455e7d4", - "sha256": "005l1is12jq35nn1ap87a7p74qin26zpgbk599619lh9vai157ww" + "commit": "c1ba2e36fe69111e7f6f42ea1b0e3b7a45d96de0", + "sha256": "1jpaknp9v9xyxqs9gkm9v1ylwp9pn2smla9zk4qk49i6ff5db6dd" } }, { @@ -17782,26 +17877,26 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20170222, - 1058 + 20220527, + 927 ], "deps": [ "autothemer" ], - "commit": "32fa3f4e461da92700523b1b20e7b28974c19a26", - "sha256": "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0" + "commit": "4e1f00a590628034282a914d483fd6008a76c8f8", + "sha256": "0yw40fmisw5wby45pk4jblpshj1vsdhs43d7b25xpvjc6l0j5jz4" }, "stable": { "version": [ 0, 3, - 7 + 14 ], "deps": [ "autothemer" ], - "commit": "32fa3f4e461da92700523b1b20e7b28974c19a26", - "sha256": "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0" + "commit": "4e1f00a590628034282a914d483fd6008a76c8f8", + "sha256": "0yw40fmisw5wby45pk4jblpshj1vsdhs43d7b25xpvjc6l0j5jz4" } }, { @@ -17866,8 +17961,8 @@ }, { "ename": "creole", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1q1c6f953g39xal1p7rj8dlcx2crk5cz1q07zp8bgp5jx4nd2z9n", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "12z7vhdqqjnwilm95hjd4ad07dwkcwcqgi6y9fwkq4jmsshpsf5c", "fetcher": "github", "repo": "nicferrier/elwikicreole", "unstable": { @@ -18138,8 +18233,8 @@ }, { "ename": "csound-mode", - "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", - "sha256": "0fpfgk5s45w69sxd1vmd8irb518x07hqfq6cmlm2ahpnsdljd1v3", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "19gsq761ahblikv5l5y70alh0f0pc29b1shqpqd5nxm4q34p4qk9", "fetcher": "github", "repo": "hlolli/csound-mode", "unstable": { @@ -18285,15 +18380,15 @@ "repo": "neeasade/ct.el", "unstable": { "version": [ - 20210219, - 1344 + 20220514, + 2027 ], "deps": [ "dash", "hsluv" ], - "commit": "c302ee94feee0c5efc511e8f9fd8cb2f6dfe3490", - "sha256": "0230h5qvg5jbpyry4xxmh41c0wpinmm04k5hc1qsc2mvqhv3n9n5" + "commit": "6bc55d01780fa921ced0e648d04497e27e23fe54", + "sha256": "03yfk0kwckb6gpp9ndnb9i1vcvx61wcy30jg35zkyfd2h93vjnp2" } }, { @@ -18369,19 +18464,19 @@ "repo": "radian-software/ctrlf", "unstable": { "version": [ - 20220509, - 2344 + 20220601, + 1649 ], - "commit": "d37d7a997e1e3ef5e2223aeecbbef92f369b0760", - "sha256": "1lfd20xknpxxb9qiqhj9mqabsgibzdkhf335mm4vl9jvgim6j7vs" + "commit": "cefb0aff9d316bd03e911f7f483f8d01f15cf5a2", + "sha256": "19kh2h2bbk43hwzmz57jzhq20d8rq7pfzfisq3by3ckrwb1vrvax" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "282eaa836d2198bb5947dfd3c454ae5305f55efb", - "sha256": "04w708g7d1pnsc18h8fjyqkhk08jkq853alaidriamxyycvdwk0i" + "commit": "495b9bc1002d27356929c101c458e69e4201e214", + "sha256": "1nd1yk86s0dyf87q77dg724f6629p270q3ar85jgp8gclw5plvyz" } }, { @@ -18458,8 +18553,8 @@ }, { "ename": "cubicaltt", - "commit": "1be42b49c206fc4f0df6fb50fed80b3d9b76710b", - "sha256": "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "18x0i4m8zk10mvpx07nh56a6cknl97yja4hv0xzsiqrqmr0290rw", "fetcher": "github", "repo": "mortberg/cubicaltt", "unstable": { @@ -18858,17 +18953,17 @@ 20211111, 1407 ], - "commit": "89591f7c85f6b8eb580ac8f3a00014f28c61a139", - "sha256": "0yj3i2jrajh33v0h6djlzsl5l5gb2958z365d1zjbabqxj202wg3" + "commit": "8e29b6d47f6f5b10ec1a37f06db440156ac2ac2e", + "sha256": "13vcbw8abqc92hq6cd9izr5fdq4zah3snd1c9ly8pr40gcfhwvdx" }, "stable": { "version": [ 0, 29, - 28 + 30 ], - "commit": "27b6709241461f620fb25756ef9f1192cc4f589a", - "sha256": "0k5wnrvnwq699mvvngraq5d93pyyiz77sn9dcqjrazc74b63sm8w" + "commit": "a6f04ef2430fb4e7383a068cd1ae9a115d7a78df", + "sha256": "141qywx4ym817lrpqis4x2i2bll0hcjljn1qfnn1dwmhmydhhkwx" } }, { @@ -18894,20 +18989,20 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20210119, - 1853 + 20220601, + 1949 ], - "commit": "199743df55c6bfce3cdb08405bd8519768c8dfa9", - "sha256": "18jzrql5g2sd322w25phws7d1v8906lyc0ipn6cknlrv4pjmdazv" + "commit": "024aca97d07e72bf3500fb6bf0cdf50c4992a741", + "sha256": "0mwd412d2kha8avkyhvvkh8r7an859xk18f7phgx7kj989pr3xkr" }, "stable": { "version": [ 2, 0, - 11 + 12 ], - "commit": "cfd1d0869d51b7548b3fb738b2f2593c76533d44", - "sha256": "0vkl470vvmxap8ca773a0jvjvalmvdbbax3qvgjdclp54ml75al4" + "commit": "024aca97d07e72bf3500fb6bf0cdf50c4992a741", + "sha256": "0mwd412d2kha8avkyhvvkh8r7an859xk18f7phgx7kj989pr3xkr" } }, { @@ -19066,8 +19161,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220512, - 513 + 20220518, + 629 ], "deps": [ "bui", @@ -19079,8 +19174,8 @@ "posframe", "s" ], - "commit": "52ac284dafff3fbae561d1743b73131339421d76", - "sha256": "112qpba47csbhqha4y3vlccgzm14x7x522r2n1p9q4ssknn7va4i" + "commit": "67fd9e5d4e157e72b09ab34daca67619cb98c673", + "sha256": "0ggi7bcx7pmvdlngkv4spbbcb912ih8pn2d57395sx4iykkswyry" }, "stable": { "version": [ @@ -19327,11 +19422,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20220417, - 2250 + 20220607, + 1100 ], - "commit": "7fd71338dce041b352f84e7939f6966f4d379459", - "sha256": "1q2p51348bpg35h9c9cg21k27c7svh52qvi6zlslvnig7wcx662s" + "commit": "0c49a33a61c739eb12e4c3680138c1659926202d", + "sha256": "0wv0hkifzn8qmwa5pxs6lc2dywc0pc6wyfcf13kvjhnj7md4wplh" }, "stable": { "version": [ @@ -19406,8 +19501,8 @@ "deps": [ "dash" ], - "commit": "7fd71338dce041b352f84e7939f6966f4d379459", - "sha256": "1q2p51348bpg35h9c9cg21k27c7svh52qvi6zlslvnig7wcx662s" + "commit": "0c49a33a61c739eb12e4c3680138c1659926202d", + "sha256": "0wv0hkifzn8qmwa5pxs6lc2dywc0pc6wyfcf13kvjhnj7md4wplh" }, "stable": { "version": [ @@ -19430,11 +19525,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220409, - 620 + 20220526, + 738 ], - "commit": "0a86c0eabe6bb5e188e6ae915d971103248a3d26", - "sha256": "1ki4g5s4n2c4zvsk56w4ync2rrwbchz63ms68a2xjkmnihy83x90" + "commit": "34d1f97200055e6b521c131270d8322efc6c52be", + "sha256": "03mnvxv0rjnby56y67f5x44s4wcnn9vxzcq1gxkxxz14kn8k42kn" }, "stable": { "version": [ @@ -19457,15 +19552,15 @@ "repo": "hyakt/emacs-dashboard-hackernews", "unstable": { "version": [ - 20190109, - 205 + 20220516, + 1809 ], "deps": [ "dashboard", "request" ], - "commit": "b71814716d8f78181b9d1990f06072460de0797e", - "sha256": "1dvv10xn2mh0nh85cd78y23cn8p9ygdhj4k7xs4fa6r7bhp0xvqm" + "commit": "dd5f8ec998d7b7bf162b4eb72474b683b8aa0a14", + "sha256": "037gn5q12lfkgp5cz2v54zdk1pcwsw5kb8b6lgn7fg04dlrahm8i" } }, { @@ -19482,8 +19577,8 @@ "deps": [ "dashboard" ], - "commit": "f9e199a20c654c3d1d8f405fdec9acb294afc004", - "sha256": "0l0bylzd9r6cc04r1b5ky3dqshzc2k6j47hqini35ibk331dm804" + "commit": "cd7c32f972f653a665e64aadf9bb88ed9fc10d5e", + "sha256": "0jy63yqix10pkw79i3x48przzbmbh5dm1hjd6w72yfa7ln01c4q4" }, "stable": { "version": [ @@ -19689,8 +19784,8 @@ }, { "ename": "db", - "commit": "79ac40439b65c217e1caaa7175d26556b6a6c889", - "sha256": "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0yb2kgaqw31sl7h7mpmack2s8m9w1qhrvhn78z8gzjf4xn8pln09", "fetcher": "github", "repo": "nicferrier/emacs-db", "unstable": { @@ -19931,8 +20026,8 @@ }, { "ename": "decl", - "commit": "8c2ecd46180643a0c493e05ec86fe50bc1e55146", - "sha256": "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0w2099qqs89lb1lyd7y10yz11akpcc7afk9xgap4ikgafh2mi9gy", "fetcher": "github", "repo": "preetpalS/decl.el", "unstable": { @@ -20093,8 +20188,8 @@ "s", "wiki-summary" ], - "commit": "51fd884c52faf61339aef3a3429fe91672b3e6a8", - "sha256": "10ch8ds5d27kry1ih2cwyp5pl2dlhwwfdsr0smpd1r23i74qlhmm" + "commit": "749d3fc788cb26032dd30e509596a8988b7b6a7d", + "sha256": "1c58v122k1qa5vv5f2fcway5qkcr8j8kbp6y8fz4b5nj9di8azj9" }, "stable": { "version": [ @@ -20458,6 +20553,29 @@ } }, { + "ename": "detached", + "commit": "f3cbb8f0ec4406a862e1d0066d5c9868ab060391", + "sha256": "1sfd9mw39n62kib403bnlsbfsnbcfwbb1znj9yc9b4kfmw6q68sy", + "fetcher": "git", + "url": "https://git.sr.ht/~niklaseklund/detached.el", + "unstable": { + "version": [ + 20220603, + 1446 + ], + "commit": "24b925435c5fb7d5927fd4db5217fbfd4f8ed9c8", + "sha256": "0lvx39i879d8n5m3b2pgjpw7i0a6wlfr2zk3bfk6kjm1vcrhhaz6" + }, + "stable": { + "version": [ + 0, + 7 + ], + "commit": "8402e7ef4574c719f114b15f89b4aecdddea1e1e", + "sha256": "160h60vrpxslw6y290ndc065cc75dab58aq7kjqash94vkifnii2" + } + }, + { "ename": "detour", "commit": "010af7946b10ded846225a19d375434b5d9427a8", "sha256": "0w63vqlzkvx54y8y71gzzdyxzm4430bqfyapzyrzrsmxh773hnmn", @@ -20480,11 +20598,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220410, - 1627 + 20220606, + 1342 ], - "commit": "4257e59dafbffb2616d240f84c5c25770ee28cac", - "sha256": "1ddzydqrgz2c12s24gy3c1gb2d9344z7ykxy2yn5gn6dzjynfnl9" + "commit": "d5d0cfbfbcd037ef8f84f41b2adc3f5a23baa11f", + "sha256": "1q81ddnvdsfmfas2sfkxzpcr51f8zmmwmig0p3i3hcc9jf1wviid" } }, { @@ -20525,14 +20643,14 @@ "repo": "psibi/dhall-mode", "unstable": { "version": [ - 20200822, - 258 + 20220519, + 1115 ], "deps": [ "reformatter" ], - "commit": "ad259c8a2292fb398dff1ce7d25c686edb02945d", - "sha256": "1vp8cjkkiih7cz5d8kcpc2ysq3iz4wr5wi2lkkkhp94k04jl5h1r" + "commit": "c77f1c1e75b6d2725019c5275fc102ae98d25628", + "sha256": "0b0pahi122rnfqpjk2svdcyywka2md6sch609d0x7vqlpylk66dx" } }, { @@ -20697,11 +20815,11 @@ "url": "https://codeberg.org/ideasman42/emacs-diff-ansi.git", "unstable": { "version": [ - 20220507, - 1118 + 20220524, + 18 ], - "commit": "bfcce7f609a95b4b5e11c384c75fef8c7c972b95", - "sha256": "0gddzdx0f6l982ij9q2ljm9dbpjrwi12glxhqr599jnxnlcrxshn" + "commit": "7e493019234d468354758f7e60032a1fb379de44", + "sha256": "0ri50ralsbmi3j0fbrk0xspnyw7ivpjii59dd09791sgyycaakh4" } }, { @@ -20727,14 +20845,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20220506, - 2102 + 20220515, + 1714 ], "deps": [ "cl-lib" ], - "commit": "14f2db367e8023ab0027713315a38ecd703afdbf", - "sha256": "0ciyg1g9sil1pvmd53r57gyds85f11457anjcfi96p4jjyjg9sxx" + "commit": "e84209e959a17c7b96148e099e391daa29a4835e", + "sha256": "1jjgdjlbpi8d5yb83143jhkb2v4375kvmxkn1q5v3wyqx0f21npx" }, "stable": { "version": [ @@ -21089,8 +21207,8 @@ 20220218, 1541 ], - "commit": "3b3b24eb231af889b0eea50e6e0a20c2bca9c439", - "sha256": "0x2vx80rx8mcj1jf6p7qbf1sfy4zymnrbpkm1gzrs8k4jibmwyz7" + "commit": "29c33c7636195f12a10b241448df7eb6760536e1", + "sha256": "1x182g34y13is7x7z32dgrcpbhzyc2narmdl3m702zpnvpd96dn7" }, "stable": { "version": [ @@ -21477,8 +21595,8 @@ }, { "ename": "dired-imenu", - "commit": "e346de86b7f7fd5dad548f0936cde54ac11e3f79", - "sha256": "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "07n2kgfva4alvwcn91fa2s79inc6gv1fsg80znvvpvjw7pf8zd8i", "fetcher": "github", "repo": "DamienCassou/dired-imenu", "unstable": { @@ -21788,14 +21906,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20220413, - 753 + 20220601, + 1536 ], "deps": [ "dired-subtree" ], - "commit": "0521cdc53e4a7ae7ea4728e5ac9f69287528dc56", - "sha256": "0r25hnij6yfdnspp0kmcp1j8dkw44xgq05ldvxqmricawxnsaxw8" + "commit": "bede31ae5f4ecdcb8cac01a9ffe746988838a344", + "sha256": "0i7y5xd1q862xg4bsg3apqcm7mha96ark7sk2cq2lpwndy3i4mxf" }, "stable": { "version": [ @@ -22011,14 +22129,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20220103, - 1342 + 20220513, + 656 ], "deps": [ "dash" ], - "commit": "d71ceb415732c3b76a2948147fa3559622aceba2", - "sha256": "01fgn8gcprx747x382ka1y5yjfcarjdhpmfr9gal8blhvlknqc8f" + "commit": "416ed17efa93503b37eba196a14f967e0899bce4", + "sha256": "0s8p96w6jvlcv2fqf3f3a3fkpk0b6a6znj6xr5nwl49xvdivlaw7" }, "stable": { "version": [ @@ -22133,20 +22251,20 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220512, - 1734 + 20220608, + 1236 ], - "commit": "e40cc2dd1594d4285ec78100e98a0b0516d23782", - "sha256": "0qzz9bzl0rjllr84hqfczjg6h4ra4ylpcsikhdx25gc7jfvah1zi" + "commit": "f47331477af930a9759cadc9ade8cf81bc03497d", + "sha256": "12h6z8z51bcnvlsb3274zxfpg3rrfhxbldyar0jn2ix0msy6kc50" }, "stable": { "version": [ 1, - 2, - 0 + 3, + 21 ], - "commit": "f03db6106adc61e050ea242dcfbd3fcae71dee23", - "sha256": "1aniq3lylc2fmw3snsjmbpzzgjspryjfq6vsc10daihnihnff0qg" + "commit": "5e57c8ba2ec278e14c6d3e2c79ae1c29f775bb46", + "sha256": "1pr17dmi57lwmwj5d17w239pdscb747zm36vdmjyy2d3yn1dns4h" } }, { @@ -22174,8 +22292,8 @@ }, { "ename": "disaster", - "commit": "a4654b3646b96f967e2c75440e664a417cd0f517", - "sha256": "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "11nc8cpapmnl7syjwglxq58fpmhksphzk1baizcda82zlk5ipahw", "fetcher": "github", "repo": "jart/disaster", "unstable": { @@ -22622,8 +22740,8 @@ }, { "ename": "django-theme", - "commit": "4ede3b4fb214b915a8230e7f220ffe71c73ad7c4", - "sha256": "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "18vvn7hb5krxkk03z72h36y9qcim8qbwlnm2wmh6dhyldhlwwzgb", "fetcher": "github", "repo": "andrzejsliwa/django-theme.el", "unstable": { @@ -22849,8 +22967,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20220409, - 1157 + 20220530, + 603 ], "deps": [ "aio", @@ -22861,8 +22979,8 @@ "tablist", "transient" ], - "commit": "cf137f5b8af7cbda17ef1d09c626db35e0e84078", - "sha256": "0rdi882r746nv8zzpcc3rv9p110ylwv1bk7nbzcychn7qsc05ydz" + "commit": "44f0bbec9b3deb027d17f4c10d8ec4106ed89dfb", + "sha256": "0w62z4y77fx2flyybhk44n2207r55j3djhpdn5xgj0hd1gnprfzr" }, "stable": { "version": [ @@ -23052,20 +23170,20 @@ }, { "ename": "docstr", - "commit": "d2638156924dc2a327dca5f20ca63479878690c2", - "sha256": "1kga9h5vy4nzwhcvshxk1lpg1n7lfbygxbdpln7vfizpw065f3m7", + "commit": "97d68e8842fdfcda9c8865ccc53b1d0d7c42a7e7", + "sha256": "0zq6pm84l6cqa57198hn5pk596wlkcnk46g01q1072650i8bp58x", "fetcher": "github", - "repo": "jcs-elpa/docstr", + "repo": "emacs-vs/docstr", "unstable": { "version": [ - 20220214, - 1539 + 20220608, + 532 ], "deps": [ "s" ], - "commit": "bb7485d24a4fb147fc7fc7fcd1e1c7ddd3ff64b5", - "sha256": "18h39vrr66y0m16nfax6646qlnw1l0qd5c7dqpnr060ma52sbfkv" + "commit": "0a48429c2d0c2aa1de34ea24d2d3f9c8176519de", + "sha256": "145b9rgkrsxbnwjplkm6qx6bdzq1zgx99qrwnrl9kkk13091xhk2" }, "stable": { "version": [ @@ -23088,11 +23206,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220227, - 205 + 20220529, + 1851 ], - "commit": "4033a8fd8681d3989550f7a2532d6b4e3c45bfe8", - "sha256": "1vfwxjn86rprfz3cfc6w6hw5lqnbh093kydv0lapgz508f5yjazg" + "commit": "8464809754f3316d5a2fdcf3c01ce1e8736b323b", + "sha256": "01sjb41kii5hhh7gdd132k4iaqqfd0psy9hlc3bi7g4bplp7h7gf" } }, { @@ -23225,16 +23343,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220412, - 853 + 20220608, + 936 ], "deps": [ - "all-the-icons", "dash", "shrink-path" ], - "commit": "85bdd9ed8674710f6b9815e9a1c41ad4b5a45ace", - "sha256": "1wmy080z709mn29w7h9m17a18jnr6a8dzip92k86kcg5z3mjg5ki" + "commit": "999790c984a83288c2b62d0a7294123f8eaf4b52", + "sha256": "0skdczk429p5cp8k24wc9inv6dripm9m5fb306nifq3akpc37dvx" }, "stable": { "version": [ @@ -23278,14 +23395,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220504, - 1557 + 20220526, + 2301 ], "deps": [ "cl-lib" ], - "commit": "e9bdd137116fa2037ed60037b8421cf68c64888d", - "sha256": "178ri980kwkndb73dawhsfr1dkl6xjdb451z0iar9ghk8z0r0wpg" + "commit": "ec199971005e720f138b3bf12b4004714a074c8c", + "sha256": "0457frpjinqg9vzbhjdmz5vcw22bg1n3g4gv7j80lw8lbj9ljr61" }, "stable": { "version": [ @@ -23749,29 +23866,6 @@ } }, { - "ename": "dtache", - "commit": "0d69cbd12938e72bcaea6b2a79385f48a462713d", - "sha256": "08cmfhjdn30wnyfypx5qjscbi4wbfvypxnwfrcx09nn137qc3h55", - "fetcher": "git", - "url": "https://git.sr.ht/~niklaseklund/dtache", - "unstable": { - "version": [ - 20220512, - 1524 - ], - "commit": "5a39733299cae60da2aab0e0b9f559bcc022369f", - "sha256": "166sbnq9n70yp7w8in2qkv921gzkzhzwkr3bjgnj427gxn34m1xd" - }, - "stable": { - "version": [ - 0, - 6 - ], - "commit": "4ecda689e4ccddc23805a22484c95c4f3f65e3bb", - "sha256": "0lrj4dwcrx3s9mxnik9h9cppqjdfnbnlknfa40qwhlzxdvhxmfmq" - } - }, - { "ename": "dtb-mode", "commit": "0c33d49a8d79ee60571775fc224453a351b0ff48", "sha256": "0s8jwmg2kafg31scl04swbx56dnxr2y3j56g95a4k4ffnb0q28n3", @@ -23794,8 +23888,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20220309, - 759 + 20220602, + 2129 ], "deps": [ "cl-lib", @@ -23803,8 +23897,8 @@ "s", "seq" ], - "commit": "56b339bc76926defa775c406113e306ec6d31b36", - "sha256": "0g33sn95zk4fp1jyh472k3qyvbm062njbxkmnv0qavrbli097q80" + "commit": "092cb79d1985a0c5017070353abbb93b8977803d", + "sha256": "1lgjph43lc13iil6cp6ihn4w8d9yy7kc0s6y912hialykrscvcas" } }, { @@ -23830,11 +23924,11 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20220226, - 1354 + 20220518, + 807 ], - "commit": "66fc30af02901db023e464a24d2b5fb3ff472794", - "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh" + "commit": "57f4072fa8acd5f7af40b11f5f33607bca324fe1", + "sha256": "1pimn792p93i2rs08al32xr3p9csp645ai5830mgjza6nkkqhxml" }, "stable": { "version": [ @@ -23912,16 +24006,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20211018, - 1545 + 20220524, + 2122 ], "deps": [ "dash", "popup", "s" ], - "commit": "dbb915441a2b66f2fbb954ff5de2723c5a4771d4", - "sha256": "0gbxhl50j6m6c0kq2v3ph9b3mdrmjdslxiy6lhms4l01zyrg621g" + "commit": "1dd583011f4025b1b8c75fd785691851b6c5dfa3", + "sha256": "1c4w5hxydn59ga9731mcg0r0hlbn2fzjalvv0w2flnx77pkl8g6a" }, "stable": { "version": [ @@ -23964,17 +24058,17 @@ 20210909, 1010 ], - "commit": "862831cd6e1146b0c18e6bdbf7daafb42868d439", - "sha256": "0kfykznv16lmbxhccnp9f1qn9wswadizp3mhq1kf1b29pvppf1yr" + "commit": "1c74870571c21e7e95c0ec53d3b714d08fcf2b83", + "sha256": "1y0gihaksjrxbxp8rr43xwbqcjy0y4a60kz7g1qqdafb1y38x5kr" }, "stable": { "version": [ 3, - 1, - 1 + 2, + 0 ], - "commit": "09eac98ced1fff7dea4e5ac45b59e00c1874067e", - "sha256": "0ljv4gnalxq77byic23c8hrjmsqvn87gqj0ijm7rdx4xr1pff1jg" + "commit": "43af00f79e41ce9101d42b36dab13e1f68d49a7a", + "sha256": "0fa8fkj2piis8b56phl6p77pl1na81krdnmmvyw16hq45zbmm9rk" } }, { @@ -24311,8 +24405,8 @@ }, { "ename": "e2wm-bookmark", - "commit": "45488849da42ac775e532f30f588bfabb7af3cae", - "sha256": "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "03pjwl9bi9bpsrkqdq8dzf34ksivamlpnp0rc09qrhss765mx2cz", "fetcher": "github", "repo": "myuhe/e2wm-bookmark.el", "unstable": { @@ -24482,11 +24576,11 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20220101, - 1517 + 20220526, + 1434 ], - "commit": "4d9d42fa05e550dbac71a2c93e1da71c48af9449", - "sha256": "1bpnrvjiz6k9s36v23y1b6pjyl78741g4rc2mpdwxcnk0vzmi0aj" + "commit": "4fe2cafbfeb73d806ebea8801c3522ff2886f30b", + "sha256": "05m121lw90rjs1a6wq8gvqxzydm4940x30xp3kh1v5x4zwwcf03b" }, "stable": { "version": [ @@ -24500,8 +24594,8 @@ }, { "ename": "earthfile-mode", - "commit": "3df5031b52e919ace5b07c588eec343ed35cb416", - "sha256": "1gcdbfzd0v5rs6wfssh8dgby9rmgyar2zqphh2whjvzqp95axh5g", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1md8c7mds7zqzkfblijz64qywz1195sszixay6srr0r4lc1jlvyp", "fetcher": "github", "repo": "earthly/earthly-emacs", "unstable": { @@ -24760,11 +24854,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20220106, - 902 + 20220530, + 453 ], - "commit": "5004d377f8c89436c28d4a7ffbef407a2b28861e", - "sha256": "05cwxlqkj9wwy35pc8dq37rdvmkrc8528s64qw0pji406r6qs9l3" + "commit": "83ec048a6d9b5376b4416ec8a07c14f243a1b45f", + "sha256": "1zl89afgj085sc6hqb8ibz0fmm4gjwaf3wzpwr8dhdh2qkl8wdiy" } }, { @@ -25228,8 +25322,8 @@ }, { "ename": "edit-server-htmlize", - "commit": "219b037401a81ce70bd2106dabffa16d8b0c7cef", - "sha256": "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0fcq988gjwmpa1cwm3nw36mn8ry8c0vby6f3lv7k2p1mhb68q960", "fetcher": "github", "repo": "frobtech/edit-server-htmlize", "unstable": { @@ -25403,8 +25497,8 @@ 20220404, 2105 ], - "commit": "d1a3c37235dd87e0bce6ffc75f5568218d6d83b4", - "sha256": "19k9mi6phdny1ihxf5apkxfv67cvyihl0za7al29dvim6172km4y" + "commit": "940a4adbbeb3b6b1a72270a814d52770dd89a997", + "sha256": "1gsx2qgv5xm9r0i0axd4hf31g2rq2m4a1hvnif48g4xb0llss73c" } }, { @@ -25415,8 +25509,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20220415, - 1722 + 20220521, + 1345 ], "deps": [ "auto-complete", @@ -25427,8 +25521,8 @@ "popup", "s" ], - "commit": "5c096ecdf9462b125f2eb4092899ff63636cfc40", - "sha256": "1l97a55kg8dcvbdv9c2bk1acz4y9vl3x68mbybhbm0rs78170hx3" + "commit": "77e0dc91f603e8bedebfdccc90352ebbfd217c99", + "sha256": "1ny3nk6x428ksfnhpgfy6z0rd272nbsnqdzaxdshld8b0cj5rz6b" } }, { @@ -25463,11 +25557,11 @@ "repo": "suntsov/efar", "unstable": { "version": [ - 20211122, - 1943 + 20220530, + 1412 ], - "commit": "49dc9b89a8b9bf2523c202ac8830d1245768f3f4", - "sha256": "18pxs3mml90hd97fdhpgxyww4vjcj7jjiz0xzlzj0fd83pxxjr3n" + "commit": "bcf74e57031bb700c0e8b0a49c6e4583112b7eda", + "sha256": "1mfv5v120d49gsxf01imj4m71d7ijrvzi0h9nsfpd9yn93i8sraf" }, "stable": { "version": [ @@ -25623,8 +25717,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220509, - 1904 + 20220519, + 900 ], "deps": [ "eldoc", @@ -25634,8 +25728,8 @@ "seq", "xref" ], - "commit": "ba618d2cee55c8c339d46621b7e721957cc30a72", - "sha256": "08ynxy8wpb1ran8r7h51n5r1njpjvz7hdxkgvr5njlhwp5wz2jd5" + "commit": "aa50b4bb9e52d15472c7a4f9c6101506dfa4f8b4", + "sha256": "1sjr6x2xbbyda0g3b04zqd6a7hm2n23dxpcb89yawssiwjn5v8xp" }, "stable": { "version": [ @@ -25661,16 +25755,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20220409, - 1811 + 20220605, + 1329 ], "deps": [ "eglot", "fsharp-mode", "jsonrpc" ], - "commit": "5208b54098c7534f4768b87c5f4c8a01b638737b", - "sha256": "04s37djxzy8v5xwc5hh8gq37zh7f6ih3y07g07q2fc39rk1xslpd" + "commit": "c7842fe63b8bae5aa8bd6a9891036c5ce04e4030", + "sha256": "17ibcl9ilm7ml4gjlvcx40hni8awccm1zk37y0nfvcscigf3i8pr" }, "stable": { "version": [ @@ -25765,11 +25859,11 @@ "url": "https://forge.chalec.org/hjuvi/eide.git", "unstable": { "version": [ - 20220316, - 619 + 20220531, + 452 ], - "commit": "23c78f4850f44d18eef66c694e7e05882d841ba6", - "sha256": "1icj34anks7f0cjdqc1kgj3bva3bnhily5xc5mzx21w0iciqvpk6" + "commit": "a32b9266414d9173dfa92fa44b17064ebb39522f", + "sha256": "09v74b78vq0vw93pm2xgkdyp6f7ql0l52bzgj1pyayjr5y6y65mg" }, "stable": { "version": [ @@ -25798,14 +25892,14 @@ }, { "ename": "ein", - "commit": "215e163755fe391ce1f049622e7b9bf9a8aea95a", - "sha256": "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "1m00w3cg69xrg2cbcm9sxpfx9f80ksaj44bswh8y2bhbakv0wcxn", "fetcher": "github", "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20220419, - 735 + 20220608, + 1138 ], "deps": [ "anaphora", @@ -25816,8 +25910,8 @@ "websocket", "with-editor" ], - "commit": "388c8f753cfb99b4f82acbdff26bbe27189d2299", - "sha256": "03idq7z0ry3mjvsw0w3acnsnfjijqkp9lr1v1xn5jn3s58ciyw80" + "commit": "7b9b14435c1dee85dd1eb5faf5d58edfa5ca5cbb", + "sha256": "1k8qj7h0kshf5crpk05q7bmp7pn6mzzbj80vwd0x9w4dwyrw0kin" } }, { @@ -25852,8 +25946,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20220511, - 1619 + 20220517, + 1303 ], "deps": [ "clomacs", @@ -25861,8 +25955,8 @@ "direx", "spinner" ], - "commit": "900cf3ff0a8cffeeb0155ca131fa2e425ca9137d", - "sha256": "0r7rfpfxxn620cafw2h3in384lql3qbnpdrc8j2yyqlqgp73yygk" + "commit": "5e100426be90fc193154b1219ab1058534a4fb52", + "sha256": "0mxl8z86wi4kjnxl2bmk5j8p7fvlihcgpd7lkxnlsifqysnvpp86" }, "stable": { "version": [ @@ -25926,28 +26020,28 @@ "repo": "xgqt/emacs-el-fetch", "unstable": { "version": [ - 20220510, - 1536 + 20220529, + 1847 ], - "commit": "3aa9594e807cb03af228c13224b381ecdd7ba2e3", - "sha256": "0rpdmhck3qn325jscysvgj2nzdy09rl895wsk5jhssmgmnp92zxs" + "commit": "7dea7aeffa68ede2cb34678ac2734502309ccbe5", + "sha256": "0fk48py9vx1mamwix2p3b20s3l7bfn9n4adqxrzli3810q3xd1mv" }, "stable": { "version": [ - 2, - 0, + 3, + 1, 0 ], - "commit": "3fa818577238adf9db7264e302d9614ce973d307", - "sha256": "0fbbnwxm96zmj2hlsjjxki901vs98qcxn8shyz8bs3qzb6kvlwyw" + "commit": "7dea7aeffa68ede2cb34678ac2734502309ccbe5", + "sha256": "0fk48py9vx1mamwix2p3b20s3l7bfn9n4adqxrzli3810q3xd1mv" } }, { "ename": "el-fly-indent-mode", - "commit": "237311b98eec4b577409f55e16d8e640936d41a2", - "sha256": "00iqiawbzijm515lswbkzxf1m6ys242xrg6lzf8k40g2ygyd1q1r", + "commit": "fa9d1ac8f71a14e975e3d39a7ddd7351b2f4ba7f", + "sha256": "1wph83wczq3n5vavpkd5ad3fhswlcl0b2d1h79qji1xwigi22r88", "fetcher": "github", - "repo": "jiahaowork/el-fly-indent-mode.el", + "repo": "jiahaoli95/el-fly-indent-mode.el", "unstable": { "version": [ 20180422, @@ -25968,8 +26062,8 @@ 20211224, 959 ], - "commit": "9353309744e4f8a7c9b1adf22ec99536fb2146b0", - "sha256": "14r7n9dkx1kf3j549h0kmdnsl89nwxadbx0qqmj2xzin7n9c412y" + "commit": "bf3dba444dcd240b8cb358a0850c8c5a92606134", + "sha256": "07wfy24lcmd1ccwjidxz704sziy95cjd1al59yava5g7nvw20wbn" }, "stable": { "version": [ @@ -26413,19 +26507,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220501, - 1128 + 20220607, + 2112 ], - "commit": "7275089749779599d87bee878e5103921ea919f9", - "sha256": "07p8qz4fx2gvgk46sl076w1rgqmdpbxsn54m330627sla5wk5bpf" + "commit": "61e3d10df55c8600f3a1f504dd718a1fe368ab50", + "sha256": "1aswsj7b2913v6v22drl3xc5n286xyf7w0zp3681jpmsba1h2xv3" }, "stable": { "version": [ 1, - 1 + 1, + 2 ], - "commit": "e08d0135a7b484686a969f5987f07bc72285ded4", - "sha256": "1ipjrifscjynrbf0nm4siyv57cd7jdi0v16kb2byv9y0yr481ag1" + "commit": "a837e383093dce56b36548b8a91b611b58bdc3fe", + "sha256": "1a7r2r48fb789nackny6y437nng119bwb40apar8m74233iz1063" } }, { @@ -26571,10 +26666,10 @@ }, { "ename": "electric-cursor", - "commit": "639747f3e5b2f8753478826a69b27727e1738d04", - "sha256": "12rlgyp9r4dgp0mid95rx0p5ygpxjzhvlxkmidlzakyirc1i0jlw", - "fetcher": "github", - "repo": "duckwork/electric-cursor", + "commit": "5485aeeb5c536e88cd1c2cfb1163d0b3ab44b8a1", + "sha256": "0adjj9fhh1xzgijf7bpbxy2hrrbrxm473jsy52y47a6fnprpbhc8", + "fetcher": "git", + "url": "https://codeberg.org/acdw/electric-cursor.el", "unstable": { "version": [ 20220108, @@ -26835,8 +26930,8 @@ "repo": "remyhonig/elfeed-org", "unstable": { "version": [ - 20220420, - 1234 + 20220529, + 1958 ], "deps": [ "cl-lib", @@ -26845,8 +26940,8 @@ "org", "s" ], - "commit": "e6bf4268485703907a97896fb1080f59977c9e3d", - "sha256": "1md7nxayysd6pkxyp85jmmz3jh6civpd3y0qgn0zq865jcjv86l6" + "commit": "d28c858303e60dcb3a6eb18ea85ee3cb9e3dd623", + "sha256": "189hr2pqpm9vpz06frkl6r3k6q6ispx97zj24lczcli44l7d8gsz" } }, { @@ -26857,15 +26952,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20220419, - 1358 + 20220524, + 336 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "eaf1329ff221098eb6d4709245010d070c89b173", - "sha256": "14zn3h7v9vygi6syjnywd5j56xlqv4a1z2grlkgrr0jd0y427jzk" + "commit": "b813574faefc1ac4825da19b40f620339b6badff", + "sha256": "0k9rkghp9rg7aidmx7q0n4wpb9z5cwr7j8z167yzaqgf9s3y4jj2" }, "stable": { "version": [ @@ -26889,14 +26984,14 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20220428, - 123 + 20220528, + 2320 ], "deps": [ "elfeed" ], - "commit": "419de17d681d75789271b8457509fa3f942eab54", - "sha256": "1mx134xj9n73v55i0yjn86zn19sg93m95gqacs2c6dxzq1v3q14f" + "commit": "ff8cfdfcb3fce9ecdfe7e58463c5c5814cb3d1c2", + "sha256": "1x909sbwcnjkamhvi0jkd4qy99a971zxc3ydqx3x2k12slhvaczz" }, "stable": { "version": [ @@ -26919,15 +27014,28 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20220506, - 720 + 20220604, + 850 + ], + "deps": [ + "elfeed", + "magit-section" + ], + "commit": "1cf73acae8b791e214dc347c2adf7ec17e8ff41a", + "sha256": "0k7g5v616gw5lsl4rga2k7dzha1mjw50sh2fhk4lkgz41z8jssa1" + }, + "stable": { + "version": [ + 0, + 1, + 0 ], "deps": [ "elfeed", "magit-section" ], - "commit": "641a453cfd03e098b5e6376e035eafd080b08781", - "sha256": "00sxk4pf58678lhjmzdi42dkiiszpnnjhv0dwdgi60mc31d7kqdc" + "commit": "1cf73acae8b791e214dc347c2adf7ec17e8ff41a", + "sha256": "0k7g5v616gw5lsl4rga2k7dzha1mjw50sh2fhk4lkgz41z8jssa1" } }, { @@ -27063,11 +27171,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20210312, - 542 + 20220513, + 1626 ], - "commit": "924b07d28e4f5b82f0e1377bcde800068f0a6d9d", - "sha256": "1pf37rlpmr8fjaxqk47p7dv84nksgh3r63m23jpi1g49myvwfzgi" + "commit": "01c301b516e9949d0239d20f6834afbc9acf0abb", + "sha256": "07rjc6kkhhc0y2wwgsv09z66i9qyfl2b189jrxqcha02rw5sb0lp" }, "stable": { "version": [ @@ -27348,17 +27456,17 @@ "stable": { "version": [ 0, - 21, + 22, 0 ], "deps": [ - "dash", "f", "reformatter", - "s" + "s", + "seq" ], - "commit": "5df694e307cf8fa5a3555d800984aa4ebb40664f", - "sha256": "0iwk4fmw8hq3ry4ky1zc7lgl4cpbnrjyk74c2xzddfspi3ks41fd" + "commit": "1e277684d8a6681a2410cce2dd589ee30a998369", + "sha256": "1gnr61ibzcznfqy5f8capmbz75rcfikwy106rjdmp45qz2jwp4di" } }, { @@ -27428,8 +27536,8 @@ }, { "ename": "elmine", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1zh0wc0n9r60y72jg26bhnmlbz2h282vwxr4p0k0v65jc1j20a75", "fetcher": "github", "repo": "leoc/elmine", "unstable": { @@ -27620,17 +27728,17 @@ }, { "ename": "elpa-mirror", - "commit": "d64ce7042c45f29fb394be25ce415912182bac8b", - "sha256": "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "056ci878vsmab9d2j72wy2skdipvi9hz0cnlhyfc3zj3shr6cbnj", "fetcher": "github", "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20220123, - 1237 + 20220526, + 1512 ], - "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e", - "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh" + "commit": "b200d979bcbfe2df0f7c0074aeb5497251ed47a8", + "sha256": "1gmwf3wv984vxnr42936kyb4npkwc3mwpm81akprxm5ggzz0zigd" }, "stable": { "version": [ @@ -27650,11 +27758,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220503, - 833 + 20220530, + 1219 ], - "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b", - "sha256": "0dv71zc95m5sa4824vk3d1xk726nh2v50i0yp6w3ydfzzsfph6j6" + "commit": "79c241f1ce5d4e4f2ba377485f4434e93391eb0f", + "sha256": "00av8qfxvr9f4jfai7pr7c1sf50m07z6gfxwy3lzvsv6i88s43fs" }, "stable": { "version": [ @@ -28038,17 +28146,17 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220407, - 329 + 20220517, + 1401 ], - "commit": "54b9ba1ac0d7f8b644354fd6d27c9e3aff111dcc", - "sha256": "165ba97ll0k8fsr3k2bxpwg4lnmd3513vn4mdgxcx9ll5p1jr4nd" + "commit": "0d0d1854299aa50edb3fd57317949c00f3fcbb03", + "sha256": "1x7c4sj7rj17mc3iwim96vn9m9ar04hj6a8lvilf4814lgvz9q4k" } }, { "ename": "emacsc", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "06yhv7g579fpzbpinzn046i7zwsc6z43vrzawvxppzxpjcz8nh4r", "fetcher": "github", "repo": "knu/emacsc", "unstable": { @@ -28371,19 +28479,19 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220509, - 2259 + 20220608, + 17 ], - "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1", - "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc" + "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487", + "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a" }, "stable": { "version": [ 0, - 16 + 17 ], - "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", - "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" + "commit": "97270d725761ee02db461b45b18ec16ae31f203e", + "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" } }, { @@ -28394,27 +28502,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220507, - 143 + 20220526, + 1525 ], "deps": [ "consult", "embark" ], - "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1", - "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc" + "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487", + "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a" }, "stable": { "version": [ 0, - 16 + 17 ], "deps": [ "consult", "embark" ], - "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", - "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" + "commit": "97270d725761ee02db461b45b18ec16ae31f203e", + "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" } }, { @@ -28544,8 +28652,8 @@ }, { "ename": "emms", - "commit": "4caa7403144670c07e326ed3a7d982c427d4a254", - "sha256": "0ml66fgzxl4wsk5g7d78mqhr9gqmbld6qh31nfc6z19c8107jrd5", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "07r44rvnwvw7fcqjy4c7kjl0qmjynkibjhwraaiv1y92l1m9z8m1", "fetcher": "git", "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { @@ -28594,8 +28702,8 @@ }, { "ename": "emms-info-mediainfo", - "commit": "d08c28c6ff4caf14f0bf4b0f40f16660dac2d5d9", - "sha256": "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0hmja2s6120yka2h6p60v1b5hgkd1ywz82igwcv5wf9mxm9mmfw9", "fetcher": "github", "repo": "fgallina/emms-info-mediainfo", "unstable": { @@ -28842,8 +28950,8 @@ "emojify", "request" ], - "commit": "434ccc9df8eb884f248d5934e7d465348bb203a4", - "sha256": "07mbh3a34qcb1d37fvy3g5z3mc436lc5vlqqk46x7bjwdbkzlsfs" + "commit": "f683f95ceae812c77c54d398e0dc02c6da4ae17f", + "sha256": "0ghv79g1iirqzy1d10ywspcdcbb5br4vd86fxg44bk4iw7jn40ng" }, "stable": { "version": [ @@ -29021,14 +29129,14 @@ "repo": "hrs/engine-mode", "unstable": { "version": [ - 20200611, - 1825 + 20220519, + 1916 ], "deps": [ "cl-lib" ], - "commit": "e0910f141f2d37c28936c51c3c8bb8a9ca0c01d1", - "sha256": "15zx4a8gvgk077pnj7wr78nfjrzrj2i9ma6cj6jj6i8ikz6wyvjz" + "commit": "57045918301f5a96f67bd409f7683987a72272cd", + "sha256": "1a2c9c9kwkczg6jjn9rf46f1qgvqr6r695srp9cijq192f23d83n" }, "stable": { "version": [ @@ -29155,15 +29263,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20220218, - 1627 + 20220604, + 1519 ], "deps": [ "inheritenv", "seq" ], - "commit": "4730b31ff1479b6d822ccc7517251dcb52de45b3", - "sha256": "0w2fnqqihiqkkqw1x1gghgd0644gf7r5wp12dr7h1ljhfcb4kz83" + "commit": "7f36664fc6d97a7ca77c6c3e0c6577b72fa0b70d", + "sha256": "0858d36xgc6r4s116hc4pb8jf1j1l9ixws9xpk39a8h1diw3gplm" }, "stable": { "version": [ @@ -29294,8 +29402,8 @@ }, { "ename": "epkg", - "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3", - "sha256": "1cj53l3fdxjwkky3j3rfmv3l11m5xkn4l8qx8x2fr35rkldii5w3", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww", "fetcher": "github", "repo": "emacscollective/epkg", "unstable": { @@ -29459,14 +29567,14 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20220424, - 350 + 20220607, + 2211 ], "deps": [ "dash" ], - "commit": "ea5c0570f58b8e62249e001ed434a1056a50abe7", - "sha256": "0l85xks1m8yprd5q84gp0ryaagjd74kwb40r0mwdly6y4dzi0kvr" + "commit": "1f1f269edd27ffce8b6ead5b317e49fa433b039f", + "sha256": "0am0lixinl10x6j62hz86wg0pdminmm74vfyklzxh0yhvbvlcc5l" } }, { @@ -29865,8 +29973,8 @@ }, { "ename": "erefactor", - "commit": "18063e16a6f556b1871e1a5b74e353a85a794e63", - "sha256": "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1fvs0zqd57jpv6yj234w1dqynldnpfifm10swwrmnyjfc6wv5a9i", "fetcher": "github", "repo": "mhayashi1120/Emacs-erefactor", "unstable": { @@ -29954,8 +30062,8 @@ 20200914, 644 ], - "commit": "9a5f2b4a8cd14edbde9d16dcdfcb8db2a91be0d8", - "sha256": "1pn3w2prmz9ibhy5l22c6mmccr7lfy561gkd2s41hlcjsyd4ar00" + "commit": "6385f850a185523bb5241a71f5a7614a148f6b53", + "sha256": "0dllhhbr265dm12nkiil0s7cb24l7pjdjgfwgcsy98imn8pl8z4p" }, "stable": { "version": [ @@ -29979,18 +30087,16 @@ 20220215, 1844 ], - "commit": "4bf325feb5885056ad3315d9a0316b652613b3d9", - "sha256": "0dwjafw8ab71bqvwpv49cwqarrcd5pa0wyh7yxjn3spnl6f80j1l" + "commit": "5f870f8af2d4cad995589414aa5eda92486fa508", + "sha256": "1w0lyvx1fdi3qgkc4fc61rabp1j6qscnm3m26k887q8gwl8k5ss3" }, "stable": { "version": [ 25, - 0, - -1, - 3 + 0 ], - "commit": "47f121af8ee55a0dbe2a8c9ab85031ba052bad6b", - "sha256": "1ir42hz81bzxn1shqq0gn824hxd6j774889vjy68psi95psfs8r2" + "commit": "4ed7957623e5ccbd420a09a506bd6bc9930fe93c", + "sha256": "1nf72yiirdpxcs8m10xc04ryghxxc73x954x38m5a6fhv2hfhp2n" } }, { @@ -30132,8 +30238,8 @@ "repo": "rejeep/ert-runner.el", "unstable": { "version": [ - 20201005, - 2336 + 20220513, + 1142 ], "deps": [ "ansi", @@ -30143,8 +30249,8 @@ "s", "shut-up" ], - "commit": "80cf4f60ec8c1f04f58054ed8ad2dcfacc17d8b5", - "sha256": "1zxhiy8hpyz1nbi238gnwvs2pyrl1h8pgfyqrjhqwni8bih4kzx7" + "commit": "69d66b934223d5f1801ba3a4c8dbfb3453f2a041", + "sha256": "12hy1wnrs9dq2hl88fbybjv18a5fh5az5vpcrrxihrwy2gi2yrw0" }, "stable": { "version": [ @@ -30512,26 +30618,26 @@ "repo": "Phundrak/eshell-info-banner.el", "unstable": { "version": [ - 20220402, - 1721 + 20220531, + 940 ], "deps": [ "s" ], - "commit": "53fc69b8712b9869cee49468a6e418d64d2c3ab9", - "sha256": "16ma3z7sxj95p3jfaszdvaj45rjkmb806mlm2vv5pgcbzqjfhrp6" + "commit": "b7f2bfc0137be9cdc3dfe26a71e1984d3c3bcdc4", + "sha256": "0xj9cmcm8cfmmnvjs2wwhqc9j7jwydywscbwq16clwb3v4v5gj1i" }, "stable": { "version": [ 0, 8, - 7 + 8 ], "deps": [ "s" ], - "commit": "9c17e92f0229c9002e071842a88396c3f2439d72", - "sha256": "08kqqlvia3hzl9yq5yia92a27rk3fsahdizlf7rpywkmj5aix43l" + "commit": "27b0be266beaedd594bf0022582567454107af5f", + "sha256": "0xj9cmcm8cfmmnvjs2wwhqc9j7jwydywscbwq16clwb3v4v5gj1i" } }, { @@ -30932,11 +31038,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220225, - 1523 + 20220509, + 801 ], - "commit": "39eba283000a7b0220303d7c5a4f3ee05efc1e9c", - "sha256": "1avzxbdj2ghzv94mjmikqdb6za4dxkby2pnyrz0519fs4sc17a06" + "commit": "e83ac622fe7e3cbfc848481a9257e5ed5c7b5afb", + "sha256": "1qi399iidac2hbz1c2ydqcbfcqr5f7ldgqbhchk96az2l41yb6sp" }, "stable": { "version": [ @@ -30992,14 +31098,14 @@ "repo": "ShuguangSun/ess-r-insert-obj", "unstable": { "version": [ - 20211209, - 812 + 20220531, + 31 ], "deps": [ "ess" ], - "commit": "dd367cb918c90ec6d3824da869f7a75bb1ca49b6", - "sha256": "17vrs3wz3gpjvnq8i5gz14jnsds8s359ynx73wwh0ydcrx79f9dh" + "commit": "105a8edf97cc1e82ce1e959e7b7bd049851a255a", + "sha256": "02ydx9l074wl4f57b0l7lv2vnjvj8rbzppjd2gqh5g7gpy9lggv6" }, "stable": { "version": [ @@ -31045,8 +31151,8 @@ }, { "ename": "ess-smart-underscore", - "commit": "b4d6166f5c80cf37c79256402fa633ad2274d065", - "sha256": "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1mkx4530j1mwdikxh2j9gzfqqv8v29z9ril303vzrhhj8lbzrvm1", "fetcher": "github", "repo": "mattfidler/ess-smart-underscore.el", "unstable": { @@ -31308,8 +31414,8 @@ }, { "ename": "ethan-wspace", - "commit": "9454f3a58e3416fa60d8411b0db19c408935408f", - "sha256": "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "1dr7ydicqa7iv88n68nlnrzh7sg8lrcnmkmc6629gi00kwxlgjbp", "fetcher": "github", "repo": "glasserc/ethan-wspace", "unstable": { @@ -31354,8 +31460,8 @@ }, { "ename": "euslisp-mode", - "commit": "b04fffe5e52f26e92930a112a64531228f94e340", - "sha256": "0v92lry9ynkvsvx060njaw1j5lj9sb1i3srs2hfqqwyqni5ldkri", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0ixg22yw4x0g4gzy3jnq4n0b6dhvavwzp3gp0gy0lk5l2iv9i4nz", "fetcher": "github", "repo": "iory/euslisp-mode", "unstable": { @@ -31550,15 +31656,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220510, - 2302 + 20220518, + 859 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "5a9cfbc443219c4063b17853b7828ec0a00d2736", - "sha256": "1vr46xn72l5m0r9v3d1xaz86q607ga5adxlqdh7mlymw15w004ha" + "commit": "157af04d2cf466e301e82b0e667c5e7203fd96a2", + "sha256": "1aqavbxg5656ycjia2pbsvif3zaf0r99v87cym6442pszhdv2hsy" }, "stable": { "version": [ @@ -31727,8 +31833,8 @@ }, { "ename": "evil-colemak-minimal", - "commit": "828c744062069027f19fe5f2f233179f9149dc16", - "sha256": "0qi5k17b9k227zz9binbrd22cwmlqxkay98by9yxcbyhl4hjhdyy", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "149hpqcv9pak4bvka3hljfl8lf0bwfipi0kq8rn9rj6sc624nxzj", "fetcher": "github", "repo": "bmallred/evil-colemak-minimal", "unstable": { @@ -31751,28 +31857,28 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220505, - 619 + 20220607, + 105 ], "deps": [ "annalist", "evil" ], - "commit": "9707efcae4fc76fa204b1c29565aae35b99b865a", - "sha256": "0iyhxmaiqk0c72lmggv9jppxmlkb0vd9y0zqxgzjnznz9p08l3vz" + "commit": "79fc09b0140311377726551ee31622f61d28c571", + "sha256": "05q9fqcj1fq8dqg014i5kk0zwh1d5q13m35052276pjmkgfnfrk7" }, "stable": { "version": [ 0, 0, - 7 + 8 ], "deps": [ "annalist", "evil" ], - "commit": "f31162b2536d14bf97fe96d6e54be0d091ba9493", - "sha256": "1f5mbg2k527brn6b7njdjizpbzj252c53crzl8sf2564czcprqj0" + "commit": "a63cb007bf15c3fd4c3322f29f85d18d5574f7ba", + "sha256": "159i3qvjnp7jiffwpr517nnxcy3w3g40302vyzxvz6mb6qay6f2c" } }, { @@ -32210,8 +32316,8 @@ }, { "ename": "evil-lion", - "commit": "8a7a0691775afec6d2c7be3d6739b55bd1d2053d", - "sha256": "1rwmpc5ifblb41c1yhhv26ayff4nk9iza7w0wb5ganny2r82fg2v", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0qi7syxhni4m5m33lkb6ajw36naysm14mp2qwidmdq8h66zmy53p", "fetcher": "github", "repo": "edkolev/evil-lion", "unstable": { @@ -32317,26 +32423,20 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20220513, - 230 - ], - "deps": [ - "evil" + 20220608, + 1134 ], - "commit": "b47931128c6b7924ea432895f469769986de410d", - "sha256": "1zjdwqqrc2znk2y8f424ygnkxsvx0hq46gicjb4nllbvvvbx6kyb" + "commit": "271551560c3c8c066b29d335f781ff9b5aefe746", + "sha256": "1vzpmr33smi1kgcrxj7jl8wvk1ffvy2bf6p6pki0r53lk03mf8fr" }, "stable": { "version": [ - 2, - 4, - 4 - ], - "deps": [ - "evil" + 3, + 0, + 0 ], - "commit": "b314e816bacfc01bb7df9b19a06b18638af5cdbe", - "sha256": "01r85bnmqbmvwlhv5ihglp0dhws1g2wsw2vy0vsw5mi5mmx2xsqr" + "commit": "7a2a7384b6e752a805d6fbb78cf9425e54c2b18b", + "sha256": "0a55hhqi14g0hy80cfi5anxs44rcdxm1jkkyl561b4d4g823bpbi" } }, { @@ -32452,11 +32552,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20220414, - 1201 + 20220524, + 1231 ], - "commit": "95ed1ad2448e7f49f1ee417061b61edbb69a0749", - "sha256": "0hypgk03yksvgakx24mrz9nrx2z0d691ls80by2fw96788d68k8x" + "commit": "386cd758a477d1b1ba742ef698ecc19916b43fbe", + "sha256": "1gg6g14nyizfagn5dgqr8qrfcyvlbcm0jvlb2wqp5z2wp1dyzqkg" }, "stable": { "version": [ @@ -32603,8 +32703,8 @@ }, { "ename": "evil-paredit", - "commit": "88db86e1351410bcff6f3ed80681946afcec9959", - "sha256": "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1wsgb4whd3lq8830vja5k6d574azwfy5i918xblsihddn7m35dkd", "fetcher": "github", "repo": "roman/evil-paredit", "unstable": { @@ -33053,14 +33153,11 @@ "repo": "7696122/evil-terminal-cursor-changer", "unstable": { "version": [ - 20220422, - 255 - ], - "deps": [ - "evil" + 20220514, + 258 ], - "commit": "69d562932f9ab9869ab1ed923e9789cbfa0ff14c", - "sha256": "14d9hyv2hhv0vzvmq5m1d59imzxmlm1qc484kn3sbc99553q0s1x" + "commit": "81ede5cfa5d8944aa4777987c846a27e28457266", + "sha256": "01q3h1dmhpcjqs9zchq7wfpibd49pycfnrpn0gj0sh5bspzrqfm7" } }, { @@ -33077,8 +33174,8 @@ "deps": [ "evil" ], - "commit": "5a9cfbc443219c4063b17853b7828ec0a00d2736", - "sha256": "1vr46xn72l5m0r9v3d1xaz86q607ga5adxlqdh7mlymw15w004ha" + "commit": "157af04d2cf466e301e82b0e667c5e7203fd96a2", + "sha256": "1aqavbxg5656ycjia2pbsvif3zaf0r99v87cym6442pszhdv2hsy" }, "stable": { "version": [ @@ -33280,15 +33377,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220423, - 947 + 20220527, + 1400 ], "deps": [ "evil", "tree-sitter" ], - "commit": "bfdef5a292f7dde36967bb86eb2f7009b03631b1", - "sha256": "18nxwn051rq2r4jhc21hy2lmla7aghc2l9cvj7ib97q2l4f0jv64" + "commit": "fba268b2fd15657404da308b3e91efa87d9f15be", + "sha256": "0av546si5h8ka9qm07sqwfklq6d864di16cfwg80g4s7anhh7f11" } }, { @@ -33886,15 +33983,15 @@ "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "dash", "ht" ], - "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06", - "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38" + "commit": "e668666770858e92de83d8217c7e384de3ba1e34", + "sha256": "0hlm8c1sif4z8fl6k9k9akc26nzxby792ca6wkrqxcjsc65a65zv" } }, { @@ -34310,21 +34407,21 @@ }, { "ename": "f", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1sfji40z03mwdkdf922rdykxkaidihfkmy7isgn4fr6hbgjkqgi7", "fetcher": "github", "repo": "rejeep/f.el", "unstable": { "version": [ - 20220511, - 1502 + 20220608, + 943 ], "deps": [ "dash", "s" ], - "commit": "ad2c7dd369a15988f1c6298b5edb901ce2e1f446", - "sha256": "0rjggym7a7sb12bspdydk2vx12hqjqv0qmkpfi0z6s7mcnpl7fhq" + "commit": "d2019d4f9625bcc44349c69fe46d6645fd9ff4ff", + "sha256": "0vml6p19zwab2zrln2g6g2hb31czlz2rqln5wi8lc37h8lgfx7fy" }, "stable": { "version": [ @@ -34454,8 +34551,8 @@ }, { "ename": "factlog", - "commit": "9075a42edee1ac7de0812d2eefcba5681859eb6e", - "sha256": "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "1x1pn2r54b5njl3wangjpwgwsaxq37zz3kh4dj6razifb9277pcq", "fetcher": "github", "repo": "tkf/factlog", "unstable": { @@ -34487,25 +34584,25 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20220512, - 21 + 20220527, + 1238 ], - "commit": "33b3344848ae17d45c19d222e53b368ea6867e7e", - "sha256": "1yi2xzp1a945p11h6ac5ci0n56ffd40sm3ja6i4hrw4dd41axgyg" + "commit": "cb0ce3ef4430eda81aa6225f7083beb8ae03a425", + "sha256": "0zq8k1ggv40fdz6a5ri5nxg7yznvlwx7j3cpl7gig1v1p97h0b8k" }, "stable": { "version": [ 3, - 2 + 3 ], - "commit": "fffae9ada9057e81812f90edbd589f4a4f346768", - "sha256": "1rcjawwjk0jkihv26wrhhp0ncnj9qq1q16gkb9c8ys1qvaqyaiah" + "commit": "cb0ce3ef4430eda81aa6225f7083beb8ae03a425", + "sha256": "0zq8k1ggv40fdz6a5ri5nxg7yznvlwx7j3cpl7gig1v1p97h0b8k" } }, { "ename": "fakir", - "commit": "d0a8abd5fd77a14b957f53b5bc8474403cc1e18f", - "sha256": "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1pdil5shyrvwg4h3y4apnyvj7dq4f5ghg7kb3ybf52i2vimnmi7z", "fetcher": "github", "repo": "nicferrier/emacs-fakir", "unstable": { @@ -34618,14 +34715,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20220310, - 358 + 20220519, + 105 ], "deps": [ "s" ], - "commit": "b01cb24209d223ae0e7281c279daab87800ee7f4", - "sha256": "1jaw9xwh58p1n0x943f6fly0scxf6zd6czq87xrb3fnkmv8qdnhk" + "commit": "b09d122a17724668f73d44b9fe0b47add7f596c1", + "sha256": "1ys3aymskjsrvkqq3k91ml1rxms8bp64i9r4q4ya5k8xdz828m5z" } }, { @@ -35033,8 +35130,8 @@ "f", "s" ], - "commit": "d81983cf389dd5d2ec6cf9d702ff28ffd1be676b", - "sha256": "109d5sz2prlih28nbzaq3anyr7kyjm9cr7krndgsf7n68w6dz5b4" + "commit": "cab1b591a541f2a5ee25529572c6895e7f78cc4f", + "sha256": "1zziwgx9w76sww9wcnfvj1msmcp3z5lxgv8pkc0szp7a1ckm07hi" }, "stable": { "version": [ @@ -35207,8 +35304,8 @@ 20210707, 354 ], - "commit": "02ab2b3854df5515245ca2a924f89bf830f9c4de", - "sha256": "1jp3jcr9ni3rslhjv3wg7gqjg2iihdi3six4b65chcxryhkd21jd" + "commit": "1191c3454c8ae10aafe9ae08e98563948284c677", + "sha256": "1dbxnl14mzxij6209qsa69zbxp64qkz0q2pkayxl6fmi4s2sp3rs" }, "stable": { "version": [ @@ -35237,10 +35334,10 @@ }, { "ename": "filldent", - "commit": "4e3d46311b4d15314b6d1a0d5ff95c5f7e366223", - "sha256": "0if5fxr5vy4b8w36d0vi43cba5xpvqc2ma46d80bpark95jj8cvq", - "fetcher": "github", - "repo": "duckwork/filldent.el", + "commit": "cf2e923e6036542b89ee9cb36fca699092a24b64", + "sha256": "1z0yhg57nb6wf8iwbj84b22qjhy969zmvrxq766yl08950093k0r", + "fetcher": "git", + "url": "https://codeberg.org/acdw/filldent.el", "unstable": { "version": [ 20220423, @@ -35357,8 +35454,8 @@ 20220430, 107 ], - "commit": "116b976b526680c038109882d5cd2d9f218b62a5", - "sha256": "0sq8fyq19jw1hm0m6hiqnvzzvx0c3xigfx7x6i40ib5hnfjlqs0a" + "commit": "38ebbc21e32a6e616d315f5f898df4ca825f916d", + "sha256": "1hla8vvm8ia9rxsrrcwh8adg9ygnlpw9s1jci58jbiq2a0ng3mkp" }, "stable": { "version": [ @@ -35549,11 +35646,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20210702, - 1631 + 20220531, + 1555 ], - "commit": "eaff81f867d9c84e25891368f3d0cac7513984e8", - "sha256": "0gc77fkc6jczb52f5hil3h0hv74f7cxbijc8mjprh7zzgb09b6za" + "commit": "7b469ca0c22b7e6a907cd65eebdfa9723998a131", + "sha256": "1jgkgnpi5zmmqmm622p3cl0hj72cbag68c8mbi9bakw2fkq64xm2" } }, { @@ -35722,8 +35819,8 @@ }, { "ename": "fix-muscle-memory", - "commit": "c6b0501714a6d82657b88d11e3f79d75eea17d8e", - "sha256": "0qhasnjw0bj5hzw27r8vj6shhwc3zxcp3wmxijh1rpdw4773f7n8", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1y46amy0a566pk5918xargyiipcnf91xpmmfdb442456argbji8w", "fetcher": "github", "repo": "jonnay/fix-muscle-memory", "unstable": { @@ -35904,11 +36001,11 @@ "repo": "seblemaguer/flatfluc-theme", "unstable": { "version": [ - 20210908, - 1423 + 20220522, + 1657 ], - "commit": "33726cd072ad83c6943e1c3b83db2fff60f324ce", - "sha256": "1nai41dzpnmv63k75xnhc64vipb9nqyv3k75mp2g8csxz569ph2l" + "commit": "1679983d22a3b213262e09b3b25db75818a9d37a", + "sha256": "1ikkr45bdkajg1s3slq00wwrk06iyly2rnrigzm5vnbw6b5ildn4" } }, { @@ -35928,8 +36025,8 @@ }, { "ename": "flatland-theme", - "commit": "0a081fd0c5598fdf5bc0ab92f4d009f32132a29e", - "sha256": "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "13b3s62xrdds2w5c1ppvq9ipybxncnmbnzcd2303rr56k9da920a", "fetcher": "github", "repo": "gchp/flatland-emacs", "unstable": { @@ -36217,11 +36314,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220502, - 50 + 20220526, + 1214 ], - "commit": "e49cbcb70235fa39a7d243521e03ad874451a39a", - "sha256": "1hjfkcdi99yfld9jakhhrncpm2yvg03xz35dngc6nn23dkwdpidm" + "commit": "b4148db1e6e6822a6a0da1eda3c58affe562d1dc", + "sha256": "0ga6jw948w0zwab4jixcrlmv6f9ck0vf7v40g3z4l6ddi2ibsy15" } }, { @@ -36239,8 +36336,8 @@ "flutter", "flycheck" ], - "commit": "e49cbcb70235fa39a7d243521e03ad874451a39a", - "sha256": "1hjfkcdi99yfld9jakhhrncpm2yvg03xz35dngc6nn23dkwdpidm" + "commit": "b4148db1e6e6822a6a0da1eda3c58affe562d1dc", + "sha256": "0ga6jw948w0zwab4jixcrlmv6f9ck0vf7v40g3z4l6ddi2ibsy15" } }, { @@ -36350,8 +36447,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20220504, - 830 + 20220514, + 1743 ], "deps": [ "dash", @@ -36359,8 +36456,8 @@ "pkg-info", "seq" ], - "commit": "1d7c1b20782ccbaa6f97e37f5e1d0cee3d5eda8a", - "sha256": "01hr9xpjyws32aap2jlyncbgl1rfig8ylspln01yxf1lljysicc2" + "commit": "66a973afca1d03b8284baaa7590eb2b8615a1e6a", + "sha256": "1acvldcdac11p92c47a25q5k3lxsibigr98b3b2zcmf5l90l0y49" }, "stable": { "version": [ @@ -36691,8 +36788,8 @@ "deps": [ "flycheck" ], - "commit": "35daaccc75b0367844b249a8cb05bf73bcebd52a", - "sha256": "0id3jp0d2bkrk17l6svj5c518yp6ndlqg7py962qdrvzz82004j7" + "commit": "6fb8d0204b0293478b5565e378797acab1f2e038", + "sha256": "1f1sg9rv91hgwzwx8nrc15nvk7m1hxm0f25gh592vjr6yy2n668r" }, "stable": { "version": [ @@ -37148,14 +37245,14 @@ "repo": "emacs-elsa/flycheck-elsa", "unstable": { "version": [ - 20200203, - 1758 + 20220523, + 1105 ], "deps": [ "seq" ], - "commit": "911ffb3498e411c538eebce20c6b20b39d725af6", - "sha256": "1b0g9lqg6kmvhvh4a6g6xmag4jmkx3br6b37z8kb7p7x3wb691f4" + "commit": "39c486096d76344f3045e69620b277ee34b6e5e8", + "sha256": "1i7r9k28d0x4gsr4if2xx6karny8f5jrbxvi5529sh8sacl6dyfh" } }, { @@ -37276,8 +37373,8 @@ "deps": [ "flycheck" ], - "commit": "c52ba814f299f62a2a339bae679f3d6d04566854", - "sha256": "11l69nj1f61lvw4arn9k0g9n5pczypn15qq4c02x1kljjlx0h1zs" + "commit": "71109b55b3809b8e3be827cec1b61914adf6b45b", + "sha256": "0xr6v7ah9a1qr3x4a6ajk2p0mqs7jcx0d6bwm49z2sfx2nz88kz9" }, "stable": { "version": [ @@ -37355,8 +37452,8 @@ "grammarly", "s" ], - "commit": "abc66e71d542f65a90c394058cdd3a7b2002c6a6", - "sha256": "0irp6cpi9qy80wssrncdlxjr2612l2mnprrfjjm5hjggflp5wygg" + "commit": "46584fee0a8e72c2b1687f4a4ec45feb1bcb1607", + "sha256": "1hj259iz1n07vj7jw4000l8hq8l4ivkys6xisb3apixr03sz8zg5" }, "stable": { "version": [ @@ -37649,14 +37746,14 @@ "repo": "jojojames/flycheck-jest", "unstable": { "version": [ - 20180411, - 328 + 20220530, + 1418 ], "deps": [ "flycheck" ], - "commit": "08f27c5ed97c83c445f99fab58f0b6c826f14449", - "sha256": "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98" + "commit": "8181c5d2e1318c6ddcff21c6f3f6d76413545645", + "sha256": "0lhvgffn08ipafyh7icldbkgslcvqr1pja70fas54f3s077sql2k" } }, { @@ -37781,8 +37878,8 @@ "deps": [ "flycheck" ], - "commit": "63674d8b928377d763df40317e15f4ca257f77d6", - "sha256": "14fjv2wckymhfw0sm89bkbn6lvmcxsivv5m1dva0wr5j0gppaj47" + "commit": "e866e3ac1bea1ef7078a6aa926abbee9ca598e5b", + "sha256": "185lgdvvhnps626c50xr5r45pyvy131hn24mgm39n6gqpcmlgxhh" }, "stable": { "version": [ @@ -38108,8 +38205,8 @@ "flycheck", "pest-mode" ], - "commit": "43447a2c70f98edd1139005e32f437d3f142442b", - "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + "commit": "af677327f185113442e95b00986097b30cab650c", + "sha256": "01wy3v1aj2891wgbr7rwpaw9xavfrqbyiqiv01q6jjdvc5vl0rwi" }, "stable": { "version": [ @@ -38328,8 +38425,8 @@ }, { "ename": "flycheck-projectile", - "commit": "2760b15caa9b23c344ad9a6685fd6994110cba36", - "sha256": "1xpl0p07m95gh187jikiz850396h388d24mg97zr6sa6krq8vv55", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0rgm6czkvqnksmhw596xj88g8kdbksy0rdclamm7dvjbjyyaq4p9", "fetcher": "github", "repo": "nbfalcon/flycheck-projectile", "unstable": { @@ -39041,8 +39138,8 @@ "flymake", "let-alist" ], - "commit": "8f36fed9eef834cf94931fc8b813f9ac8db6d2a4", - "sha256": "0586g7qdcp2bh51ll1sv73ji6vh8l3xxsndpkqxgfkyckmc3iyhh" + "commit": "46afe132148da1e3f989e25b00ee17ae4bf1716c", + "sha256": "046kmnfid30bwihfzp6mv7ya4vf48b8isfq6hm7y15925y695cg9" } }, { @@ -39088,8 +39185,8 @@ "deps": [ "flymake" ], - "commit": "6ce75c17bc02ae9755deda50d5ac366785c94091", - "sha256": "0nbggmz3b6r2rixbn20r58dca05h45lsdyfbbw74syd4fv5g8s9c" + "commit": "99fcfbd002dbfd99ab66910265507bf767f52ce6", + "sha256": "0ik8rpw1gqrzc7p5ky22clprhvpd0a5i5zrb1p4fnwcywa5mzqr2" }, "stable": { "version": [ @@ -39316,8 +39413,8 @@ "grammarly", "s" ], - "commit": "74ab6bb817205dbf1cd77a161be76904c1e17b75", - "sha256": "0ngs38h3zcg2znqbfy0m886g4spn39bnch4s1zcl8f8zcn3s24mg" + "commit": "2c5711952922358ea9ca9a7351eb45588238f661", + "sha256": "0l0fc2qsg77gv0kha45q6il74xvi0vnh42fkr01dhyf0g1bq4mpq" }, "stable": { "version": [ @@ -39578,8 +39675,8 @@ "deps": [ "s" ], - "commit": "c24339b50a4b42cc2bd7e8e167c77a75d8227774", - "sha256": "1lvpyn9s3x9wyhdsa9krra03appn8p0dv8086hixpmqm10d21wl1" + "commit": "5f9eef8fe3f342f17593e0caeaba906ba7cab24a", + "sha256": "1mz18inlv78lg40jgq68qq3v62b6mgmz89lcgczg93lyfh81pjp3" }, "stable": { "version": [ @@ -39695,8 +39792,8 @@ "deps": [ "flymake" ], - "commit": "06d819c6d1292f8c87ebc0681c83c9fb48620bbe", - "sha256": "1blzcr2c176wlqv8fr4mna0qqm20cd77s8b4gz21jzrq44d7qqf8" + "commit": "2e98ef45d764cd8d4e146097ff763c5ec92c6570", + "sha256": "1mckr39zgx2f0n56iw4mmy26bayb1y0wjcrr6nnxpbl6jr28rqvw" }, "stable": { "version": [ @@ -39725,8 +39822,8 @@ "deps": [ "pest-mode" ], - "commit": "43447a2c70f98edd1139005e32f437d3f142442b", - "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + "commit": "af677327f185113442e95b00986097b30cab650c", + "sha256": "01wy3v1aj2891wgbr7rwpaw9xavfrqbyiqiv01q6jjdvc5vl0rwi" }, "stable": { "version": [ @@ -39784,8 +39881,8 @@ "deps": [ "flymake-easy" ], - "commit": "10d3e7e1c31c104e3da694b2b52cd34df61efa5e", - "sha256": "1gzg5xz2vchz6kq7hyc1pvd250kfnwkpy88gmh857v3mnzrq71dg" + "commit": "abee6b8f50a631e5bc52499b938fcfd88f958a44", + "sha256": "0vxi77x11ipsgyy008b9gwav7psdv0wx3bg07sbg6fmhaa3y4fqi" }, "stable": { "version": [ @@ -40150,20 +40247,20 @@ "repo": "shaohme/flymake-yamllint", "unstable": { "version": [ - 20220311, - 636 + 20220531, + 913 ], - "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d", - "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57" + "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342", + "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8" }, "stable": { "version": [ 0, 1, - 3 + 4 ], - "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d", - "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57" + "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342", + "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8" } }, { @@ -40207,11 +40304,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20220131, - 834 + 20220520, + 630 ], - "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", - "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" + "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e", + "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm" }, "stable": { "version": [ @@ -40231,15 +40328,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20210124, - 1143 + 20220520, + 630 ], "deps": [ "avy-menu", "flyspell-correct" ], - "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", - "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" + "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e", + "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm" }, "stable": { "version": [ @@ -40263,15 +40360,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20210124, - 1143 + 20220520, + 630 ], "deps": [ "flyspell-correct", "helm" ], - "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", - "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" + "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e", + "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm" }, "stable": { "version": [ @@ -40295,15 +40392,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20210124, - 1143 + 20220520, + 630 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", - "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" + "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e", + "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm" }, "stable": { "version": [ @@ -40327,15 +40424,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20210124, - 1143 + 20220520, + 630 ], "deps": [ "flyspell-correct", "popup" ], - "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", - "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" + "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e", + "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm" }, "stable": { "version": [ @@ -40569,8 +40666,8 @@ }, { "ename": "fold-this", - "commit": "9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c", - "sha256": "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0v0rppl53cxfr1y1yi8vcy761ipp9lpsw52hhmd2iv67d4xa2s05", "fetcher": "github", "repo": "magnars/fold-this.el", "unstable": { @@ -40679,8 +40776,8 @@ 20170305, 1356 ], - "commit": "a5fafe89d4032fd1f0c21b7b04708ef2cce2517b", - "sha256": "0m9dwcgja1d33h6d5fbc42lgfxafwvzc3zwnj4ywx6vai9yqljhd" + "commit": "26fe027e03911f24b3658b44611d3b38fb6df455", + "sha256": "0zcj78r7ixlrag1h58s64g63xx87m1qn3wv6rs6qxcqxwlcl9n96" }, "stable": { "version": [ @@ -40764,8 +40861,8 @@ 20191004, 1850 ], - "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86", - "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri" + "commit": "4359c640c7822a23976e9a5ca4ce63452d796912", + "sha256": "176qjbhvdg1bqy45qk6zf5ij12qif6xkd3ppd1a5wg67p2rv21z8" } }, { @@ -40836,14 +40933,14 @@ }, { "ename": "forge", - "commit": "6cee0395aa57874032cb75c9f3f71e62bd139235", - "sha256": "0a1yvdxx43zq9ivwmg34wyybkw4vhgzd2c54cchsbrbr972x9522", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "0pzlh2b77qfg4fgpxm8zxvrnfwl7q38srxsvf39r4hgip30sk3lp", "fetcher": "github", "repo": "magit/forge", "unstable": { "version": [ - 20220506, - 420 + 20220526, + 1854 ], "deps": [ "closql", @@ -40857,8 +40954,8 @@ "transient", "yaml" ], - "commit": "05babf69068de7a982bd2e8ad888f37dc7319003", - "sha256": "02mck5c2cbz61j2xwgpwaqlpbnp5svn6g05lylhmw7g0sprzcdvb" + "commit": "66b3993c98c724e0d3e6411036ccdfab95c7a504", + "sha256": "0mfg16vb006avbgw8gygylbqa74cp1fp5cfdr2mp32z6fc77sqcd" }, "stable": { "version": [ @@ -41052,8 +41149,8 @@ }, { "ename": "fountain-mode", - "commit": "27cc1d093ce12b559a4266184fb9077c9810d542", - "sha256": "1jmb5xm0d1wffw3gj0idv114dzs845n41312dvghv7bblbxyd7bj", + "commit": "af5c1593052d63146e850683c461a760ab166033", + "sha256": "1ljfdk79lvy04whx0sl211xam5nkj5i31myrdnl6kkg8azbdsj4d", "fetcher": "github", "repo": "rnkn/fountain-mode", "unstable": { @@ -41497,6 +41594,21 @@ } }, { + "ename": "frimacs", + "commit": "80c47d487c434b7e551a265b32e49da6baa818b6", + "sha256": "0lg5yarriaab4x1zsdfhfci3sivmj2gslwvnc35jmhp2jq4fa9q9", + "fetcher": "github", + "repo": "pdo/frimacs", + "unstable": { + "version": [ + 20220602, + 1847 + ], + "commit": "4713aa13c96183bccaeccc135b932f94522c2c05", + "sha256": "02i6niy6axhwdxw56vqqcnin9iba8vblnmf0fprk06rwlxyj7svc" + } + }, + { "ename": "fringe-current-line", "commit": "eaaa6f7f2f753a7c8489415ae406c4169eda9fa8", "sha256": "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8", @@ -41612,11 +41724,11 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20220429, - 1847 + 20220605, + 1329 ], - "commit": "5208b54098c7534f4768b87c5f4c8a01b638737b", - "sha256": "04s37djxzy8v5xwc5hh8gq37zh7f6ih3y07g07q2fc39rk1xslpd" + "commit": "c7842fe63b8bae5aa8bd6a9891036c5ce04e4030", + "sha256": "17ibcl9ilm7ml4gjlvcx40hni8awccm1zk37y0nfvcscigf3i8pr" }, "stable": { "version": [ @@ -41682,8 +41794,8 @@ "deps": [ "cl-lib" ], - "commit": "041430cda31c73fd51d7c16e736dcf08db13eb11", - "sha256": "10kv8hpqh08mgyhn04i72kvzncdaqyflai6h0flg89wv1air0m46" + "commit": "6900d1eab9750001e8525f3990ed6fa4a73a8c44", + "sha256": "0vxak1s31ql6zk1i3c2kj35dxqi5sdp41ip56b586y0f1p9hfcab" }, "stable": { "version": [ @@ -41829,6 +41941,35 @@ } }, { + "ename": "fussy", + "commit": "c62fcc6f8f487390423a66aca59700d8856287c9", + "sha256": "1rsdrnbnqhd0vk56il7z5vcnz356xhvhmimry3diiaqswl79mk20", + "fetcher": "github", + "repo": "jojojames/fussy", + "unstable": { + "version": [ + 20220606, + 1543 + ], + "deps": [ + "flx" + ], + "commit": "1e77aa133b1bed8164a927b9090af839d0383774", + "sha256": "0jiip3gcrqvm91bcv647j30kqxbpfqi10w21zi986ggdjjhdcdjs" + }, + "stable": { + "version": [ + 1, + 4 + ], + "deps": [ + "flx" + ], + "commit": "4526f81bb76b5af3af13e540ff7a5f1ac0d8ed4f", + "sha256": "0mk31kf9aj0mmdynv42h3lwzd4x9ys1d9s1r9qyy0kdi8y8vcs21" + } + }, + { "ename": "futhark-mode", "commit": "97210774b450b7611d2bfdf36e04a425835d86b9", "sha256": "1sck984a8m0i9n07jnhpnin6k060756g73ix34ghzd65j5f0pvlw", @@ -41872,8 +42013,8 @@ }, { "ename": "fuzzy", - "commit": "9e0197df173fbd7ec1e7e35c47476fcf2aaa483f", - "sha256": "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0hcl2qw1685nn9kv32dj1lnf4wv91nkp5h23rbzzvjaa81z3x8j3", "fetcher": "github", "repo": "auto-complete/fuzzy-el", "unstable": { @@ -41881,8 +42022,8 @@ 20211231, 1837 ], - "commit": "7691a73a85f014a34cc161650e989801f2aba5a3", - "sha256": "1xm0cmfyvypxhygl36m3r68asixmrdq23q4c3vkx8y7i7yaml4w1" + "commit": "bfba20e435a6f5bba328309a8a5ca20dea7a301d", + "sha256": "0y4lv1cbpfcz8d1dwvqc728s5hyn6b7fb2n0gg4lhz76h1i411ky" }, "stable": { "version": [ @@ -42124,8 +42265,8 @@ }, { "ename": "gather", - "commit": "595e40c7102294684badf86deb72d86bbc3c1426", - "sha256": "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1y7n7qavqj5dv03y3cvmhj59pccyiz66axvxi7b99q9ya6ig7hsg", "fetcher": "github", "repo": "mhayashi1120/Emacs-gather", "unstable": { @@ -42571,8 +42712,8 @@ }, { "ename": "geiser-stklos", - "commit": "6530db79aafe4ac4cefa01f77a8cc1e259385171", - "sha256": "0bbxxxvzp4dd22lrlmg0lnishvqj1pcm82scds27nrkzrcdycs8s", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1msv27dfasy18mdjh5ymgqakgjj73gw77nzarcg0s34dbdssrzp0", "fetcher": "gitlab", "repo": "emacs-geiser/stklos", "unstable": { @@ -43074,8 +43215,8 @@ }, { "ename": "ghub", - "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3", - "sha256": "1xqhjhr08qrbv4g6i73f60h6ph4rc2m419f2p5n54hrq929qsdri", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i", "fetcher": "github", "repo": "magit/ghub", "unstable": { @@ -43447,16 +43588,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220506, - 1936 + 20220607, + 1403 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d", - "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c" + "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453", + "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2" }, "stable": { "version": [ @@ -43567,8 +43708,8 @@ }, { "ename": "git-gutter+", - "commit": "b2db25d23c2a1a4f38867aac25d687a150e95c2b", - "sha256": "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "02f314ks9hv8fgbajq1cci3gd9vycz08w87xngz3wa8r1f7ga6gc", "fetcher": "github", "repo": "nonsequitur/git-gutter-plus", "unstable": { @@ -43630,8 +43771,8 @@ }, { "ename": "git-gutter-fringe+", - "commit": "ad46c349d13f7d40db706b487319ede40b96b09c", - "sha256": "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "18h9jkp5blfw4lgxh36x51wjh7fh669q4g7qsifj3lhg595lb757", "fetcher": "github", "repo": "nonsequitur/git-gutter-fringe-plus", "unstable": { @@ -44910,11 +45051,11 @@ "url": "https://codeberg.org/akib/emacs-gnu-indent.git", "unstable": { "version": [ - 20220330, - 422 + 20220515, + 1719 ], - "commit": "cd5dc79ac65c24e9e775bd2582ad620e316f2182", - "sha256": "07ccrjlh5ph8sdsrd7k5ihrjl4qgsjf9qr54y90fq5b9hzy9ksgp" + "commit": "ff3e10edbdf9b919747ec2ba3434d5858f5cc9fa", + "sha256": "040vlkzhgi7mhp6m4nrqz2srh8fr8xgpgbiqm8mbcs7py41smkg0" } }, { @@ -45770,11 +45911,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20220404, - 1240 + 20220514, + 1046 ], - "commit": "b0898e6cd647e38e6f70e6cd121b789610573237", - "sha256": "19nffy0zqcjgqigbq0p03ldf31xki1cci48yfj620nh0cxvyd0vp" + "commit": "3b48787f5e91b9480ef5066bf3657f67306524ca", + "sha256": "1c27rk6r9103lwmb0mqkfiph521w7af34p2hli9ahjj8da5y91cb" }, "stable": { "version": [ @@ -46043,8 +46184,8 @@ 20220210, 1659 ], - "commit": "1faa779a126c3564e74d6254d596da8dd2b4bf56", - "sha256": "0lhlpl3ilkrpfk3r638avp85wvbyk3arlssa94xw99a4nz7ix4a2" + "commit": "25bd3525fa8277d40a0163df04f6a06277e6265b", + "sha256": "0nwjz13zyi9fvy96frzjw9y9k42vzgy4h1rpx4p9ar5agi9nrk17" } }, { @@ -46092,8 +46233,8 @@ }, { "ename": "google-this", - "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8", - "sha256": "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "02jfrjan40a5dwjwigr4aff413v6dd20przy7l4jbrbaazq705w2", "fetcher": "github", "repo": "Malabarba/emacs-google-this", "unstable": { @@ -46268,8 +46409,8 @@ 20210323, 332 ], - "commit": "ea845966423ce90526d717bb27d0022101c75796", - "sha256": "0cwp00677vw20xzrrf7sjjivdz5ny9imqdhj8719ibgqa0cq52zc" + "commit": "6fa81449dac4b5b0a0245ff29f13b44cc72cf940", + "sha256": "0d0c3zfy8ffg26nzbwy6i26niyikdxf15f8z2147kahlwl23nsvp" }, "stable": { "version": [ @@ -46355,8 +46496,8 @@ 20210323, 422 ], - "commit": "d4db955860de830ebc067b065cba16a776717e76", - "sha256": "0d9429y6nwmjywj7rbyjdxs9h98177s16szj6mr54clixvws57rg" + "commit": "8046c9d4839438437281fece36858575c0810706", + "sha256": "0w09j5k7kvlhq6zdwimx2kmcxc6hbyc3kf2dx3w2b3bc4c8k2xq9" }, "stable": { "version": [ @@ -46385,8 +46526,8 @@ "magit-popup", "s" ], - "commit": "b4c0b4fe98b2692cf84e445ad2528911e3e1a622", - "sha256": "1wcr3bw7ck5v5w1x3ivhmgm4lq7ln0fvszl7sw0cyj95jqcd7brd" + "commit": "b4847059960b2faa100c7066f104be86c561229d", + "sha256": "16x2n3xb7yx7ihl4bgzwdwqxv20arlmz7nmiw8j7gy8qvfjnrk0q" }, "stable": { "version": [ @@ -46620,8 +46761,8 @@ "s", "websocket" ], - "commit": "3e14e53b87465ca35b08b5355061e380afb87b31", - "sha256": "0zia9hpamwjhyc38l903jwfij06y237j5c2sx600g5r9y36byg9z" + "commit": "37d4d7d068c51afefebd58dfa6021662c9c64cf1", + "sha256": "0knwcljmq52xlrnl8nzmja0kacc0bb68g4sgi3gkj7g3rl5g2crs" }, "stable": { "version": [ @@ -46737,8 +46878,8 @@ }, { "ename": "graphql", - "commit": "3e801ae56f11b64a5a3e52cf1a6c152940ab8c97", - "sha256": "139fng2psn535ymqa7c6hm1r7ja1gs5mdvb487jj6fh0bl9wq8la", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1az0pczmyifsig8yaq9qf8w29vr8vcy2s9dqgfdx09zjypy540nm", "fetcher": "github", "repo": "vermiculus/graphql.el", "unstable": { @@ -46767,15 +46908,15 @@ "repo": "ifitzpatrick/graphql-doc.el", "unstable": { "version": [ - 20210808, - 8 + 20220527, + 1721 ], "deps": [ "promise", "request" ], - "commit": "6ba7961fc9c5c9818bd60abce6ba9dfef2dad452", - "sha256": "0hb6nxyiz36r3ii8iava76cv0k4nckslli20q2iw8s1nszgwbxky" + "commit": "d37140267e0c426c7c18aff31900aa1650257394", + "sha256": "008wnng94pm2p1xjpbvzzm2l29yq1635j45xywgcj66vknsvvijg" }, "stable": { "version": [ @@ -47541,8 +47682,8 @@ }, { "ename": "guru-mode", - "commit": "e60af6ccb902d8ef00cfecbb13cafebbe3b00d89", - "sha256": "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0daan2hhi24agbc33rss9j298caszfnx6qqx8kh69s16yk5hm4h0", "fetcher": "github", "repo": "bbatsov/guru-mode", "unstable": { @@ -48001,16 +48142,16 @@ "repo": "otavioschwanck/harpoon.el", "unstable": { "version": [ - 20220402, - 446 + 20220604, + 50 ], "deps": [ "f", "hydra", "project" ], - "commit": "a23571eaab94fb2da0569ed5ab3c1b469f123b97", - "sha256": "0xl7lfj9cc9qp72ibjyilrdxrknvfd07fk206c8933yngrkqf376" + "commit": "b08d4af6e4ab404c8a1031ff8cbfff49d5c8aec4", + "sha256": "103z74y5x3pfanbalf6xgrm7cny30f1n3lihliabfiav96xzpmq7" } }, { @@ -48139,11 +48280,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20220331, - 1645 + 20220529, + 1859 ], - "commit": "4ec2aa32b1772e629a6a2b47b84048e1990d6728", - "sha256": "0m0irwlwz17dmx4k1x82slmbxaxkmhxdjm9ha1490jf4wbbh93q4" + "commit": "5a9f8072c7b9168f0a8409adf9d62a3e4ad4ea3d", + "sha256": "0np1wrwdq7b9hpqpl9liampacnkx6diphyk8h2sbz2mfn9qr7pxs" }, "stable": { "version": [ @@ -48239,26 +48380,26 @@ "repo": "purplg/hass", "unstable": { "version": [ - 20220402, - 1326 + 20220526, + 2124 ], "deps": [ "request" ], - "commit": "c6bded14ae4b68194bd9e35428e9973ca144569b", - "sha256": "1qklrp1gskcr93j8gzi1nsp6kzjq7pra1rnyls67l4nchff2knl3" + "commit": "5da5404c8de483ca70dcab13ad07805f1b37e4bd", + "sha256": "1a9m8pny9x8mfi1jkk7y4357hbhqfi7i71shs26ilr0gyivfvxbp" }, "stable": { "version": [ 2, - 1, - 2 + 2, + 1 ], "deps": [ "request" ], - "commit": "22873f7df205cc1144ebff7aa2dc9bb85031c8a3", - "sha256": "1qklrp1gskcr93j8gzi1nsp6kzjq7pra1rnyls67l4nchff2knl3" + "commit": "5da5404c8de483ca70dcab13ad07805f1b37e4bd", + "sha256": "1a9m8pny9x8mfi1jkk7y4357hbhqfi7i71shs26ilr0gyivfvxbp" } }, { @@ -48309,8 +48450,8 @@ 20210108, 1835 ], - "commit": "6641a0d7c00ce633887baf3f8c594d9a8a504e9b", - "sha256": "0395f1pwrga0vfd153s7xlgiw5m2d89s5lx6xn9dm8x31q78ghq6" + "commit": "063785e0a9e54826e758571281c6715f4dd82387", + "sha256": "0hl54ksfiv0gnvhnfxa913n8jhysv94nmhryd4ipg2lljlr11zxr" }, "stable": { "version": [ @@ -48366,8 +48507,8 @@ }, { "ename": "hc-zenburn-theme", - "commit": "01ccd40bd5fc2699a4756ebf503ac50f562cf600", - "sha256": "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "14ag9y0i5ma07ja0f2n9lmnivhy11r1l9ixy41xl3wc4gjdhmyn2", "fetcher": "github", "repo": "edran/hc-zenburn-emacs", "unstable": { @@ -48449,15 +48590,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220512, - 1048 + 20220607, + 1243 ], "deps": [ "helm-core", "popup" ], - "commit": "0f7d7acf5724d79ed51ae22349ceb743c4868a3e", - "sha256": "177gpf0s722xdya74gdx8my3jw49f38im31i3impw5c25g8x9ajs" + "commit": "9e706bc154deab9b5932d7849eff249f7c4bf1c9", + "sha256": "1kgh0srn59sbjkrjb1kwvyiyklp3aj6bf8c161b3k73g6gpz3kj4" }, "stable": { "version": [ @@ -48556,8 +48697,8 @@ "deps": [ "helm" ], - "commit": "9820ba1893c8a7e31e756c891f9b4cf0eff1e50b", - "sha256": "173n4s1i9zi4yizvlzfr2qsj6rb2qizkmhwm21ijd701ac3v9xcs" + "commit": "6a45f2f6a6c5a957eb43ed32c6e77069c5251e1c", + "sha256": "04fq30hashpvss4f1ar9w2nc5pw7drhx0l5d37x7dy2y7pf85mal" }, "stable": { "version": [ @@ -48573,8 +48714,8 @@ }, { "ename": "helm-ag-r", - "commit": "6aa1cf029db913dafb561e4c8ccc1ca9099524de", - "sha256": "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "00z4xg144axzha993iv3ci3wpsh4rbdbff9ywapfa19j4q76fb72", "fetcher": "github", "repo": "yuutayamada/helm-ag-r", "unstable": { @@ -49355,14 +49496,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220512, - 856 + 20220607, + 1243 ], "deps": [ "async" ], - "commit": "0f7d7acf5724d79ed51ae22349ceb743c4868a3e", - "sha256": "177gpf0s722xdya74gdx8my3jw49f38im31i3impw5c25g8x9ajs" + "commit": "9e706bc154deab9b5932d7849eff249f7c4bf1c9", + "sha256": "1kgh0srn59sbjkrjb1kwvyiyklp3aj6bf8c161b3k73g6gpz3kj4" }, "stable": { "version": [ @@ -49538,14 +49679,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20220319, - 955 + 20220514, + 714 ], "deps": [ "helm" ], - "commit": "69f1e5bf03d67c9e5cb0065e702e8c311ac9d3db", - "sha256": "0haq758rxayl4qwyxm44w7mq1s5g0gpfxspd0q9c546qvws4kwrr" + "commit": "65fdf36e9a5c6dd8dffa71dfb6c65bc03879abe2", + "sha256": "1r62xrq95lzgg3if0q86idl9l8gmks76pgpxr615vm8ndhq8a545" } }, { @@ -49919,8 +50060,8 @@ "deps": [ "helm" ], - "commit": "f9ffd81c3b7fa3e5f79f511a6c2226b5e99b73e6", - "sha256": "0g4gy812ahch4p4nqw8wz0a7qsn637lm85x3iahphy53qvyzc9rf" + "commit": "5814015490c4540a5779168511d596022c6ebb44", + "sha256": "0rivhzxk0yifjkphf59sq4h37485kggdy8ww7s10nf40n360prz3" }, "stable": { "version": [ @@ -50184,8 +50325,8 @@ "flx", "helm" ], - "commit": "dd092e8eea5257d49bbdf694df4fefd86252e54b", - "sha256": "1w6625gd5k149wm54m7ci6l9pzrcma6z8hppj965vqlwqc8fj4xa" + "commit": "99bb20cd7ec89ac1e2ae6eaecd9ac4b30f570bee", + "sha256": "1srns7jr7nbgq25x4qapc44p6ivfzlm18xxqnbdadf05ld9jgh2v" }, "stable": { "version": [ @@ -50531,8 +50672,8 @@ "deps": [ "helm" ], - "commit": "6285c083d885ea8e110868c6a5b9df69c3f3c4af", - "sha256": "1di39sbwf3yi01jh8nbiayqqnms1dddfqnz5g0gg935f5w3l1phm" + "commit": "c97a2fe68632938c2414249abbc9c7004eed3255", + "sha256": "1scjp0rrgsvlk963vrx6s8fmgz4fga24prlvbck07c3wvrfz37lx" }, "stable": { "version": [ @@ -50790,8 +50931,8 @@ }, { "ename": "helm-j-cheatsheet", - "commit": "681b43eb224942155b97181bbb78bcd295347d04", - "sha256": "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1k3ajip1k225zrcb901887a8lqp0wkyavqikajfb0jszk8v63ysk", "fetcher": "github", "repo": "abo-abo/helm-j-cheatsheet", "unstable": { @@ -50985,14 +51126,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20220418, - 657 + 20220605, + 434 ], "deps": [ "helm" ], - "commit": "c6494a462e605d6fd16c9355e32685c3e0085589", - "sha256": "02gx6a8n7csip5wm818bmhrq4r0r394r3vvfsn8fja8fagmg3z1a" + "commit": "27a0fae5c8927c5980f49726bd29d0a7274af337", + "sha256": "03k5gpz3vinj4w7k0cfmpjn6rxwiyyscn4jl9zyj2bgdf2m39wfm" }, "stable": { "version": [ @@ -51382,8 +51523,8 @@ }, { "ename": "helm-org", - "commit": "5c14f6b048ec9983e31fcd3e7cdea45ebe806ce8", - "sha256": "02zyc7nssl4zvbbw03fl0nbf4d6qmqxywa2hnfyiwfzn5jzxkl95", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0j486w0nzn9iw96h8gh9vwichhnasvl4h0wd48dfxnvzymz6z5gj", "fetcher": "github", "repo": "emacs-helm/helm-org", "unstable": { @@ -51463,14 +51604,14 @@ "org-ql", "s" ], - "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170", - "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl" + "commit": "64a9234733904af20fd495861792f1d5c2b37190", + "sha256": "1w3vly4jh854gb9bgnwqfzry6214v498fmiwm491gi8m5g0d05xp" }, "stable": { "version": [ 0, 6, - 1 + 2 ], "deps": [ "dash", @@ -51478,8 +51619,8 @@ "org-ql", "s" ], - "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", - "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" + "commit": "115500c8a0a3190ec6a69d1120fe81944d819125", + "sha256": "0iamqv5j43ngj1xdqr36rkgk9lqpk9bg8y531jsldnvwzrp3srpf" } }, { @@ -52079,8 +52220,8 @@ }, { "ename": "helm-recoll", - "commit": "0a0d168f96470753c22b92ad863be98d8c421ccd", - "sha256": "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0bq0gp1cqmx39fsfpccxn7dsa34f75bdi3kyni7d55rvlvascaqz", "fetcher": "github", "repo": "emacs-helm/helm-recoll", "unstable": { @@ -52357,8 +52498,8 @@ "s", "searcher" ], - "commit": "d0a3aa7c4a882c6563c053c3317600582043d71c", - "sha256": "10hvm4xym1886b02jqpg83p2pz6s9nkkrs7ifnydhn2zn5khn855" + "commit": "6409eef130d3561e024813f3af82a61f73c9ae5b", + "sha256": "1l0csk24ls9784k4fry15mdkmryn2dcvssiqv07jjl90n04pjq62" }, "stable": { "version": [ @@ -52733,15 +52874,15 @@ "repo": "emacs-helm/helm-system-packages", "unstable": { "version": [ - 20210628, - 1727 + 20220515, + 812 ], "deps": [ "helm", "seq" ], - "commit": "a16bb1c3708416984106a98353700d456414b6a1", - "sha256": "09acgs1mjkqmm7n88x4hck2bp3jv5fifdkd406r8fh874vyfib38" + "commit": "e93f4aeaa77b73c6e529141c3fa0ac49b40b6306", + "sha256": "1i5dy2hi5xiyb2p2795pk24h8kzmd38pasd51azyx5d0qmjjvb8m" }, "stable": { "version": [ @@ -52759,8 +52900,8 @@ }, { "ename": "helm-systemd", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "1m1by9i37ban3zkznyamp5vxizj8zsz06fdscdhmky1grf6ri4r8", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "03hzx0202kw5bhmbn51wsaf1jajk2cmxx3nkk4pa8dawgrh8mg95", "fetcher": "github", "repo": "Lompik/helm-systemd", "unstable": { @@ -52838,8 +52979,8 @@ "deps": [ "helm-core" ], - "commit": "b6bd3379b98d306935731e9632907387b078e000", - "sha256": "0ki38i2qiysba6xm6hc4xmy4vkpsvc85lh1vgjy8741wkysija2x" + "commit": "7b39adc0e80e791390f34aab866a963df317c235", + "sha256": "0jllvylilc81gxkdhy4cl0bma8jrkjhj8c1m7vzjdxr3mplnl1sj" }, "stable": { "version": [ @@ -53179,14 +53320,14 @@ "repo": "duncanburke/help-find", "unstable": { "version": [ - 20210826, - 928 + 20220513, + 1028 ], "deps": [ "dash" ], - "commit": "576d6505b9e42f50f121b1a6a675f17f03a04406", - "sha256": "064asvq6hfmrh3fnkm8dnarwmdgfm8f97mjng1bkf13wmnzglhck" + "commit": "6dd61bbb6290e06e30c002c011da71e348ac045f", + "sha256": "00b4vbk3m0br5k2x9mqx1v58j7jpd4k1nln18s99ggxpmx5klk02" } }, { @@ -53221,8 +53362,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20220412, - 421 + 20220513, + 302 ], "deps": [ "dash", @@ -53230,23 +53371,22 @@ "f", "s" ], - "commit": "c2729a236a84a1fbd3d184c163fbd10e0fd62077", - "sha256": "0q5a1s4wkxjp56gy95qzkxzz8w46djacgh9fhwm509rkkdxpp30c" + "commit": "209971ba9f576ba080352642cfbf25df5692b1d7", + "sha256": "1qrxr0ybvdvx6qw6akb1pv074bmffv4m57855kk8fr1vp4w07z0i" }, "stable": { "version": [ 0, - 18 + 19 ], "deps": [ "dash", - "dash-functional", "elisp-refs", "f", "s" ], - "commit": "5a5eb62ae1f9cfdd4897ec6e878ec96231c52bdd", - "sha256": "0gdjxykqkal2x765mi51m99i5ql23i1fy909wy4mzj5ajhjfgqcc" + "commit": "2afbde902742b1aa64daa31a635ba564f14b35ae", + "sha256": "0qwsifzsjw95l83m7z07fr9h1sqbhggwmcps1qgbddpan2a8ab8a" } }, { @@ -54203,11 +54343,11 @@ "url": "https://codeberg.org/ideasman42/emacs-hl-prog-extra.git", "unstable": { "version": [ - 20220507, - 1118 + 20220607, + 140 ], - "commit": "a8e2ee5d43ce70c59e57d2ab90b39a6cf9e7b851", - "sha256": "08vs56lvq9ihhxd7vhcgd9lry2bm8q14mx18ap1izj6r52njdsy5" + "commit": "e7e24735cd020746e4070c908a6ebd2515c4c19b", + "sha256": "00r7fdgi9mda69sw1c0q9zhjwjdrn74gyw3hk9ml3n3qxnagkfva" } }, { @@ -54261,13 +54401,13 @@ }, { "ename": "hledger-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "15s8rqc94z70jzv13961nvcm9a9qadq04pf0m6xrzf8qqk71zn52", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "05nyifa0r398w5yw1751rzn90w9dh9w5y7fhn9h5xmd7qdq8zibq", "fetcher": "github", "repo": "narendraj9/hledger-mode", "unstable": { "version": [ - 20210706, + 20220515, 1225 ], "deps": [ @@ -54275,8 +54415,8 @@ "htmlize", "popup" ], - "commit": "9ac07ff0adbce6a402c17e789b1750f9da0d22f4", - "sha256": "0x3dgws8nh7q8x7zzjwbm5k9n7gi7qqd3ww7y51fbx6p6ii3jpp4" + "commit": "400bde42a8d2712af80cd7c773c9cdfbb63a515a", + "sha256": "0xmcfpr3rxli1adwypg18npl8hb8ak5rg6a6i26inzzqja6vr897" } }, { @@ -54357,8 +54497,8 @@ }, { "ename": "hoa-mode", - "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", - "sha256": "0cg7jg8ddcrpr47imix21m84h65z2xls3p20b32pasiqav3n8zsm", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1j8fi6bv25lgj8n6ykki2n1k9hbwbm7gw9g5jh2ds5n475291gcj", "fetcher": "git", "url": "https://gitlab.lrde.epita.fr/spot/emacs-modes.git", "unstable": { @@ -54554,11 +54694,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20210924, - 936 + 20220607, + 1906 ], - "commit": "95a1be449624aa2b25128b900b6211034d0e17bb", - "sha256": "1lfwa6r3z79kvahgily4drmpf2y4sfwkv5gqbpn57fjxh2sq4rwp" + "commit": "50ea5b54c21dc6a2437e37b17c7ea14f8ba06771", + "sha256": "11aw2b5wixf6qlh3b2wnnms4n1fgp23g1yy48ykb3g6hkwrs2nrs" } }, { @@ -54696,8 +54836,8 @@ }, { "ename": "ht", - "commit": "6c7589bca1c1dfcc0fe76779f6847fda946ab981", - "sha256": "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1fcqidqkzxnqrdm6qljn0dy26f1bk0ipkamcq56f5myrd8mnqhgd", "fetcher": "github", "repo": "Wilfred/ht.el", "unstable": { @@ -54848,8 +54988,8 @@ 20200929, 559 ], - "commit": "049efcadbd9b51a601cca60fc78616bcef0799ae", - "sha256": "09l1n4jmw2cr89jfss3zmlbzpbglir1h548kv3zdl44hbyb4wlk9" + "commit": "1bacc5a6348e29ab506cd530e2ebb7348caf77fd", + "sha256": "0pjm45973khr48w17srwvp4ns1sjifjy8pv2q0gnhks00ab5p5n1" }, "stable": { "version": [ @@ -55827,8 +55967,8 @@ }, { "ename": "ido-completing-read+", - "commit": "6104efc035bcf469d133ab9a2caf42c9d4482334", - "sha256": "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0amf3v21f86pd7z3ijvlqgxrc6fpl6afwcc84r206ywzxbw11k6j", "fetcher": "github", "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { @@ -56014,8 +56154,8 @@ }, { "ename": "ido-select-window", - "commit": "775c8361322c2ba9026130dd60083e0255170b8f", - "sha256": "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "0fjc5j5s7g109lac0pv75vw8g50a0217kyngcyrmylfpy210cd4f", "fetcher": "github", "repo": "pjones/ido-select-window", "unstable": { @@ -56159,15 +56299,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20220105, - 1300 + 20220519, + 917 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "65d6db1b7574ceccd3d97eee3790c2f74aa9724d", - "sha256": "0dc5mfm0gh7y4yzsz2lgc3802m4pv85l213j04k347xqqcl414lc" + "commit": "3c1f8f8410d909229d12d0227399f2d5c16b1ea4", + "sha256": "1is7n7j7h6w3x5i7byqn3kc41qk2p5wb0cdnr6cjxvlc3zar3wb0" }, "stable": { "version": [ @@ -56606,11 +56746,11 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20220214, - 1859 + 20220519, + 635 ], - "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", - "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" + "commit": "e022d1a2fdc899b4c22254ebcf8997f5690d7c60", + "sha256": "0knpyh0ci777g6h83lr4pvy7w1syf068gy1p409rg3ssnwjnkxnl" }, "stable": { "version": [ @@ -56707,8 +56847,8 @@ "deps": [ "impatient-mode" ], - "commit": "6825147ebacb1d738b1c96baf0534a5ed3e6b289", - "sha256": "10kjxm93cdll6a5l1lzk0ciya5z6d02x5rl7har507ac1laj1v23" + "commit": "832e6725d4b95b2f00ff8be94cd75dc3cc873ca4", + "sha256": "0d54m7hkfaidxjynz762i7cjrgdqy9d3rrkm2r16ql9rmk8hdwvn" }, "stable": { "version": [ @@ -56797,8 +56937,8 @@ "epc", "f" ], - "commit": "701dfcca5f3ab42be0f26a8d381d7116c79be850", - "sha256": "035830aizamh4c8hpnmfrbz9v9gy23d3nx0dv366l3q8mrh36l44" + "commit": "570fb4f519d5e84dd681f932447cb995e8460840", + "sha256": "1xrlnighvzgmfb4fwnp07bnj1wyym1pn4ap62swq0h0mcq8gjr80" }, "stable": { "version": [ @@ -56848,8 +56988,8 @@ 20220227, 653 ], - "commit": "6fb6c9326077105febe2cd9c77b683b7c310cf03", - "sha256": "069mcbj3gwpbw1fwrpyfb81s0kyk3vklymfj9z7nr7yl8ra986ym" + "commit": "e04850bb05a816395a92c69b7ad7cd32d33eb62a", + "sha256": "1fvvhpbqq22cab2pa480sanp1jnjyipysa8jgxwrf3r438yhi729" }, "stable": { "version": [ @@ -57054,14 +57194,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20220421, - 559 + 20220603, + 1523 ], "deps": [ "clojure-mode" ], - "commit": "abeab8d6d4cb3bdded5e9083776aab0c06cbdf57", - "sha256": "0b73dm3kyard035jfijcah8vp96vzgywmkl0ajnhyzzxmbl26hqa" + "commit": "8f295050a856b03d6ec14f0fd5e782e7acde6e2d", + "sha256": "0gm2psay483202vjzf27gvlmy7l2y8gawwviv5rbfbsxyb4l5xrm" }, "stable": { "version": [ @@ -57452,8 +57592,8 @@ }, { "ename": "initsplit", - "commit": "5a908c8fad08cd4d7dbb586570d0f0b384bf9071", - "sha256": "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1jkn4d7mlchpnzn79rln8ypcwqac7h3lv44ax3dpppzxq5y6ylx1", "fetcher": "github", "repo": "dabrahams/initsplit", "unstable": { @@ -58084,8 +58224,8 @@ "deps": [ "f" ], - "commit": "e6c9d5e19533eda6b74505a86198416eeecb915a", - "sha256": "00chrr0i1bw0dzrlznahca8zj4q9yqwl187m9dm9d1kgh0dwhn3s" + "commit": "85efbf0c1c651a94062fa820faf48f7bc8d4f8af", + "sha256": "1yhmzrns7bzncg0mc7mxwg5jxvblhfkg7nim5c66hmq3mr60gb48" }, "stable": { "version": [ @@ -58117,8 +58257,8 @@ }, { "ename": "isend-mode", - "commit": "8ef6e4dab78a4c333647a85ed07a81da8083ec0c", - "sha256": "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "16xd41z7b1kf599ggwkikdamd41ldlfvc37hq25z8hz7g1ajbcar", "fetcher": "github", "repo": "ffevotte/isend-mode.el", "unstable": { @@ -58317,11 +58457,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20220406, - 1052 + 20220529, + 1130 ], - "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", - "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" + "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", + "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" }, "stable": { "version": [ @@ -58348,8 +58488,8 @@ "avy", "ivy" ], - "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", - "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" + "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", + "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" }, "stable": { "version": [ @@ -58595,8 +58735,8 @@ "ivy", "s" ], - "commit": "942b2565097c97c1afc4fa395fac5788eabc730b", - "sha256": "03q15h6ckbrxmwskf19dhzcr8whgcipbf4nilpqfnhpsn5f4zl8l" + "commit": "bb576866d81ee4ee428c8d56663d3e30edf57998", + "sha256": "1plpjs2vkc9n1cb05p7ldfrm0ic2b82lpnmghkd60x64j36yjp20" }, "stable": { "version": [ @@ -58716,8 +58856,8 @@ "hydra", "ivy" ], - "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", - "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" + "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", + "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" }, "stable": { "version": [ @@ -58917,27 +59057,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20220509, - 2300 + 20220601, + 1652 ], "deps": [ "ivy", "prescient" ], - "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484", - "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c" + "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e", + "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk" }, "stable": { "version": [ 5, - 2 + 2, + 1 ], "deps": [ "ivy", "prescient" ], - "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7", - "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5" + "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e", + "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk" } }, { @@ -58973,8 +59114,8 @@ }, { "ename": "ivy-rich", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "1il1lhxxg694j9w65qwzjm4p4l3q1h1hfndybj6z1cb72ijw27fr", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1qwfnz3lgsp9brbhv2kv9bzlzyjzj6j6plzs1nhczpz06c62123s", "fetcher": "github", "repo": "Yevgnen/ivy-rich", "unstable": { @@ -59049,8 +59190,8 @@ "s", "searcher" ], - "commit": "17a93eadb8a681d878e1d66b90073ed1be2e1dc2", - "sha256": "0m0lvpqamikmg957jj2nkr8xqzxl0kxyjl68577h4r83b60xrnhh" + "commit": "22867f0987b77e2cba0d251b62f5bd6324cc366f", + "sha256": "0kk39km7nw7izhb5r2rlhbaxcypvjngnmxmxnb2b0jx101kwzrhr" }, "stable": { "version": [ @@ -60056,11 +60197,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20220510, - 430 + 20220524, + 2327 ], - "commit": "f968413df2c2bd1e00c5b6c61c53bdd208b90ee3", - "sha256": "0gyf61krqy6d5sjvj5c9z57vqx2nq0fia2pxmk32slisxc9drcqm" + "commit": "5e8eb048dd398597378eaf20842e410398bd5b55", + "sha256": "0qhp1p49b8mjnyr8lxlvwjdhnl36l5byyzb9psnf1iid7f306rki" } }, { @@ -60720,8 +60861,8 @@ }, { "ename": "json-rpc", - "commit": "82c6b97cdfe2970f028a00146b01e5734710291b", - "sha256": "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0m986dlzsvr068nywrrrad72wwnv22dvw00d8y66h5rmx1nh87hs", "fetcher": "github", "repo": "skeeto/elisp-json-rpc", "unstable": { @@ -60843,8 +60984,8 @@ }, { "ename": "jss", - "commit": "e3dc3607f512df378ba141327802820da4991a97", - "sha256": "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0jm2gfba3i12k269xrvhy0y4s536x7arcpx0018adylg7b4mmsh6", "fetcher": "github", "repo": "segv/jss", "unstable": { @@ -60990,8 +61131,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220512, - 539 + 20220523, + 435 ], "deps": [ "dash", @@ -61001,8 +61142,8 @@ "spinner", "vterm" ], - "commit": "88ce4fadc065736e154506538d365a8f1dd643e1", - "sha256": "1gj9mnv0kyq20hdz506qlz80kx28zwng12vnnahshji6bh6wbwj5" + "commit": "326da9a7d0463ed2727f66dcbd4cb58b517ffe25", + "sha256": "0irspd2j644g1fwai51wwawmq5ni0fpwzby3j4yka2w0pwvqvg6w" }, "stable": { "version": [ @@ -61029,14 +61170,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20220510, - 2259 + 20220524, + 1328 ], "deps": [ "vterm" ], - "commit": "5374776991232de966efca245f9ce24c59728588", - "sha256": "0cg5mqiciawigb5n7w8q5hi8q1h253nbjif3p9n7vhbckwx318rx" + "commit": "c5f67a372777bb6a855ba2a89228a713c8dda957", + "sha256": "15h92yq88na3banbf7x0k99bya9z5216qckyrgx3f5ksdci1bbih" }, "stable": { "version": [ @@ -61598,15 +61739,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20220422, - 1305 + 20220519, + 720 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "51b1f719bc300a4f684b6dc7511dfb044f75f575", - "sha256": "0nq78kb751lgz398w8xbbl63cznb1g3l6j0j4limylmi8rlzvsnd" + "commit": "5fd75d41647d9535eb730b99b5adddc9edf55cd2", + "sha256": "1pi9xhrlw76b35zsndgkfc4g5v1kk29y023xd0iczf74v8ih08ps" }, "stable": { "version": [ @@ -61694,11 +61835,11 @@ "repo": "delaanthonio/kconfig-mode", "unstable": { "version": [ - 20211018, - 2142 + 20220604, + 1415 ], - "commit": "241436a507782d18f09dab7d1f373ddea60fad3d", - "sha256": "0ayizg9ih98yn9127737i0g9q8f484v0fc9qwda0al3r69iqxpxq" + "commit": "cd87b71c8c1739d026645ece0bbd20055a7a2d4a", + "sha256": "114hjz7k8p8xmpfbv2img98qfkb46wn4mz5sdbl7278f973z2yqv" } }, { @@ -62011,14 +62152,14 @@ "repo": "dacap/keyfreq", "unstable": { "version": [ - 20210630, - 1318 + 20220607, + 1613 ], "deps": [ "cl-lib" ], - "commit": "7bb36e910ae04ff1dce387e3ce73b669d299680b", - "sha256": "188055yg9fqw92p1wip7mx7nz5gz5jbwb6lgcjncxzs4i9v7w8kr" + "commit": "dd88193cd7a91a92113121191573758ea2a3ceb1", + "sha256": "1rld3pwrdpgvpbn1pfwa71bb0kapv5a0ny0dh7ck2g07k1wql7lh" }, "stable": { "version": [ @@ -62131,8 +62272,8 @@ }, { "ename": "keystore-mode", - "commit": "7870d808fc19096ed6ecde5e9297b28254466210", - "sha256": "1r1my7jgjv2zvkhdwd8ml6489x48gzanz4lvdiw5m2hymb53fdg6", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1sbafmwn286k4hj99dp9kz3s1pnx2i27f2k157pnkzgywn8n63pi", "fetcher": "github", "repo": "peterpaul/keystore-mode", "unstable": { @@ -62175,8 +62316,8 @@ 20220222, 639 ], - "commit": "d6fe2d51769ee5d1d84a74adeae5c3a0aa66a602", - "sha256": "0hkp0dl8aqc2javsnl3pm37iy9f534l6wf1vgh44ba6ws6bxxgl5" + "commit": "468b528add57e15c2413c8984937fb428fb257f3", + "sha256": "1r481kpijmyawv5v32y202nz932mv24l5v7vrgandrjnaxjv0kgs" }, "stable": { "version": [ @@ -62431,8 +62572,8 @@ 20210318, 2106 ], - "commit": "93ccd2058c1980207848810942dbb1a6d9edebe9", - "sha256": "1ciqb2simq7fdc31pjav30rlskami70dcg4abqairfq3yvx5nb7k" + "commit": "37292f00a8a457762a94011d7719e2c7d03d821c", + "sha256": "1zagb6lx5nhn1za7ybkdz6b33vmmw0k7ms3swxgw1fv2dzyqns4c" }, "stable": { "version": [ @@ -62633,11 +62774,11 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20210917, - 1911 + 20220527, + 1646 ], - "commit": "3e0c34087ba4965a8bf08d3f27325f0a1e631bfb", - "sha256": "15gxznanmcgjgcqlcazschxcwlsmd4rzivw0jb6pvz3m7zabd16r" + "commit": "99499e1500034b5fd5fdce9bfef367d90c61b5ce", + "sha256": "067m5idlnfz01aiynmnxh3x3vv4c2nkkldskv7g1cssxqaxagnxj" } }, { @@ -62920,41 +63061,41 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20220508, - 929 + 20220527, + 829 ], "deps": [ "s" ], - "commit": "61d7211469ea3e2c429937869c5a29584103361a", - "sha256": "0mi5jln34pd372h7f3rvigis6dll6sxdqg9izj9bip93917cff0y" + "commit": "d17a77d9210b3e7b8141d03c04d1898bcab2b876", + "sha256": "0gnh0yzip0238ycprx03147xaclcbmiy4lkp6wqil2waavwrkwbf" }, "stable": { "version": [ 1, 2, - 7 + 9 ], "deps": [ "s" ], - "commit": "1c80df0f2c542f54920f18aa4eb837f0a51c7676", - "sha256": "0hmsf7kgzmpzri3ggb7l6y3pvfpinfv0d24fnxpbp1zd17lfwks1" + "commit": "076de3e420210fc479675389acb3fed6ada9c8e0", + "sha256": "0a36bnnyg0ay60kpjwv6s5cl5m3cvygjgq7kfpj8wkjv1gf19q05" } }, { "ename": "kuronami-theme", - "commit": "f1fe04f11b3ab6ee00a36d2d171d7042aebe3115", - "sha256": "00f5lxhpqy1p7nlaw7nka90hy95dqrg7flfv5i9f8nrx9r3r7rpp", + "commit": "d1630a13d841c740a700a5fa34de8a0e9d20b17e", + "sha256": "02ps0q7nk91jdxwyzyyr26m4xsbynsfvwj3yxnnjjapqvvqlk7h4", "fetcher": "github", - "repo": "super3ggo/kuronami", + "repo": "inj0h/kuronami", "unstable": { "version": [ - 20220309, - 604 + 20220602, + 339 ], - "commit": "910e8fa56a0cfe89dae888522f9fec4045d017fb", - "sha256": "0pghi50ffzlp7igvq81dmrbrwyj9ivl5kkxm47hff7qgb9rvx8n1" + "commit": "a51d5ff3883bd94d0a181bb5d60f747190eda4f6", + "sha256": "0mrk8d0z09cbvqisl44ln50bbmfim0j876v91x73428vr7k46z0d" }, "stable": { "version": [ @@ -62968,8 +63109,8 @@ }, { "ename": "kv", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0c10r7mhg517p62lc87ccqypsjrm28xh3bgv4f01fnx569jqgzgp", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1dv3vbhgs7q5q92idyy5mn9gwmx2k6xigb1vchfh7p21f2is86x8", "fetcher": "github", "repo": "nicferrier/emacs-kv", "unstable": { @@ -63167,8 +63308,8 @@ "highlight", "math-symbol-lists" ], - "commit": "67ae434d6ce2073e9c914817d21269f5c6a2a66f", - "sha256": "14m9i4ikppbf4ffrxibhdlvanyvjfhx68xalga66lj5chhhdqbk5" + "commit": "1fb1d9aa8d162279e0496d976b286fffc721f332", + "sha256": "0qwv6jpszhp47hx4bmj5qp85lpmcka75c7f1jsd8q10r95gmd7l4" }, "stable": { "version": [ @@ -63235,8 +63376,8 @@ }, { "ename": "langtool", - "commit": "503845e79e67c921f1fde31447f3dd4da2b6f993", - "sha256": "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1vsxdkq8qdjn446rf7gjcnr1hwaasqrp0ibv4nsvnib7n85ldl7s", "fetcher": "github", "repo": "mhayashi1120/Emacs-langtool", "unstable": { @@ -63330,26 +63471,26 @@ "repo": "PillFall/languagetool.el", "unstable": { "version": [ - 20220127, - 2215 + 20220514, + 309 ], "deps": [ "request" ], - "commit": "ea50c120ee3418489b43d51ed750288791d6eb95", - "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa" + "commit": "503d18bd3c074fe8f495cfa6a34ccca1ef6961ce", + "sha256": "0zid9ip540qknnj9sdky2jrxp5l5kym76dr3wgff3ika6g7y75p6" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "request" ], - "commit": "ea50c120ee3418489b43d51ed750288791d6eb95", - "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa" + "commit": "503d18bd3c074fe8f495cfa6a34ccca1ef6961ce", + "sha256": "0zid9ip540qknnj9sdky2jrxp5l5kym76dr3wgff3ika6g7y75p6" } }, { @@ -63409,6 +63550,24 @@ } }, { + "ename": "latex-change-env", + "commit": "f213f7787cd06b2f6ff8f4e2cf035f44b6407384", + "sha256": "1z4g784k19dbyf7azdgrbqdbgpc8jnza0r4mvyi91lzn7h1bfr1y", + "fetcher": "gitlab", + "repo": "slotThe/change-env", + "unstable": { + "version": [ + 20220531, + 726 + ], + "deps": [ + "auctex" + ], + "commit": "b5c31c9551bea70835762360a57407fba6e37b4e", + "sha256": "1q88pg2izz2m22n0xgd281vhna5znrs3q6nfg3v6bkxp73y17k13" + } + }, + { "ename": "latex-extra", "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8", "sha256": "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj", @@ -63534,8 +63693,8 @@ }, { "ename": "launch", - "commit": "8e46ed1761fa2e69f0dc2f58e422ea1de8a8cb49", - "sha256": "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1zcfnk8qd727ngr9bmgj5sf28g6kj9xa9qnkpxy73yz0z1ga7b7p", "fetcher": "github", "repo": "sfllaw/emacs-launch", "unstable": { @@ -63682,14 +63841,14 @@ "repo": "AnselmC/le-thesaurus.el", "unstable": { "version": [ - 20220509, - 2120 + 20220519, + 610 ], "deps": [ "request" ], - "commit": "2af1ab37097cdd17044ab217e9aa6839add98626", - "sha256": "1w2k2pvzgd5v008ma9bc6y16aiyjixhgvrn7bxf6cy43056mh0wf" + "commit": "3ea30714e7197f660dea59ec6c762cde0a44f74e", + "sha256": "0dbaxxa81bsfqnkqz0sfx67kqghi3qscclwnsvk638m3xrp6sbbz" } }, { @@ -63960,11 +64119,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20220307, - 854 + 20220604, + 1632 ], - "commit": "11e850395448ee7012dba16bd6df103f5552ebfb", - "sha256": "0hzky36vrlb7kvpyz4gy3zn01zdlmlx0s58w6ggk5djbcvjc2rfx" + "commit": "1e6ddafa0fdf8f009c35488fdd6d0b0c8485ad34", + "sha256": "1f2djjxr8sy9adysprfk5zk9dkphnfa4dcv8hzknszchjm6a3lgh" }, "stable": { "version": [ @@ -64191,8 +64350,8 @@ }, { "ename": "leuven-theme", - "commit": "c75a5db2c9724a513ad3f64fc138d8565d608eeb", - "sha256": "0468jbv04gwxhh9ag3yblzv1y1rxfr6yqr6dqfp11x6j8c910byr", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "11jnwyqf7vkw7h5qy7nrp0vvmyskbxc54nwc8p8carhzvpqm41d6", "fetcher": "github", "repo": "fniessen/emacs-leuven-theme", "unstable": { @@ -64202,6 +64361,15 @@ ], "commit": "d7dd9188a65e2ab7cf73c2e575a830baae38cb0c", "sha256": "0wvx4wcn845v1fh5jlljlh7l28nwycpivaay7flqb52zz47xj116" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "c72db2d5aeb5ed8e4ca066c803ae8d30e7540f79", + "sha256": "1mv5lv98b3351cwkiw51bq8xx4hmnvk93sx6lkdmq0sciw2qz22i" } }, { @@ -64526,8 +64694,8 @@ "deps": [ "request" ], - "commit": "e03f4a30c4abf354fb961babe4dce1dfa733aa82", - "sha256": "11mjypjv1h2qsfbqxfwknv6lp2fql4cnfsivcpj68475grn1g3s5" + "commit": "053e7f6517b20d5c9c93952428bd7d98a2700722", + "sha256": "1x99hanrlr8x07d16v19k00q9jgq3s121wsxr0x97d6dpi9hq8l5" }, "stable": { "version": [ @@ -64568,8 +64736,8 @@ 20220209, 755 ], - "commit": "7d706986636b5cfc04f14341c19046b56b61b51c", - "sha256": "0v7306fq02q36smg157xcsil0r99vznzf7fx0xnys2df5id0ww36" + "commit": "c917420838b088da68b148652d3be468d7b746b5", + "sha256": "1mwa0ggbw4v8cd3v9l2rsydn0hklzc5z37gfxljg843v9b594z97" }, "stable": { "version": [ @@ -64598,8 +64766,8 @@ "indicators", "ov" ], - "commit": "c0cebef629a98556f5696f78436f4d8428ce8135", - "sha256": "0k7gzx3g33wf7w3wbpiv6b3amnl2miyynvr3x6wlpzmh3q57s11a" + "commit": "e8fe451f1c22ad2f90c82da42b4da73d5152d835", + "sha256": "1yfvzyy1gkk53ivlzcxpyl2dp6hhw127sl7bkg0ansgdfsnm1zgl" }, "stable": { "version": [ @@ -64642,10 +64810,10 @@ }, { "ename": "lines-at-once", - "commit": "513d0f0c6976f685fc0df6b6bb0da3162f58f537", - "sha256": "1hiij6i47i9px82ll87dvx5pgp5jzz8qis7hdm8n6hd3c9rnabma", + "commit": "dcf4e93b13a279485fcbc8d2bb329008b2120b0a", + "sha256": "04ljzb7711mncmjh2ahhdkxngmh0g1kpxija3rqnmz4csnvmqp0f", "fetcher": "github", - "repo": "jiahaowork/lines-at-once.el", + "repo": "jiahaoli95/lines-at-once.el", "unstable": { "version": [ 20180422, @@ -64844,8 +65012,8 @@ 20211004, 1429 ], - "commit": "22dd4c3ea4c0d2bd82270e2fb272317d0bc87752", - "sha256": "02aa3ci9cfxswpv5nf0bqpp9lkbqirpmksg5hwxl0xxr672mv7kc" + "commit": "13738280c854654b8118f90c9ab1a6a74410f0c4", + "sha256": "0c5qzp3zw5nz8hwv3zxy26bh67bsxkrnal596c6m8x8747rfvd31" }, "stable": { "version": [ @@ -64998,16 +65166,16 @@ "repo": "noctuid/lispyville", "unstable": { "version": [ - 20210702, - 2031 + 20220519, + 2339 ], "deps": [ "cl-lib", "evil", "lispy" ], - "commit": "9c14bed0359f659e246d345c706f895737c3d172", - "sha256": "1jlxcr9vikczhryw3xslfy6hzs2ikcf9khbwaw53ymwdxrmphcci" + "commit": "32d6b1f4b3f5bc792a0610c7e91123a70b582a91", + "sha256": "1h87j2yc79skb56i8j5239nr0hialgwg0fkz418caxzkrjglrf8m" } }, { @@ -65308,11 +65476,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20220322, - 133 + 20220524, + 217 ], - "commit": "dc4f9d64a8483aa6e394178087c589cdefc571e2", - "sha256": "08hhp74s56h9k3hlfqky68aiv4qy79gnci46r5nh4mbkrybsijnq" + "commit": "4bfc686f5ee5d781f99d6d4d9b7dd057054c8b1c", + "sha256": "0r0mzfj6yxlzh89cs249s2xlryi6z6acvd43picz0jv7ff616fph" }, "stable": { "version": [ @@ -65435,11 +65603,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20220512, - 34 + 20220518, + 204 ], - "commit": "7eaf6dc55caaaa65c5d6937b25e1748df75dbdb3", - "sha256": "0gcszam4qsl64jx5yggbawsawrj74cqsp7mbzmvvs40gr8pvx2yp" + "commit": "054b959fef7e696864ae29575583d0dec414f2d6", + "sha256": "0ldrdl9bqjfc472wn8qp3d9mj6kadcl082cl106bgl0p365ngarj" }, "stable": { "version": [ @@ -65834,8 +66002,8 @@ "ht", "s" ], - "commit": "b3366ec866b6e3b5c608fee23e86eb832d132ef8", - "sha256": "106fgd8id9xrrl7qyyzxxmi690m29i7zcfk6anc5h52lm52ydk0j" + "commit": "f9addea83793b771b3a61d167ed5419749a349c1", + "sha256": "01yjhy33i0c8xswkqajjj6ibn0xi9s0vlblnng0q7gi4h3glfxwf" }, "stable": { "version": [ @@ -65913,15 +66081,15 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20201014, - 2033 + 20220607, + 1757 ], "deps": [ "datetime", "extmap" ], - "commit": "5a543c53d04d32f0adcc023253888198e0b69589", - "sha256": "01vvyf7bbkaj8338dinp6x1w4alld165njb0sh432gdkpa6y2wkm" + "commit": "a17cafb5445b584e8fa386709192317da5ac4530", + "sha256": "0ck9milv8jv0qxqbb77f1z5q36d8c3hwgryq3mxllc2i0mvssyq6" }, "stable": { "version": [ @@ -66016,8 +66184,8 @@ }, { "ename": "loop", - "commit": "ba481ca96469b3bd518e4fd8f24947338c8af014", - "sha256": "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1qyg1qy7jdh7ncihg59wd467laylx46lsw9vxf0hjpbrq19rj0dz", "fetcher": "github", "repo": "Wilfred/loop.el", "unstable": { @@ -66076,8 +66244,8 @@ "map", "seq" ], - "commit": "98537cb29e28d32d3607fa61253ff1bf04db2539", - "sha256": "1skl536wmygbnnvcdh307zh5d3y0vz31q0nkwvbd5rpifl4rpk2h" + "commit": "a2dbc79bd33a1d194c4804c1157caf27e67b5066", + "sha256": "0ccwf2sh52689ajpx7zf0kz8win7nclhm70sc08wk44ygazywjfx" }, "stable": { "version": [ @@ -66108,8 +66276,8 @@ "dash", "loopy" ], - "commit": "98537cb29e28d32d3607fa61253ff1bf04db2539", - "sha256": "1skl536wmygbnnvcdh307zh5d3y0vz31q0nkwvbd5rpifl4rpk2h" + "commit": "a2dbc79bd33a1d194c4804c1157caf27e67b5066", + "sha256": "0ccwf2sh52689ajpx7zf0kz8win7nclhm70sc08wk44ygazywjfx" }, "stable": { "version": [ @@ -66189,8 +66357,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220430, - 1535 + 20220522, + 1902 ], "deps": [ "dap-mode", @@ -66200,13 +66368,13 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "7ca60ce9a703ad7a950dcd5ec36ef4251f57d207", - "sha256": "1snsnd9pgq2lz3avypps73qfdl3ky2i5sx04sybj7gj41yz834bc" + "commit": "4d28d13d8b468bfb8f992da0ea450269d672562c", + "sha256": "1z936j2x5sy5hagn0i4a4j16ippmkh1d2ccd7kw6ilal4zi4smk9" }, "stable": { "version": [ 1, - 21, + 22, 0 ], "deps": [ @@ -66217,8 +66385,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "813d3c92db02596a8e8aa7802977c50ec1262f9d", - "sha256": "1l0208bys0zq9qgnih27aldi5v3rp5bj8i9nar24hgfm42ld75gz" + "commit": "4d28d13d8b468bfb8f992da0ea450269d672562c", + "sha256": "1z936j2x5sy5hagn0i4a4j16ippmkh1d2ccd7kw6ilal4zi4smk9" } }, { @@ -66229,8 +66397,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20220501, - 1056 + 20220513, + 1434 ], "deps": [ "dash", @@ -66239,8 +66407,8 @@ "lsp-mode", "yaml" ], - "commit": "c57863609abfb93fccabf81dc3112ac38f93c4a2", - "sha256": "007rf2zbkskidskmcnlsx56dxv0saqm2nl9ih1rk6h9vm27yl24z" + "commit": "a0d7cbf80652429c0be4dc7d39e1887ba4691ec7", + "sha256": "1mf3c76c8979pqwkikx5dpi0nnfq7w111c6fa65sp4s9y1aip63z" } }, { @@ -66283,8 +66451,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20220511, - 707 + 20220530, + 2101 ], "deps": [ "grammarly", @@ -66293,8 +66461,8 @@ "request", "s" ], - "commit": "709c522df7a68e2724dbfb5bd210199dff5a2264", - "sha256": "188sx0a6n1kl9awcic1pjbzxsqhq2cbbk8chbp8zgpl0x67ph7d6" + "commit": "d56ca607cd597e622969c91a78ec74e463260b32", + "sha256": "1rxnfzdyv4ad0b3b1prgxhpnk9y9ayjr5s9r7x38ch43khfqz0cq" }, "stable": { "version": [ @@ -66551,8 +66719,8 @@ "deps": [ "lsp-mode" ], - "commit": "8c2ba735ed1e21777408167f6a7c7d9681d9e7bc", - "sha256": "1iqmvy870vllb794cpmsnpm65hindxym9dnhb0pnxz0mf6hcvz2v" + "commit": "8a133cee26ea8c69831817295136c985039f19ce", + "sha256": "0zfwn3nald6w4xi3swnrd098sinaw93w4aaqdfhdqkq90j81whri" }, "stable": { "version": [ @@ -66621,8 +66789,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220511, - 1331 + 20220607, + 937 ], "deps": [ "dash", @@ -66632,8 +66800,8 @@ "markdown-mode", "spinner" ], - "commit": "465bcc5fbeb6293446a3241f5f2c1b872337958c", - "sha256": "151vc741rwi2gggkw39msql1y050b1n46rrjnzalz9nqsk6l5dp2" + "commit": "358b5df8df10b4837193af78c2e72df2c381b1fa", + "sha256": "1bqd1ga9jcwhkcm527sisx65lvh3lfsg01xln0iilyi2y7ahvzy7" }, "stable": { "version": [ @@ -66915,14 +67083,15 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20211211, - 248 + 20220601, + 1509 ], "deps": [ + "f", "lsp-mode" ], - "commit": "8c04fc4ac6f5eb8053ecdaaedffa35e0f7a5b865", - "sha256": "01qn3qkr06jz0xsqvz76pc2x8aby0hv1f84mh1v3zsmcjdb64vy8" + "commit": "09377d5bbb742f11c458481905ddbb022dd2b0da", + "sha256": "090ymnd24cd2665b9kb32yxwvbbrcxc884s68b9g1x59z7wmw42g" }, "stable": { "version": [ @@ -66981,16 +67150,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220510, - 627 + 20220514, + 2010 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "eba9c4eaa255a14e2facd658e7122674c05390f8", - "sha256": "09c6qy17dlqh2jnzk6xf6cj8r7gbwgn59cmhaadzhh3v3n13362z" + "commit": "a0b97db2ada163453c9072d3640202a0b27c29f5", + "sha256": "1dpbx7mny2h7qrd67z6n0grl6nv95zwc9yiiv5b0fby6gank5hv9" }, "stable": { "version": [ @@ -67064,8 +67233,8 @@ }, { "ename": "lusty-explorer", - "commit": "efedaa3b1de5f6406c7dcd842eee42eefaf8ab50", - "sha256": "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1qmv4077xd8156k1gh25cwv6x1ig27wka5j2ka0j0k0fp8xvwlw1", "fetcher": "github", "repo": "sjbach/lusty-emacs", "unstable": { @@ -67325,14 +67494,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20220512, - 1330 + 20220606, + 34 ], "deps": [ "transient" ], - "commit": "ebca27f8e16d3607070582849bea81d40ca5f584", - "sha256": "0xz5y5smfa69ylngkfck935c03ak40i4aazzklzyslv385vv9kd4" + "commit": "bb5c789af7adaaf5b7c0a6013d0397b4cd801b10", + "sha256": "0v63m2i505074i63642ywiaplis65mszg66rn4h7r7x960a6bpyq" } }, { @@ -67519,8 +67688,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220512, - 1218 + 20220607, + 1443 ], "deps": [ "compat", @@ -67530,8 +67699,8 @@ "transient", "with-editor" ], - "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d", - "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c" + "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453", + "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2" }, "stable": { "version": [ @@ -67897,8 +68066,8 @@ "libgit", "magit" ], - "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d", - "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c" + "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453", + "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2" }, "stable": { "version": [ @@ -68046,15 +68215,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220506, - 1936 + 20220513, + 1429 ], "deps": [ "compat", "dash" ], - "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d", - "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c" + "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453", + "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2" }, "stable": { "version": [ @@ -68117,14 +68286,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20220306, - 2311 + 20220527, + 2213 ], "deps": [ "magit" ], - "commit": "ae9345d867539a4c5c635be04df2e26468444da8", - "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3" + "commit": "ff416b87a77a2f7cea234d9063ff629fc0e4c6c8", + "sha256": "11l5vkh5ylg91czl69s4al50pyyhfkarl2qqp32ma2rymsq0mhsm" }, "stable": { "version": [ @@ -68629,8 +68798,8 @@ 20210108, 1832 ], - "commit": "e1af20253fbc5a91034ccd01cf00141130c11863", - "sha256": "1pvyv1yhhm5ziqrlvd0hfphp3mcdh8iwwqs5awb54frj9j61fsi8" + "commit": "7d886dddf81568c9387410701f60302cd33b4f63", + "sha256": "1yalwmbmh993qhp8n4ybh5f6mi82gf68119ziy0w0hxpxpv7x2bc" }, "stable": { "version": [ @@ -68655,8 +68824,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "e4c38aeb8ef6a85d8c082ad683720e5a4174aa79", - "sha256": "18w2xazs6hw49z7v2z8dcjwbzn696vny22ncdh0s2szp0acwvlaa" + "commit": "884aca19bd6affec69c58cbfcac46bab4cd87bde", + "sha256": "1y000660813hdpzjl2bx699qi8am90qrhxnykfr1zjiv4i942sja" }, "stable": { "version": [ @@ -68688,8 +68857,8 @@ }, { "ename": "mandoku", - "commit": "1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912", - "sha256": "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "00w246svp3lmbhq7cak2p7fmabnl6dbbsa3cx7wbiwq0f4hpjiaw", "fetcher": "github", "repo": "mandoku/mandoku", "unstable": { @@ -68952,11 +69121,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20220508, - 1219 + 20220603, + 300 ], - "commit": "5b6e660c13ca3f4d15dbc1aa3d7ab2f228491ef9", - "sha256": "11phyiblvxzx3dqqqrqlfi0q67ih1hy1630rlx6pi7w835npn0wz" + "commit": "1f709778ac7990f4a07fdf11fe37bc6541810b29", + "sha256": "1gwx11rzyaz7ym5lzaddcr1mz1pzysykz8kajkkfx2rq65k9skpw" }, "stable": { "version": [ @@ -69084,8 +69253,8 @@ }, { "ename": "markup", - "commit": "a75c955ad6b2f68b8933329e545625d948f6f8f4", - "sha256": "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0v4lnwgh10rj5njgn4mw8mf39rg29jb4s9imxhsdimnqaizh83wk", "fetcher": "github", "repo": "leoc/markup.el", "unstable": { @@ -69167,8 +69336,8 @@ 20200720, 1034 ], - "commit": "c36dcf8c282f547da5b3666f025a3000b5dbd1d9", - "sha256": "135j7i4y5jhypbknknmpha6mfjfzphb3n7pb303dss0amxfs0430" + "commit": "5e8518a5f89c19d4aa9d7146cfdb213194d24e5d", + "sha256": "0471f234wi2bd3das0l96j4c3ka4cs6gs4w85hrw8b8bwx19d5xm" }, "stable": { "version": [ @@ -69242,21 +69411,21 @@ }, { "ename": "mastodon", - "commit": "891defb51d73e742486b18cbe4495c951b26fc47", - "sha256": "0450xbgv0hy5gvcycxin6yvb0vd65y5dsgxlx6xjnzij3rkb4xsj", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "0jmmcnd76sw0fapac370d8mkg1v1qhhdy015pds0v7j5g5wwrssz", "fetcher": "git", "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220405, - 1531 + 20220513, + 1124 ], "deps": [ "request", "seq" ], - "commit": "e5ff349d23c71a521db41dcdb1ac9765bac5388f", - "sha256": "1iq7m0acvhb86l5p7ah2pq2fz1716l94dw1m7pbi6asbnypgnavy" + "commit": "4ab5a4bb8d603b189a99cc4a4eea4c42e8f97cf0", + "sha256": "00rvnpcbpxpnqqplqvgjny5ddj6ggdk3i532hdw8i9z38r2gafyl" }, "stable": { "version": [ @@ -69303,16 +69472,16 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20220512, - 1853 + 20220604, + 1107 ], "deps": [ "dash", "json", "s" ], - "commit": "0f0b2315d23e5d18b627c9faa8f231f175b728a0", - "sha256": "003ih3nrv753rj4ssdvs6ddqzxgl63vzmrypd41xf4g5dfsbmsf0" + "commit": "a7254ba89a524f30c1acfdbde07a179271f02658", + "sha256": "1d1s1ff49xb5rdmphgx2g5n5mmjrkrdi38wqijlkr6jj15d5lrig" }, "stable": { "version": [ @@ -69458,15 +69627,15 @@ "repo": "sasanidas/maxima", "unstable": { "version": [ - 20210526, - 1525 + 20220531, + 1751 ], "deps": [ "s", "test-simple" ], - "commit": "ce5fd160c193e387d9e2bacdba4065c4b4262cb1", - "sha256": "18bjr4n1m1y76kh0pp6ci7ywklrmw611ka3avrj23lb0wwrljf86" + "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", + "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" }, "stable": { "version": [ @@ -69882,11 +70051,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220501, - 1918 + 20220515, + 2054 ], - "commit": "72d6ff36b62a57aa9c9dbfbd44cdb3002a0e940a", - "sha256": "0vaam51wg8a7ilk9kp3lvz3p0vfcc3fl2nkpwswdadgr69f2d4qb" + "commit": "0a978e0232947d8e3a0895d104fe7f8671daed6f", + "sha256": "0phzafaj4zvih9h5ky7jryixwhv0kxwjvcxijvch7sn1i6fdpvkf" }, "stable": { "version": [ @@ -69906,11 +70075,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20220502, - 811 + 20220517, + 1602 ], - "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", - "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" + "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55", + "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44" }, "stable": { "version": [ @@ -69938,8 +70107,8 @@ "auto-complete", "merlin" ], - "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", - "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" + "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55", + "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44" }, "stable": { "version": [ @@ -69971,8 +70140,8 @@ "company", "merlin" ], - "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", - "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" + "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55", + "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44" }, "stable": { "version": [ @@ -70033,8 +70202,8 @@ "iedit", "merlin" ], - "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", - "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" + "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55", + "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44" }, "stable": { "version": [ @@ -70362,8 +70531,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20211025, - 106 + 20220521, + 17 ], "deps": [ "cider", @@ -70373,8 +70542,8 @@ "projectile", "s" ], - "commit": "80ece19a6ce6fd3dac374911edb9734286978450", - "sha256": "0qqr88r1g3lwzl4m9qjiwba23ylp44g5hspawwfzchlbs9js6yj7" + "commit": "ae02f9e3b93730672f2f0a476a4e32bf1a024937", + "sha256": "0j0p3s4n0z873191w8z27p2fl77ybpb958v0wzjdi1alq0rl1bdf" }, "stable": { "version": [ @@ -70916,20 +71085,20 @@ "repo": "hlissner/emacs-mips-mode", "unstable": { "version": [ - 20211114, - 1645 + 20220608, + 1204 ], - "commit": "5676174bea9a5780ddd33d2d8111b8678dfa4e99", - "sha256": "0nlxhchcy3swmyfzdd8qmdzq05a4lzlgs1psnsvfjbbi9w8g8w5v" + "commit": "98795cdc81979821ac35d9f94ce354cd99780c67", + "sha256": "1wpgp08q1f2gbkn4ksd3chfz2s3cn8fdfyz04wmj37ss43mai355" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], - "commit": "e6c25201a3325b555e64388908d584f3f81d9e32", - "sha256": "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf" + "commit": "98795cdc81979821ac35d9f94ce354cd99780c67", + "sha256": "1wpgp08q1f2gbkn4ksd3chfz2s3cn8fdfyz04wmj37ss43mai355" } }, { @@ -71212,8 +71381,8 @@ }, { "ename": "mocker", - "commit": "16a4fe34a6f354d396c24ff13e15157510202259", - "sha256": "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1c44ws77r0sp9b46a2xk39039m28mf8sqd46dbzwsms5glkwl82c", "fetcher": "github", "repo": "sigma/mocker.el", "unstable": { @@ -71402,8 +71571,8 @@ }, { "ename": "modern-sh", - "commit": "b0db199b134810cd2912aaaaa9793d9a59bdedef", - "sha256": "1lz14cwv61kn765ahs91dzgpp18kzyhj0a10p6y39pk481fp7wbl", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0liizd9w6yh1p1x3pvmalv97rn6676rknh8r1lcka9xgcng8lap1", "fetcher": "github", "repo": "damon-kwok/modern-sh", "unstable": { @@ -71466,20 +71635,20 @@ "url": "https://git.sr.ht/~protesilaos/modus-themes", "unstable": { "version": [ - 20220512, - 1808 + 20220605, + 1714 ], - "commit": "b6285162d80fe438b4ac99acff74d33b5f901c35", - "sha256": "139ycd3p63hlxs70g266xj6i7bng1p2xavwcsxf4j4nvfayib9r7" + "commit": "6f2b048528d1c40bf5bead0d3e01beff28b78d2b", + "sha256": "0hr7202jhmjcx3z71dn2lzwv7980lalj0kbvjn6jjg4dm71fywjn" }, "stable": { "version": [ 2, - 3, - 3 + 4, + 1 ], - "commit": "ee0670f85bc55a3178c18774e141b4e58b2f6fe7", - "sha256": "14nfb94y9vcnpmwj9acwl6h5v0h1c6swqf33ch4zimxxqgx9zrm4" + "commit": "467aab71377a6e1476dcab7ab5f2c55d1ffc28fe", + "sha256": "0b4y8dzyc9qwwaf2ngqiwyfcnhwlr49kxhc96laqk20lvjlfsrnx" } }, { @@ -71490,11 +71659,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20220111, - 1220 + 20220608, + 1159 ], - "commit": "edf3fe47fb986e283e3b04cba443dcb39fe8720e", - "sha256": "1wr6xd3hhgnqjrr2d8llbrdaagi4wz77zfxh1jg2f2mj28i52ksz" + "commit": "4d9e876d24d69d18c4111fa42bd34fe01a124866", + "sha256": "1a18pg8fwx0iicxrab2qj7wfh05pbqb4bh13nhlp2r94w024idd9" }, "stable": { "version": [ @@ -71789,11 +71958,11 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20210221, - 18 + 20220608, + 25 ], - "commit": "42e402a89473458f55a71c5bbe785575e9a927ba", - "sha256": "1ma5138src6iglkhd2h8w9k4gqqaxvsngz08cd4v2s8dhqkcayw8" + "commit": "65e98bafa0277b9c706c6e3564f11edbca5d5699", + "sha256": "1sc8z0fp7q9xkjm5d2x8gv0l0km4m28q71li1pkvdzmxmzn40ayd" }, "stable": { "version": [ @@ -72122,8 +72291,8 @@ 20210306, 1053 ], - "commit": "247db142f7251062978ade3fd27c815259eaa05b", - "sha256": "16bdqpmj4lsc3nx78ikvgqslb6jrzc5qmkhfl8m5gy26gfd37dxn" + "commit": "73f289987769fe1dd381bf436b5888a2a663e276", + "sha256": "09y3x603xgk51jgnry3x59hysv7z8d7v0p3bsp015z9lx3m83b4v" }, "stable": { "version": [ @@ -72524,16 +72693,16 @@ "repo": "xzz53/mu4e-alert", "unstable": { "version": [ - 20220416, - 1840 + 20220528, + 1923 ], "deps": [ "alert", "ht", "s" ], - "commit": "b34d0ea7b75709cc25d842a783cebea855dc9f7d", - "sha256": "09qzph8madnhd8kqnj662sgfcyvp1wg35ll6i5xbh98yazc0r64s" + "commit": "85489fae322a655e275be2483b9d02486b172ea8", + "sha256": "17d2nqndb760k96s8wskpx4g6xmfzwaifmbs25pj9114zvpz2byy" }, "stable": { "version": [ @@ -72613,14 +72782,14 @@ "repo": "agpchil/mu4e-maildirs-extension", "unstable": { "version": [ - 20201028, - 921 + 20220517, + 1852 ], "deps": [ "dash" ], - "commit": "1167bc6e08996f866e73e9a02f563fd21ac317fd", - "sha256": "0bnznfz3bfk348hw5avri6n5w7x8376j0vzybwdxrqb6hfbvwzw0" + "commit": "cdc2e141d8ecd59508a5cd50d6d02120073bf4f1", + "sha256": "0nkkz4x0wk3sc1d97zl47x4d80d29r5nmh6f3sy7xw342gnb8gsj" }, "stable": { "version": [ @@ -72722,10 +72891,10 @@ }, { "ename": "muban", - "commit": "3576c6b7d79ce6d4df40ce83400fa2468f8fbcdf", - "sha256": "1njphxx6sgw952p7v2qkbjwa8sb2mwrxrzv35bzp0d4c84ny2sa0", + "commit": "167ddaca39085bd570bb9392408ae31e58509793", + "sha256": "13p1xbz90q055iczyclwcw0bkwwphq3c9bgy1ykr84jhfhvpm80a", "fetcher": "github", - "repo": "jiahaowork/muban.el", + "repo": "jiahaoli95/muban.el", "unstable": { "version": [ 20180415, @@ -72987,14 +73156,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20220328, - 1724 + 20220528, + 1215 ], "deps": [ "cl-lib" ], - "commit": "aae47aebc0ae829211fa1e923232715d8e327b36", - "sha256": "1rpimqf8srlvilnqi02lr7my9ccxc89gc14pzs6jdffc60gb4659" + "commit": "fd8441bfc8738d463601823e5a3d9c2d7123bfbf", + "sha256": "1201q60cnydglq431hkf68kz6gx4i1fs1v00jldliqrxkxm0ignx" }, "stable": { "version": [ @@ -73059,8 +73228,8 @@ }, { "ename": "mustache", - "commit": "d1bcf9599ca6d2c29333071a80f96808d4ab52e2", - "sha256": "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1qag8yv1xh65ny7gni4ncz42ij3h6ca4nzp13pbfy5bmyw9hfzlj", "fetcher": "github", "repo": "Wilfred/mustache.el", "unstable": { @@ -73115,8 +73284,8 @@ }, { "ename": "mustang-theme", - "commit": "2ed3691edd1cba6abc0c30d2aab732e2ba51bf00", - "sha256": "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0984cjy659w4f0hxpvijs6wz6978vwabkp7nbwnqb9pmpgaf1ia2", "fetcher": "github", "repo": "mswift42/mustang-theme", "unstable": { @@ -73271,11 +73440,11 @@ "repo": "redguardtoo/mybigword", "unstable": { "version": [ - 20201030, - 1253 + 20220526, + 1438 ], - "commit": "4c1386252444df2ade734e02078069a06f3f0f97", - "sha256": "0gbynsf84dgsg2m6h2m2xj54ph0a7kiz9njd33j4xp7r36d268f8" + "commit": "ffbfa2a938a58c4e60ccc4c2ec0ae32a11eac485", + "sha256": "1aknn89k9chrn65jxxj82pjia4rqfqp8s71j7x1hb10fscmscdbp" }, "stable": { "version": [ @@ -73289,8 +73458,8 @@ }, { "ename": "mykie", - "commit": "e10504a19e052c080be2ccc9b1b8fd2e73a852e0", - "sha256": "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "18s3cb0gxji5xvslbpw9dcw2d3msj6lv7zg8kl3vifjzjsp5b94p", "fetcher": "github", "repo": "yuutayamada/mykie-el", "unstable": { @@ -73591,8 +73760,8 @@ }, { "ename": "namespaces", - "commit": "de404e9ad3d1e27af24e868e84218d872d5fc795", - "sha256": "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0mcyi74zvd60kmvyi1zq43arnk57rmahdyl4g75v31ka6fd5yspm", "fetcher": "github", "repo": "chrisbarrett/elisp-namespaces", "unstable": { @@ -74012,20 +74181,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20220501, - 2053 + 20220514, + 2039 ], - "commit": "239c16655431b27ee558bf250bece4f4b10a0e83", - "sha256": "1d31g7a9js378cq56gqwrd978bzc57848j169lsykz24yqx3sf22" + "commit": "12fadb994054306984010d0096b051a972af75cc", + "sha256": "08fbm2sfdw4g0skbwyn9wbb1jcf46l8f23j552y202znfmyqhz2v" }, "stable": { "version": [ 0, 0, - 28 + 31 ], - "commit": "6e8620c1a3001d1541ad934ae2847905451a21cf", - "sha256": "0ipg6d8vm7i4jgdxa56w8a4al2nnj09pivfplfja7791mgl0qk30" + "commit": "61e9d2f4c55601a5a03e1525eb75cfa6ce7325b1", + "sha256": "1sg29z2hca6ssplj4hcam0334rabix0bqbm94blgl0yn1r5cac7r" } }, { @@ -74527,11 +74696,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20220513, - 240 + 20220525, + 220 ], - "commit": "958a92a979c88bee909d03a78b2faf6726d0069b", - "sha256": "0l4bi6hnwk4lssmya8x6av0j0nhvwccxaiv2ar1byiy7i3bxvr16" + "commit": "a5f51bc847553dc1ac7ad54fa5af32cd4623a66d", + "sha256": "12m9vcnpg8vv6kbi6yw0n2x8gall2wz8y5gl1jgiil9nycyxnikg" }, "stable": { "version": [ @@ -74554,17 +74723,17 @@ 20181024, 1439 ], - "commit": "7905dee5ac62f7a1e0dfec4d936b97d96c7566d7", - "sha256": "17q8sqnrrsyxz6zld2zarp44wsjn53nsp8bz8k007wd5lbwylvg2" + "commit": "55f54511d35716c43637dee2bcb5fbc7839f967b", + "sha256": "0pmxi8nsd9zid9nys8ba26281k34s0gv7dszk2rlx92rb8c3k22i" }, "stable": { "version": [ 1, - 10, - 2 + 11, + 0 ], - "commit": "e72d1d581c945c158ed68d9bc48911063022a2c6", - "sha256": "0mspq4mvx41qri2v2zlg2y3znx5gfw6d8s3czbcfpr2218qbpz55" + "commit": "51edeeb063a82693573db43782d9e3733b2840e4", + "sha256": "14wqccblr3nc2pjgv1a5fsjznp7iyp6z993jp1ddknz01dvhr765" } }, { @@ -74857,16 +75026,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20220107, - 1537 + 20220604, + 2100 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "6748065db2f12ae6ea07058e7d643f586fb4b3bc", - "sha256": "0b566hb8j0mwl8b8plaf10majn8v70r9j7ffwsk1jnkixc8y4l37" + "commit": "ec99d579b9fa26fdb5f5e00dfd77e968ed8386f0", + "sha256": "0bnalbgf3bdvwnvmdjy1vq439n6vkfzmp9a5rgn0kdr32ar75kfw" } }, { @@ -74886,8 +75055,8 @@ }, { "ename": "nnreddit", - "commit": "4581c76fee699eb9f41eb0f00e4ccd4a008b8399", - "sha256": "0pfb57pwdyhsrmgzbf83xrq10xjhm6sk6xyz8rd15gjqka2mc8c2", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "07m8q4nymchx16pj6l2brmks6011i586dyycaczv1zqdvvhd4b8g", "fetcher": "github", "repo": "dickmao/nnreddit", "unstable": { @@ -74909,8 +75078,8 @@ }, { "ename": "nntwitter", - "commit": "39b3ec38c4a6762afdea13c17e0447caa976181f", - "sha256": "0788lajp113rqc38d0s1qypvgmfnxw1mjcj97syi27jda5jw3lbl", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "1sgj1fn06zk2rblf5c4jlqyjdrlxvn56pj1q9vylglswy7dgz9xp", "fetcher": "github", "repo": "dickmao/nntwitter", "unstable": { @@ -74950,14 +75119,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220509, - 1733 + 20220530, + 1845 ], "deps": [ "compat" ], - "commit": "fed46eb7060aca624bfe1a18f13b73f94e70f013", - "sha256": "169asd32iask7h6m861j1qfg60mxnmxxcwc3f8ddxkpfjb6b27sq" + "commit": "a5aa3faada054f96b70b32ba9d9447f7a4cf403c", + "sha256": "1gykaxdzv1j5q6h9m36ms5708h3jsn5yjilnajrngv3nkh6mb0qs" }, "stable": { "version": [ @@ -74995,15 +75164,14 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20220509, - 1600 + 20220515, + 2359 ], "deps": [ - "dash", "request" ], - "commit": "507831164b09a2d769bd68d5a45608fc0de626dd", - "sha256": "1xsnr4y3al9ps2v1y8yjapmghrvcgk8671h300l3w9w0gjcwkbhj" + "commit": "1ebacdfbaa996319adf88a49258814c28ba49b1b", + "sha256": "1gz3blbj1snvdq9vyc2f2brbpkarxid221lpqm8h58jlzxx0by86" } }, { @@ -75292,11 +75460,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220226, - 1200 + 20220602, + 1121 ], - "commit": "37492858b61907e4728b2e68e67238c68e9a0d49", - "sha256": "0kc750z3p23rkn2nr3z7y205xb58qi77f2vr8w33nj4ykgil65ar" + "commit": "3a6b479a7360fbdbc1c6def4c1e1581bfd63e8a2", + "sha256": "1r7vr10yz0vjhlv5wbgv1x3519fg9lhdp165ksr1gg8mcp5yca37" }, "stable": { "version": [ @@ -75810,11 +75978,11 @@ "repo": "enricoflor/numbex", "unstable": { "version": [ - 20220504, - 1329 + 20220518, + 29 ], - "commit": "55d4977c74ca33d1ad4c10fea7369f4bcdfd3f86", - "sha256": "0d43ad14b2k1w3my2nwrnw58z594hw18k6p37xvvpnx8r4fdxbl2" + "commit": "aa3903f190946e54f41601dd7831f3aa973a8be7", + "sha256": "1fnll6ccys7wmwbw4xp638ln0qsdy9bfczphgrdjps0h8xr3awpc" } }, { @@ -75921,11 +76089,11 @@ "repo": "dpk/nxml-uxml", "unstable": { "version": [ - 20220130, - 1405 + 20220606, + 1213 ], - "commit": "94440741f7e8b83504d53991f26f63b4855cce27", - "sha256": "17k0d6ik2zj99kdvxdj5jg2kjj83lpy983mgcr3vv36axlw58wyr" + "commit": "95bbd0018ab218b9f39f5bf1f1e809f60fbc3edc", + "sha256": "10rah19x3pnvksi7ikji36i5bci9jhh6xjqlv6cn6xm7fdwrrkd8" } }, { @@ -76024,27 +76192,27 @@ "repo": "rocher/ob-ada-spark", "unstable": { "version": [ - 20220401, - 926 + 20220515, + 2014 ], "deps": [ "f" ], - "commit": "1213b877bc893ac5990a20052ea2bf2d8f086260", - "sha256": "18v4psk9ilvbnsbdksarix7zak7pbyxbn0rfy3kv9r2p0nrw9brj" + "commit": "b4f16b255947240e458127e5c737d793ac894ac1", + "sha256": "1vfkp4k5wz6aqq13f8p3la825q7qa3q1m05s2a5mdffn2r7f7nb9" }, "stable": { "version": [ 1, 2, 5, - 2 + 3 ], "deps": [ "f" ], - "commit": "1213b877bc893ac5990a20052ea2bf2d8f086260", - "sha256": "18v4psk9ilvbnsbdksarix7zak7pbyxbn0rfy3kv9r2p0nrw9brj" + "commit": "b4f16b255947240e458127e5c737d793ac894ac1", + "sha256": "1vfkp4k5wz6aqq13f8p3la825q7qa3q1m05s2a5mdffn2r7f7nb9" } }, { @@ -76110,8 +76278,8 @@ "deps": [ "axiom-environment" ], - "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2", - "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6" + "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56", + "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p" } }, { @@ -76622,15 +76790,15 @@ "repo": "shg/ob-julia-vterm.el", "unstable": { "version": [ - 20220512, - 820 + 20220518, + 1429 ], "deps": [ "julia-vterm", "queue" ], - "commit": "448b1d0d2edf908c13a99a2424fec20de636f5a3", - "sha256": "040k25ikvngczd8yxm8i6qa0q6vbqgsiq1ddwq1wlvhaw9iam6qm" + "commit": "39dbdb265785ae72bcd53706bc53190ec5e11bf0", + "sha256": "0wnvfv2ddvfwm6w446xx3x024g2vi8wzxyj85wdhpdh2hzssfchi" }, "stable": { "version": [ @@ -77037,15 +77205,15 @@ "url": "https://repo.or.cz/ob-spice.git", "unstable": { "version": [ - 20220210, - 1415 + 20220529, + 404 ], "deps": [ "org", "spice-mode" ], - "commit": "6dc2c6b9391ea8dd8123224f6c282b673b89dc94", - "sha256": "15lnmqzpgaz8n6zh0x9dm6hynl7rf1pcyf5m3fk7bbinqbxclljn" + "commit": "b1106ef2a74b2e88b294b05b83af22810feef4f6", + "sha256": "1k0ylhlaz8g2f1p1chn9vrzid78fswpyjalim73566pslc09lxsp" }, "stable": { "version": [ @@ -77370,20 +77538,20 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20220307, - 1315 + 20220519, + 1004 ], - "commit": "c490e5b7c4b5f5e5848a5cbdb1e669588dfeaae3", - "sha256": "1kq8290g494z48a1g1myzyazzfl33gz1hws984kxv8i29lp7jqr3" + "commit": "3b59f18b040e8bf7484a91435bfffcc34db55864", + "sha256": "11nm1idxnpzrdipnaxi35hzppwmylzdpvmjfnlgrqbmb6bcjinxs" }, "stable": { "version": [ 0, - 21, - 0 + 22, + 4 ], - "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429", - "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071" + "commit": "838ba9fa00cc27703441220b9a5d3880b17430fb", + "sha256": "171lq3vx4y8xj4by5zy93isx8nhg6ysxg1hxmkqkq16fdaiz8mnc" } }, { @@ -77567,26 +77735,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20220402, - 1505 + 20220603, + 1106 ], "deps": [ "org-re-reveal" ], - "commit": "df7180a8d75dedb2fd8878843a3d3cc654be508d", - "sha256": "0wf02hziqxmjvcxbnl8nr6dmgw9ivmx2n1ybrqh2k75zz1rnzasc" + "commit": "0c455d31516baa02603f54917d5ff1f309e31925", + "sha256": "1y8vw5m9z9jc8yam5hxsamiz9hpn2v9q5rmrf9f9s7m4xm5iq10j" }, "stable": { "version": [ 4, 4, - 0 + 4 ], "deps": [ "org-re-reveal" ], - "commit": "df7180a8d75dedb2fd8878843a3d3cc654be508d", - "sha256": "0wf02hziqxmjvcxbnl8nr6dmgw9ivmx2n1ybrqh2k75zz1rnzasc" + "commit": "0c455d31516baa02603f54917d5ff1f309e31925", + "sha256": "1y8vw5m9z9jc8yam5hxsamiz9hpn2v9q5rmrf9f9s7m4xm5iq10j" } }, { @@ -78315,11 +78483,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20220418, - 2119 + 20220527, + 2228 ], - "commit": "75eeae21971d86b51a712ed8ecd6434463b2d866", - "sha256": "0rl3na97qkl5a5p2ifs1sli80rq38qqmjqkv6khn60f05rj5yvk3" + "commit": "8b9af2796fa0eb87eea4140bc08d16880a493803", + "sha256": "0vbxg9k4w6yc770l330ir2h0fz108msmxhjq7p8alcql45vmhwn8" }, "stable": { "version": [ @@ -78477,30 +78645,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220302, - 1706 + 20220525, + 903 ], "deps": [ "dash", "promise", "request" ], - "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d", - "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9" + "commit": "c084599a199f794b7e25d5ca4d58f0c0ad87c160", + "sha256": "1h0dlph8cxs8spdqy0zs515hnza5jp15szbv7qgnricbg9k3pkx7" }, "stable": { "version": [ + 1, 0, - 0, - 9 + 2 ], "deps": [ "dash", "promise", "request" ], - "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d", - "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9" + "commit": "c084599a199f794b7e25d5ca4d58f0c0ad87c160", + "sha256": "1h0dlph8cxs8spdqy0zs515hnza5jp15szbv7qgnricbg9k3pkx7" } }, { @@ -78594,26 +78762,26 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20211115, - 543 + 20220607, + 2042 ], "deps": [ "async" ], - "commit": "c3cbde261fd66b747374b667cb715ca9ee8c52ba", - "sha256": "084pfgjyf41nmwyixvza9vhmfbaq587hx78knpg7c19aiki2r8zx" + "commit": "87b867b46e9d75bb65c6b4d02565c67e225bd429", + "sha256": "1zb7vcmhmjiqpbbhqrqci689rnpn10p985cs5jk9sgg66xsbrgs3" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "async" ], - "commit": "c3cbde261fd66b747374b667cb715ca9ee8c52ba", - "sha256": "084pfgjyf41nmwyixvza9vhmfbaq587hx78knpg7c19aiki2r8zx" + "commit": "87b867b46e9d75bb65c6b4d02565c67e225bd429", + "sha256": "1zb7vcmhmjiqpbbhqrqci689rnpn10p985cs5jk9sgg66xsbrgs3" } }, { @@ -78624,11 +78792,11 @@ "repo": "calvinwyoung/org-autolist", "unstable": { "version": [ - 20211225, - 658 + 20220530, + 1620 ], - "commit": "48666001f9ae1fdf9e295410d5a494e79284e2f7", - "sha256": "0ij0j96ns4scrlcf52ljwhi3y4q9jfv9kra3nw162fs3f4q6lp7m" + "commit": "da3a45f95f2e9f7281d533d1e5cec1764ae26a9c", + "sha256": "0zj4g6vfwyyxlpci6fcawvf35bgk7b84rrnm9s9myv53b6nri73f" }, "stable": { "version": [ @@ -78674,8 +78842,8 @@ }, { "ename": "org-beautify-theme", - "commit": "f55f1ee9890f720e058401a052e14c7411252967", - "sha256": "0rrlyn61xh3szw8aihxpbmg809xx5ac66xqzj895dn1raz129h2w", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "08f8lzbsyx919i83k070zyykn5hmndj5krschby52mimsllcrl80", "fetcher": "github", "repo": "jonnay/org-beautify-theme", "unstable": { @@ -78931,14 +79099,14 @@ "repo": "dfeich/org-clock-convenience", "unstable": { "version": [ - 20220503, - 530 + 20220515, + 849 ], "deps": [ "org" ], - "commit": "988d4e3c9f0ae6df098b0ab1985b79eed2c5b808", - "sha256": "0b1i013likxba92z3bwrg9in3g3daaz31fdsn1cfxbn3yha6yzai" + "commit": "9201db80862d144459f1316d571842f5389a47eb", + "sha256": "010wl014dh8sipfqnyasxy1rq5q726bgxm50v4fyqlqkpc6r07d2" } }, { @@ -79050,6 +79218,26 @@ } }, { + "ename": "org-contacts", + "commit": "40c73fda1fc5fd5cf01680838a9556fb3fa528cf", + "sha256": "11xh2qpibpxcfw6wbv7i18294pd9ccdhdqnka2p3jcrpac1m8ai9", + "fetcher": "git", + "url": "https://repo.or.cz/org-contacts.git", + "unstable": { + "version": [ + 20220604, + 102 + ], + "deps": [ + "cl-lib", + "gnus", + "org" + ], + "commit": "c1c4cadf3f7890a07d03c531ef823e1fb5f3ef2f", + "sha256": "07jkgmi9i9k0pnlxhrmhx3rjqaxl3q69mz9zmyxrpk7y9dv6hc92" + } + }, + { "ename": "org-context", "commit": "f33b6157eb172719a56c3e86233708b1e545e451", "sha256": "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz", @@ -79312,6 +79500,25 @@ } }, { + "ename": "org-edit-indirect", + "commit": "53497135511754f2d6fb11b4f9ffd34f6715bd2c", + "sha256": "0kbhj4qihb442f2yvnv5i6d0gy8hdqa6qbawj563zgrfi19swi0r", + "fetcher": "github", + "repo": "agzam/org-edit-indirect.el", + "unstable": { + "version": [ + 20220508, + 2141 + ], + "deps": [ + "edit-indirect", + "org" + ], + "commit": "f146d1b406308298b4004a28aaa11124b02d015b", + "sha256": "18w6gpdj8ch8zgyidaglym8mxp23y4aa6a0z2qix7skka0vlknjq" + } + }, + { "ename": "org-edit-latex", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry", @@ -79535,8 +79742,8 @@ "request", "request-deferred" ], - "commit": "554c48fb57dc46877202028019197b0699961ca0", - "sha256": "1l48dgzwwh230l5kxd17jdmjwhbkaqzmj95znxzhs9jrfm7jixyb" + "commit": "f8075bd8eac7288eea1060077ca103d5fd01fb65", + "sha256": "0vmf9l3cc5i0kqyqdvbhd4sndla2j57rvy551rib5knhqx1ry0sd" }, "stable": { "version": [ @@ -79654,23 +79861,24 @@ "org-edna", "transient" ], - "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", - "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" + "commit": "66918121e8daf8e0b355b12717dc898150f0f2e1", + "sha256": "128r3nfhx7pqfhfjymny7idrnid7g9xc3rjmxa71r80bj936j86b" }, "stable": { "version": [ - 1, - 1, - 1 + 2, + 0, + 0 ], "deps": [ "f", "org", "org-agenda-property", - "org-edna" + "org-edna", + "transient" ], - "commit": "13f04f46ed027cd119f21377b050288a96b344cf", - "sha256": "15my09gz094z0ihrakxa1x0zcb073s85azwmp891iv62qjhgl5x6" + "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", + "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" } }, { @@ -79956,8 +80164,8 @@ }, { "ename": "org-kanban", - "commit": "a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1", - "sha256": "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1gfkmqrhhbbwg4q6h56nrjknh9m0fzd3svm7y0l6wlfh5bg6hqjr", "fetcher": "github", "repo": "gizmomogwai/org-kanban", "unstable": { @@ -80036,14 +80244,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20220503, - 458 + 20220605, + 239 ], "deps": [ "all-the-icons" ], - "commit": "b20e296b497360de12d5d973aa273cab70c77126", - "sha256": "17vcrz99759sh75swd94w1pajq5kknj7bgw5n12frwgfjlq6hi3s" + "commit": "47d54dd736abc9ef5406e3e7394d54c5110d355d", + "sha256": "0g3j3xnyk1fxs3m7c3vsb7ai7cxjj6iv3qji19a50rjcc7l6s4ja" } }, { @@ -80120,8 +80328,8 @@ "deps": [ "seq" ], - "commit": "075e0e6d36eb50406a608bc8a2f0dd359ec63938", - "sha256": "133smvw9iaxg0p3y5wl0rc4fwwgbxgw6hxngpmar8qf4grwy4w27" + "commit": "d2f4b9e8f1c7c9b495f71deeaa77e4f6f47bc7bf", + "sha256": "1p9mz0fz6s63wy7zh4r1ifa7kcycymlcgmqjbpgv85m2783ab0l6" } }, { @@ -80165,20 +80373,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20220204, - 42 + 20220521, + 1422 ], - "commit": "98504d043c8421ac390b7358b146733c7c0b4479", - "sha256": "0n0bm9xddlgvlrmc2yjkdyvag7690yphdkcjx4w3cb04xlcac9ns" + "commit": "cf96f585c68ad14751a3f73d937cbfcb890171b9", + "sha256": "17380kpf08j5ai30nn5iks0k3x8sm3kmz8lkyr1v0qvpr5a8s70b" }, "stable": { "version": [ 0, - 2, - 6 + 3, + 1 ], - "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d", - "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j" + "commit": "cf96f585c68ad14751a3f73d937cbfcb890171b9", + "sha256": "17380kpf08j5ai30nn5iks0k3x8sm3kmz8lkyr1v0qvpr5a8s70b" } }, { @@ -80208,21 +80416,21 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20211231, - 700 + 20220601, + 1412 ], "deps": [ "dash", "org", "s" ], - "commit": "3974435bbf72722801f7ed78855381d77a773162", - "sha256": "0zdvz8lzrf7dj6giryy98wkxrrcawigvhab3prxwhjrkp8n9wvbv" + "commit": "f191ebfee6dcf6a05b5d1db43cf75f4a20faa8b4", + "sha256": "1vcdbpq746xa5a3rlq9vj4r42ygmws0wg7r7q4zylkvx9gv0c3n5" }, "stable": { "version": [ 5, - 7, + 8, 1 ], "deps": [ @@ -80230,8 +80438,8 @@ "org", "s" ], - "commit": "0a96482452fc60170e3f5b8cf3a259b2b09c9ef5", - "sha256": "1ca6wgjwslv3582fmsxna81mgryziw9v9zh1836sbp3yszqddday" + "commit": "7b0022b3a751bb4396b07f47546c66ddcd5be922", + "sha256": "1vcdbpq746xa5a3rlq9vj4r42ygmws0wg7r7q4zylkvx9gv0c3n5" } }, { @@ -80260,11 +80468,11 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220422, - 940 + 20220605, + 2206 ], - "commit": "ff1046705b3950b7a49da50bc34c11da86c6226d", - "sha256": "0zg2bi6jprigvqy4zglb8f8357sxikcfx0b8vjbwcjl08iimxp6j" + "commit": "b352680d9ee8c6e6966cc21d595513c3595e3bb7", + "sha256": "1mc1m6x9bj92lfsbrxnasp78sc501mjiad4jrb5m1j42j0d1cs83" }, "stable": { "version": [ @@ -80498,8 +80706,8 @@ }, { "ename": "org-octopress", - "commit": "fba6c3c645ba903f636814b5a2bb1baca0b5283b", - "sha256": "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw", + "commit": "4d846f217178edce928aa586147c3cd71312eb2a", + "sha256": "1qwmm2c226m1g8hwkj2f5yxczg8d1wvya0b1gadgcbwrxlcrjm8s", "fetcher": "github", "repo": "yoshinari-nomura/org-octopress", "unstable": { @@ -80894,8 +81102,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20220318, - 1534 + 20220602, + 1651 ], "deps": [ "dash", @@ -80909,14 +81117,14 @@ "transient", "ts" ], - "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170", - "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl" + "commit": "64a9234733904af20fd495861792f1d5c2b37190", + "sha256": "1w3vly4jh854gb9bgnwqfzry6214v498fmiwm491gi8m5g0d05xp" }, "stable": { "version": [ 0, 6, - 1 + 2 ], "deps": [ "dash", @@ -80930,8 +81138,8 @@ "transient", "ts" ], - "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", - "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" + "commit": "115500c8a0a3190ec6a69d1120fe81944d819125", + "sha256": "0iamqv5j43ngj1xdqr36rkgk9lqpk9bg8y531jsldnvwzrp3srpf" } }, { @@ -80954,8 +81162,8 @@ }, { "ename": "org-random-todo", - "commit": "80fad6244ea3e5bdf7f448c9f62374fae45bae78", - "sha256": "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1abhpazwr7gp9bvl83zdg2nvw51mg70myqi18l3hzic033pbhxwz", "fetcher": "github", "repo": "unhammer/org-random-todo", "unstable": { @@ -81010,28 +81218,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20220402, - 1456 + 20220523, + 1744 ], "deps": [ "htmlize", "org" ], - "commit": "c787ebf93d51b63b8726df241e3e2fcda35d4ae1", - "sha256": "02y6qm4va43c25i7b0q3pvk888war64rrb2p9bmv5p8176dy1mjw" + "commit": "93ba4e91f1d007669d39fc76c097ff5d6a64489e", + "sha256": "0qwlyikci53z1qc33nsg19fazg5p1jrjsjc481afyjf364ds2j1i" }, "stable": { "version": [ 3, - 13, + 14, 0 ], "deps": [ "htmlize", "org" ], - "commit": "c787ebf93d51b63b8726df241e3e2fcda35d4ae1", - "sha256": "02y6qm4va43c25i7b0q3pvk888war64rrb2p9bmv5p8176dy1mjw" + "commit": "ac67832e7b342326deef650db6601b95127627bc", + "sha256": "1kcr1zpafgaykbkxfav4iia6fbglpjv4kvj5yjn8wcm1liiaj6ck" } }, { @@ -81186,8 +81394,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220509, - 1414 + 20220601, + 2032 ], "deps": [ "avy", @@ -81198,11 +81406,12 @@ "htmlize", "hydra", "org", + "ox-pandoc", "parsebib", "s" ], - "commit": "0d2355d1eb4dcac1095a03d885788a12fe566610", - "sha256": "019pbp02fnbb7rcr80cfyi7pa9b413lgdfmbwaak2icb5cpmj452" + "commit": "cbe9e870a5f488cdfc5e6a3b5478845ea8acdcde", + "sha256": "05js4f3xnms8c06s63agmhfcwj6cjsp2z83pqmlwga8h74z7f5y7" }, "stable": { "version": [ @@ -81278,28 +81487,29 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220310, - 1646 + 20220521, + 1755 ], "deps": [ "dash", "org" ], - "commit": "9ebd42b521e7adf26a35cbb17144113a83f73264", - "sha256": "0wjz26qmjwiz1594b4s9vycbbz7zhs52xpa0ksph92fcl21c5fp5" + "commit": "0b24765e270a2dfd84adf3a0f9afa8b72aabad30", + "sha256": "1z529iy3zm8szyr98kmi7m3rfpkx139xcpjz4vazk23zj93mpxrc" }, "stable": { "version": [ 0, 3, - 10 + 11, + 1 ], "deps": [ "dash", "org" ], - "commit": "c42078f8601b7f600135f66e75246a53c5f9975f", - "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2" + "commit": "0b24765e270a2dfd84adf3a0f9afa8b72aabad30", + "sha256": "1z529iy3zm8szyr98kmi7m3rfpkx139xcpjz4vazk23zj93mpxrc" } }, { @@ -81349,8 +81559,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220512, - 1634 + 20220608, + 1621 ], "deps": [ "dash", @@ -81359,8 +81569,8 @@ "magit-section", "org" ], - "commit": "2657f0b444194e1de6957f9cfc112383980d62f9", - "sha256": "1x1222nvy5fq2cyz8ds271xq03bcyn4252vxzdch9gai3n0vg00b" + "commit": "fcefc1b1b4027185dc35cc1fe16c268ae65bc076", + "sha256": "0brfmiz97sg7wz7pi148xw422jcmvcfk60rb9nfvw71xdnncqaj0" }, "stable": { "version": [ @@ -82004,15 +82214,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220427, - 1552 + 20220602, + 940 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "88fde267441118836a5c4ed28bb5958fca37a800", - "sha256": "1f7acxpc133abqzhc667syd7dkazarazndwl1dg8clcms4v6xaqq" + "commit": "481f44aa4067b287e0c724c6d5e1185c62d1560c", + "sha256": "016p3fjdd5vpri7bg2yfmk3ldkng7jp65fb0fv9i89kmzkkcq4az" } }, { @@ -82385,8 +82595,8 @@ 20220220, 1757 ], - "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86", - "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri" + "commit": "4359c640c7822a23976e9a5ca4ce63452d796912", + "sha256": "176qjbhvdg1bqy45qk6zf5ij12qif6xkd3ppd1a5wg67p2rv21z8" } }, { @@ -82824,8 +83034,8 @@ "ht", "s" ], - "commit": "6fe53900ead434f3e18e63e9d22a8fa8380ccb37", - "sha256": "0h33ih533dirghhpjlyzm3k8iss007f9npk2fpbc75z3q4ws67wp" + "commit": "f9347e8d1f7cf770c7a2bc594ccf3f3c730f9b81", + "sha256": "0k27dy8r1g6ikd61n8vv4dv4la4rpl88a05x4fg8702573vqq1cx" }, "stable": { "version": [ @@ -83028,8 +83238,8 @@ 20211126, 2201 ], - "commit": "bc981b957967be8d872c08be9ba7f2dbde5caf1d", - "sha256": "1gn9bs5fxrshyyi7wqm30p2d4izjdrspvh5cx8fs803mxl593wim" + "commit": "e54b5cc7f95ded5dc39f60fbf6d72f64f469da58", + "sha256": "1i0h9f45jzw3m341pp242ihcqf7jvzddxidnn1qv971fpvibjvxx" }, "stable": { "version": [ @@ -83169,14 +83379,14 @@ "repo": "vyorkin/ormolu.el", "unstable": { "version": [ - 20211020, - 2229 + 20220530, + 921 ], "deps": [ "reformatter" ], - "commit": "1941a8ce48027b5670d226bacc2fa10b00774b3a", - "sha256": "1bs6c6059g585dwsd4ldl49v38l6jlr54z9rj9qhc1a1gg6pzb3b" + "commit": "a6b1d3f8838d067ac5352fb0673c3c3dae7abd73", + "sha256": "098az157nsgwdxl8pbvznha1lvh2mpilm7m90p9v6pwdfvmcjb3x" } }, { @@ -83244,19 +83454,19 @@ "repo": "minad/osm", "unstable": { "version": [ - 20220511, - 1756 + 20220513, + 1002 ], - "commit": "471f21f0f8bffc078d5ccfd86610a83e5269c2a0", - "sha256": "1w8xc4g2fgg9l0yibqc0190afgk71z697ni4yx1v1z1vy46s76c4" + "commit": "563d9646b1f8df37cefcec5d51d20249eba407da", + "sha256": "039ac364f00slx1dxxgsgfcr4x47v9ymn8arcs0fyhdhw7jnky5j" }, "stable": { "version": [ 0, - 7 + 8 ], - "commit": "e3ea969ce1bf84343f357efa2de97e1dd857f481", - "sha256": "0d037512llpny669m6mhvwhnm90g6ysgjqdx45gqxfwdc65s4a46" + "commit": "563d9646b1f8df37cefcec5d51d20249eba407da", + "sha256": "039ac364f00slx1dxxgsgfcr4x47v9ymn8arcs0fyhdhw7jnky5j" } }, { @@ -83992,14 +84202,14 @@ "url": "https://git.sr.ht/~jakob/ox-haunt", "unstable": { "version": [ - 20200202, - 229 + 20220602, + 143 ], "deps": [ "org" ], - "commit": "f3c8fda6fee78f45a259e5d218a519dfd11c00c7", - "sha256": "1rs1n228c2fmpvirc57bqgf2616ijpphkgf4w9ln5j46snmkam25" + "commit": "4d585c51d5701b4d43c02db78c7032658cae47fd", + "sha256": "19pwg5qds5xmrv3yxkmhd3ibln3spcldwkmfwixkaq20an9z2d6k" }, "stable": { "version": [ @@ -84039,27 +84249,26 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220512, - 1805 + 20220531, + 2158 ], "deps": [ "tomelr" ], - "commit": "cab606a2098524ea7ac97704cc8df6d2d9d190f8", - "sha256": "13gfchjdhalijbf5d4xmz1zvl904syl4lm07ssrqck4h66y4nr9y" + "commit": "df0b12ef1aff2b322403f24006f0ec17676d3606", + "sha256": "0xxj133j2l0002yp4hm4k01klrcvpbzxp6f75rhyvijny0ggmnw4" }, "stable": { "version": [ 0, - 11, + 12, 1 ], "deps": [ - "org", "tomelr" ], - "commit": "4fc594eda0d0cb41cc3b634b43fbd055db7ae67e", - "sha256": "1qrxy32g8brmc3psfg458ca6r91wqq55bgmsk76w6zm8cgrvsnyc" + "commit": "3c8c0bf28cf02128ceff9a972db3ebad01083953", + "sha256": "0q4gyjzvxzw6a0phw2x2v9n43i28n3g9m7szwbhzch4j6ggxzcw4" } }, { @@ -84400,14 +84609,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20220410, - 1533 + 20220524, + 1144 ], "deps": [ "org" ], - "commit": "862b41df7734f57019543f6bd82ff7dad7183358", - "sha256": "1009w8bp2rkqjvks97xlzbprrb1fxhcdb9fzx08ak229glvwav08" + "commit": "43ebe238ef747985b336880305ae5065da67235c", + "sha256": "1j7bz4g6dd5zcsdj24ry71i5sadldcza2ib7k4yayz6xi5qv3gl5" } }, { @@ -84448,14 +84657,14 @@ "repo": "choppsv1/org-rfc-export", "unstable": { "version": [ - 20220206, - 1046 + 20220604, + 1114 ], "deps": [ "org" ], - "commit": "0849028a2e4a274bfb0fc85d9538203ddf72a9e8", - "sha256": "1syzqc1lhnpkrzzd2hwxmaqr31dn44gcqwy5db44y8fr6nkrj6n0" + "commit": "f0fe3503f8732ea5e95a4016c6b7ce5b47cf6295", + "sha256": "0a1gp9s92m7scxdf2sc4dqh6ixyv1x7cf190z5d2lz8yz3aw9hkw" } }, { @@ -84876,28 +85085,25 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220510, - 2024 + 20220530, + 1027 ], - "commit": "899bb08963c21028a02894426a9d86f768fe06d8", - "sha256": "1zw68gg8ai5921kly35fnxapnxqzdqx8ll7w8bdxpv8f06vq24xj" + "commit": "6bbe65de495110970c2c33497ca640a0774e41b3", + "sha256": "0g6x0p6dbz7zk4xrh5n3367zhv026h3a9hbb8jf2f0qw95685cbr" }, "stable": { "version": [ 3, - 0 - ], - "deps": [ - "cl-lib" + 1 ], - "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1", - "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r" + "commit": "1604b3a5f0040c6f487d38561388abab2f3d54c5", + "sha256": "1gkqav0ipfk5gsklxrbggqrbphr12qg1qr6dpdi4f0hs0i11fr23" } }, { "ename": "package-filter", - "commit": "89312eaf69f3d7ac46647255c847fcb45415e78d", - "sha256": "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0l1hq3a7bx1mp17g9lii4b7m31b1n328b8r6rqv5g2ab1d2cs0ks", "fetcher": "github", "repo": "milkypostman/package-filter", "unstable": { @@ -84917,15 +85123,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20220412, - 1648 + 20220607, + 738 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "80a9d9815ab2919c992ad29ae4846443dec43a35", - "sha256": "0sfxpw19vi7hsr3j86wbwxfi02020z38qg1w72j8k6mm0m9m21yi" + "commit": "70529b2ecba5f3a037be8b2c6ecbca769c64b00e", + "sha256": "1s26jbxlpqd9p1ahmxga6m28d142l1lnv315bkzsf642kk57446k" }, "stable": { "version": [ @@ -84954,8 +85160,8 @@ "deps": [ "package-lint" ], - "commit": "80a9d9815ab2919c992ad29ae4846443dec43a35", - "sha256": "0sfxpw19vi7hsr3j86wbwxfi02020z38qg1w72j8k6mm0m9m21yi" + "commit": "70529b2ecba5f3a037be8b2c6ecbca769c64b00e", + "sha256": "1s26jbxlpqd9p1ahmxga6m28d142l1lnv315bkzsf642kk57446k" }, "stable": { "version": [ @@ -85046,8 +85252,8 @@ }, { "ename": "packed", - "commit": "57a2fb9524df3fdfdc54c403112e12bd70888b23", - "sha256": "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "19bqa1j2g453gk9h0k4pvi1mgpyx9f9rh7ang28sq13hzd9c8mjb", "fetcher": "github", "repo": "emacscollective/packed", "unstable": { @@ -85389,27 +85595,27 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20211208, - 2229 + 20220519, + 2008 ], "deps": [ "dash", "hydra" ], - "commit": "c1429887287b7ee9601196e26f97c908b6e4f5c0", - "sha256": "1zw92bkp5mjzc78vrvsaj3ycqn0j5mqzxxxv2nkb891spgandpvy" + "commit": "2a4e726a29d38e7c2379787cad619e5392ad2da0", + "sha256": "1yn9mdlxcv9d33nvgy3wp09qhynb2m50cyhsv1xf77wyzlwdlb2p" }, "stable": { "version": [ 2, - 31 + 32 ], "deps": [ "dash", "hydra" ], - "commit": "500e80666fb779457be8771c5613c177187ba0cc", - "sha256": "1c3gay9fkikg7h46djw1nf86fzckmv7w1zbz5fbar20klcr12pbm" + "commit": "2a4e726a29d38e7c2379787cad619e5392ad2da0", + "sha256": "1yn9mdlxcv9d33nvgy3wp09qhynb2m50cyhsv1xf77wyzlwdlb2p" } }, { @@ -85446,8 +85652,8 @@ 20200510, 5 ], - "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86", - "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri" + "commit": "4359c640c7822a23976e9a5ca4ce63452d796912", + "sha256": "176qjbhvdg1bqy45qk6zf5ij12qif6xkd3ppd1a5wg67p2rv21z8" } }, { @@ -85520,8 +85726,8 @@ "deps": [ "autothemer" ], - "commit": "95e8248edbdb01fedc7db4472bcce90d2d872106", - "sha256": "13rcajw03sbddks5wgzznvrz7ibd7m0jx8mcw1amfk97ghs57h7s" + "commit": "f6738f8e6075cb6b275210d7e978b1420ee9a056", + "sha256": "0f6vphpxvky4x6fnwyp1gx56awsvhdmazf1p6qg191inn3h5wygj" }, "stable": { "version": [ @@ -85538,8 +85744,8 @@ }, { "ename": "paredit", - "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86", - "sha256": "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0mpay7xqb4910nlp0gmdj8q2zkinq77zh5b9lcg6ah2d9vzxzc9s", "fetcher": "git", "url": "https://mumble.net/~campbell/git/paredit.git", "unstable": { @@ -85747,8 +85953,8 @@ "deps": [ "s" ], - "commit": "c2bdc5ee1d1f029886245f9a5c409e47c1db2cb8", - "sha256": "050b932qa0ll66pa68i8bbjdmi8bgdvklqm65cvm5ssc5hcwjq3k" + "commit": "079da5e65a5ded0b5ebe7cfe799eac668d7323db", + "sha256": "1w00ifh8qa12f9b38acv47c9cb3vnzpyk72p5qf6jf4pjc2izx9c" }, "stable": { "version": [ @@ -85848,15 +86054,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20220512, - 1328 + 20220520, + 835 ], "deps": [ "map", "parseclj" ], - "commit": "35e9f3173a6cca60b6851dddace470b29654ac77", - "sha256": "06in2r87rn398bnqfc7bmpfvfbvrx9ybqs8r5yzy5y84f9gbfnm4" + "commit": "a09686fbb9113b8b1b4f20c9e1dc0d6fea01a64f", + "sha256": "0wjzzjwz92rk5nx1km1fw46lgspqahj93p5mfyrxwcw27cb8z1av" }, "stable": { "version": [ @@ -85922,8 +86128,8 @@ }, { "ename": "passmm", - "commit": "8ae2a1e10375f9cd55d19502c9740b2737eba209", - "sha256": "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "17rd9pgi9p9w9m9grpnhn1d4mrx3bfrzl04z37mf4gd8qzzzqvqs", "fetcher": "github", "repo": "pjones/passmm", "unstable": { @@ -86237,8 +86443,8 @@ }, { "ename": "paxedit", - "commit": "106b272c2f0741d21d31a0ddfa4f521c575559c1", - "sha256": "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "08mf53y7ipiqw8p21y6fly0qh3fqgmcwl8r95m1a2lqh3wg5xi9j", "fetcher": "github", "repo": "promethial/paxedit", "unstable": { @@ -86441,8 +86647,8 @@ }, { "ename": "pcre2el", - "commit": "f04a25e467cc4c7d9a263330a7a1a53d67c6eb9b", - "sha256": "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1ri005gw9i93l8flvvgcmk0ww3b6lvnpwpls7k69cm0pbxhyvm40", "fetcher": "github", "repo": "joddie/pcre2el", "unstable": { @@ -86470,8 +86676,8 @@ }, { "ename": "pcsv", - "commit": "80ffaf99b2a4566a3f9d0309cd7b63f563f3826e", - "sha256": "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1z6if6cpj2kz2d975f5ar10yaqvys1cspzbak2sza3858vf9wph5", "fetcher": "github", "repo": "mhayashi1120/Emacs-pcsv", "unstable": { @@ -86524,22 +86730,22 @@ }, { "ename": "pdf-tools", - "commit": "10a057a573123c7093159e662fafdc97c2dd4a02", - "sha256": "1x0yd86r3iybpiq7ypln1fy0cl55wznkcgvqszzqjdrnlpqs0abc", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "1632b6qr7mpj655vs3ylkfzcm2yx1bi2v2lb1w3wqfjickmy0p2v", "fetcher": "github", "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220512, - 145 + 20220522, + 13 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "fedd930a09a497c03df3ce5204ccbd80da724662", - "sha256": "13yl83ld5z1asjqrsfdzyhnz4nrrr064lwbsgfvk3mmlqpas7b08" + "commit": "f9ccdf99e560bae70d3a13325cec9dc0e3cc45b0", + "sha256": "19hj0hbg3rssw9xjia1g0nmknmvcrxhgb3p0y5vy8nlk0d2h5v4z" }, "stable": { "version": [ @@ -86846,11 +87052,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20220206, - 1742 + 20220507, + 32 ], - "commit": "7a594a3d8f1c4ba9234dcd831a589e87f3f4ae86", - "sha256": "0ckcnqg2fn4m5zp06jlw5cj81clizrm8cxjiwz5rd4d9m9lwdrgd" + "commit": "d0f8eb099e852b6073d4ec06d32587c60a7dce3f", + "sha256": "02518lq9wma0hsm96lws7fg2bdjsp52jg2rj33iczsj515w5mdgl" }, "stable": { "version": [ @@ -86942,14 +87148,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20220420, - 1550 + 20220521, + 2138 ], "deps": [ "cl-lib" ], - "commit": "4e38680793585a907ae46b148697030c2b552a00", - "sha256": "0jgd2vzfza3pnnksh1kss5mqhbirqn93lvzanhgjr4vb4fv8x13f" + "commit": "794afdbc5188ef6f2d78d26302cd78903ce618fa", + "sha256": "1adn4knbhsygsy67q6w86qbhqx2gg6rw5hcnan7x40wq8fi7hr0p" }, "stable": { "version": [ @@ -87034,8 +87240,8 @@ 20200321, 504 ], - "commit": "43447a2c70f98edd1139005e32f437d3f142442b", - "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + "commit": "af677327f185113442e95b00986097b30cab650c", + "sha256": "01wy3v1aj2891wgbr7rwpaw9xavfrqbyiqiv01q6jjdvc5vl0rwi" }, "stable": { "version": [ @@ -87216,8 +87422,8 @@ }, { "ename": "phi-rectangle", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "111fqqa7h5cajq92sbiqhavm25l5bcapxhfh38y7irq4mv08xifw", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "133d0iphybwg7gpbv257vdxamm5d6yk96qv2fgq1cxw0b778ylx0", "fetcher": "github", "repo": "zk-phi/phi-rectangle", "unstable": { @@ -87392,26 +87598,26 @@ "repo": "OVYA/php-cs-fixer", "unstable": { "version": [ - 20220510, - 1407 + 20220516, + 1008 ], "deps": [ "cl-lib" ], - "commit": "225ca7127052e2b3d660495d04319e817ec302ab", - "sha256": "1zwl6hpw0ka4pdsk9i67dbv42idb0nhi5i3yajy1wzdihj7hqg3y" + "commit": "efe4368d891f1eec6311363cfd6be3e9eadb5e0a", + "sha256": "1j0ivk4d8xd2r9ssdn9y4xl3lr2isg4sks5va7wjvk6h7jnf81bj" }, "stable": { "version": [ - 1, + 2, 0, - 2 + 0 ], "deps": [ "cl-lib" ], - "commit": "ac2d64c4b672a01744d14cc8ad80e9c9ff55c63c", - "sha256": "1jyjqwv4haibv526bwpvyyszs7ga9lmsjhn47hyk3ddffrr84c0y" + "commit": "efe4368d891f1eec6311363cfd6be3e9eadb5e0a", + "sha256": "1j0ivk4d8xd2r9ssdn9y4xl3lr2isg4sks5va7wjvk6h7jnf81bj" } }, { @@ -87431,17 +87637,17 @@ }, { "ename": "php-mode", - "commit": "5593a586ce7579fd3a136e2416b89721157f98e1", - "sha256": "1xa9dmjinm6qm4cbzqanw5njmif71sg3jxnvgvi17jj9j3125d9f", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "097bznn3k1z68mxdmp8zm4cn590sl9qgc1g7dm3abcli77xy4436", "fetcher": "github", "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20220120, - 1959 + 20220606, + 1831 ], - "commit": "4503672471b8fdaaea6c454344817a119c87fcc6", - "sha256": "0fxmqhpw0i54davcg9h8gxf8zxix02g2wnxxly6m0p5g785yng2h" + "commit": "81717a56b74d7ab76a1126eb4f45167d5eb61c32", + "sha256": "1bnn1lwsqd9rlx1qjrl4h2v6j29cnhagd4ay82psq309yvr4av5x" }, "stable": { "version": [ @@ -88034,15 +88240,16 @@ "repo": "pwalsh/pipenv.el", "unstable": { "version": [ - 20210127, - 1444 + 20220514, + 123 ], "deps": [ + "load-env-vars", "pyvenv", "s" ], - "commit": "8f50c68d415307a2cbc65cc4df20df18e1776e9b", - "sha256": "0l81vbwp7gmcg1n7i8cwa01rpwc24db7gxqvmhln8piy1r2ymh6x" + "commit": "3af159749824c03f59176aff7f66ddd6a5785a10", + "sha256": "1ak9dvjqhdm12i7yamgbqjmc4zmvy2f0gd1nia1q9dy3n6576ryq" } }, { @@ -88153,8 +88360,8 @@ }, { "ename": "pkgbuild-mode", - "commit": "ca7bf43ef8893bf04e9658390e306ef69e80a156", - "sha256": "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0hsm4qqh555fkbd34mi0cah5j69rcsxfglj9lr927bv828663mrb", "fetcher": "github", "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { @@ -89506,8 +89713,8 @@ }, { "ename": "popup", - "commit": "083fb071191bccd6feb3fb84569373a597440fb1", - "sha256": "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "009446in223b8391n1mq3fn8gdvwlp3x7lc32mhzcsnyijhvc73y", "fetcher": "github", "repo": "auto-complete/popup-el", "unstable": { @@ -89515,8 +89722,8 @@ 20211231, 1823 ], - "commit": "114d646f0f4dd49de19dfedd78630018f71470e5", - "sha256": "1hgia0d2j81mlkcl8bilznn4044qjjpy00cdd96zs7p2lbvaz3sb" + "commit": "976bd8e06100df5a266377d0e5f63b104ba93119", + "sha256": "0ssr7anniahn8l72gykc24c6yma4lkjwrxc3a8wvi6r7qkbdafxq" }, "stable": { "version": [ @@ -89659,8 +89866,8 @@ 20210215, 1849 ], - "commit": "f90f3a09622993bf34704bb11c24984f6b1f10e2", - "sha256": "05gmc5wrj4pn1s1k4p6vvnl1z75bj4w163mpy8rybxdhsqhhf9a4" + "commit": "71a0ab27b13733df0fa37fd1a5fcba8799a35df9", + "sha256": "1c7h9xhi366alh4y7jycfb79ssrhnd61pa4pk9ncfwh3lspp2sf0" }, "stable": { "version": [ @@ -89757,11 +89964,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20220124, - 859 + 20220528, + 27 ], - "commit": "c91d4d53fa479ceb604071008ce0a901770eff57", - "sha256": "15h809mf8d8w8axbfzjs40j8yrh5ms88x4pmlx1qlcac8j6qrilf" + "commit": "0d23bc5f7cfac00277d83ae7ba52c48685bcbc68", + "sha256": "1p42kyh1l9m3h48fl4pq27rcz2dbhgk28qnrf5h1mmxjln1lbb2w" }, "stable": { "version": [ @@ -90034,15 +90241,15 @@ "repo": "LaurenceWarne/prefab.el", "unstable": { "version": [ - 20220403, - 1026 + 20220605, + 1310 ], "deps": [ "f", "transient" ], - "commit": "ffcf9c640c8c458a58b752ef2608e07a929a1104", - "sha256": "119gbadnzgxhrw5y5swyzkm5268wjpjnxfy21ybsxw8dj2rsvvzj" + "commit": "5ca61a420d8de5e3707a5c2f01153f4ab2ea3ec1", + "sha256": "16fhcry3a66acwnms7qshw4q1jzqqcqhl4g3yddhxramcgbp2x3f" }, "stable": { "version": [ @@ -90081,19 +90288,20 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20220509, - 2300 + 20220601, + 1652 ], - "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484", - "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c" + "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e", + "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk" }, "stable": { "version": [ 5, - 2 + 2, + 1 ], - "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7", - "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5" + "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e", + "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk" } }, { @@ -90149,28 +90357,29 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20211018, - 955 + 20220603, + 1338 ], "deps": [ + "editorconfig", "iter2", "nvm" ], - "commit": "485417c0677255249e944b1174225547e4c61c00", - "sha256": "17jh6xccqs4z2slj6c3hhdk29nv300d4lmvrgz9cn8cxrk157vcy" + "commit": "3fcf3ba3507f47b8ac1392e7901aa2c418147758", + "sha256": "0sg6ibcwfgnwgfg760v8wnijz79n86f61b7rlgizvgi8v7ky88f6" }, "stable": { "version": [ 1, - 1, + 3, 0 ], "deps": [ "iter2", "nvm" ], - "commit": "8b38172bb6644b71b718c0732e5b9f1cd32e587a", - "sha256": "0zkicnfj1y2zpwbwm4ccrpvzr5z6rpkk82mdzaszkx0sksd3hzxm" + "commit": "1c0a1bd97635090a611cf6cda3ba9146c84fa41d", + "sha256": "14plfh1hqjygcpp1ijkhzkpsshqfpzmn6c44bac6rk13072sg097" } }, { @@ -90559,16 +90768,16 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20220507, - 1753 + 20220523, + 1728 ], "deps": [ "dash", "f", "s" ], - "commit": "535789e32028133fa9dfb4c9135b6a65c199472f", - "sha256": "0x68c7c40cafg4lbi1lwlli3bghnhcb21wm4idg6qr07y351fjqd" + "commit": "a3be00d3b90a77118c2d7d9f5a2f26151091fa07", + "sha256": "0pijzj4a8q6acm8rsrx92gam04vhz5xgc5jzzv5ykl6d4xx4zskk" }, "stable": { "version": [ @@ -90671,8 +90880,8 @@ 20210715, 1213 ], - "commit": "d47f08f64cce595cbd4e9fbe3544986b3c4cee83", - "sha256": "0pp9f8kcgnsgz0mykss4jppnwvlfx7ny58y4pb1rm4l2xvs8y6yj" + "commit": "f0f8d70317fb6f505ec2762aa82962322b14a9f0", + "sha256": "07dxxr610dmjbx9mm9xyhpfg3piqmj5njxz2arrz47h49xsgl4b0" }, "stable": { "version": [ @@ -90795,11 +91004,11 @@ "repo": "buzztaiki/project-rootfile.el", "unstable": { "version": [ - 20220512, - 443 + 20220516, + 1419 ], - "commit": "cb87657c4426e39aa2c481190e594c68fb0de8be", - "sha256": "07gb9b72gkwz748xwnsjayn68x5qn8b0ka8wmwvqgwgak14f1da3" + "commit": "65e46311dae24f3458e43c2490ad265c711aa624", + "sha256": "03x0mlndml6mm3jfpk95rnq2fhcdyr199pj9hmxjb1ny1j72lvdl" } }, { @@ -90837,17 +91046,17 @@ }, { "ename": "projectile", - "commit": "ca7bf43ef8893bf04e9658390e306ef69e80a156", - "sha256": "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0p592fq6gp4dzar30fiw6ks6i75kc9q1pm1agrx0qxwk84f4j76f", "fetcher": "github", "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220430, - 800 + 20220530, + 615 ], - "commit": "a4f86f981c84a546530d5904253fa266431ef806", - "sha256": "02303v7y79vdl4n2qga42892cqd5hdajwzp4vk3a4fxcyl8yhv8k" + "commit": "e60883ff370c1545499b97cf56479de1a58c5b3b", + "sha256": "08h4q3fghhc749pb8zak2z5p1sify01bkxhhv9iyrg0iiwl9bl6p" }, "stable": { "version": [ @@ -90964,8 +91173,8 @@ "projectile", "ripgrep" ], - "commit": "4ed5c741233a81d96115f556784269042070901e", - "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2" + "commit": "872e250e8f93b8bb0a8a1de8bde17fd9bd116e31", + "sha256": "1n3jkj8a37ap4ndh9an5qm8dn8nxcgv9vqr8bcnxx5l0wnsvdg8z" }, "stable": { "version": [ @@ -91249,11 +91458,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220329, - 655 + 20220525, + 1052 ], - "commit": "2a8701209b273db5a35f15145ec62f32799e03b1", - "sha256": "05l65cwyw2pdyv6rn14h0axplgnlm5z7v90iwcxk9vysz74icdd7" + "commit": "ac9ba11fda58800a1cec699fbda8811644847bbe", + "sha256": "03bn22byy8p80wjdpal2w1cq2jkxdnivdd6xdkfh3vl5mb5vwc68" } }, { @@ -91339,27 +91548,25 @@ }, { "ename": "protobuf-mode", - "commit": "b4e7f5f641251e17add561991d3bcf1fde23467b", - "sha256": "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj", + "commit": "5be08102d4de84c35b18cd1e3321fe8b6836ff56", + "sha256": "0ksrgr2ymac30qcwmjzrf1jfdkkfpy91irbyp87fjnipi4dfnp6h", "fetcher": "github", - "repo": "google/protobuf", + "repo": "protocolbuffers/protobuf", "unstable": { "version": [ 20220303, 1716 ], - "commit": "b3cbea18ea02ab82379ba5d014899035aad4b8f4", - "sha256": "0x60jy244xm1gkqvsidyj8xfqdfwpn0q8knr28n4giycwlzncgyr" + "commit": "c0fc2e881bc36aafb0bf539bf41889611370f60c", + "sha256": "108i14rd0wvj04kk6mqz577g142sqs33avbflc728mnkkp9wqmpy" }, "stable": { "version": [ 21, - 0, - -1, 1 ], - "commit": "3cede25cef0c2f5f5b60461b608d8c07a621ac04", - "sha256": "0q024rd5y8kd9pjslh118vhl3awr95gfvc6zxxr6i4qwqq1jy5nj" + "commit": "e73ed1630fdec85d7fb513c166629ed49cd4eb18", + "sha256": "0h2an911grs5kdvsf4cgypa4x022rgm81arxg42ks6sdzf8895x2" } }, { @@ -91533,29 +91740,28 @@ "repo": "emacs-php/psysh.el", "unstable": { "version": [ - 20190709, - 106 + 20220607, + 1642 ], "deps": [ - "f", "php-runtime", "s" ], - "commit": "21250984ad8137aa3440ac12e52475ef03f19fcb", - "sha256": "1r0aiwdmj0y96faqvbz39wgxw91i9bj6rnwlj3a277pzlhzmyyxl" + "commit": "796b26a5cd75df9d2ecb206718b310ff21787063", + "sha256": "01j8dfgck3wlayh5spklfwvkzzckd0zwa4d5mrhpii2xsjy28r8a" }, "stable": { "version": [ 0, - 0, - 5 + 1, + 1 ], "deps": [ - "f", + "php-runtime", "s" ], - "commit": "4709a57cdcf7103c4a606be89849ea3ead2d38a5", - "sha256": "1apf6mnqp9bg5dfykgvsn02z0xpyx6k34sd2pvicicig7w09kzvb" + "commit": "796b26a5cd75df9d2ecb206718b310ff21787063", + "sha256": "01j8dfgck3wlayh5spklfwvkzzckd0zwa4d5mrhpii2xsjy28r8a" } }, { @@ -91761,11 +91967,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20220405, - 1808 + 20220517, + 1536 ], - "commit": "bb9b1e271b51b3dfae984da15f0e40f5be5b2473", - "sha256": "1m581adq9pp6q22n2dfazzmnlyb375ggk4f0ihpccrwccf2kzdk3" + "commit": "a8f6e66be99051f34f0ab2704bdea04667d8b005", + "sha256": "0h6isykcwh7b1vxm5qikcfd3g6v0lv487q7gf5j9p6v5gs1f9yb9" } }, { @@ -91945,11 +92151,11 @@ "url": "https://codeberg.org/ideasman42/emacs-py-autopep8.git", "unstable": { "version": [ - 20220502, - 310 + 20220522, + 1152 ], - "commit": "89c9ed8de2deab6bb891ae25c85cc6498e60b90a", - "sha256": "0ygvl8zq8d6lbv8x6j6vklxhc6xrmii4fd9c74py1bjqvx4d1fjh" + "commit": "d904639f1fca12435e38adb6cc602cd468fa618b", + "sha256": "1sr64n1cg1pdxfa3n8ckq3hy92asnwi2b5nl88qy3jy1mybah4d2" }, "stable": { "version": [ @@ -92126,11 +92332,11 @@ "repo": "statmobile/pydoc", "unstable": { "version": [ - 20211119, - 2211 + 20220531, + 1457 ], - "commit": "3aaffe41e1c5a9d53fbc1de02686c386fd002890", - "sha256": "1z6p1glspxr5vl9igzhginaws65iqs9h2ymi21f62x7ydm54i96y" + "commit": "c8b667e17bfe3e63221f822c5c4d58c8fb4fea90", + "sha256": "082ar5w28dknaa63mf587vdzr78xlnvh8lbxqq3hk6qa2c72akam" }, "stable": { "version": [ @@ -92219,8 +92425,8 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20211021, - 2325 + 20220531, + 1422 ], "deps": [ "ivy", @@ -92229,8 +92435,8 @@ "tree-sitter-langs", "uci-mode" ], - "commit": "eb1da7e3eb5f5754b60d404b0e341206eebe19ca", - "sha256": "1nf5ihyppviwys3qay07v25f96jj5a2yr4qh1iygv2423y63q7gp" + "commit": "9a56e701cfcdf9024dda15175e0d0fc645446019", + "sha256": "1g24545512vr07773k7lcjf4ispwkf7y3y4nivgp66fqr1lqh34z" }, "stable": { "version": [ @@ -92249,34 +92455,34 @@ }, { "ename": "pyim", - "commit": "151a0af91a58e27f724854d85d5dd9668229fe8d", - "sha256": "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1g730kh9hmc5g87n6661cbl65i7nzcmr15s975brdw3wv6nqzly2", "fetcher": "github", "repo": "tumashu/pyim", "unstable": { "version": [ - 20220512, - 930 + 20220608, + 343 ], "deps": [ "async", "xr" ], - "commit": "dcdae4db85646de85b1ca75e4604691cf9273273", - "sha256": "1432ph59plnh41xrmq59n9z987r41xf34qsxl3sbzfw6v8m927ys" + "commit": "21eb4d60d0af85099ddd820e4a367e662185beac", + "sha256": "1bj63c8hp05hah0cwsn4df3wjqfp556brqbhhr4n5sx57mfgr2xj" }, "stable": { "version": [ 4, 2, - 0 + 1 ], "deps": [ "async", "xr" ], - "commit": "cd1bfd2bbc10fe0ac47d0ec383cde453f6019e6c", - "sha256": "0lvf50p97fns4pc6ilm4pqzp7s4srhcx2gyg6x5ywd5wv32nd04d" + "commit": "6b4cea1b541f5efd18067d4cafa1ca4b059a0c63", + "sha256": "1qcdf1v20sm99gbirjycppm3rnig1qvk8iiv50zmd6z38l48j7vh" } }, { @@ -92287,20 +92493,20 @@ "repo": "tumashu/pyim-basedict", "unstable": { "version": [ - 20210517, - 43 + 20220531, + 555 ], - "commit": "86f6de3e3a1523eb278bd3afe7c4ceba2a0e2972", - "sha256": "07jrp0n5cfhlfhjjfkiqrc3aadjx1vn33dw1f39snqhqly4x4yq8" + "commit": "0e6da11c4f500f6a3642dca167592eb27066ba52", + "sha256": "0h3w44q1ivhrrhy19ckis4z54kqrh7madzjif1ai2fnxfqk0zi5p" }, "stable": { "version": [ 0, - 3, - 1 + 5, + 3 ], - "commit": "f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585", - "sha256": "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d" + "commit": "4aa30ff9f83cf6435230a987d323e48230f1f40e", + "sha256": "1xy48cvmx37sx8kcyfwjy92ym22p81a7qm48967a79bh98pydgsp" } }, { @@ -92347,14 +92553,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20210902, - 1714 + 20220604, + 1340 ], "deps": [ "pyim" ], - "commit": "4db1ca7fee75bd3aa394d620e5af2f42b3caf3c4", - "sha256": "141rzf15334r4sdqy791n3kspad8jcz4iig55mvcqabii4bqx9p1" + "commit": "e3b128cfcf218e4a0ca04189b0bd46909761227e", + "sha256": "04bp6fvqvp9myiakjak0jj4zinqcljr03v3w986zm7gs9i7hxx4f" }, "stable": { "version": [ @@ -92441,17 +92647,17 @@ 20210411, 1931 ], - "commit": "2ea65b12176e575748db64d740ef834cba577d70", - "sha256": "18fv0kibj3rj8aydyxzda4mk7qi19hg82q3rm2mdi85082628wmy" + "commit": "72855d5d08a91ca5faa8c5442ff6f4aedfadf7ca", + "sha256": "1f4q7yb159jg57wmd29300sjis8y53nr9b880cd5yb8da7j3fbzb" }, "stable": { "version": [ 2, - 13, - 8 + 14, + 1 ], - "commit": "45cbae2bab9001bb2f159103490a02d63e75ee5b", - "sha256": "1wc3h25p7pid3pzh6vaiaynzs1bqrl62dpb2g486hp3kbqdzlwp3" + "commit": "6447553ab509c9e811b7da53168e17fe2cadf187", + "sha256": "1v2qid36mig87q7cqblv0nzja7xj4ls15q5hy7jzvhpj20fsmp5f" } }, { @@ -92765,20 +92971,20 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20220505, - 1523 + 20220528, + 1502 ], - "commit": "6016c780865b3b9dcf90d9452367e0d39bbc1d1f", - "sha256": "00n2vrc7yq2cfsiwpwdga0yjl483rd59zvbdf41nxa92sircvjp2" + "commit": "bbfe9a8b2ea081c032eccfd541dac2bc46aa54a6", + "sha256": "0686f0a2jglby8nmwjfbzxjm7xd7h71safa4bphj1rb9v23kxzwl" }, "stable": { "version": [ 0, 1, - 1 + 3 ], - "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1", - "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n" + "commit": "e0af9d48023c9f999160245df64c524ec54c2af6", + "sha256": "188wrjm7yp5q08q6gkyalqy5b6cc7lkjx3xza21gkpc1iwd75436" } }, { @@ -92789,11 +92995,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220512, - 1206 + 20220608, + 1625 ], - "commit": "97bb2d5ca50bec43a22ffc6187d13e3afb38238f", - "sha256": "02i5mqx3ip6k9n09yzr395ayhf4i1l7n8sk9q0ibcm2zadxnlqc7" + "commit": "68f5313712e20e2f292e723a84ebb5db609e38e5", + "sha256": "1lhnfac9jc5p80pvi9akv4b288g3i9x2j5658z5v0g5rwfipqncz" }, "stable": { "version": [ @@ -92879,16 +93085,16 @@ "repo": "wavexx/python-x.el", "unstable": { "version": [ - 20190611, - 1303 + 20220602, + 2108 ], "deps": [ "cl-lib", "folding", "python" ], - "commit": "b1f8eaccee210d7c0580dba6dc9bd361fcf3765d", - "sha256": "0vyipfsppissa87pdnbksamdby0yl2q8nzawqivv6smn33jp6vsn" + "commit": "fef5162af9dfc1225339098ae00e053a2e16b799", + "sha256": "17nyjvbydclp2v2nrmdayxic2mj7j0frksc359ad999r05qq0nv7" }, "stable": { "version": [ @@ -93099,8 +93305,8 @@ "repo": "quarto-dev/quarto-emacs", "unstable": { "version": [ - 20220405, - 1556 + 20220602, + 1714 ], "deps": [ "markdown-mode", @@ -93108,8 +93314,8 @@ "polymode", "request" ], - "commit": "2a199735866dc34126a061c6f2990378b381e687", - "sha256": "0bdigc8d2b9g2dgdcalf5f0a7hh56sji7k78vv23ikdydmag5bi1" + "commit": "3cf4546a01766775d56b92e1c974c850ec35d5a9", + "sha256": "0r2f4m5vqxhb6jpkciywj86mxvw9zw5wxpmh56d1znids4jyypxz" } }, { @@ -93173,8 +93379,8 @@ "leaf", "quelpa" ], - "commit": "ea60d14a6c8dbe65ad0b3353185945d43ae4393d", - "sha256": "0xddhjal99q3s537kcdrcimykmzca73ic3v2abv2ymwby2wm52b9" + "commit": "9b2197770304772fa5262d0b9bfd26908746a2fb", + "sha256": "0v9ky8s3yfxvdyvc83b7qlv4xxb9j65g4iwkzc3kdn0zsbakrjp0" }, "stable": { "version": [ @@ -93312,8 +93518,8 @@ 20210904, 1553 ], - "commit": "30e9a1333fe4a83424385df53ddaf7016df3679d", - "sha256": "1k6iyzajrw7kvz027l7yddvxq4a0jsahrdhsv8is4bnz8ws36s15" + "commit": "314beae43cac2e4943e9ed4850e8e147bc3d2fac", + "sha256": "029swfgl8jzla9y6d0s4nfzpgnbn9j0b9wn0gzzdb02khp5sanqh" }, "stable": { "version": [ @@ -93471,11 +93677,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220512, - 1447 + 20220607, + 1810 ], - "commit": "3b351fbb0d3e81bf260cb3fc7b623f1b782550cc", - "sha256": "0gcyb47ld10jvrf3wm63njz0d9y70fi8dwsx14pbdcrw2xs2p4s3" + "commit": "1c88636d5da4537b897e7b9b23edfd9495a24d10", + "sha256": "12nfrdvgndn11a17zaawv2i6mbjfiw1gih683l0cj0xknx11rg8j" } }, { @@ -94175,8 +94381,8 @@ }, { "ename": "real-auto-save", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "1li0b2d93ffxjq4jdyzyvjdy5h7q5xllys0w4748d2bhr8q35p3w", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1n0hsms3g0z06b3i55gpp0xqxfychqscvfifpz4jmar87z7lvwp2", "fetcher": "github", "repo": "ChillarAnand/real-auto-save", "unstable": { @@ -94475,11 +94681,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20220426, - 2048 + 20220527, + 2122 ], - "commit": "2cfe54e9f5470415ab5f59d3c0829bfce41525ad", - "sha256": "1050bv05ljgr61jpvcahfd0cjc00n5kvdvdsawnq4fgpfj2j3vih" + "commit": "a8ec93656698c5c02a02279ee7d7976325cc74cd", + "sha256": "075x71llqa8g4a872m57vij49bsxiv42yr0sbrwcxjm6dp6q08wa" }, "stable": { "version": [ @@ -94842,8 +95048,8 @@ "promise", "request" ], - "commit": "911a1c6310b42226392fd03dc1746a4c6fc4eb95", - "sha256": "0zljjqd1qyxh0p5rjphkljbl4b1kpmjw279axxp8y4hd67rk8fc2" + "commit": "c00407087e155c4fb672e5544e2ef3cb33f1f7eb", + "sha256": "14mfv9fx3zdca1xbbs31m3c2hjxjq25692j8ln73knlgy0y659dd" } }, { @@ -95799,8 +96005,8 @@ "f", "s" ], - "commit": "dd72004f6f7b0d554dbd979f22a31c350e211089", - "sha256": "126dn4d0f301pybvrkjw3h5c729kbnaglzbgpsv5v7r35wrmxfgs" + "commit": "a94de082d8f6a1219532e85f432b4919c175fe9b", + "sha256": "0hs61cl97r6bwl2di5fjgrh6cmhjjfgk750159028a7pfcm3qyjd" }, "stable": { "version": [ @@ -95970,15 +96176,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20220511, - 1328 + 20220521, + 1653 ], "deps": [ "transient", "wgrep" ], - "commit": "c46c5167ac03f68fd6fee07972017282c62bc942", - "sha256": "1pkbkh260k2r7x158b691ppqvxxzqkyylbapwlrxzc2ly23rmaxs" + "commit": "51596cb516d7af1737d964ffdbb4c4d416d6dfaf", + "sha256": "0pka31i87mf9ih40cb8yc1scvzklb5h5agscac2v7faklranih7i" }, "stable": { "version": [ @@ -96174,8 +96380,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20220421, - 1811 + 20220522, + 2351 ], "deps": [ "cl-lib", @@ -96183,8 +96389,8 @@ "popup", "posframe" ], - "commit": "e6a89e9fa9eabc32063bffb2eacfcece46f7a049", - "sha256": "0rzynl2n6bk5lwff2rvpj0p3djnr421i1a9vm53554hk0vljzksr" + "commit": "0b4a2709159f5e975544b26302b8463deb7640d8", + "sha256": "1sk09z05xvg94pkf4181hvlg9q0m71kinzxv8223ls8df6ymc43k" }, "stable": { "version": [ @@ -96275,11 +96481,11 @@ "repo": "nlamirault/ripgrep.el", "unstable": { "version": [ - 20220309, - 1746 + 20220520, + 1410 ], - "commit": "4ed5c741233a81d96115f556784269042070901e", - "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2" + "commit": "872e250e8f93b8bb0a8a1de8bde17fd9bd116e31", + "sha256": "1n3jkj8a37ap4ndh9an5qm8dn8nxcgv9vqr8bcnxx5l0wnsvdg8z" }, "stable": { "version": [ @@ -96374,11 +96580,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20220510, - 1621 + 20220526, + 1719 ], - "commit": "3fe322e5739e57cceea37c4104ac7bc5231555c3", - "sha256": "1nc7hh3psw548mzzbcz7226i7pbyrdadmlrw955cl91z51rahxah" + "commit": "9c56c62993b9644a3c8bf6fc0a3a6599c0956707", + "sha256": "035cbj2ppxrjx8fdyjq3w7zjznzljxkcnr5pg61xw2vigd9mcjva" } }, { @@ -96536,11 +96742,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20220314, - 2026 + 20220604, + 749 ], - "commit": "5e2bcd808f301b1a92cd583f2799d520bd802480", - "sha256": "0gb5bk1c10n4hr9dbwpgyk17qmd6bfqj9v9l0bmrbdvxafmnii8p" + "commit": "f66d2177b00b277a36c058549c477d854148623c", + "sha256": "07magls67fy99ckvy759lqk2q41mi4dvljx78ahclckyp7adwl21" } }, { @@ -96614,15 +96820,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20220401, - 306 + 20220517, + 2325 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "a54ac64097b6ccc6acc52a8b077ceb63766fc4d1", - "sha256": "0s512jgd62rh0x5x24jzkmnw7hs6m1s1bcys41hr1vv27i0j2zvh" + "commit": "41224216cb7762a18eb0e309095796f3eb319e01", + "sha256": "0ym2i3w071iqh32p36fb22br62cbfs6zyhpm9khbspgmvpxaas8x" }, "stable": { "version": [ @@ -96967,8 +97173,8 @@ }, { "ename": "ruby-refactor", - "commit": "8d223ef5b9e51265c510f1cf7888b621e47bfdcf", - "sha256": "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0zz913v8hwc97qpz1c910adrhcj5ca7s72ixjnr32xq4qscmw9x2", "fetcher": "github", "repo": "ajvargo/ruby-refactor", "unstable": { @@ -97120,17 +97326,18 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20220301, - 2010 + 20220604, + 1330 ], "deps": [ "dash", "f", + "ht", "run-command", "s" ], - "commit": "02a4d366e309b7dd6a45f8a94669a25d6fe80ea1", - "sha256": "0j634n2v8sqpybbmd62jayyamz28dzlmvr45bsijbwxn6b4pa8k0" + "commit": "6cff6fff2c3ac23384d044a9c64d0e4b80721d4c", + "sha256": "1bg1ha4mlbxr13w3v7xkbdi9mqp3amljikbnkfcc5wijx572c396" } }, { @@ -97235,8 +97442,8 @@ 20220217, 2009 ], - "commit": "d17be3051b22a06d7742178cd1367aed61807a66", - "sha256": "0yslscybdvnmak1h99qgjrwqim9aiwxhnp5kw4wb4nfqr1nwm3yd" + "commit": "0df2f22479b98f76d97de90e1c390ff1b0902a46", + "sha256": "0c8bhdsip75wa966zhli2khncqf1zhbxyxfqics1lh10ncxa7qw0" }, "stable": { "version": [ @@ -97279,8 +97486,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220509, - 716 + 20220531, + 1820 ], "deps": [ "dash", @@ -97294,13 +97501,13 @@ "spinner", "xterm-color" ], - "commit": "3b379fc25b7a097a014147d9c8b83ec1a418cd76", - "sha256": "129mclfyy6nji7c3avni4y3kzi3z67dv3cv40jmlv1m4isxf59n1" + "commit": "2c5b46e4e103edb6a4f60a6e38f3bc0c3099d470", + "sha256": "1rqfbkl16c287gg4p7y6hny5020j2q11yldamdcmrk83is7v06px" }, "stable": { "version": [ 3, - 0 + 1 ], "deps": [ "dash", @@ -97314,8 +97521,8 @@ "spinner", "xterm-color" ], - "commit": "b3f4442f7198eee758958196f89a150f8de8963a", - "sha256": "18br5yfakfwcbw3vkawhw5sm41xg78cz4bimz36x5xcgbwi88k3p" + "commit": "3bdc3042d3d321a0b0c45147c22732dc6bdfcdf3", + "sha256": "1bryx1w388ryhxk0ydigqf14hfdy518g8h06gimdim6bi1npvyl0" } }, { @@ -97378,8 +97585,8 @@ }, { "ename": "s", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "04mcdjm4i1vws26l3n7s5d4nkwf9l7gr95ab18a40si7wiza5pk1", "fetcher": "github", "repo": "magnars/s.el", "unstable": { @@ -97402,8 +97609,8 @@ }, { "ename": "s-buffer", - "commit": "f1bf91527219e7afc8e113134a958f3adb862a5a", - "sha256": "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0c65zz03gw7wpx2cy889z2k4f7j1nfhi43jjff9vpcnlviyhqc9f", "fetcher": "github", "repo": "nicferrier/emacs-s-buffer", "unstable": { @@ -97588,21 +97795,6 @@ } }, { - "ename": "sane-term", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "08b8zlr8qzxfrpg9lqiyam3sb8a8rzak79ra4r6ljjppyj4zmwi7", - "fetcher": "github", - "repo": "adamrt/sane-term", - "unstable": { - "version": [ - 20181130, - 101 - ], - "commit": "369178c2dd0348250c2ec0019567688376c637f7", - "sha256": "1klwn7crvn7769b5kan91fj5lpz5sanghi4way8h77b2iciya7bf" - } - }, - { "ename": "sass-mode", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800", @@ -97804,8 +97996,8 @@ 20200830, 301 ], - "commit": "b929e705e76e8ff47d170c5e9849f86002f3e09f", - "sha256": "1iflrjldvabilvji1zmx1rmkl6z16s50k3hldn3l871gz16wa0h6" + "commit": "6aae7963498675dfb5bedaaef2cb8e56bdcddcab", + "sha256": "1ildv2wi9j1gp99l2d69gdc2a5h4i1jm17f59xr987l942mwnwnf" } }, { @@ -98074,8 +98266,8 @@ }, { "ename": "scratch-log", - "commit": "bec9692973db8853f9d329aebc0cc9e81bb34003", - "sha256": "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "15mn3i9mg6p1vcm5bdmp5wc0q945f9f1bkx1pwvns1iqj9pxdkv5", "fetcher": "github", "repo": "mori-dev/scratch-log", "unstable": { @@ -98156,8 +98348,8 @@ }, { "ename": "scribble-mode", - "commit": "6469c2b389d757003da69da727905228eb564d50", - "sha256": "0idagikxhr86h2k6fb45zdzg73wpmpiszx0gi6d8jx7s1xqd6s50", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "09l54fmpkvwikf8b1kqxndka21j2v5cj09vxkhvlc659j6l1qh88", "fetcher": "github", "repo": "emacs-pe/scribble-mode", "unstable": { @@ -98293,11 +98485,11 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20220512, - 2235 + 20220601, + 1349 ], - "commit": "be3adaf9db276e899b44e5093316cae2014b22c9", - "sha256": "0wn066zc72djac8ccss95ydi69ggngknkjh2hg0hi17g3m2pj6f6" + "commit": "ff2fdd1c38cb9f3f1abf420b77d1ef3a2786ce57", + "sha256": "1pwj9snqr87x16h02fnls90m63c3v6y35zcnr2f5sq9ydfxrzijn" }, "stable": { "version": [ @@ -98383,8 +98575,8 @@ "dash", "f" ], - "commit": "26ecae6a6d028fcbffc576a69ef8f787646bc12a", - "sha256": "1v9clc25pwbdq50xqabk36iypg2n68ip7znnhy6qwk9b3ir00zm5" + "commit": "2a0e37f818f4486dd624300a8dd77ac1b6d96070", + "sha256": "1dy336ga5268mqqhw1fpwd9zbagfldfbp11jc3yd1aasj9y32s99" }, "stable": { "version": [ @@ -98615,17 +98807,17 @@ }, { "ename": "selectrum", - "commit": "4273a6e55cf797d1fab1825618aab7e9b6c01886", - "sha256": "012jmgr7w6x0gy8ygpzyyk23adyzmr7cknz2w51zjapcilkf6ghv", + "commit": "ebc43ea653ed9623745d0379576a023729ce9f32", + "sha256": "0gjkfdny0b8l6sf44z5c3psqglvh2kp4mp60lj2ajgybv80pzb44", "fetcher": "github", - "repo": "raxod502/selectrum", + "repo": "radian-software/selectrum", "unstable": { "version": [ - 20220323, - 10 + 20220513, + 2106 ], - "commit": "7da932eeb89f1aa8060a73ddd040f95bbb127343", - "sha256": "14hplki838svbjpasmm9ik8c5xm0ji2xxrp61cq82dc6r0axg5w9" + "commit": "810ea697bdd559d97b86b795e01769cddfa3daf2", + "sha256": "1bci9vnpki7lf3v3wwcixq1ak5mgbvlxplsw5c04nckir163cqvb" }, "stable": { "version": [ @@ -98644,27 +98836,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20220509, - 2300 + 20220601, + 1652 ], "deps": [ "prescient", "selectrum" ], - "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484", - "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c" + "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e", + "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk" }, "stable": { "version": [ 5, - 2 + 2, + 1 ], "deps": [ "prescient", "selectrum" ], - "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7", - "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5" + "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e", + "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk" } }, { @@ -98777,34 +98970,34 @@ "repo": "abailly/sensei", "unstable": { "version": [ - 20220502, - 2012 + 20220530, + 1226 ], "deps": [ "projectile", "request" ], - "commit": "1294a96f544fd1be9ddaea3a85369fcf437403e9", - "sha256": "0cg7rwvfc0yf9pld50f6hnpcyq3g7r7rh62sb9wzdnwiv9n249lk" + "commit": "3538990de9ab57154e3da08d10fbd2c6228d87b8", + "sha256": "1f7q7s0ajrpgaa78j3zrff5dr1p2j82kgpvpal2lgqns4947m726" }, "stable": { "version": [ 0, - 41, - 1 + 43, + 3 ], "deps": [ "projectile", "request" ], - "commit": "1294a96f544fd1be9ddaea3a85369fcf437403e9", - "sha256": "0cg7rwvfc0yf9pld50f6hnpcyq3g7r7rh62sb9wzdnwiv9n249lk" + "commit": "3538990de9ab57154e3da08d10fbd2c6228d87b8", + "sha256": "1f7q7s0ajrpgaa78j3zrff5dr1p2j82kgpvpal2lgqns4947m726" } }, { "ename": "sensitive", - "commit": "5e5468ce136fabe59e1434f8a7f265f41c5e64c1", - "sha256": "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1q53y2lf28z8vdja13bhn1w7yrzqirbk1m02sv2w6chf40797fxy", "fetcher": "github", "repo": "timvisher/sensitive.el", "unstable": { @@ -98827,15 +99020,15 @@ "repo": "noctuid/emacs-sentence-navigation", "unstable": { "version": [ - 20180408, - 1619 + 20220522, + 1137 ], "deps": [ "ample-regexps", "cl-lib" ], - "commit": "7c5d2edeaed01196aec25031782e89adeaa089f0", - "sha256": "15za4fg7c8fsih86wz1npyx6gdmw0xhizklfsyfh84416dsmgswp" + "commit": "ea6e94a5518643acda5b6e98e4e7f47dfc107d29", + "sha256": "1wpr37gwkly0jl0m8kh7f1pkp9dwg5i1r3bpx3sd1z8c57sfn8da" } }, { @@ -98855,8 +99048,8 @@ }, { "ename": "separedit", - "commit": "297ba98f4bc011948c34aad30ae28b7adc611938", - "sha256": "00p4crbzr5fkcj8lhpfd9w44ynpmhd9fay9yrwgz0yh87lll6nqx", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1k7wd8aaq5yq9l1jpj4sl5kjcp0rhknv3gdb8hqx65kscpmksdzh", "fetcher": "github", "repo": "twlz0ne/separedit.el", "unstable": { @@ -98902,8 +99095,8 @@ }, { "ename": "sequences", - "commit": "4cf716df68fb2d6a41fe75fac0b41e356bddcf30", - "sha256": "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0s3n454zizak773svgw3rj0cn5nyq4xrhwr9vywd9x9f0xcfj3n8", "fetcher": "github", "repo": "timvisher/sequences.el", "unstable": { @@ -99555,26 +99748,26 @@ "repo": "redguardtoo/shellcop", "unstable": { "version": [ - 20220414, - 530 + 20220526, + 1424 ], - "commit": "327f5ac43e5d543149a772aef06cdb616477eb43", - "sha256": "1rmv2swyir91c6x94bggkrwankfkipfzhxzmg2c1455ybm48n3lx" + "commit": "4e71f5b9199a0ad10017104a6b2bf5ef5f207dfc", + "sha256": "10aydyxli33h4vg0mkbmni41swy78cbj85k9j0qf1lhiqxzah8k5" }, "stable": { "version": [ 0, - 0, - 9 + 1, + 0 ], - "commit": "327f5ac43e5d543149a772aef06cdb616477eb43", - "sha256": "1rmv2swyir91c6x94bggkrwankfkipfzhxzmg2c1455ybm48n3lx" + "commit": "4e71f5b9199a0ad10017104a6b2bf5ef5f207dfc", + "sha256": "10aydyxli33h4vg0mkbmni41swy78cbj85k9j0qf1lhiqxzah8k5" } }, { "ename": "shelldoc", - "commit": "551623175e55629be6cfe44a595f25f09bd889e8", - "sha256": "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0ihw3c2rg01zrmpdp61wh9xw7klbrcnh29gbsxs2143a70bmms1x", "fetcher": "github", "repo": "mhayashi1120/Emacs-shelldoc", "unstable": { @@ -99672,20 +99865,20 @@ "repo": "redguardtoo/shenshou", "unstable": { "version": [ - 20220324, - 1137 + 20220607, + 39 ], - "commit": "bc16a637edaaca831a5147b6f479ba1dbdc02454", - "sha256": "0mli3h3i511vq8g69b2y8hq9591bv5yjblvx7cnh1nrjpb4flak0" + "commit": "317a87ca4b1a3f1860d9ce88aeabac154598a834", + "sha256": "045z3h0yk5bkdiipp158s47bphmbz1fgmfx9fdm5acf1w1sdqm8q" }, "stable": { "version": [ 0, 0, - 1 + 4 ], - "commit": "8e12d366ca371fc259294485047a431a7c610605", - "sha256": "09w57wq9mw3yjklxsqm87xl2q229qwqp48ssxlp5xpwhwljgwd2j" + "commit": "317a87ca4b1a3f1860d9ce88aeabac154598a834", + "sha256": "045z3h0yk5bkdiipp158s47bphmbz1fgmfx9fdm5acf1w1sdqm8q" } }, { @@ -99696,14 +99889,14 @@ "repo": "purcell/emacs-shfmt", "unstable": { "version": [ - 20210803, - 222 + 20220602, + 1535 ], "deps": [ "reformatter" ], - "commit": "ceb1ed4df3d7e198e4c5af0c2fd44c4d9d65832e", - "sha256": "1apaka8w4iwpa2ba652zpl5kl17ixjfnws0pnmx52yyvfj7bjv7n" + "commit": "279a51defa3e0d97dc40b8a26e078699d4e22e90", + "sha256": "1kzi8gy37cm1z4x69400gbkawx4k0jafvz8m50w0b48nvrvsy6ys" }, "stable": { "version": [ @@ -99767,11 +99960,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220426, - 715 + 20220606, + 2301 ], - "commit": "7baf17355289c29d18f993f383c5d6a187f33b35", - "sha256": "1a2m6jkvnv852q07wvi80nbm7437wnvdfdyiq4iffhffmz8c2mrr" + "commit": "45155e42ea10990295d47d5ee3cb29be16a1f9f6", + "sha256": "1cjz3sli309i2qrwxic63x1am4hpn8r9gwjnfjb62b954wdhhf97" } }, { @@ -99846,8 +100039,8 @@ 20210715, 1227 ], - "commit": "09aaba23300b9fa3cfd15ceb0e62da4a3d53e7e5", - "sha256": "160ck71cwlzsi59wazxf3nl5sim6rflbs2dxhiavmv9rz2xjgk46" + "commit": "b59e0fcca14dd2d8424d8ba0800da2e35bb52cc7", + "sha256": "1vz7fvx36r0dmim7n61zi00zvdk03sjxqsh5xcd6vxfv5869hxz5" }, "stable": { "version": [ @@ -99957,15 +100150,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20210829, - 1013 + 20220523, + 1440 ], "deps": [ "language-detection", "org" ], - "commit": "b8a23e097b25d6c7754f9aaf4de89259f8a0b17d", - "sha256": "0krd112xglcvkgjl0dj6z4h9gwzh99avh10hlp4idcsm8b7hgdc9" + "commit": "b3916e1ebe2477c031db1440d9b57e373c0354fe", + "sha256": "0m357d795qcn1l2gynglzdrdc9h197vj68436hkwnc1j72zhcpl4" }, "stable": { "version": [ @@ -100464,8 +100657,8 @@ }, { "ename": "simple-rtm", - "commit": "a784f931849ca836557390999b179ef9f6e775f3", - "sha256": "0v5f0vr8sh62yvb7znx00wgybb83dfnkvgl8afyk3ry8n9xkhf5b", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "09m5akqrdn22lxr50z3x2zyldh1m62b8sbwkq6pb428bhanvhky2", "fetcher": "gitlab", "repo": "mbunkus/simple-rtm", "unstable": { @@ -100504,11 +100697,11 @@ "repo": "rolandwalker/simpleclip", "unstable": { "version": [ - 20210406, - 1221 + 20220518, + 1251 ], - "commit": "67c8c17adbbe6d9407a5ce4159d097a8b8bf6adb", - "sha256": "0lggdlgkcxzl1myddis7xy7x2qi1q91grgxpq2rlkkz70rz0xcv0" + "commit": "023f239275115169c3a3637ad95fae4a036c005e", + "sha256": "1mvjlcmldcx3vd6xkk3nriy8lghp6nqa6l13a6kax5n8dc0hi4qi" }, "stable": { "version": [ @@ -100603,11 +100796,11 @@ "repo": "smallwat3r/emacs-simplicity-theme", "unstable": { "version": [ - 20220217, - 1928 + 20220519, + 1439 ], - "commit": "2a0aaf19cf1e99c50df0d2e6225a2d2931a203d2", - "sha256": "0xv1gf0a9i3ajxd6cprr7b62xvar6r6ia5qd4sjvr8pnaw3cav45" + "commit": "692d908961990f463632089041d4705cbb1c5912", + "sha256": "0a1igxk9jrybrf8qgh8nqdqkk7i7gvq7jq66w34gi9lbckmfvi05" } }, { @@ -100945,15 +101138,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220510, - 2050 + 20220526, + 1343 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "c5342a3086367c371e8d88b3140e6db070365d43", - "sha256": "008qav1p8angqczv8l1yd2ics0pyp69x93s8xvapcrxvhv8ishgn" + "commit": "1f9a95f3a07b2aa5b01d8be427b90837be5cea6a", + "sha256": "12fndsp7rkzvs7r1srrccywv5lmr6xbp7fx96ijymff82fqblcy9" }, "stable": { "version": [ @@ -101184,11 +101377,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20220302, - 1053 + 20220603, + 843 ], - "commit": "4513c382f07a2a2cedb3c046231b69eae2f5e6f0", - "sha256": "10bzxhi5d7h18hqclxqy2z857d0sfbsnyxvrhmfkdi0h75zz7m4n" + "commit": "b501b4335096fd4306c2c1eb86382b69e91c09e5", + "sha256": "1naj8cm0rd4pimrncmv6dka73l22avypclhr00dmpnh174vizpnp" } }, { @@ -101415,11 +101608,11 @@ "repo": "hrehfeld/emacs-smart-hungry-delete", "unstable": { "version": [ - 20211020, - 1822 + 20220516, + 1538 ], - "commit": "78acd1f16fb99b66a6c9bd605a988c3c74280577", - "sha256": "0c4yrnngq1m5nwis5y26qf0mfp12qnargh7s4hd3wm5xl4n5369x" + "commit": "e06525cc1841805ebe470c876d6b966de90bc275", + "sha256": "0226lpiqnrjjdnay6nafgm118g8dkr59ilvygk4xrjcb52jjhn7z" } }, { @@ -101636,8 +101829,8 @@ }, { "ename": "smart-tabs-mode", - "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", - "sha256": "0wxrpn145z2ivdadls7p7ha16py9fani3zlwlh6s8rz18hj4ad9x", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1ylzsa069lfnxv6cf4qsqn4jil6ib5zyjwsyhgn7b7knbp00f7v8", "fetcher": "github", "repo": "jcsalomon/smarttabs", "unstable": { @@ -102724,8 +102917,8 @@ "cl-lib", "deferred" ], - "commit": "112450888f3f90f0f2a0e43e49eb5a7e49b1b6db", - "sha256": "1dmchr5mg84xsyny0xnwwvvqcn09kca4r85amy1h7b0qv7p60vv4" + "commit": "f65456e9d91487cde6f4b31134033466e7db716f", + "sha256": "06khvgz76gn6d0594rl8g37y8gkx11axv85vhiwvcl8cg0qawikl" }, "stable": { "version": [ @@ -103111,11 +103304,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220511, - 143 + 20220518, + 117 ], - "commit": "701e7c49c38babaa2b2071febd2b112fef600683", - "sha256": "1wkqrlwh9n827x49m71j5ilkgk9xn6smxi11cfbd35hbdkdf5gyn" + "commit": "e23ac498e9c96f5e93569271d192e6c247134412", + "sha256": "1dyc7ax2idr30ph2y05lxb94pg0qnpj23l17bg0rscv00pg8883c" } }, { @@ -103153,11 +103346,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20211231, - 758 + 20220608, + 1422 ], - "commit": "a4be22b5b62a6be1e749df6f64b06e16a6b09790", - "sha256": "192fw278mmgqcbagigl97rwlj0jks63vmzgdpakhcr8as8ybc9gz" + "commit": "7e30c439729d5635ddd341ad5ab16f832a4619ea", + "sha256": "18xgqp8r1bgj63g2n08jbx4jwdcjn3p2lpdndyvfm394y2nzkcxr" } }, { @@ -103245,8 +103438,8 @@ 20220507, 1118 ], - "commit": "2f2fd6de0003edb1038b7c639cf23264d1406993", - "sha256": "1p23c2y124xmd3zwfns4zmk460vxd459dds0w0k9mnjnm9p8dkq2" + "commit": "1299bfca2ec9bdca0424fcaa330ddadc8f8d1143", + "sha256": "0w8ydbl1wnjn4wj8zfypab5pngxgmg4d06srkarfym2v75ksass7" } }, { @@ -103666,6 +103859,21 @@ } }, { + "ename": "sql-trino", + "commit": "141f76317967d6561d722b6dc390adf65774654e", + "sha256": "075fj37qc6h1hqshybddavppv5dnhnxbsfnfc37j7snqjndzxkmi", + "fetcher": "github", + "repo": "regadas/sql-trino", + "unstable": { + "version": [ + 20220502, + 851 + ], + "commit": "bad7be0bf2f6d2d653a787a4b5bc6a281a8bea88", + "sha256": "0b27b8nbghxfqynr6sfadpmwlsixn4hhqqmczc3i9i69sbm2m8a0" + } + }, + { "ename": "sqlformat", "commit": "6bdaa1ccae12f2ea779ac6989607d8027feac2c9", "sha256": "07lf2gx629429b41qr04gl98gplb538gb5hw7idzrmi3higrmv8m", @@ -103725,11 +103933,11 @@ "repo": "pekingduck/emacs-sqlite3-api", "unstable": { "version": [ - 20220501, - 1217 + 20220529, + 1106 ], - "commit": "68eda59d5f3d29d0a64d6256d58b8c1f93ba3583", - "sha256": "0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2" + "commit": "2f6095201b1d943d92cc017e100eec571a8d2aab", + "sha256": "00kxjvfgw3qcy49l5qkkxar32m7kk25knc9kij7xr8fz8pqhr633" }, "stable": { "version": [ @@ -103833,11 +104041,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20220406, - 1831 + 20220526, + 2233 ], - "commit": "dbcdc58d3ea9e0767b24bb0f05fc8de8849889fe", - "sha256": "1a7s7p3lq5gvgkw9ldzgg8nvjap4j6szdk0gw5njq02jccfzc7ll" + "commit": "3e5fbaef46126634c58d0f39be4bc522c05de1f9", + "sha256": "1wahhk2fssjasiz691pkh61qd6x8dbabv4vrwzvc32r9vy8xpyg5" }, "stable": { "version": [ @@ -103988,14 +104196,14 @@ "repo": "death/ssh-tunnels", "unstable": { "version": [ - 20220410, - 1424 + 20220606, + 1229 ], "deps": [ "cl-lib" ], - "commit": "a74488a71c2827dcaf42d9381d0d974aca96e27f", - "sha256": "0lrfrzxwjrhj90ampkg92pcpblb4i7744kwx2sl6ivkp7ldklyfn" + "commit": "191013b83f3ec3214394a1ed698c4cf38e4d9047", + "sha256": "0l50d8vkfc5hv1j5j807a398ghv4ap19mpiv75c8l5k1mbrysald" } }, { @@ -104273,11 +104481,11 @@ "repo": "wavexx/stem-reading-mode.el", "unstable": { "version": [ - 20220418, - 1136 + 20220522, + 1053 ], - "commit": "a8bacd80fab6013c09e4e8d337fd88267cbe2ff8", - "sha256": "0ib2rqybwjxclgqy6bp0gmgr6mvyp434mf9ix6m8by3jrkpppvgq" + "commit": "6efc9962e3a19a452c7ab9636cf1e2566a51bd38", + "sha256": "04kjf6byxp66v6iprp8wcymi283c46fb4w4wiyj64pp76y3g59az" } }, { @@ -104375,28 +104583,28 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20220430, - 1144 + 20220523, + 1424 ], "deps": [ "async", "dash" ], - "commit": "58018a1747273df23dec08ec5d318da1960428c1", - "sha256": "0jbj24pbc07gjb6zk29yzjrd80c4aaqfp2mffc4qqisws0f8gfvb" + "commit": "14fe70fcce24a045f34e42617432a2d830906b98", + "sha256": "0854qx7vfycf8dfr8amksb0iv4nydbqn0g5357s3dfwmpj6rvvzk" }, "stable": { "version": [ 0, 1, - 4 + 6 ], "deps": [ "async", "dash" ], - "commit": "34632dd99903d4ffbb78a2deb5b658291a6cf040", - "sha256": "0rq8qimc3xfh1x9g691x2bmmy9a1bglv6180hdc5z6irv5gfszvn" + "commit": "58018a1747273df23dec08ec5d318da1960428c1", + "sha256": "0jbj24pbc07gjb6zk29yzjrd80c4aaqfp2mffc4qqisws0f8gfvb" } }, { @@ -104476,20 +104684,20 @@ }, { "ename": "string-edit", - "commit": "20fd24f22ef734fe064c66692bf3e18eb896f1ac", - "sha256": "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1z2m9dskxcvbrcdx296qy5spbqd9gf1fvgqwsf9jy5487n03nyhh", "fetcher": "github", "repo": "magnars/string-edit.el", "unstable": { "version": [ - 20210405, - 1836 + 20220604, + 2128 ], "deps": [ "dash" ], - "commit": "0e225df6f8740467231c787a50025e4552b3eddb", - "sha256": "1x5b3iq1c25c74jb77qw3zijblp6zx9kp9hzsb0wfx66lp4wn2wi" + "commit": "d7c4b9db6c4987b5c022a9858e6302a4c53aff5f", + "sha256": "1fr17145rk62wc8h4vr164ya8vr6ifyy0h4kzbsgwwkh6qji6aym" }, "stable": { "version": [ @@ -104828,14 +105036,14 @@ "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "transient" ], - "commit": "ee2b1f20521e647472be7553242eb2253809e1d1", - "sha256": "1j8q47vvvsdfb9hg2r72dgmg2a886aa15yrvi6ahp7g5z4jmp19k" + "commit": "e9acece0f840bc6ea096ae56e77573939a2c510c", + "sha256": "0pynzc34bzppdfl1bxkhb0r7z4c0kd1bil5vblnyn4gnjx00jb94" } }, { @@ -105055,11 +105263,11 @@ "repo": "bbatsov/super-save", "unstable": { "version": [ - 20220426, - 1056 + 20220531, + 1745 ], - "commit": "71c26cbd47d993fff37e572523ea79c9c49f5caf", - "sha256": "1r56g3h7cn2p64lk5d9zw2hmr7f5xzim1ccydzi8i1g7m7rzlgjp" + "commit": "6f6512bc44b09f7187e58772892fa330f4518c12", + "sha256": "1nbkx8hphszwn42g75f92n22zkp8kjl3pr0rbfpwdzbsla5lm2dz" }, "stable": { "version": [ @@ -105169,14 +105377,38 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20211229, - 920 + 20220525, + 1752 ], "deps": [ "svg-lib" ], - "commit": "07640c97a1dcc305010a384fffdaa7788c342da7", - "sha256": "0f5p07li2nr65jil57b52qiryp8b5blzcnymx05cc4pm4m539aff" + "commit": "efd22edf650fb25e665269ba9fed7ccad0771a2f", + "sha256": "1qwbhkl0fd22yymncmsw5ivrhwsl42mch64kai6zpn1q0aclk1dx" + } + }, + { + "ename": "svgo", + "commit": "63366b06071a7c5a54a47cfc7a0529f83e44a1c4", + "sha256": "1dg3ziia58jd88y02ndr617cyxvwpwsp70v9226ilgi76xdw58d6", + "fetcher": "github", + "repo": "hupf/svgo.el", + "unstable": { + "version": [ + 20220525, + 2059 + ], + "commit": "40ddd6f47966561344bec8f46235e40dad99115f", + "sha256": "1h06dimzii1acnf42jg0irwr5sjlr9br9dkrndx9wl2wwhjnwzdz" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "commit": "9b01cc9eb1fdf2731cd2b931a7dfe1f601b70786", + "sha256": "1qdyzf5k1azqqkhpqm3qwz4h4pm57x141i0z0wq40sf5lwdk9wk9" } }, { @@ -105469,8 +105701,8 @@ "deps": [ "ivy" ], - "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", - "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" + "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", + "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" }, "stable": { "version": [ @@ -105674,20 +105906,20 @@ }, { "ename": "sxiv", - "commit": "7a9ad1ddf9387323c8c3a48f7e1443be01f95440", - "sha256": "1yiwdrg3cgxpjijk7hxl7dv7q9l3sk0ga2896110yc2f2prjm9fc", + "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3", + "sha256": "179mqhkm52mccyxbwfl1sa5ky3zrivz6lb2vjnk54117l5ifzv07", "fetcher": "git", - "url": "https://tildegit.org/contrapunctus/sxiv", + "url": "https://codeberg.org/contrapunctus/sxiv.el.git", "unstable": { "version": [ - 20210514, - 918 + 20220530, + 14 ], "deps": [ "dash" ], - "commit": "028409c3a9ff7ba33a1cc2158abfc1793ed50717", - "sha256": "0zscfz1f6sgf4b9arfj9bmyvxqlpphm7q36k73zn5hn28kzd9di4" + "commit": "47f5b2fbb94c569dc5e71cbe4de9c6eabbbc69e8", + "sha256": "0j0dqab5br92qz9wz3ssjps84dr0q28x11065cx90b6gis9wvv5j" }, "stable": { "version": [ @@ -105838,8 +106070,8 @@ }, { "ename": "symon", - "commit": "3f4bbc6b3d7b2e2a9fbe7ff7f1d47cda9c859cc0", - "sha256": "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0xrfvx09qb0pbpr7ck0w3sr6hyw0wl6vkcc9z6qkym37qg9harwm", "fetcher": "github", "repo": "zk-phi/symon", "unstable": { @@ -106370,14 +106602,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20220507, - 607 + 20220607, + 526 ], "deps": [ "project" ], - "commit": "24266c6c9a766261a8c8620692dfa4000f3e1d5d", - "sha256": "1fyfpi31qy03qpxw8hpjgykn67pvflgah3agwf053iqpj1krh1gz" + "commit": "0ce73ece84027939428ade3d46706cbd0a61ec3f", + "sha256": "09li624kg8p5637lq85sl6f4lrmlc71a9cgy1xj0rs63jv2wf3w3" } }, { @@ -106397,8 +106629,8 @@ }, { "ename": "tagedit", - "commit": "8968e2cd0bd49d54a5479b2467bd4f0a97d7a969", - "sha256": "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1qykq6y6vqswwj9f6m5srp4imd841l94jhajzkpyaaa51saywp56", "fetcher": "github", "repo": "magnars/tagedit", "unstable": { @@ -106492,11 +106724,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20211222, - 1100 + 20220525, + 1311 ], - "commit": "774b03f932bbc336ce5f943af175d5faa651f2e0", - "sha256": "0nl73ggirjs0a6zapqpp4h2wszkfbj8956qn3yg86fc0hk9jiz05" + "commit": "bdf1dd6ea9c43d07b22dfa15fec0dcfd03544c63", + "sha256": "01q6c2k9lkz1zpi816b9s99lwrnlf4ni9r0z45jx4fljsy59c0i3" } }, { @@ -106737,15 +106969,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220503, - 349 + 20220602, + 2031 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "29010616931f52e3a5aa9d155c14873c09c7306b", - "sha256": "17cshy0ba7jiq36rj66k6m8swijzvpnwpfrgy0xvhgxsz115bhp6" + "commit": "892ac2e88f764af516abc307ff199cb819442e4e", + "sha256": "17ysqxb5j2qi3kkjwnb8rvwan6yz90av5967sypdss2by0hlwd97" }, "stable": { "version": [ @@ -106998,8 +107230,8 @@ "key-intercept", "term+" ], - "commit": "fd0771fd66b8c7a909aaac972194485c79ba48c4", - "sha256": "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w" + "commit": "2d98e976877a5ca71500ab57377b6e5a129fa2f3", + "sha256": "0jyl3jwbx6msbd2x1qlicdfbyrv71f1zwdh43zb7zif4i6r40znq" } }, { @@ -107017,8 +107249,8 @@ "tab-group", "term+" ], - "commit": "81b60e80cf008472bfd7fad9233af2ef722c208a", - "sha256": "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q" + "commit": "cd12a3744d4b7d37a002f4f7fcc4a45ea5be95c3", + "sha256": "1qxzs6z0wgzcrfl8mm0fvliax8k8ns0fww03pjjvjfskkfzlwmrk" } }, { @@ -107217,22 +107449,19 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20220510, - 806 + 20220519, + 552 ], - "commit": "24cb30dea30195108f85aceea28f086a84d47e5e", - "sha256": "0cqj8g1pbq24d6zgsd0dq85sam2sl7w2y29ksnv4a93krjw1i2hr" + "commit": "c16a500926416c09cd2faee6ab9541686b51e34f", + "sha256": "1iv1c2mbvhn00ha46c6f98j9syc71xhjpk8m5wa5p32sk4wcc9f4" }, "stable": { "version": [ - 1, + 2, 0 ], - "deps": [ - "cl-lib" - ], - "commit": "e176d1675dc5c41b6aebd05122fb2efc44b6cff0", - "sha256": "0dj3z8czvziszb20sizgf1yriv4im811rcfadm7ga9zs2al56kqy" + "commit": "c16a500926416c09cd2faee6ab9541686b51e34f", + "sha256": "1iv1c2mbvhn00ha46c6f98j9syc71xhjpk8m5wa5p32sk4wcc9f4" } }, { @@ -107707,17 +107936,17 @@ "repo": "monkeyjunglejuice/matrix-emacs-theme", "unstable": { "version": [ - 20220503, - 1325 + 20220607, + 322 ], - "commit": "f2f69c3aa9c76dc3c27e9bf3c965e66f8b7f61cc", - "sha256": "00jylvw3h1r8lvpw50ca9gwiq4g8frxh7rhibdm9zisvjzw27p5w" + "commit": "403226efb0c38898a8a848c60b8da0f94470b055", + "sha256": "19dqbynjhwcyxdzp0zxx6kxzdb2kz9bal8xhpblf16ajga593g3g" } }, { "ename": "theme-anchor", - "commit": "74f79dc5db5246a2f70e4d4ad76601be8b5c79d8", - "sha256": "15819kkxvhk03yfzd0qp78d5ayc33cm064gy7fdpi0aq28nbw6ba", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "12vdip9v2hz16scc936kbxr4jp9cnmkzri5w1sz9w56hfrav927l", "fetcher": "github", "repo": "GongYiLiao/theme-anchor", "unstable": { @@ -107904,18 +108133,18 @@ 20200212, 1903 ], - "commit": "200776bcf1296360707c5b8a3f18d2b8817da888", - "sha256": "0s1pzpcx6g12hnn48gfyfp9wai5yk6rnsjzn82661rdmhjwm2z64" + "commit": "d00a78590a91c6fccb361713d32b846c22164af5", + "sha256": "059wbqiij52hxmx0i65baifk421d2i2qrnsp51i5ayk5w8ai1iwh" }, "stable": { "version": [ 2022, - 5, - 9, + 6, + 6, 0 ], - "commit": "321b08352d043708869d5c15f961610392afca16", - "sha256": "0pynyavfwwylqibj4az58a3q45di540d0j6dwdwywihn470cinvz" + "commit": "954b49b17037fe12fdcbffadcf42c0e525b3233e", + "sha256": "1w4yjqpqah3w2c58m6b73qsamknsy9i1i8rwgqnw9srr1ba6as55" } }, { @@ -107971,8 +108200,8 @@ "deps": [ "haskell-mode" ], - "commit": "39389e4080144c6734dbe3020cc35185f025ebf0", - "sha256": "14gb1az5gmlq6j7lx4d2cdkb9kr0jad6whd4b0l9h608s86057v7" + "commit": "fda9c1ecb3722698935245e5409ef8ccdfca16c8", + "sha256": "117r67apl06z2smyb5j2a45m4a9s2i8izjxllascc18q4vjlrqxl" }, "stable": { "version": [ @@ -107995,8 +108224,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20220429, - 1501 + 20220514, + 614 ], "deps": [ "cl-lib", @@ -108005,8 +108234,8 @@ "s", "typescript-mode" ], - "commit": "83c34c636f47cb0c10c7d1a728fa308bfec40890", - "sha256": "19yg6zij9jx39d8b6c41ipa0z99q0af4l59pmnpxv8pfadxvi9qg" + "commit": "96bfc5da11a9b83b32368c38e933a405270652de", + "sha256": "1py0z8nrkgh3lzsmgxq62bi2nbdx3c97194frjyb5wl81kh4pbbp" }, "stable": { "version": [ @@ -108033,11 +108262,11 @@ "repo": "emiliotorres/tikz", "unstable": { "version": [ - 20210927, - 1704 + 20220526, + 521 ], - "commit": "f9ea0793affa34be29e1861bfa559fd248b7d22e", - "sha256": "03jcj6vkb8i7jqfwyiix5achq5bgwvjz97w2pwr46v3hbrf4r62q" + "commit": "4b205afc5c88f050639135d1d57f1276db323842", + "sha256": "0ykhlyq45r0nzv03kbmdwxbhrydpls6iihcf0g43nq0fhswb20g7" } }, { @@ -108220,19 +108449,19 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20220501, - 1753 + 20220525, + 1239 ], - "commit": "935e4907f01fba2c7c2ecaab88eb7c4163955c3b", - "sha256": "0651q30pvxqdfv31mn87jxxkhds3f7bqh8bl1dsn7k9l1j6l3xfz" + "commit": "5c6f406bf5815e6b72b09093b651b09c7c6769fc", + "sha256": "04wjz4xzbb5ps16bfvwd39ifh7y880g4n1di76kn9mylc445a0kq" }, "stable": { "version": [ 1, - 2 + 4 ], - "commit": "fe86f7d9864d986c7c8c430b6100070ab86dbbf1", - "sha256": "0651q30pvxqdfv31mn87jxxkhds3f7bqh8bl1dsn7k9l1j6l3xfz" + "commit": "02281cde75ab7e5bb624003dc0de035dc14f2469", + "sha256": "1xv0cjiwl86hvyb9f8awjwx14b158qpnlmfxlxn7f0z3lzim9d7x" } }, { @@ -108243,19 +108472,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220501, - 1509 + 20220525, + 1238 ], - "commit": "1318c58a118c6c5a95a82e71da5eda6bfcf8f143", - "sha256": "1vav4f6g86fh71ddprql0m8b05f4h8l04n7jfskfmvpfwgw2w87r" + "commit": "d9ff61d8e5393952e19da434b9f226be75eee493", + "sha256": "0649npmyj4x1hi57dic7gmr49723q0dv5ccj824qjq3jb0ng21hm" }, "stable": { "version": [ 2, - 0 + 1 ], - "commit": "9e1a12a494537472fb1f9f9f23dc38b8bca1f9af", - "sha256": "0bndwcpz2alzimlmkcpcdxsl5xvckks22xmqn78rkg9pscl10gjq" + "commit": "d8db5dceb95144ad50c1dc3577196eef7a10d5b3", + "sha256": "14r325a9qq9xigqbp03dbblc8lnw3hz7hbnmj9d58jshd6avdcnc" } }, { @@ -108341,17 +108570,17 @@ }, { "ename": "titlecase", - "commit": "b82998e77fb69c640077db8d9a37c7c25859f820", - "sha256": "1rvlzq2b7rvp91ac689na04mdfirryxmp820xfzvxz4cm483knc8", - "fetcher": "github", - "repo": "duckwork/titlecase.el", + "commit": "eb90d69154a8977fab35f4a272274b34320af4cd", + "sha256": "0qc5xqjj742qr46ylb949wagvm06j6xwkh6n00w8h9a76ims1v9c", + "fetcher": "git", + "url": "https://codeberg.org/acdw/titlecase.el", "unstable": { "version": [ - 20220510, - 331 + 20220516, + 1909 ], - "commit": "8f609e46d4d0c06cd442352ca7d296e2ccb1b62a", - "sha256": "12ghq6zcv3ldcfr9c0zhlrq8kscf7fz2irpil7zq926alcqiqxkl" + "commit": "ca79d9b25e8bab5eef92b13dc69ac0c38ac39172", + "sha256": "179h6pzz2nw6b7zbp6w67xckhh12fibk02wh1jyv1i8nic32sfr1" }, "stable": { "version": [ @@ -108474,16 +108703,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20220412, - 2337 + 20220517, + 1814 ], "deps": [ "dash", "org", "transient" ], - "commit": "f6906be346073f082a6d1f9ae14932ec2bfd99f5", - "sha256": "0iwsic69cffwiy63dhxmypy89zvadrr82pjcn228ipdnimkgd11p" + "commit": "f9ec1e730705f1fc8888f11a2b4ef1a4907e2f0b", + "sha256": "0kay18q6nr8skib17hx2sswcxdzgp00wf23avnnqacy90x540pv8" } }, { @@ -108548,8 +108777,8 @@ "deps": [ "cl-lib" ], - "commit": "09166f32d3ece2b297da036f0abbeba63329580e", - "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d" + "commit": "7725c08f00a463ba7210efcb759c934223c85b00", + "sha256": "1dqascm5ds9jzp4m4hdb4l9wwfcnkc1ba3y4m24ybx43gjj38sxn" } }, { @@ -108605,11 +108834,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20220509, - 1324 + 20220601, + 708 ], - "commit": "a1a224d96665ee14c059eed63dc4b458f6b7a8d8", - "sha256": "0amcvd7x1llfjk2a78rkgia6n7vmrpqnh4xq28aczsi1z6khnkvz" + "commit": "3e7e946f0e474fa2d2a5bbdddf7f168e6ed759ba", + "sha256": "0jd54rxrc3b26z3d9p4d8bg9dxs5p20s5qkc0h3vfbwfhcjj2vwf" } }, { @@ -108626,8 +108855,8 @@ "deps": [ "magit-section" ], - "commit": "181021cd881eecd604a546d4a717866a81c7a511", - "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1" + "commit": "08db7ef62b3bcab5e1e1abf0a427d478db04420b", + "sha256": "01zyk465w5j74jal1nqcn00ppn093mg227zj5glgx21qvym0lms2" }, "stable": { "version": [ @@ -108658,8 +108887,8 @@ }, { "ename": "toml", - "commit": "bab369a63ca0e7fcfacfcb9ac3847ac4e631b28c", - "sha256": "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0f081wsvnycbqxpxz61figphw3sn5pg05lxr0vwvzypdkrvwb8xv", "fetcher": "github", "repo": "gongo/emacs-toml", "unstable": { @@ -108739,20 +108968,20 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220512, - 2008 + 20220608, + 1302 ], - "commit": "86127bf20f241a3c421b13523f0de6590fe42055", - "sha256": "1ahi1kgfis3khbgr3ps9ms71nc4b10aydd97q9mpm6h5rxvl2iv8" + "commit": "6692cd1346ce0b0a1fbdcbfa496b49365bcd660b", + "sha256": "18lj15y63lx57vzximsa0f7rhbr4vr39abj0r4b7fl5ivs46k3gy" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], - "commit": "9760a3ab5ebcde43ab93246fd9cb93732c5d8647", - "sha256": "1xk4nyivzhlxigsxbxfhvf7zp8bwbmp5hkzcqnz8xg9b6zdn7lz8" + "commit": "6ed32d242666b4a38276de433aca9f6387dd867b", + "sha256": "1yxcig19wkr0592iips3bh7mj1g9yhv0v2yaw19jaxqg1rzg3hip" } }, { @@ -108934,32 +109163,32 @@ }, { "ename": "tr-ime", - "commit": "b7ea719d0923650050b252ec0ff6fc8bd7484e99", - "sha256": "0py1qq6wnyg3mn0smnrxijvx5spy92cgn0awa0svn375css79kbk", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "1ij930ixa6dcxwsgi4gjwrzrhldyqspqf12flma983ykhn3km39k", "fetcher": "github", "repo": "trueroad/tr-emacs-ime-module", "unstable": { "version": [ - 20211120, - 718 + 20220604, + 1107 ], "deps": [ "w32-ime" ], - "commit": "e6313639afb51d91efcc417bd0c81afd13bb079c", - "sha256": "0hcqpvvjndddwcg81c2xz3msjghilym5lvbayc6wj0hk47xs9ylc" + "commit": "87f0677220b755f947fe5f373b6a34e1afb82f3c", + "sha256": "1xvhagynkhx4l0smbg9lz1kas7y25jpg66m1q5b32z3aagm90sb1" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 0 ], "deps": [ "w32-ime" ], - "commit": "5cb95d1fa59f46215d637916168a9eb1fc5e857f", - "sha256": "1xixsfzkv4hdirwm06d55dvdkfh2jvhpkl8r91a1xlqqg20f6rag" + "commit": "87f0677220b755f947fe5f373b6a34e1afb82f3c", + "sha256": "1xvhagynkhx4l0smbg9lz1kas7y25jpg66m1q5b32z3aagm90sb1" } }, { @@ -109015,8 +109244,8 @@ 20210713, 1609 ], - "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", - "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" + "commit": "41cdc116b09818d33f5cb0fc1d72c025c23aa2f1", + "sha256": "0hmclqaagnqvyvxb93vi1qdyvqm53hsyjyv1b4zh79hwzvn6s8g3" }, "stable": { "version": [ @@ -109113,20 +109342,20 @@ }, { "ename": "transient", - "commit": "325cca8031b99c6abe2ee9858a6b547d1af0cdde", - "sha256": "1pq7pimnkx1j5mia4wjahn9bd4c0jzm98bhhr4am8j8pg2pym49s", + "commit": "af5c1593052d63146e850683c461a760ab166033", + "sha256": "11a2m4vdccn2yfn5aj2g5smiml69vidir9ss8c70pld17z1wzx07", "fetcher": "github", "repo": "magit/transient", "unstable": { "version": [ - 20220509, - 1943 + 20220527, + 2213 ], "deps": [ "compat" ], - "commit": "6fc09a663e408ade0d1b88f47701c96a9b051e34", - "sha256": "0xihkzz94s84xkl60hi388lhcdiwnlyq2mpnnqn0vf54amjfdh7x" + "commit": "2e4426fe8161893382f09b3f4635e152ee02488e", + "sha256": "1ila9yn99vbbllmzn3ysfvwhavc930g9av6faqai8m4abs0j05k5" }, "stable": { "version": [ @@ -109279,8 +109508,8 @@ 20200910, 1636 ], - "commit": "1e151e5fc841688f1c4d68e9acc0f7b410cd754c", - "sha256": "1x3xdv789b3j8zm1zpd8v1m0712p1z9xi553yspp714w30dzxrs5" + "commit": "4128b85b1ee075a55c88fd53d04823cb48a3cce6", + "sha256": "1b8df9bnsyx8gx70inp2waxi00n5bq7j0w7sgjp9bcz3514iwd76" }, "stable": { "version": [ @@ -109423,8 +109652,8 @@ }, { "ename": "tree-sitter", - "commit": "f07a741d1a14f99a634041cc9b4c200e75461ae5", - "sha256": "0rnk77pk0rmfl9azag4l2q3x2f1achykxjdm0q7aj82rvf60f5mb", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "0y02pqxwpz6q00n2d2m9xnry9ig7kp1f88lshs3crvm1bl7j8609", "fetcher": "github", "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { @@ -109556,8 +109785,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220511, - 1852 + 20220601, + 1749 ], "deps": [ "ace-window", @@ -109569,8 +109798,8 @@ "pfuture", "s" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -109606,8 +109835,8 @@ "all-the-icons", "treemacs" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -109637,8 +109866,8 @@ "evil", "treemacs" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -109667,8 +109896,8 @@ "deps": [ "treemacs" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -109698,8 +109927,8 @@ "pfuture", "treemacs" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -109731,8 +109960,8 @@ "persp-mode", "treemacs" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -109764,8 +109993,8 @@ "perspective", "treemacs" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -109796,8 +110025,8 @@ "projectile", "treemacs" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -109827,8 +110056,8 @@ "dash", "treemacs" ], - "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", - "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", + "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" }, "stable": { "version": [ @@ -110152,11 +110381,18 @@ }, { "ename": "ttl-mode", - "commit": "f91dc8c20b7b8a06cc2ee25b6f376aac3a6ad2c8", - "sha256": "07jryy2dws2q0v3184fzijx68gz65rv83csfwr5llm9ic6xmw5ky", - "error": "Not in archive", + "commit": "0575169e8fb9a2537582f5aa77fc9950f1f1384c", + "sha256": "1fi8xxzwz3h7kgn69h4p1wlvhvia0v8qqh7k64pgh44b2fq040p1", "fetcher": "github", - "repo": "nxg/ttl-mode" + "repo": "nxg/ttl-mode", + "unstable": { + "version": [ + 20170920, + 1329 + ], + "commit": "8aa647178942c9be58e5c9cea1e6ede30c8fd562", + "sha256": "0sy8v6m4769390mj8qws106m4vky0hkc3dqg5142icsqiybhmsw0" + } }, { "ename": "tuareg", @@ -110574,11 +110810,20 @@ "repo": "md-arif-shaikh/tzc", "unstable": { "version": [ - 20220126, - 604 + 20220513, + 434 ], - "commit": "3af821d2125a67786f93d50d532a71f681f381cc", - "sha256": "0zd0g5qdm4w0jj37n0ijcknz74xgb3f9s0w72qz8zapf5n8q9mbp" + "commit": "f4e2273b65ace1ea56c9824c3bdb97925c98c8ba", + "sha256": "0aij1425cwj7423nls1dywxsr2xvzbmz0y6b2rargicxl066swrf" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "f4e2273b65ace1ea56c9824c3bdb97925c98c8ba", + "sha256": "0aij1425cwj7423nls1dywxsr2xvzbmz0y6b2rargicxl066swrf" } }, { @@ -110852,8 +111097,8 @@ 20200719, 618 ], - "commit": "b7b5bffe242fd15b9eb8fe5cb7c9b45e474babbc", - "sha256": "0rbm3gq1b1w1f3gg7h9sncjp088dg7rd5vn3vakh140p289rwirx" + "commit": "1bba7a3d42885a7ce432ca18d3755c40f2af6d27", + "sha256": "0hql80w0zl87piwwp2q3ccl71vd3c064kppv9kdrz6lnh3amjh3k" }, "stable": { "version": [ @@ -110947,8 +111192,8 @@ "deps": [ "cl-lib" ], - "commit": "ec95d5038425bca375865803701c971a9c748114", - "sha256": "0k6mrsbfhacz4ipcggb4x3gln8bqz2nxk8zapidz6vb11fgay8my" + "commit": "81350551de9cdc4a9a3e4f00ff5907714eef24dd", + "sha256": "0s95cskrkyrz60v7hvsf3s4nkil82xclmkphg1fax7xgf27vnc1l" }, "stable": { "version": [ @@ -111275,20 +111520,20 @@ "repo": "DamienCassou/unify-opening", "unstable": { "version": [ - 20171122, - 2012 + 20220521, + 911 ], - "commit": "502469ddba6d8d52159f53976265f7d956b6b17c", - "sha256": "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61" + "commit": "9d537094220f5ec329b196e269e18b45dbdd1fa2", + "sha256": "06awa2bmdpxxazy3j24pd11wqmym6p9xzd9dg407wg2v0n3x7im3" }, "stable": { "version": [ 2, - 1, + 2, 0 ], - "commit": "502469ddba6d8d52159f53976265f7d956b6b17c", - "sha256": "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61" + "commit": "4c6e3447e203a51af116a2117e88d41114950205", + "sha256": "0pmln3z3vz3qnxbv79n8lrk28k9759czz6wllk81m1np5k6yjhnj" } }, { @@ -111796,8 +112041,8 @@ 20220220, 150 ], - "commit": "0cb20745e3889f4eb8ea49c4a748f34f9ddf1fa6", - "sha256": "1840m49s0wnk376va05n2vq9877x3siri15da8z6mqrh02sj1fa9" + "commit": "4cc7a372f035674f4037a0051c125739bc2e3299", + "sha256": "0dpwsfg3nmr39vxidk2jlsd1f4dryalzcbh6fcszpmhijx2pk63p" }, "stable": { "version": [ @@ -111932,8 +112177,8 @@ }, { "ename": "v-mode", - "commit": "247cab604cf0ef6078f5b0f5887526bcbbcefb70", - "sha256": "0jky9y06fqj06m4mg95h8k3h5fihf9j9qj4w3n836qg5lnb4ywga", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0a5arb0d6r868j4y83d4j8wi1vn5xfx5ccsp41ix5fz5ldpzpw1w", "fetcher": "github", "repo": "damon-kwok/v-mode", "unstable": { @@ -112204,11 +112449,11 @@ "repo": "venks1/emacs-fossil", "unstable": { "version": [ - 20210928, - 737 + 20220607, + 617 ], - "commit": "7815c30d739a01e1100961abb3f2b93e0ea9920f", - "sha256": "0j33cmnl9ka2r7ahf84dkj6y2lf8m455986y7rms1d62ih9fq6ds" + "commit": "8ce6113aa272583130e5f929fefd67115c8f572a", + "sha256": "087na2g22dnyw52cwaxkzdgbl13p2ldvby7lmqg05bm02cmsv9c2" } }, { @@ -112243,26 +112488,26 @@ "repo": "redguardtoo/vc-msg", "unstable": { "version": [ - 20211224, - 1354 + 20220526, + 1435 ], "deps": [ "popup" ], - "commit": "3ad560afc1e0610acd1ce4b9509aedae66276b91", - "sha256": "02lbjpfyy1hl6kdml9mm7m8aaawaphwqzk3cljw50a0z2m7xrk63" + "commit": "720c6f0e699f25463cd37642ee23adb4e23bc60b", + "sha256": "0pn4gpxzgxlz12h4yymqdfmvic51jc5s3b973wl3qjizv1j1062l" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "popup" ], - "commit": "6c94578b5c692ade27c8b34bf5d99333ee7b4680", - "sha256": "1p54m71ypvz7x5wyzv0lfrxfsx23ipmb4zkq6dm0ppgh9al9hd7k" + "commit": "720c6f0e699f25463cd37642ee23adb4e23bc60b", + "sha256": "0pn4gpxzgxlz12h4yymqdfmvic51jc5s3b973wl3qjizv1j1062l" } }, { @@ -112389,16 +112634,16 @@ "repo": "justbur/emacs-vdiff-magit", "unstable": { "version": [ - 20210908, - 135 + 20220518, + 1948 ], "deps": [ "magit", "transient", "vdiff" ], - "commit": "d3a39c3f8cb7ad9a6a769ce45f633b613b067490", - "sha256": "0ci5zsmd4r7z8h7g19ddd29y09lja0ikkm9rp8d2whxi9fz37dha" + "commit": "413f32c9f7e66f8379c23b5ab6341695dbcc2f20", + "sha256": "1zr6j6lw0x5w06sjlx8vnrrp1kx87zhm505plkb31hspf0ggsqlq" }, "stable": { "version": [ @@ -112638,8 +112883,8 @@ }, { "ename": "verona-mode", - "commit": "342867cf256c6e6c242387b6d8c439a7a90f17dc", - "sha256": "1w94hs8mkd6qfklgm7hxb8j7ykvif25czpha0yq7ghbfc0vb3595", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0qkrfgf9mpf3jphspzpw9sk3d0x9nfx1rcf7ff3s6m470vmg7xbr", "fetcher": "github", "repo": "damon-kwok/verona-mode", "unstable": { @@ -113071,19 +113316,19 @@ "url": "https://codeberg.org/joostkremers/visual-fill-column.git", "unstable": { "version": [ - 20220426, - 2045 + 20220519, + 1959 ], - "commit": "cdfe574a51c4fc3519536fa3b169b01d5482d5df", - "sha256": "1gimqhpnagv675wsb1yr50wxf8fwxlviks515yhyxn65hgl2x4wn" + "commit": "453d698d7fc243a547665f8ba43c55eee574e0db", + "sha256": "168wiywaffhhn7j4nfbnq4lfxpxl0x17z9ckk3nwkpaz45d9a2q6" }, "stable": { "version": [ 2, - 4 + 5 ], - "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54", - "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l" + "commit": "453d698d7fc243a547665f8ba43c55eee574e0db", + "sha256": "168wiywaffhhn7j4nfbnq4lfxpxl0x17z9ckk3nwkpaz45d9a2q6" } }, { @@ -113299,11 +113544,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220414, - 930 + 20220515, + 714 ], - "commit": "2801a2354d93920dcd12da3d1090954aec9f7402", - "sha256": "1w4fkb7yp8cmpyxqyghiz4rqkzajjh1nqf5wjnxhvjv0av1lddhn" + "commit": "29694e7951374a8711a0a84a6fd76c70946cc2cb", + "sha256": "1h37hrpiiarw8lhqqw92zkxqb4wyl488kw5l3hp7q36p3dxbs4g1" }, "stable": { "version": [ @@ -113322,11 +113567,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220414, - 931 + 20220515, + 714 ], - "commit": "73e8431576e5b65c227dcf37c7d1a5c609221ac9", - "sha256": "0fxwcxdr7ssj7v5bsx42zinas6fp3iigdh98j1mqm54xm61a58jc" + "commit": "718c458901ec58db2844a2960ebe01581574efe4", + "sha256": "1fn1s34g3nys5z2rc1w1lm8879043afp9fz4i4zhxyl5dq4ly5jk" }, "stable": { "version": [ @@ -113414,14 +113659,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20220416, - 1034 + 20220606, + 1524 ], "deps": [ "vterm" ], - "commit": "644e9df9f741c3338c248291799375a1778eb98b", - "sha256": "19c8z0nfhavimxr8nc5m67k8yxfzr7vaanjrxs3c6zip35nqrn8w" + "commit": "02519323aa0a2e6af641cd205b230f48a04a5ca3", + "sha256": "15na73bil1kfyg3915d1gm7lsl6k4p81x7ybwr79lx8qpw9rlqvg" } }, { @@ -113655,11 +113900,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220508, - 2259 + 20220606, + 2300 ], - "commit": "7baf17355289c29d18f993f383c5d6a187f33b35", - "sha256": "1a2m6jkvnv852q07wvi80nbm7437wnvdfdyiq4iffhffmz8c2mrr" + "commit": "45155e42ea10990295d47d5ee3cb29be16a1f9f6", + "sha256": "1cjz3sli309i2qrwxic63x1am4hpn8r9gwjnfjb62b954wdhhf97" } }, { @@ -113771,10 +114016,10 @@ }, { "ename": "walkclj", - "commit": "44472b35938fe70d4cb3d15397495fe321fcd464", - "sha256": "0m971dlazildhgj8jqg4x679i6s6p80mbpri7l24ynxk45wix22m", + "commit": "27981293c1787aa41ede18d529b9c2efa30b3608", + "sha256": "10d44mxk03dq0vvwy634ca6a15byf9gb5vljzrrqn3bhrh2am8q5", "fetcher": "github", - "repo": "plexus/walkclj", + "repo": "corgi-emacs/walkclj", "unstable": { "version": [ 20220422, @@ -113872,15 +114117,11 @@ "repo": "cmpitg/wand", "unstable": { "version": [ - 20210511, - 725 - ], - "deps": [ - "dash", - "s" + 20220519, + 1214 ], - "commit": "08c3d9156517a31dd98ea64bfc269fae730b643c", - "sha256": "18xgi1anficjl6cnhhv197zbrnb0p63pnj8gshvixb6fr4ybw8k0" + "commit": "e4afc0469c818e7ce73ef31c38d911477947d72e", + "sha256": "1gcmzqpv8s87s5md3nr2s0vvbp68c4na5zmmwc080x9nf8q3hnm4" } }, { @@ -114169,18 +114410,20 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20220319, - 653 + 20220531, + 615 ], - "commit": "efa853e5cfff8e0bcacbda9d1c6696b33da91b03", - "sha256": "1hpdr9r1wvvh44iqkv1lcfnjlvn16yrsgdq2ald2p6sxh9hkvn66" + "commit": "cdbd74b5e71d78ca7cb0768771f38e7b764fa0ac", + "sha256": "0ghkdnq1iad2flz49fwjxxn9q1ryiwq65276axbx1j7572rxshwa" }, "stable": { "version": [ - 17 + 17, + 2, + 1 ], - "commit": "d115f8dc3052e5779938d782d9cdaa4533ef20ff", - "sha256": "0jr5a1nzp8nbdng0k2fcaymiiv9ngrbknbrqaswgqn3akvx793jk" + "commit": "8edf9048c326e8230c4245d8bf3461395b38af84", + "sha256": "0sd2ysysn8x4iwz2fhnvh8knr3pdqgkvhkhsl948smmfl0dwj42f" } }, { @@ -114376,15 +114619,15 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20211211, - 658 + 20220524, + 1745 ], "deps": [ "cl-lib", "request" ], - "commit": "78272662e6992b8614e79a571ff2395fa9630357", - "sha256": "07hj9nr7x6c9w2dnvc58cfbprgp9cqzdxflp5qlpglzdw0bi9s3c" + "commit": "d96da58fe42988d5c433c71ee9f8e6fb75d595a9", + "sha256": "0h4cp334ga2vk89gmkhycqzakxsjldql98a687y57ixpq7ri8qsq" }, "stable": { "version": [ @@ -114706,11 +114949,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20220419, - 227 + 20220518, + 1941 ], - "commit": "129f4ebfc74f207ac82978f6d90d8b4bb1a55cf9", - "sha256": "065jfwnz9ymv5xiiyhnhsi5sm03ah5985hnm5psay6z9msskcnx8" + "commit": "1ab1d0cc88843c9a614ed3226c5a1070e32e4823", + "sha256": "0i4wxihcly3i8pgmw1gv7lriqcyis9q476akvwrdgjwxnn2gmk0w" }, "stable": { "version": [ @@ -114845,8 +115088,8 @@ 20210510, 533 ], - "commit": "b2e35321f03914cae90be4f942d911b7e7175899", - "sha256": "14ralz7jn98ckcmwshq1yg35bpybjlfw04cxy9qcnk67sfnp3ggv" + "commit": "f60154a992ca4048c71e3815a628be2ec9185c79", + "sha256": "03jbi0xrc8zrb9hnynf5b98pmn5xkymcid55km0pxmimsnrl0hk3" }, "stable": { "version": [ @@ -114941,11 +115184,11 @@ "url": "https://codeberg.org/akib/emacs-why-this.git", "unstable": { "version": [ - 20220510, - 1146 + 20220601, + 1132 ], - "commit": "71baf80f9ae7c1117f3b1bf531e23e43bf567424", - "sha256": "1cwasg2dyy86c3hh71xqqsl7wy5c6mf9mnaf251l5fa5895xhbff" + "commit": "0975f5b57ffc77bf4aa871aa313085b80c5e43cd", + "sha256": "1lilp6adi8k1f6ww02mzr729h22paz7daqvlych07qm7aznl37aq" } }, { @@ -115167,8 +115410,8 @@ }, { "ename": "window-layout", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "1ypr77ygr4g47mykd7kgcyf30fjcb29bj14wjdklkjk08wjj09xg", "fetcher": "github", "repo": "kiwanami/emacs-window-layout", "unstable": { @@ -115205,8 +115448,8 @@ }, { "ename": "window-numbering", - "commit": "ce1dc80f69894736b276885e4ec3ce571a8612c9", - "sha256": "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "0d70c31rxnhxjkpcmjvwkyky1dpyv9ksmw9hx3jzgvxng60wi00g", "fetcher": "github", "repo": "nschum/window-numbering.el", "unstable": { @@ -115432,11 +115675,11 @@ "url": "https://hg.sr.ht/~arnebab/wisp", "unstable": { "version": [ - 20220208, - 636 + 20220529, + 1522 ], - "commit": "d266109b95e73281ae3aa1ed9a023346b6d39d28", - "sha256": "0fr3p6cfqxxj01bix9aiglfb2ls2grr62l735wdkn2r7lfvf5hjx" + "commit": "1a01003d400db8a42838cabcb26c06d627246a17", + "sha256": "04sn6k7v8551lzxrbld59kzks55c96siwkr4v8l4havczz6yqcz7" } }, { @@ -115471,20 +115714,20 @@ }, { "ename": "with-editor", - "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3", - "sha256": "1cyq6i54dhmj5pvdq475v39s82k2a0zg55zf7vz38n32cnasdhz1", + "commit": "af5c1593052d63146e850683c461a760ab166033", + "sha256": "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb", "fetcher": "github", "repo": "magit/with-editor", "unstable": { "version": [ - 20220506, - 420 + 20220608, + 1017 ], "deps": [ "compat" ], - "commit": "4ab8c6148bb2698ff793d4a8acdbd8d0d642e133", - "sha256": "1mc0ayfhxl8jpdgw2p6prdi4m3ab3hh7hv0p0kyxmlc9m6f3ablc" + "commit": "cfcbc2731e402b9169c0dc03e89b5b57aa988502", + "sha256": "02kdsksjn76g4fcqxnidzdy1zql25650fpdjjsx2ccdnbyj9fqax" }, "stable": { "version": [ @@ -115791,14 +116034,14 @@ "url": "https://codeberg.org/martianh/wordreference.el", "unstable": { "version": [ - 20220504, - 2021 + 20220601, + 650 ], "deps": [ "s" ], - "commit": "785a5d3245efdc3f32ce61fad1c7596230682f3a", - "sha256": "0g23d58lm6fvk2v5z8zvn09c9q3nffdq6w4mdhygj2xc2l3c6rcp" + "commit": "f1f0354dee403b0ee9b2187bc346e9badff69ec3", + "sha256": "0yq5vrampjibn7p9ixx8fp0jzdhw4acr7i5jxjczypnhp96f6vk0" } }, { @@ -115910,11 +116153,11 @@ "url": "https://codeberg.org/akib/emacs-workroom.git", "unstable": { "version": [ - 20220501, - 1500 + 20220607, + 1715 ], - "commit": "001fe2777f49ac73b6ab24401094a1c3c5efc887", - "sha256": "0haj4w8xcpm1yb3anla4ql2zi339hs6bcznxzl7qla575ff5sivp" + "commit": "c38489669e8b0ddc7a6a13544a099fc51b65d388", + "sha256": "1jng8a0qwsdxghpisvibjgxd0yr7l4nn5gvv16fpm2vfqjgaglwh" } }, { @@ -116138,11 +116381,11 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20211201, - 1214 + 20220526, + 1431 ], - "commit": "09fc58a02621b6c9615f8289c457e30ca6f63bcb", - "sha256": "15jva7qp723fpwv6f24300h8knmxrlsjb2icg9rzr0994g9f36qs" + "commit": "fe5dfb4e4db38f9fc944509a687812b8f419b958", + "sha256": "05h5wxzwzl5almgsk2mjas8in7h5kfmb06r3lfrwgydwxl3wmqnl" }, "stable": { "version": [ @@ -116229,14 +116472,14 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20210407, - 627 + 20220607, + 715 ], "deps": [ "cl-lib" ], - "commit": "470769edba111aed8eabce58a3f2a02da0767624", - "sha256": "19xvfzmsnc271a2zhjbnspb269c5mnps4l94ifrdlqn7y886qr4r" + "commit": "2b44e4aec3a733bd22e00a56906eb5151f8b8d81", + "sha256": "01w6bddbrx0bh2dkrwd1p98hpnp0k6w5r7nb3p9l95gk8pvvmnby" } }, { @@ -116353,8 +116596,8 @@ }, { "ename": "xenops", - "commit": "605c8ca551d54c79246310bcee678cdd854548b0", - "sha256": "0l9pwjbdyfs2mkp2n9xg16pv02y063l92302fmi0h8rwra81xrvv", + "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", + "sha256": "0lhi2qv43lfbivr9rz77qhadjqjwk086qn2r8ib2vdp94frwnwgs", "fetcher": "github", "repo": "dandavison/xenops", "unstable": { @@ -116676,17 +116919,17 @@ }, { "ename": "xref-rst", - "commit": "2f6748512dc546f84b13733086cefb158bc7787c", - "sha256": "0crzzalphr4865a78wih085ycscg78h288hlq0dh6qk50siaxk1m", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-xref-rst", + "commit": "6a5393b31e8bd789e14b998d68c25221905617aa", + "sha256": "00fmff7ph9wca7yp2iv31cs73h4kmnfjay99y1sglp5248wwqlxc", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-xref-rst.git", "unstable": { "version": [ - 20220406, - 2311 + 20220518, + 1102 ], - "commit": "7964709276ff033cd138efabfafb4f2179e75c22", - "sha256": "15sdarz7iqifk9jazgp8l4v8ni48jb6rrixzmf1h60d5r3rf0z68" + "commit": "bc76bc228d51f64a2e57be8f230cf8a7746ea54a", + "sha256": "1yrvymgqwxib93dd6q57p3glj8ll6385wbnpzf3q7pbmdiihi82y" } }, { @@ -116996,20 +117239,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20220311, - 332 + 20220518, + 1229 ], - "commit": "34c300b08579b72c7c92aefee1f4b500913f0c85", - "sha256": "1lwhm3c7xmx1j9ggf9ka0whpm7g5p6b11gfv1bxkdx1j8ypvxn0m" + "commit": "adb3e52a214a5154267085639f95a3ffae1ec2d3", + "sha256": "0ziqjiszidr6kwnpwnzfsi1as0iawjvbg7nb9jhkbzvbal1mxh2s" }, "stable": { "version": [ 0, 3, - 4 + 5 ], - "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28", - "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx" + "commit": "adb3e52a214a5154267085639f95a3ffae1ec2d3", + "sha256": "0ziqjiszidr6kwnpwnzfsi1as0iawjvbg7nb9jhkbzvbal1mxh2s" } }, { @@ -117242,8 +117485,8 @@ 20220212, 1742 ], - "commit": "25f6bf7415f6821a4097037a8decd03813d08722", - "sha256": "1dvrm7paaiy3f8mchhk2wxaaba3qzvl0hcld40k3miyjpdn2lfgs" + "commit": "48cad7618fece0d86023d0b1e0f1f0e37f63d2f5", + "sha256": "15hpv4sxmhq8g23my75kqzhkvqyanvna7knrsfgcdp0barx027wn" }, "stable": { "version": [ @@ -117750,36 +117993,6 @@ } }, { - "ename": "zel", - "commit": "25b445a1dea5e8f1042bed6b5372471c25129fd8", - "sha256": "0fwc1fghsw2rg4fv10kgc9d6rhbq20xa9diqcvp1f1cqs12rfhpd", - "fetcher": "github", - "repo": "rudolfochrist/zel", - "unstable": { - "version": [ - 20171014, - 832 - ], - "deps": [ - "frecency" - ], - "commit": "9dae2d212224d1deae1f62561fa8e4d689fd09f2", - "sha256": "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp" - }, - "stable": { - "version": [ - 0, - 1, - 2 - ], - "deps": [ - "frecency" - ], - "commit": "1d938ac01a42e7a985a3f92f5e97bc09e057676e", - "sha256": "1hk84x4aqcfd3jggk9san1v4kr58v2zhikbv9sh3dcii6x5w2nv0" - } - }, - { "ename": "zen-and-art-theme", "commit": "692cfa0e9edbc1b7114e2ae2f36bef34b20ad17c", "sha256": "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2", @@ -117826,11 +118039,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220412, - 2023 + 20220527, + 1800 ], - "commit": "89c0e39317850d5ccf14dcbbaff06b0a193454a6", - "sha256": "06f7jaglgrckfw36l2pb63y1qxn64svc7wa3c6np3hjpjs5y13f5" + "commit": "b600814c8ddfe8812582f4ba4b62db817d665860", + "sha256": "1d08g55z9m3cj3v9fvw647i6x7dz4g7z9c3y3yq35dlaz6rlsk0m" }, "stable": { "version": [ @@ -118033,6 +118246,70 @@ } }, { + "ename": "zetteldesk", + "commit": "2d08d8964dbabc93de6a05ea29e9af3edfbe8957", + "sha256": "1kghvlbrqcg6fcq90igvjjy6zb544k1vkb0y82mf43n8zfsja12w", + "fetcher": "github", + "repo": "Vidianos-Giannitsis/zetteldesk.el", + "unstable": { + "version": [ + 20220528, + 1904 + ], + "deps": [ + "org-roam" + ], + "commit": "177771d7e1eddf86e0b6f6e94332200cf26dedaa", + "sha256": "0zncqyzhmcvxprg4ba9wn6mgi35sih465r45bygcc97g19hlxy43" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "org-roam" + ], + "commit": "0237a5a0f9cc40dc543c9713c37bbb34d548de50", + "sha256": "1isqd3a0mkcfqqj386h3glmxq02323a1gdykf8wpsm67x8myjgij" + } + }, + { + "ename": "zetteldesk-kb", + "commit": "6ade7599f12a93517f24f5871091fa74c6c2e387", + "sha256": "1mbvjn9hzdzq7bz39y0jyfxqa98zqh00npqrpli33xdjnrrlq6a4", + "fetcher": "github", + "repo": "Vidianos-Giannitsis/zetteldesk.el", + "unstable": { + "version": [ + 20220530, + 2045 + ], + "deps": [ + "hydra", + "major-mode-hydra", + "zetteldesk" + ], + "commit": "177771d7e1eddf86e0b6f6e94332200cf26dedaa", + "sha256": "0zncqyzhmcvxprg4ba9wn6mgi35sih465r45bygcc97g19hlxy43" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "hydra", + "major-mode-hydra", + "zetteldesk" + ], + "commit": "0237a5a0f9cc40dc543c9713c37bbb34d548de50", + "sha256": "1isqd3a0mkcfqqj386h3glmxq02323a1gdykf8wpsm67x8myjgij" + } + }, + { "ename": "zettelkasten", "commit": "ed12df24029a4154fe55588f3e8ca0670af3f5f3", "sha256": "07gbkpanzs4rk066gg3nm95mfv3ng1f0si17mv2qax2dfx5k0lzd", @@ -118064,8 +118341,8 @@ }, { "ename": "zetz-mode", - "commit": "ad2add185cf31a92ca1fcd3a9efcbcdb0aa9e583", - "sha256": "0k30c0f2h96vvb8yacpg710gi64swwslm1gljpzcwxni5kdpqkzm", + "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", + "sha256": "121sjp8iy71mp2jm7h9fl05zmy32148y28q7v9l6hm6flz0wmi1j", "fetcher": "github", "repo": "damon-kwok/zetz-mode", "unstable": { @@ -118102,11 +118379,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20211227, - 1108 + 20220521, + 1148 ], - "commit": "aa20d630b8c413dab8d6bd120ec3ed5db5c9da70", - "sha256": "0d081n6244q4y2sbhdya87gacw742v5f62pfs7c3bwgq0pcng997" + "commit": "dbc648f5bca8f3b9ca2cc7827f326f5530115144", + "sha256": "0hwkkwhc5b2pzyqa2h0xw8wxijsrp1fk70fhyv8hx19shzlc4la3" } }, { @@ -118157,11 +118434,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220509, - 2156 + 20220604, + 1536 ], - "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d", - "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" + "commit": "2dee0650892494410c0e0a340c565b79606f53e4", + "sha256": "1bf19614bp7954j4d23d7mx30jshvb6dpd4cdpxkxil1h7dc7f5q" }, "stable": { "version": [ @@ -118180,14 +118457,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220509, - 802 + 20220604, + 1536 ], "deps": [ "zk" ], - "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d", - "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" + "commit": "2dee0650892494410c0e0a340c565b79606f53e4", + "sha256": "1bf19614bp7954j4d23d7mx30jshvb6dpd4cdpxkxil1h7dc7f5q" }, "stable": { "version": [ @@ -118423,8 +118700,8 @@ 20201205, 1038 ], - "commit": "402f85f5d7d18e26289adcd452d42c73dc1df580", - "sha256": "1x7awisyb1vizpykmflvxw17x58xd2hj6dxq92xkpbswjj6fk238" + "commit": "9b052ac33d4eafe724d0e37d3376926deba91676", + "sha256": "1w59qa0xnnqc4pz6hfj3q9qq199ryyzd0nwwi84nyb48cpgbsyxh" }, "stable": { "version": [ @@ -118591,8 +118868,8 @@ 20220302, 522 ], - "commit": "2133eb000b5239b08a1c2532629a19a19f8e6309", - "sha256": "15r4v3m9plygnkajaaf2y76a09am7r29d8h4yxh5fk7vb7cfyrw3" + "commit": "41c090402816b15eb226ff9368f0ca40c7244f92", + "sha256": "09hvl5ddggkgl4ckmnfhlwf2wwli1pw799sy5f5i6dr6r07mqi37" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json index 6a5608cbf8d56..746ec60669dfc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json +++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json @@ -25,7 +25,6 @@ "tree-sitter-ruby", "tree-sitter-rust", "tree-sitter-scala", - "tree-sitter-swift", "tree-sitter-typescript", "tree-sitter-verilog", "tree-sitter-zig" diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index f722f8c3db820..ff5b195bf724a 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.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "sha256-qDhubKk6FLZmVxp4SkGm1B7zIg6rPtPRoFGCcBYUDFA="; + sha256 = "sha256-j8nfK162JmhQLWS1qN909jjxWpzhxE6JnO5uRwtw3c4="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index 05841bb1bac2d..b4b5e74887c13 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A free text editor for developers"; homepage = "http://fte.sourceforge.net/"; license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index dfdf75627bfff..e4b6393b67e9b 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - hash = "sha256-NpgtxYqxMWMZXZRZjujob40Nn6hirsSzcjoqRJR6Rws="; + hash = "sha256-Vr1w9bAtjQK1ZevFDWQ7xNsUrdv5qrP+JHe1Cuc2CvE="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; @@ -34,6 +34,7 @@ mkDerivation rec { meta = with lib; { description = "A cross-platform, aesthetic, distraction-free Markdown editor"; homepage = src.meta.homepage; + changelog = "https://github.com/wereturtle/ghostwriter/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ dotlambda erictapen ]; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 962710be2f505..6bf26b525b514 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple integrated development environment for Java"; homepage = "https://www.greenfoot.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; maintainers = [ maintainers.chvp ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index cb948b99065d3..e33eaa787a2c4 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "22.03"; + version = "22.05"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - sha256 = "DP/hh6JfnyHdW2bg0cvhwlWvruNDvL9bmXM46iAUQzA="; + sha256 = "sha256-MVHfj9iVC8rFGFU+kpRcH0qX9kQ+scFsRgSw7suC5RU="; stripRoot = false; }; - cargoSha256 = "zJQ+KvO+6iUIb0eJ+LnMbitxaqTxfqgu7XXj3j0GiX4="; + cargoSha256 = "sha256-9jkSZ2yW0Pca1ats7Mgv7HprpjoZWLpsbuwMjYOKlmk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 56b721842a36f..238bc905f7130 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }: stdenv.mkDerivation rec { pname = "hexedit"; - version = "1.2.13"; + version = "1.6"; - src = fetchurl { - url = "http://rigaux.org/${pname}-${version}.src.tgz"; - sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka"; + src = fetchFromGitHub { + owner = "pixel"; + repo = "hexedit"; + rev = version; + sha256 = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI="; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ]; - meta = { + meta = with lib; { description = "View and edit files in hexadecimal or in ASCII"; - homepage = "http://prigaux.chez.com/hexedit.html"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + homepage = "http://rigaux.org/hexedit.html"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 0d29eeb17dc24..1cffa831ef614 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Mature programmer's text editor (Java based)"; homepage = "http://www.jedit.org"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 86b4a790d0372..394c668989a03 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -94,7 +94,7 @@ let The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language ''; - maintainers = [ maintainers.miltador ]; + maintainers = [ ]; }; }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' @@ -137,6 +137,7 @@ let inherit pname version src wmClass jdk product; productShort = "MPS"; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://www.jetbrains.com/mps/"; inherit license description platforms; longDescription = '' @@ -161,7 +162,7 @@ let with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; - maintainers = with maintainers; [ schristo ma27 ]; + maintainers = with maintainers; [ ]; }; }); @@ -170,6 +171,7 @@ let inherit pname version src wmClass jdk product; productShort = "PyCharm"; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://www.jetbrains.com/pycharm/"; inherit description license platforms; longDescription = '' @@ -204,7 +206,7 @@ let apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications. ''; - maintainers = [ maintainers.miltador ]; + maintainers = [ ]; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 55ed0e6829e5a..3f77f3fae5b15 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -46,7 +46,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { truncate --size=$size $fname } - interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + 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) patchelf --set-interpreter "$interpreter" bin/fsnotifier64 diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix index ffecd65d50f96..504d417688684 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix @@ -25,6 +25,7 @@ let meta = with lib; { description = "A Jupyter kernel for Clojure"; homepage = "https://github.com/clojupyter/clojupyter"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; # deps from maven license = licenses.mit; maintainers = with maintainers; [ thomasjm ]; platforms = jre.meta.platforms; diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index fba884f5a2fd4..0fd59ca391e95 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -39,26 +39,22 @@ in ${concatStringsSep "\n" (mapAttrsToList (kernelName: unfilteredKernel: let - allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64"]; + allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64" "extraPaths"]; kernel = filterAttrs (n: v: (any (x: x == n) allowedKernelKeys)) unfilteredKernel; config = builtins.toJSON ( kernel // {display_name = if (kernel.displayName != "") then kernel.displayName else kernelName;} // (optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; }) ); - logo32 = - if (kernel.logo32 != null) - then "ln -s ${kernel.logo32} 'kernels/${kernelName}/logo-32x32.png';" - else ""; - logo64 = - if (kernel.logo64 != null) - then "ln -s ${kernel.logo64} 'kernels/${kernelName}/logo-64x64.png';" - else ""; + extraPaths = kernel.extraPaths or {} + // lib.optionalAttrs (kernel.logo32 != null) { "logo-32x32.png" = kernel.logo32; } + // lib.optionalAttrs (kernel.logo64 != null) { "logo-64x64.png" = kernel.logo64; } + ; + linkExtraPaths = lib.mapAttrsToList (name: value: "ln -s ${value} 'kernels/${kernelName}/${name}';") extraPaths; in '' mkdir 'kernels/${kernelName}'; echo '${config}' > 'kernels/${kernelName}/kernel.json'; - ${logo32} - ${logo64} + ${lib.concatStringsSep "\n" linkExtraPaths} '') definitions)} mkdir $out diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix deleted file mode 100644 index 2620a87ce4251..0000000000000 --- a/pkgs/applications/editors/kodestudio/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, # Patchelf dependencies: - alsa-lib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL -, openssl, xorg, zlib -}: - -let - - version = "17.1"; - - sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "1kddisnvlk48jip6k59mw3wlkrl7rkck2lxpaghn0gfx02cvms5f" - else if stdenv.hostPlatform.system == "i686-cygwin" then "1izp42afrlh4yd322ax9w85ki388gnkqfqbw8dwnn4k3j7r5487z" - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - urlBase = "https://github.com/Kode/KodeStudio/releases/download/v${version}/KodeStudio-"; - - urlStr = if stdenv.hostPlatform.system == "x86_64-linux" then urlBase + "linux64.tar.gz" - else if stdenv.hostPlatform.system == "i686-cygwin" then urlBase + "win32.zip" - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - -in - - stdenv.mkDerivation { - pname = "kodestudio"; - inherit version; - - src = fetchurl { - url = urlStr; - inherit sha256; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libXScrnSaver ]; - - desktopItem = makeDesktopItem { - name = "kodestudio"; - exec = "kodestudio"; - icon = "kodestudio"; - comment = "Kode Studio is an IDE for Kha based on Visual Studio Code"; - desktopName = "Kode Studio"; - genericName = "Text Editor"; - categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ]; - }; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out - cp -r ./* $out - ''; - - postFixup = lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") '' - # Patch Binaries - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out:${atomEnv.libPath}" \ - $out/kodestudio - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${lib.getLib openssl}/lib" \ - $out/resources/app/extensions/krom/Krom/linux/Krom - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib" \ - $out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64 - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib" \ - $out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64 - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \ - $out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64 - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \ - $out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64 - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \ - $out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64 - - # Patch Shared Objects - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/libnode.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib" $out/libffmpeg.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libplatform.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicuuc.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libbase.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicui18n.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/RPi/libneko.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux64/libneko.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux/libneko.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/pty.js/build/Release/pty.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/gcsignals.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/obj.target/gcsignals.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/onig_scanner.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/obj.target/onig_scanner.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/keymapping.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/obj.target/keymapping.node - - # Rewrite VSCODE_PATH inside bin/kodestudio to $out - substituteInPlace $out/bin/kodestudio --replace "/usr/share/kodestudio" $out - - # Patch library calls that expects nix store files to be mode 644: - # A stat is made on srcFile (in the nix store), and its mode used - # for destFile, but it expects the mode to be read write, whereas - # all regular files in the nix store are made read only. - # (33188 is 100644 octal, the required mode) - substituteInPlace $out/resources/app/extensions/kha/Kha/Tools/khamake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188" - substituteInPlace $out/resources/app/extensions/kha/Kha/Kore/Tools/koremake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188" - - # Wrap preload libXss - wrapProgram $out/bin/kodestudio \ - --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 - ''; - - meta = with lib; { - description = '' - An IDE for Kha based on Visual Studio Code - ''; - longDescription = '' - Kode Studio is an IDE for Kha based on Visual Studio Code. - - Kha and Kore are multimedia frameworks for Haxe and C++ respectively - (with JavaScript coming soon). Using Kha or Kore you can access all - hardware at the lowest possible level in a completely portable way. - ''; - homepage = "http://kode.tech/"; - downloadPage = "https://github.com/Kode/KodeStudio/releases"; - license = licenses.mit; - maintainers = [ maintainers.patternspandemic ]; - platforms = [ "x86_64-linux" "i686-cygwin" ]; - }; - } diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 49c3d5559aa4a..715b7ee9c68ca 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -4,19 +4,12 @@ , rustPlatform , cmake , pkg-config -, python3 , perl -, freetype , fontconfig -, libxkbcommon -, xcbutil -, libX11 -, libXcursor -, libXrandr -, libXi -, vulkan-loader , copyDesktopItems , makeDesktopItem +, glib +, gtk3 , openssl , libobjc , Security @@ -28,21 +21,20 @@ rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "lapce"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KSumy7M7VNUib4CZ0ikBboEFMzDQt4xW+aUFHOi+0pA="; + sha256 = "sha256-jH473FdBI3rGt90L3WwMDPP8M3w0rtG5D758ceCMw94="; }; - cargoSha256 = "sha256-7SVTcH9/Ilq8HcpJJI0KFiQA076lR2CAIBwmTVgmnjE="; + cargoSha256 = "sha256-0Kya2KcyBDlt0TpFV60VAA3+JPfwId/+k8k+H97EhB0="; nativeBuildInputs = [ cmake pkg-config - python3 perl copyDesktopItems ]; @@ -51,17 +43,11 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; buildInputs = [ + glib + gtk3 openssl ] ++ lib.optionals stdenv.isLinux [ - freetype fontconfig - libxkbcommon - xcbutil - libX11 - libXcursor - libXrandr - libXi - vulkan-loader ] ++ lib.optionals stdenv.isDarwin [ libobjc Security @@ -71,11 +57,6 @@ rustPlatform.buildRustPackage rec { AppKit ]; - # Add missing vulkan dependency to rpath - preFixup = lib.optionalString stdenv.isLinux '' - patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce - ''; - postInstall = '' install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/lapce.svg ''; diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix new file mode 100644 index 0000000000000..175026440daaa --- /dev/null +++ b/pkgs/applications/editors/ldtk/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip +, appimage-run }: + +stdenv.mkDerivation rec { + pname = "ldtk"; + version = "1.1.3"; + + src = fetchurl { + url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; + sha256 = "sha256-qw7+4k4IH2+9DX4ny8EBbSlyXBrk/y91W04+zWPGupk="; + }; + + nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; + + buildInputs = [ appimage-run ]; + + unpackPhase = '' + runHook preUnpack + + unzip $src + appimage-run -x src 'LDtk ${version} installer.AppImage' + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 'LDtk ${version} installer.AppImage' $out/share/ldtk.AppImage + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/ldtk \ + --add-flags $out/share/ldtk.AppImage + install -Dm644 src/ldtk.png $out/share/icons/hicolor/1024x1024/apps/ldtk.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ldtk"; + exec = "ldtk"; + icon = "ldtk"; + terminal = false; + desktopName = "LDtk"; + comment = "2D level editor"; + categories = [ "Utility" ]; + mimeTypes = [ "application/json" ]; + }) + ]; + + meta = with lib; { + homepage = "https://ldtk.io/"; + description = "Modern, lightweight and efficient 2D level editor"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ felschr ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 18fbf566876c1..cc9da53f2b671 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -106,6 +106,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/LibreSprite/LibreSprite/issues/308 - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix deleted file mode 100644 index e2e08a84c884a..0000000000000 --- a/pkgs/applications/editors/lighttable/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, lib, fetchurl, zlib, glib, alsa-lib, makeDesktopItem -, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf -, cairo, cups, expat, libgpg-error, nspr, gnome2, nss, xorg, systemd, libnotify -}: - -let - libPath = lib.makeLibraryPath [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gnome2.GConf - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr - xorg.libXcursor - ]; - desktopItem = makeDesktopItem { - name = "LightTable"; - exec = "light"; - comment = "LightTable"; - desktopName = "LightTable"; - genericName = "the next generation code editor"; - }; -in - -stdenv.mkDerivation rec { - pname = "lighttable"; - version = "0.8.1"; - - src = - fetchurl { - name = "LightTableLinux64.tar.gz"; - url = "https://github.com/LightTable/LightTable/releases/download/${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv"; - }; - - dontConfigure = true; - - installPhase = '' - tar xf ${src} - mkdir -p $out/{bin,share/LightTable} - mv ./${pname}-${version}-linux/* $out/share/LightTable - - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${libPath}/lib64:$out/share/LightTable \ - $out/share/LightTable/LightTable - - mv $out/share/LightTable/light $out/bin/light - - ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 - substituteInPlace $out/bin/light \ - --replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \ - --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \ - --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable" - - mkdir -p "$out"/share/applications - cp "${desktopItem}/share/applications/LightTable.desktop" "$out"/share/applications/ - ''; - - meta = with lib; { - description = "The next generation code editor"; - homepage = "http://www.lighttable.com/"; - license = licenses.gpl3; - maintainers = [ maintainers.matejc ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index d0733eb5aa80f..810d8365b5a70 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { characters live in. ''; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.steveej ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix index 55249dde579b6..506f94237ff80 100644 --- a/pkgs/applications/editors/mle/default.nix +++ b/pkgs/applications/editors/mle/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Small, flexible terminal-based text editor"; homepage = "https://github.com/adsr/mle"; license = licenses.asl20; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 3605f6c6e4e2c..cf20d102cb50f 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -38,6 +38,7 @@ in stdenv.mkDerivation rec { in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. ''; homepage = "http://www.tuxguitar.com.ar/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl2; maintainers = [ maintainers.ardumont ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix new file mode 100644 index 0000000000000..cb69b5ecacdba --- /dev/null +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, buildVimPluginFrom2Nix +, buildLuarocksPackage +, lua51Packages +, toVimPlugin +}: +let + # sanitizeDerivationName + normalizeName = lib.replaceStrings [ "." ] [ "-" ]; +in + + # function to create vim plugin from lua packages that are already packaged in + # luaPackages + { + # the lua attribute name that matches this vim plugin. Both should be equal + # in the majority of cases but we make it possible to have different attribute names + luaAttr ? (normalizeName attrs.pname) + , ... + }@attrs: + let + originalLuaDrv = lua51Packages.${luaAttr}; + luaDrv = lua51Packages.lib.overrideLuarocks originalLuaDrv (drv: { + extraConfig = '' + -- to create a flat hierarchy + lua_modules_path = "lua" + ''; + }); + finalDrv = toVimPlugin (luaDrv.overrideAttrs(oa: { + nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ + lua51Packages.luarocksMoveDataFolder + ]; + })); + in + finalDrv diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index cd046b1871fa0..8d8618c881cd7 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8="; + sha256 = "sha256-eKKQNM02Vhy+3yL2QV+0FSEpcniEa5Aq6hkAUIgLo1k="; }; patches = [ @@ -133,7 +133,7 @@ in # those contributions were copied from Vim (identified in the commit logs # by the vim-patch token). See LICENSE for details." license = with licenses; [ asl20 vim ]; - maintainers = with maintainers; [ manveru rvolosatovs ma27 ]; + maintainers = with maintainers; [ manveru rvolosatovs ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 9cb786989efb8..346647838e957 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; rev = version; - sha256 = "sha256-pbniOWjEw1Z+PoXqbbFOUkW5Ii1UDOMoZpAvVF1uNEg="; + sha256 = "sha256-2fN05o8Zo1MGdIYUcsCgkiW/kG6DkY8uTnpw2XrKxrI="; }; - cargoSha256 = "sha256-7o7uJXH68pvfuiG1eSNmbPx8OO8QJjCe+oEFl38bFm4="; + cargoSha256 = "sha256-eATUyczkcwHI8Y7Gl2ts4dRgiFUAL8yrWDNe4JzserE="; SKIA_SOURCE_DIR = let @@ -42,8 +42,8 @@ rustPlatform.buildRustPackage rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m93-0.42.0"; - sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ="; + rev = "m100-0.48.7"; + sha256 = "sha256-roZUv5YoLolRi0iWAB+5WlCFV+8GdzNzS+JINnEHaMs="; }; # The externals for skia are taken from skia/DEPS externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json); diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json index d0553830a6be3..fe0bcdea93789 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -6,8 +6,8 @@ }, "libjpeg-turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20", - "sha256": "sha256-bhbUnA36rKYLJSLpElmXJqccXQDjjbMcNMsVM4Eekrs=" + "rev": "02959c3ee17abacfd1339ec22ea93301292ffd56", + "sha256": "sha256-cuSBVhHCX2Fh2SmmRpjinYtge8yaxcM06jlSXfvCywk=" }, "icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", @@ -21,8 +21,8 @@ }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "3a74ee528255cc027d84b204a87b5c25e47bff79", - "sha256": "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM=" + "rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc", + "sha256": "sha256-QyVkeBVl45gygOylhnojcQuDIBp2DT2d7pD+OcX29VU=" }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git", diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix index 4d53143ac85c7..f6013202bafb1 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/pkgs/applications/editors/neovim/neovim-qt.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "neovim-qt-unwrapped"; - version = "0.2.16.1"; + version = "0.2.17"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny"; + sha256 = "sha256-UJXaHENqau5EEe5c94pJuNxZU5rutJs642w9Cof8Sa4="; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/neovim/tests.nix b/pkgs/applications/editors/neovim/tests.nix index 1e46a59f563bd..3163041dabfef 100644 --- a/pkgs/applications/editors/neovim/tests.nix +++ b/pkgs/applications/editors/neovim/tests.nix @@ -150,8 +150,8 @@ rec { # and do `:call deoplete#enable()`. It will print an error if the remote # plugin is not registered. test_nvim_with_remote_plugin = neovim.override { - extraName = "-pathogen-remote"; - configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; + extraName = "-remote"; + configure.packages.foo.start = with vimPlugins; [ deoplete-nvim ]; }; # only neovim makes use of `requiredPlugins`, test this here diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index ee0abb5828914..16b19f63d2d35 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -1,4 +1,6 @@ { lib +, buildLuarocksPackage +, callPackage , vimUtils , nodejs , neovim-unwrapped @@ -184,4 +186,9 @@ in { inherit makeNeovimConfig; inherit legacyWrapper; + + buildNeovimPluginFrom2Nix = callPackage ./build-neovim-plugin.nix { + inherit (vimUtils) buildVimPluginFrom2Nix toVimPlugin; + inherit buildLuarocksPackage; + }; } diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 2282e583683db..1fd1e2cbf5653 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "13"; + version = "14"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha512-Xnh2OhnHOo++gGPx1o/WmcTHV7KNVeeT6ut9xH2Zo0EFtt43GFi2+HLOXm3u/IcjAzWlbGvIp9+TVUnwDusDoA=="; + hash = "sha512-AEuUOiVCvZh4SjghQR2j8LBIubEBzEaZqWsb93icZU9K1sc6ddUanLD0NsQhzjK6oK1EDv5GG9PmqOXo6Sf1xg=="; }; buildCommand = '' diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 0207ae9b24069..06d5997af1e88 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -1,31 +1,32 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, libsForQt5, stdenv }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qttools, qtx11extras, stdenv }: mkDerivation rec { pname = "notepad-next"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-J7Ngt6YtAAZsza2lN0d1lX3T8gNJHp60sCwwaLMGBHQ="; + sha256 = "sha256-9VbtSpWiSVNRydqpTJ0Zd2/9mXy18Drl6q61BHZ0zrs="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; - nativeBuildInputs = [ qmake libsForQt5.qt5.qttools ]; - qmakeFlags = [ "src/NotepadNext.pro" ]; + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtx11extras ]; + + qmakeFlags = [ + "PREFIX=${placeholder "out"}" + "src/NotepadNext.pro" + ]; - # References - # https://github.com/dail8859/NotepadNext/blob/master/doc/Building.md - # https://github.com/dail8859/NotepadNext/pull/124 postPatch = '' - substituteInPlace ./src/NotepadNext/NotepadNext.pro --replace /usr $out + substituteInPlace src/i18n.pri \ + --replace 'EXTRA_TRANSLATIONS = \' "" \ + --replace '$$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm' "" ''; - # Upstream suggestion: https://github.com/dail8859/NotepadNext/issues/135 - CXXFLAGS = "-std=gnu++1z"; - meta = with lib; { homepage = "https://github.com/dail8859/NotepadNext"; description = "Notepad++-like editor for the Linux desktop"; diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 65604926b8fda..1149117e67b24 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://pinegrow.com"; description = "UI Web Editor"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ unfreeRedistributable ]; maintainers = with maintainers; [ gador ]; }; diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix new file mode 100644 index 0000000000000..9846d10491c1f --- /dev/null +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchFromGitHub, godot-headless, godot-export-templates }: + +let + preset = + if stdenv.isLinux then + if stdenv.is64bit then "Linux/X11 64-bit" + else "Linux/X11 32-bit" + else if stdenv.isDarwin then "Mac OSX" + else throw "unsupported platform"; +in stdenv.mkDerivation rec { + pname = "pixelorama"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "Orama-Interactive"; + repo = "Pixelorama"; + rev = "v${version}"; + sha256 = "sha256-+Sfhv66skHawe6jzfzQyFxejN5TvTdmWunzl0/7yy4M="; + }; + + nativeBuildInputs = [ + godot-headless + ]; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + mkdir -p $HOME/.local/share/godot/ + ln -s "${godot-export-templates}/share/godot/templates" "$HOME/.local/share/godot/templates" + mkdir -p build + godot-headless -v --export "${preset}" ./build/pixelorama + godot-headless -v --export-pack "${preset}" ./build/pixelorama.pck + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D -m 755 -t $out/libexec ./build/pixelorama + install -D -m 644 -t $out/libexec ./build/pixelorama.pck + install -D -m 644 -t $out/share/applications ./Misc/Linux/com.orama_interactive.Pixelorama.desktop + install -d -m 755 $out/bin + ln -s $out/libexec/pixelorama $out/bin/pixelorama + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://orama-interactive.itch.io/pixelorama"; + description = "A free & open-source 2D sprite editor, made with the Godot Engine!"; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ felschr ]; + }; +} diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix index 9475f44170314..4b56698602382 100644 --- a/pkgs/applications/editors/quartus-prime/quartus.nix +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -89,6 +89,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit homepage; description = "FPGA design and simulation software"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 35c5f644ffa43..c13b6a4d53e93 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { + broken = stdenv.isDarwin; description = "Simple XML editor based on qt libraries" ; homepage = "https://sourceforge.net/projects/qxmledit"; license = licenses.lgpl2; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 76c94693d24b4..d7746ac17838c 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -39,6 +39,6 @@ buildPythonApplication rec { changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ orivej tstrobel ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 3b169bf4e5331..52134d15da823 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/solemnwarning/rehex"; changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt"; license = licenses.gpl2Only; - maintainers = with maintainers; [ markus1189 SuperSandro2000 ]; + maintainers = with maintainers; [ markus1189 ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 8d4aa112cdb66..9a362fec65be3 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -39,16 +39,17 @@ let pname = "RStudio"; - version = "1.4.1717"; - RSTUDIO_VERSION_MAJOR = lib.versions.major version; - RSTUDIO_VERSION_MINOR = lib.versions.minor version; - RSTUDIO_VERSION_PATCH = lib.versions.patch version; + version = "2022.02.3+492"; + RSTUDIO_VERSION_MAJOR = "2022"; + RSTUDIO_VERSION_MINOR = "02"; + RSTUDIO_VERSION_PATCH = "3"; + RSTUDIO_VERSION_SUFFIX = "+492"; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "sha256-9c1bNsf8kJjpcZ2cMV/pPNtXQkFOntX29a1cdnXpllE="; + sha256 = "1pgbk5rpy47h9ihdrplbfhfc49hrc6242j9099bclq7rqif049wi"; }; mathJaxSrc = fetchurl { @@ -59,7 +60,7 @@ let rsconnectSrc = fetchFromGitHub { owner = "rstudio"; repo = "rsconnect"; - rev = "f5854bb71464f6e3017da9855f058fe3d5b32efd"; + rev = "e287b586e7da03105de3faa8774c63f08984eb3c"; sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y="; }; @@ -74,7 +75,7 @@ let in (if server then stdenv.mkDerivation else mkDerivation) (rec { - inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH; + inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH RSTUDIO_VERSION_SUFFIX; nativeBuildInputs = [ cmake @@ -114,6 +115,7 @@ in "-DRSTUDIO_USE_SYSTEM_SOCI=ON" "-DRSTUDIO_USE_SYSTEM_BOOST=ON" "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" + "-DQUARTO_ENABLED=FALSE" "-DPANDOC_VERSION=${pandoc.version}" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" ] ++ lib.optional (!server) [ @@ -124,14 +126,9 @@ in patches = [ ./r-location.patch ./clang-location.patch - # postFetch doesn't work with this | error: unexpected end-of-file - # replacing /usr/bin/node is done in postPatch - # https://src.fedoraproject.org/rpms/rstudio/tree/rawhide - (fetchpatch { - name = "system-node.patch"; - url = "https://src.fedoraproject.org/rpms/rstudio/raw/5bda2e290c9e72305582f2011040938d3e356906/f/0004-use-system-node.patch"; - sha256 = "sha256-P1Y07RB/ceFNa749nyBUWSE41eiiZgt43zVcmahvfZM="; - }) + ./use-system-node.patch + ./fix-resources-path.patch + ./pandoc-nix-path.patch ]; postPatch = '' @@ -141,14 +138,14 @@ in --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' substituteInPlace src/gwt/build.xml \ - --replace '/usr/bin/node' '${nodejs}/bin/node' + --replace '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ --replace '@libclang@' ${llvmPackages.libclang.lib} \ --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so - substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace "bin/pandoc" "${pandoc}/bin/pandoc" + substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ + --replace '@pandoc@' ${pandoc}/bin/pandoc ''; hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); @@ -197,11 +194,13 @@ in for f in .gitignore .Rbuildignore LICENSE README; do find . -name $f -delete done + rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc} ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); inherit description; homepage = "https://www.rstudio.com/"; license = licenses.agpl3Only; diff --git a/pkgs/applications/editors/rstudio/fix-resources-path.patch b/pkgs/applications/editors/rstudio/fix-resources-path.patch new file mode 100644 index 0000000000000..24f8b3cb51b9d --- /dev/null +++ b/pkgs/applications/editors/rstudio/fix-resources-path.patch @@ -0,0 +1,19 @@ +--- a/src/cpp/desktop/DesktopOptions.cpp ++++ b/src/cpp/desktop/DesktopOptions.cpp +@@ -499,15 +499,9 @@ + { + if (resourcesPath_.isEmpty()) + { +-#ifdef RSTUDIO_PACKAGE_BUILD + // release configuration: the 'resources' folder is + // part of the supporting files folder +- resourcesPath_ = supportingFilePath().completePath("resources"); +-#else +- // developer configuration: the 'resources' folder is +- // a sibling of the RStudio executable +- resourcesPath_ = scriptsPath().completePath("resources"); +-#endif ++ resourcesPath_ = supportingFilePath().completePath("resources"); + } + + return resourcesPath_; diff --git a/pkgs/applications/editors/rstudio/package.json b/pkgs/applications/editors/rstudio/package.json index 31943987a522c..6677ca9e06de8 100644 --- a/pkgs/applications/editors/rstudio/package.json +++ b/pkgs/applications/editors/rstudio/package.json @@ -5,57 +5,59 @@ "license": "agpl-3.0", "dependencies": { "@types/ace": "^0.0.43", - "@types/clipboard": "^2.0.1", + "@types/clipboard": "^2.0.7", "@types/diff-match-patch": "^1.0.32", - "@types/js-yaml": "^3.12.3", + "@types/js-yaml": "^4.0.3", "@types/lodash.debounce": "^4.0.6", + "@types/lodash.orderby": "^4.6.6", "@types/lodash.uniqby": "^4.7.6", "@types/orderedmap": "^1.0.0", - "@types/prosemirror-commands": "^1.0.3", - "@types/prosemirror-dev-tools": "^2.1.0", - "@types/prosemirror-dropcursor": "^1.0.0", - "@types/prosemirror-gapcursor": "^1.0.1", - "@types/prosemirror-history": "^1.0.1", - "@types/prosemirror-inputrules": "^1.0.3", - "@types/prosemirror-keymap": "^1.0.3", - "@types/prosemirror-model": "^1.7.2", - "@types/prosemirror-schema-list": "^1.0.1", - "@types/prosemirror-state": "^1.2.5", + "@types/pinyin": "^2.10.0", + "@types/prosemirror-commands": "^1.0.4", + "@types/prosemirror-dropcursor": "^1.0.3", + "@types/prosemirror-gapcursor": "^1.0.4", + "@types/prosemirror-history": "^1.0.3", + "@types/prosemirror-inputrules": "^1.0.4", + "@types/prosemirror-keymap": "^1.0.4", + "@types/prosemirror-schema-list": "^1.0.3", "@types/prosemirror-tables": "^0.9.1", - "@types/prosemirror-transform": "^1.1.1", - "@types/react": "^16.9.32", - "@types/react-dom": "^16.9.6", - "@types/react-window": "^1.8.2", - "@types/zenscroll": "^4.0.0", - "biblatex-csl-converter": "^1.9.1", - "clipboard": "^2.0.6", - "diff-match-patch": "^1.0.4", - "fuse.js": "^6.0.4", - "js-yaml": "^3.13.1", + "@types/react": "^17.0.20", + "@types/react-dom": "^17.0.9", + "@types/react-window": "^1.8.5", + "@types/transliteration": "^1.6.6", + "@types/zenscroll": "^4.0.1", + "biblatex-csl-converter": "^2.0.2", + "clipboard": "^2.0.8", + "diff-match-patch": "^1.0.5", + "fuse.js": "^6.4.6", + "js-yaml": "^4.1.0", "lodash.debounce": "^4.0.8", + "lodash.orderby": "^4.6.0", "lodash.uniqby": "^4.7.0", "orderedmap": "^1.0.0", + "pinyin": "^2.10.2", "prosemirror-changeset": "^2.1.2", - "prosemirror-commands": "^1.1.4", + "prosemirror-commands": "^1.1.10", "prosemirror-dev-tools": "^2.1.1", - "prosemirror-dropcursor": "^1.3.2", + "prosemirror-dropcursor": "^1.3.5", "prosemirror-gapcursor": "^1.1.5", - "prosemirror-history": "^1.1.3", - "prosemirror-inputrules": "^1.1.2", + "prosemirror-history": "^1.2.0", + "prosemirror-inputrules": "^1.1.3", "prosemirror-keymap": "^1.1.4", - "prosemirror-model": "^1.11.0", - "prosemirror-schema-list": "^1.1.4", - "prosemirror-state": "^1.3.3", + "prosemirror-model": "^1.14.3", + "prosemirror-schema-list": "^1.1.5", + "prosemirror-state": "^1.3.4", "prosemirror-tables": "^1.1.1", - "prosemirror-transform": "^1.2.8", + "prosemirror-transform": "^1.3.2", "prosemirror-utils": "^0.9.6", - "prosemirror-view": "^1.15.6", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "react-window": "^1.8.5", - "sentence-splitter": "^3.2.0", + "prosemirror-view": "^1.20.1", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-window": "^1.8.6", + "sentence-splitter": "^3.2.2", "thenby": "^1.3.3", "tlite": "^0.1.9", + "transliteration": "^2.2.0", "typescript": "3.8.3", "zenscroll": "^4.0.2" }, diff --git a/pkgs/applications/editors/rstudio/pandoc-nix-path.patch b/pkgs/applications/editors/rstudio/pandoc-nix-path.patch new file mode 100644 index 0000000000000..a2b9bbd9f02bb --- /dev/null +++ b/pkgs/applications/editors/rstudio/pandoc-nix-path.patch @@ -0,0 +1,11 @@ +--- a/src/cpp/session/include/session/SessionConstants.hpp ++++ b/src/cpp/session/include/session/SessionConstants.hpp +@@ -140,7 +140,7 @@ + #ifdef QUARTO_ENABLED + # define kDefaultPandocPath "bin/quarto/bin" + #else +-# define kDefaultPandocPath "bin/pandoc" ++# define kDefaultPandocPath "@pandoc@" + #endif + + #define kDefaultQuartoPath "bin/quarto" diff --git a/pkgs/applications/editors/rstudio/use-system-node.patch b/pkgs/applications/editors/rstudio/use-system-node.patch new file mode 100644 index 0000000000000..b78adbaee263c --- /dev/null +++ b/pkgs/applications/editors/rstudio/use-system-node.patch @@ -0,0 +1,28 @@ +--- a/src/gwt/build.xml ++++ b/src/gwt/build.xml +@@ -84,23 +84,7 @@ + </target> + + <!-- panmirror typescript library --> +- <!-- ensure version matches RSTUDIO_NODE_VERSION --> +- <property name="node.version" value="14.17.5"/> +- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> +- <condition property="node.bin" value="../../../${node.dir}/bin/node"> +- <not> +- <os family="windows" /> +- </not> +- </condition> +- <condition property="node.bin" value="${node.dir}/node.exe"> +- <os family="windows" /> +- </condition> +- +- <!-- use node from /opt/rstudio-tools if installed (typical for Docker) --> +- <available +- property="node.bin" +- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node" +- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/> ++ <property name="node.bin" value="@node@/bin/node"/> + + <property name="panmirror.dir" value="./panmirror/src/editor"/> + <property name="panmirror.build.dir" value="./www/js/panmirror"/> + diff --git a/pkgs/applications/editors/rstudio/yarn.lock b/pkgs/applications/editors/rstudio/yarn.lock index d1717012db47e..ce02ab6748b87 100644 --- a/pkgs/applications/editors/rstudio/yarn.lock +++ b/pkgs/applications/editors/rstudio/yarn.lock @@ -10,11 +10,16 @@ "@babel/highlight" "^7.8.3" "@babel/helper-module-imports@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498" - integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg== + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f" + integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA== dependencies: - "@babel/types" "^7.8.3" + "@babel/types" "^7.15.4" + +"@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== "@babel/highlight@^7.8.3": version "7.8.3" @@ -39,13 +44,12 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/types@^7.8.3": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01" - integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA== +"@babel/types@^7.15.4": + version "7.15.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f" + integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig== dependencies: - esutils "^2.0.2" - lodash "^4.17.13" + "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" "@emotion/babel-utils@^0.6.4": @@ -102,30 +106,47 @@ resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc" integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw== -"@textlint/ast-node-types@^4.2.5": - version "4.3.4" - resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.3.4.tgz#f6596c45c32c85dc06915c3077bb7686033efd32" - integrity sha512-Grq+vJuNH7HCa278eFeiqJvowrD+onMCoG2ctLyoN+fXYIQGIr1/8fo8AcIg+VM16Kga+N6Y1UWNOWPd8j1nFg== +"@mapbox/node-pre-gyp@^1.0.4": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz#2a0b32fcb416fb3f2250fd24cb2a81421a4f5950" + integrity sha512-4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA== + dependencies: + detect-libc "^1.0.3" + https-proxy-agent "^5.0.0" + make-dir "^3.1.0" + node-fetch "^2.6.1" + nopt "^5.0.0" + npmlog "^4.1.2" + rimraf "^3.0.2" + semver "^7.3.4" + tar "^6.1.0" + +"@textlint/ast-node-types@^4.4.2": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.4.3.tgz#fdba16e8126cddc50f45433ce7f6c55e7829566c" + integrity sha512-qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A== "@types/ace@^0.0.43": version "0.0.43" resolved "https://registry.yarnpkg.com/@types/ace/-/ace-0.0.43.tgz#9f0916174b6060dabbccd36ba4868ea769a1c633" integrity sha512-eQdX8AQ7CfSHym07MZMBQ8FKUj9AZ2Wcc26W5Ct8J4KOMjFY6SFUaf2YA8YHBut0Fwl//2kZ+0GLZNp+NQNRIA== -"@types/clipboard@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.1.tgz#75a74086c293d75b12bc93ff13bc7797fef05a40" - integrity sha512-gJJX9Jjdt3bIAePQRRjYWG20dIhAgEqonguyHxXuqALxsoDsDLimihqrSg8fXgVTJ4KZCzkfglKtwsh/8dLfbA== +"@types/clipboard@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.7.tgz#db578ceec578947be2d603b003667ebdd5f274e1" + integrity sha512-VwVFUHlneOsWfv/GaaY7Kwk4XasDqkAlyFQtsHxnOw0yyBYWTrlEXtmb9RtC+VFBCdtuOeIXECmELNd5RrKp/g== + dependencies: + clipboard "*" "@types/diff-match-patch@^1.0.32": version "1.0.32" resolved "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz#d9c3b8c914aa8229485351db4865328337a3d09f" integrity sha512-bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A== -"@types/js-yaml@^3.12.3": - version "3.12.3" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.3.tgz#abf383c5b639d0aa8b8c4a420d6a85f703357d6c" - integrity sha512-otRe77JNNWzoVGLKw8TCspKswRoQToys4tuL6XYVBFxjgeM0RUrx7m3jkaTdxILxeGry3zM8mGYkGXMeQ02guA== +"@types/js-yaml@^4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz#9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200" + integrity sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg== "@types/lodash.debounce@^4.0.6": version "4.0.6" @@ -134,6 +155,13 @@ dependencies: "@types/lodash" "*" +"@types/lodash.orderby@^4.6.6": + version "4.6.6" + resolved "https://registry.yarnpkg.com/@types/lodash.orderby/-/lodash.orderby-4.6.6.tgz#126543bb597477dc9b27d748b5822244f577915c" + integrity sha512-wQzu6xK+bSwhu45OeMI7fjywiIZiiaBzJB8W3fwnF1SJXHoOXRLutrSnVmq4yHPOM036qsy8lx9wHQcAbXNjJw== + dependencies: + "@types/lodash" "*" + "@types/lodash.uniqby@^4.7.6": version "4.7.6" resolved "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz#672827a701403f07904fe37f0721ae92abfa80e8" @@ -161,12 +189,17 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== +"@types/pinyin@^2.10.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@types/pinyin/-/pinyin-2.10.0.tgz#074964ec2f777d632e221f927a975bb7d51ded9a" + integrity sha512-YLty6FPYiBgxNbQNaTRJquvflRdG026jjOpjNXR7HdGEJPGtmPBp1x9LkWePCNA/ClaTT0hYem080TbRCMLbew== + "@types/prop-types@*": version "15.7.3" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== -"@types/prosemirror-commands@*", "@types/prosemirror-commands@^1.0.3": +"@types/prosemirror-commands@*": version "1.0.3" resolved "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.3.tgz#e9fa5653cffd1c75c260594cf3ec5244c9004dbf" integrity sha512-AjFCJqBvAhQ4gOzXPgUcnEZwu4jd7se7ani3dYAv8p4L+cWEPD6Pshrpp5uJDI5/pzvNXLWQ/4c2Qk4h9IML1w== @@ -175,65 +208,67 @@ "@types/prosemirror-state" "*" "@types/prosemirror-view" "*" -"@types/prosemirror-dev-tools@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.0.tgz#91e2ef4f36129f5155f924296e306de187e86bdb" - integrity sha512-OhnSaC4yrrEMLPRUkEWcHAIPVqgKlLkE4kISqL3cHeAYxASouSPvPMLqhBIbWkGwaozy43DjjVC1OXkxTo+y5Q== +"@types/prosemirror-commands@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.4.tgz#d08551415127d93ae62e7239d30db0b5e7208e22" + integrity sha512-utDNYB3EXLjAfYIcRWJe6pn3kcQ5kG4RijbT/0Y/TFOm6yhvYS/D9eJVnijdg9LDjykapcezchxGRqFD5LcyaQ== dependencies: + "@types/prosemirror-model" "*" "@types/prosemirror-state" "*" "@types/prosemirror-view" "*" -"@types/prosemirror-dropcursor@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.0.tgz#2df872bc6431a9f06bc1a4a0eac7c2dc527e7f12" - integrity sha512-S2ndHt94M64avSqjBcgIblaF3YeC3RfcmpY9/WIdfqU7aoJxuOh4RJk5emdmQPHZT1wbczMHFmFSsRqgErK0EQ== +"@types/prosemirror-dropcursor@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.3.tgz#49250849b8a0b86e8c29eb1ba70a463e53e46947" + integrity sha512-b0/8njnJ4lwyHKcGuCMf3x7r1KjxyugB1R/c2iMCjplsJHSC7UY9+OysqgJR5uUXRekUSGniiLgBtac/lvH6wg== dependencies: "@types/prosemirror-state" "*" -"@types/prosemirror-gapcursor@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.1.tgz#56a6274ef39f62c339adcc64305294b800211a5e" - integrity sha512-ruA7FK9NJv+bn5s55SZYFf9SwaN3wk/MkBvqRmhIqIHvowTTa7nzIGWbUdWZMga1DDTk+GrwdcQaEHunAFjFsQ== +"@types/prosemirror-gapcursor@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz#7df7d373edb33ea8da12084bfd462cf84cd69761" + integrity sha512-9xKjFIG5947dzerFvkLWp6F53JwrUYoYwh3SgcTFEp8SbSfNNrez/PFYVZKPnoqPoaK5WtTdQTaMwpCV9rXQIg== dependencies: + "@types/prosemirror-model" "*" "@types/prosemirror-state" "*" -"@types/prosemirror-history@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.1.tgz#b8d7595f73788b63fc9f2b57a763ba8375abfe87" - integrity sha512-BYyPJlWDo3VEnWS5X2DCHXrrAKEjdbCe1DUjGL6R/8hmwMFe3iMJGYdBkOXU1FfkTpw7Z+PlwY/pMyeelVydmg== +"@types/prosemirror-history@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.3.tgz#f1110efbe758129b5475e466ff077f0a8d9b964f" + integrity sha512-5TloMDRavgLjOAKXp1Li8u0xcsspzbT1Cm9F2pwHOkgvQOz1jWQb2VIXO7RVNsFjLBZdIXlyfSLivro3DuMWXg== dependencies: "@types/prosemirror-model" "*" "@types/prosemirror-state" "*" -"@types/prosemirror-inputrules@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.3.tgz#3f8f07921f692b6c7e4781fa426aee3e76b9018c" - integrity sha512-cxMkCcu/di8//68jWc/NrRpvpCbizgq9vqv4rCRsAiuSiJ8L5hf4aFlCBUYCffuQnrY98uOfJ8YAUY3dbtaF9A== +"@types/prosemirror-inputrules@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.4.tgz#4cb75054d954aa0f6f42099be05eb6c0e6958bae" + integrity sha512-lJIMpOjO47SYozQybUkpV6QmfuQt7GZKHtVrvS+mR5UekA8NMC5HRIVMyaIauJLWhKU6oaNjpVaXdw41kh165g== dependencies: "@types/prosemirror-model" "*" "@types/prosemirror-state" "*" -"@types/prosemirror-keymap@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.3.tgz#09cc469a69222a4c8a3d415d02eeb459bb74269c" - integrity sha512-iCYUtt0u8y6qeDZVsidEWJGbw2Kas+jtHD1QY374W/N2jASYp+8auucFLXe0UvoOy9jiWcGcqcecec1R+vkzgw== +"@types/prosemirror-keymap@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.4.tgz#f73c79810e8d0e0a20d153d84f998f02e5afbc0c" + integrity sha512-ycevwkqUh+jEQtPwqO7sWGcm+Sybmhu8MpBsM8DlO3+YTKnXbKA6SDz/+q14q1wK3UA8lHJyfR+v+GPxfUSemg== dependencies: "@types/prosemirror-commands" "*" "@types/prosemirror-model" "*" "@types/prosemirror-state" "*" "@types/prosemirror-view" "*" -"@types/prosemirror-model@*", "@types/prosemirror-model@^1.7.2": +"@types/prosemirror-model@*": version "1.7.2" resolved "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz#9c7aff2fd62f0f56eb76e2e0eb27bf6996e6c28a" integrity sha512-2l+yXvidg3AUHN07mO4Jd8Q84fo6ksFsy7LHUurLYrZ74uTahBp2fzcO49AKZMzww2EulXJ40Kl/OFaQ/7A1fw== dependencies: "@types/orderedmap" "*" -"@types/prosemirror-schema-list@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz#7f53e3c0326b1359755f3971b8c448d98b722f21" - integrity sha512-+iUYq+pj2wVHSThj0MjNDzkkGwq8aDQ6j0UJK8a0cNCL8v44Ftcx1noGPtBIEUJgitH960VnfBNoTWfQoQZfRA== +"@types/prosemirror-schema-list@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.3.tgz#bdf1893a7915fbdc5c49b3cac9368e96213d70de" + integrity sha512-uWybOf+M2Ea7rlbs0yLsS4YJYNGXYtn4N+w8HCw3Vvfl6wBAROzlMt0gV/D/VW/7J/LlAjwMezuGe8xi24HzXA== dependencies: "@types/orderedmap" "*" "@types/prosemirror-model" "*" @@ -248,15 +283,6 @@ "@types/prosemirror-transform" "*" "@types/prosemirror-view" "*" -"@types/prosemirror-state@^1.2.5": - version "1.2.5" - resolved "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.5.tgz#a91304e9aab6e71f868e23b3a1ae514a75033f8f" - integrity sha512-a5DxAifiF6vmdSJ5jsDMkpykUgUJUy+T5Q5hCjFOKJ4cfd3m3q1lsFKr7Bc4r91Qb7rfqyiKCMDnASS8LIHrKw== - dependencies: - "@types/prosemirror-model" "*" - "@types/prosemirror-transform" "*" - "@types/prosemirror-view" "*" - "@types/prosemirror-tables@^0.9.1": version "0.9.1" resolved "https://registry.yarnpkg.com/@types/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz#d2203330f0fa1161c04152bf02c39e152082d408" @@ -264,7 +290,7 @@ dependencies: prosemirror-tables "*" -"@types/prosemirror-transform@*", "@types/prosemirror-transform@^1.1.1": +"@types/prosemirror-transform@*": version "1.1.1" resolved "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.1.tgz#5a0de16e8e0123b4c3d9559235e19f39cee85e5c" integrity sha512-yYCYSoiRH+Wcbl8GJc0PFCzeyMzNQ1vL2xrHHSXZuNcIlH75VoiKrZFeZ6BS9cl8mYXjZrlmdBe8YOxYvyKM6A== @@ -280,21 +306,21 @@ "@types/prosemirror-state" "*" "@types/prosemirror-transform" "*" -"@types/react-dom@^16.9.6": - version "16.9.6" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.6.tgz#9e7f83d90566521cc2083be2277c6712dcaf754c" - integrity sha512-S6ihtlPMDotrlCJE9ST1fRmYrQNNwfgL61UB4I1W7M6kPulUKx9fXAleW5zpdIjUQ4fTaaog8uERezjsGUj9HQ== +"@types/react-dom@^17.0.9": + version "17.0.9" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add" + integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg== dependencies: "@types/react" "*" -"@types/react-window@^1.8.2": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.2.tgz#a5a6b2762ce73ffaab7911ee1397cf645f2459fe" - integrity sha512-gP1xam68Wc4ZTAee++zx6pTdDAH08rAkQrWm4B4F/y6hhmlT9Mgx2q8lTCXnrPHXsr15XjRN9+K2DLKcz44qEQ== +"@types/react-window@^1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.5.tgz#285fcc5cea703eef78d90f499e1457e9b5c02fc1" + integrity sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.9.32": +"@types/react@*": version "16.9.32" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383" integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ== @@ -302,6 +328,27 @@ "@types/prop-types" "*" csstype "^2.2.0" +"@types/react@^17.0.20": + version "17.0.20" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz#a4284b184d47975c71658cd69e759b6bd37c3b8c" + integrity sha512-wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + +"@types/transliteration@^1.6.6": + version "1.6.6" + resolved "https://registry.yarnpkg.com/@types/transliteration/-/transliteration-1.6.6.tgz#72b4f1742280d9341fbbe19c7efa5c2bc20a4726" + integrity sha512-drgWFeHgZt16bXKhsu4cP6TlunW3Pu9MS1l9w7Qnm+bcsqf4/pnjnO6/uMAziCV8rnmuU3iCSk7J2zio1nR1+A== + dependencies: + transliteration "*" + "@types/unzip@^0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@types/unzip/-/unzip-0.1.1.tgz#96e80dc5e2917a769c8be01aa49c4fe660e7bab3" @@ -309,10 +356,10 @@ dependencies: "@types/node" "*" -"@types/zenscroll@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.0.tgz#9acc7df6c87cc9e064f5a6230df499835dee1972" - integrity sha512-n9np/qsr3HBH3VBVfviHhQPmGP1+D01+VI/40QFq/7LyJqDoIlcaaABu/qPAVats/oNuUJ/dhrjrOjVaqos+4A== +"@types/zenscroll@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.1.tgz#881e92d5cc44ef900d2919ca0295a0b8d9011858" + integrity sha512-r1h1/SPJQn8kL4rzyJvf4HJvqv20YrTV++qRGiPuA1mYbCSkMBaUOsCXLN780gI6BZfRzDbmjU0/sWq9yi1WgQ== abbrev@1: version "1.1.1" @@ -339,6 +386,13 @@ acorn@^5.0.3, acorn@^5.7.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== +agent-base@6: + 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" + ajax-request@^1.2.0: version "1.2.3" resolved "https://registry.yarnpkg.com/ajax-request/-/ajax-request-1.2.3.tgz#99fcbec1d6d2792f85fa949535332bd14f5f3790" @@ -362,11 +416,21 @@ ansi-escapes@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -374,6 +438,13 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + ansi@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" @@ -397,6 +468,19 @@ app-root-path@^2.0.1: resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a" integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA== +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -409,6 +493,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + arr-diff@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" @@ -571,10 +660,10 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -biblatex-csl-converter@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-1.9.1.tgz#50aacfef172997f1c98d72837ffdd3b19c62f8c4" - integrity sha512-M7HkWas8NbiFoNdS/lZOfup5A83Scw4iWFoPn9r84zh9DzaG/gHU86qH1QHMgUc2dSaquuIBQZRHC9wCs7k92g== +biblatex-csl-converter@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-2.0.2.tgz#bfddc2cfb013296affb98c9f432634e3d5b90b53" + integrity sha512-od1JdAkQYh2T1Pzpq11eYtuNb3nNXQ0w+17CAnYqRsX+QFtoiK0XcvBE7N6rpDJyUo0acoaB6Of7EDhFQOcblA== binary-extensions@^1.0.0: version "1.13.1" @@ -747,6 +836,11 @@ chokidar@^1.6.1: optionalDependencies: fsevents "^1.0.0" +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -776,15 +870,29 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= -clipboard@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376" - integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg== +clipboard@*, clipboard@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz#ffc6c103dd2967a83005f3f61976aa4655a4cdba" + integrity sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ== dependencies: good-listener "^1.2.2" select "^1.1.2" tiny-emitter "^2.0.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== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -800,11 +908,23 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + 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= +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== + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -817,6 +937,13 @@ commander@^2.12.1, commander@^2.20.0, commander@~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@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-1.1.1.tgz#50d1651868ae60eccff0a2d9f34595376bc6b041" + integrity sha1-UNFlGGiuYOzP8KLZ80WVN2vGsEE= + dependencies: + keypress "0.1.x" + component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -847,6 +974,11 @@ concat-stream@^2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" +console-control-strings@^1.0.0, 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 sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -859,13 +991,20 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.5.0, convert-source-map@^1.5.1: +convert-source-map@^1.5.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== dependencies: safe-buffer "~5.1.1" +convert-source-map@^1.5.1: + 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" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -933,9 +1072,14 @@ csstype@^2.2.0: integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w== csstype@^2.5.2: - version "2.6.9" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098" - integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q== + version "2.6.18" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.18.tgz#980a8b53085f34af313410af064f2bd241784218" + integrity sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ== + +csstype@^3.0.2: + version "3.0.9" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" + integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== dashdash@^1.12.0: version "1.14.1" @@ -951,6 +1095,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" +debug@4: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" @@ -961,13 +1112,6 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -define-properties@^1.1.2, 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== - dependencies: - object-keys "^1.0.12" - define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -1000,6 +1144,11 @@ delegate@^3.1.2: resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -1010,11 +1159,21 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -diff-match-patch@^1.0.0, diff-match-patch@^1.0.4: +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + +diff-match-patch@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1" integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg== +diff-match-patch@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37" + integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw== + diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -1033,6 +1192,11 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= +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== + emotion@^9.2.5: version "9.2.12" resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9" @@ -1053,37 +1217,16 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: - version "1.17.6" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a" - integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.2.0" - is-regex "^1.1.0" - object-inspect "^1.7.0" - object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - es6-object-assign@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw= +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -1406,6 +1549,13 @@ fs-extra@^7.0.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-minipass@^2.0.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" @@ -1429,11 +1579,6 @@ fsevents@^1.0.0: mkdirp "0.5" rimraf "2" -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - fuse-box@^3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-3.7.1.tgz#d32879ceee4c8bcec9bbd8fcfe5b29e7142371cd" @@ -1480,16 +1625,35 @@ fuse-concat-with-sourcemaps@^1.0.5: dependencies: source-map "^0.6.1" -fuse.js@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.0.4.tgz#9f5af976f836247ad5d2c338090d6ce13cf9a4d2" - integrity sha512-XAeQaT+DV8dxqohN911+Qzkb4iMzTzae04mdb9/XSQbMjbsFasQxe0+UwM+3UWP+8vO7svz1Rj0KuQw6xJ45Ww== +fuse.js@^6.4.6: + version "6.4.6" + resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.4.6.tgz#62f216c110e5aa22486aff20be7896d19a059b79" + integrity sha512-/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw== + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" get-caller-file@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== +get-caller-file@^2.0.5: + version "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-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -1571,10 +1735,10 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= -has-symbols@^1.0.0, has-symbols@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" - integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= has-value@^0.3.1: version "0.3.1" @@ -1607,13 +1771,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - html@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61" @@ -1652,6 +1809,14 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +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== + dependencies: + agent-base "6" + debug "4" + iconv-lite@0.4.24, iconv-lite@^0.4.17: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -1751,11 +1916,6 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4, is-callable@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" - integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== - is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -1770,11 +1930,6 @@ is-data-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-date-object@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== - is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -1822,11 +1977,23 @@ is-extglob@^1.0.0: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" @@ -1875,20 +2042,6 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" - integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== - dependencies: - has-symbols "^1.0.1" - -is-symbol@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== - dependencies: - has-symbols "^1.0.1" - is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -1939,6 +2092,13 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -1994,6 +2154,11 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +keypress@0.1.x: + version "0.1.0" + resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz#4a3188d4291b66b4f65edb99f806aa9ae293592a" + integrity sha1-SjGI1CkbZrT2XtuZ+AaqmuKTWSo= + kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -2065,12 +2230,17 @@ lodash.flow@^3.3.0: resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a" integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o= +lodash.orderby@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3" + integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM= + lodash.uniqby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= -lodash@^4.17.13, lodash@^4.3.0: +lodash@^4.3.0: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -2082,6 +2252,20 @@ loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -2219,6 +2403,21 @@ minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minipass@^3.0.0: + version "3.1.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" + integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== + dependencies: + yallist "^4.0.0" + +minizlib@^2.1.1: + 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" + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -2241,6 +2440,11 @@ mkdirp@^0.5.1: dependencies: minimist "0.0.8" +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + mock-require@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" @@ -2259,6 +2463,11 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== +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== + mustache@^2.3.0: version "2.3.2" resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" @@ -2306,6 +2515,33 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +node-addon-api@^3.0.2: + 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-fetch@^2.6.1: + version "2.6.5" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" + integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== + dependencies: + whatwg-url "^5.0.0" + +nodejieba@^2.2.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/nodejieba/-/nodejieba-2.5.2.tgz#fc929ee29f93c28c639696bac0319bac116a296a" + integrity sha512-ByskJvaBrQ2eV+5M0OeD80S5NKoGaHc9zi3Z/PTKl/95eac2YF8RmWduq9AknLpkQLrLAIcqurrtC6BzjpKwwg== + dependencies: + "@mapbox/node-pre-gyp" "^1.0.4" + node-addon-api "^3.0.2" + +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + nopt@~1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" @@ -2320,12 +2556,27 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" +npmlog@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -2339,16 +2590,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" - integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== - -object-keys@^1.0.11, 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== - object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -2356,16 +2597,6 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== - dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" - object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -2381,15 +2612,10 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" - integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - has "^1.0.3" +object_values@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/object_values/-/object_values-0.1.2.tgz#f8fbc31d2e537170a4cbcfb28dd61501b3207334" + integrity sha512-tZgUiKLraVH+4OAedBYrr4/K6KmAQw2RPNd1AuNdhLsuz5WP3VB7WuiKBWbOcjeqqAjus2ChIIWC8dSfmg7ReA== on-finished@~2.3.0: version "2.3.0" @@ -2506,6 +2732,16 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +pinyin@^2.10.2: + version "2.10.2" + resolved "https://registry.yarnpkg.com/pinyin/-/pinyin-2.10.2.tgz#93e3b3cb4430009925163bad10c741778c85b013" + integrity sha512-qAcp7+2vnjm6sAd0B9pp5JpyvHbYoQO1v9zCeJQMEgyw2VeRi02l0gR22ZBgfjjvZ1c2EGoVjJHJ1h0rwr34Ug== + dependencies: + commander "~1.1.1" + object-assign "^4.0.1" + optionalDependencies: + nodejieba "^2.2.1" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -2569,10 +2805,10 @@ prosemirror-changeset@^2.1.2: dependencies: prosemirror-transform "^1.0.0" -prosemirror-commands@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.4.tgz#991563e67623acab4f8c510fad1570f8b4693780" - integrity sha512-kj4Qi+8h3EpJtZuuEDwZ9h2/QNGWDsIX/CzjmClxi9GhxWyBUMVUvIFk0mgdqHyX20lLeGmOpc0TLA5aPzgpWg== +prosemirror-commands@^1.1.10: + version "1.1.10" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.10.tgz#406a6589966e6cd80809cea2d801fb998639b37d" + integrity sha512-IWyBBXNAd44RM6NnBPljwq+/CM2oYCQJkF+YhKEAZNwzW0uFdGf4qComhjbKZzqFdu6Iub2ZhNsXgwPibA0lCQ== dependencies: prosemirror-model "^1.0.0" prosemirror-state "^1.0.0" @@ -2596,10 +2832,10 @@ prosemirror-dev-tools@^2.1.1: react-json-tree "^0.11.0" unstated "^2.1.1" -prosemirror-dropcursor@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz#28738c4ed7102e814d7a8a26d70018523fc7cd6d" - integrity sha512-4c94OUGyobGnwcQI70OXyMhE/9T4aTgjU+CHxkd5c7D+jH/J0mKM/lk+jneFVKt7+E4/M0D9HzRPifu8U28Thw== +prosemirror-dropcursor@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.5.tgz#d2808c17089df0e441ad66016aecc2b6457c8a1f" + integrity sha512-tNUwcF2lPAkwKBZPZRtbxpwljnODRNZ3eiYloN1DSUqDjMT1nBZm0nejaEMS1TvNQ+3amibUSAiV4hX+jpASFA== dependencies: prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" @@ -2615,19 +2851,19 @@ prosemirror-gapcursor@^1.1.5: prosemirror-state "^1.0.0" prosemirror-view "^1.0.0" -prosemirror-history@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz#4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489" - integrity sha512-zGDotijea+vnfnyyUGyiy1wfOQhf0B/b6zYcCouBV8yo6JmrE9X23M5q7Nf/nATywEZbgRLG70R4DmfSTC+gfg== +prosemirror-history@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.2.0.tgz#04cc4df8d2f7b2a46651a2780de191ada6d465ea" + integrity sha512-B9v9xtf4fYbKxQwIr+3wtTDNLDZcmMMmGiI3TAPShnUzvo+Rmv1GiUrsQChY1meetHl7rhML2cppF3FTs7f7UQ== dependencies: prosemirror-state "^1.2.2" prosemirror-transform "^1.0.0" rope-sequence "^1.3.0" -prosemirror-inputrules@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz#487e46c763e1212a4577397aba7706139084f012" - integrity sha512-Ja5Z3BWestlHYGvtSGqyvxMeB8QEuBjlHM8YnKtLGUXMDp965qdDV4goV8lJb17kIWHk7e7JNj6Catuoa3302g== +prosemirror-inputrules@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz#93f9199ca02473259c30d7e352e4c14022d54638" + integrity sha512-ZaHCLyBtvbyIHv0f5p6boQTIJjlD6o2NPZiEaZWT2DA+j591zS29QQEMT4lBqwcLW3qRSf7ZvoKNbf05YrsStw== dependencies: prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" @@ -2655,17 +2891,17 @@ prosemirror-model@>=1.0.0, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, p dependencies: orderedmap "^1.1.0" -prosemirror-model@^1.11.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.0.tgz#dc36cdb3ad6442b9f6325c7d89170c624f9dc520" - integrity sha512-GqoAz/mIYjdv8gVYJ8mWFKpHoTxn/lXq4tXJ6bTVxs+rem2LzMYXrNVXfucGtfsgqsJlRIgng/ByG9j7Q8XDrg== +prosemirror-model@^1.14.3: + version "1.14.3" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.3.tgz#a9c250d3c4023ddf10ecb41a0a7a130e9741d37e" + integrity sha512-yzZlBaSxfUPIIP6U5Edh5zKxJPZ5f7bwZRhiCuH3UYkWhj+P3d8swHsbuAMOu/iDatDc5J/Qs5Mb3++mZf+CvQ== dependencies: orderedmap "^1.1.0" -prosemirror-schema-list@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1" - integrity sha512-pNTuZflacFOBlxrTcWSdWhjoB8BaucwfJVp/gJNxztOwaN3wQiC65axclXyplf6TKgXD/EkWfS/QAov3/Znadw== +prosemirror-schema-list@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.5.tgz#e7ad9e337ea3d77da6d6a4250f3d7bd51ae980a4" + integrity sha512-9gadhga/wySVfb/iZ2vOpndbG0XroeLw0HkkZN5demNbOea6U5oQtJmvyYWC7ZVf3WkhmVdVsOXrllM9JcC20A== dependencies: prosemirror-model "^1.0.0" prosemirror-transform "^1.0.0" @@ -2678,10 +2914,10 @@ prosemirror-state@>=1.0.0, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, p prosemirror-model "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-state@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz#b2862866b14dec2b3ae1ab18229f2bd337651a2c" - integrity sha512-PLXh2VJsIgvlgSTH6I2Yg6vk1CzPDp21DFreVpQtDMY2S6WaMmrQgDTLRcsrD8X38v8Yc873H7+ogdGzyIPn+w== +prosemirror-state@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.4.tgz#4c6b52628216e753fc901c6d2bfd84ce109e8952" + integrity sha512-Xkkrpd1y/TQ6HKzN3agsQIGRcLckUMA9u3j207L04mt8ToRgpGeyhbVv0HI7omDORIBHjR29b7AwlATFFf2GLA== dependencies: prosemirror-model "^1.0.0" prosemirror-transform "^1.0.0" @@ -2715,10 +2951,10 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor dependencies: prosemirror-model "^1.0.0" -prosemirror-transform@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.8.tgz#4b86544fa43637fe381549fb7b019f4fb71fe65c" - integrity sha512-hKqceqv9ZmMQXNQkhFjr0KFGPvkhygaWND+uIM0GxRpALrKfxP97SsgHTBs3OpJhDmh5N+mB4D/CksB291Eavg== +prosemirror-transform@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.3.2.tgz#5620ebe7379e6fae4f34ecc881886cb22ce96579" + integrity sha512-/G6d/u9Mf6Bv3H1XR8VxhpjmUO75LYmnvj+s3ZfZpakU1hnQbsvCEybml1B3f2IWUAAQRFkbO1PnsbFhLZsYsw== dependencies: prosemirror-model "^1.0.0" @@ -2736,12 +2972,12 @@ prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3: prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" -prosemirror-view@^1.15.6: - version "1.15.6" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.6.tgz#446bf7662235300c5f47362af2db805c6df3ad24" - integrity sha512-9FBFB+rK5pvvzHsHOacy0T/Jf+OxZSzY8tSlQiur3SZwAVaNVQm+fl23V/6gU2dHBnreGxjYx9jK+F3XPsPCGw== +prosemirror-view@^1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.20.1.tgz#174ba8ca358c73cc05e9a92a3d252bcf181ea337" + integrity sha512-djWORhy3a706mUH4A2dgEEV0IPZqQd1tFyz/ZVHJNoqhSgq82FwG6dq7uqHeUB2KdVSNfI2yc3rwfqlC/ll2pA== dependencies: - prosemirror-model "^1.1.0" + prosemirror-model "^1.14.3" prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" @@ -2830,15 +3066,14 @@ react-dock@^0.2.4: lodash.debounce "^3.1.1" prop-types "^15.5.8" -react-dom@^16.13.1: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" - integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== +react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" + scheduler "^0.20.2" react-emotion@^9.2.5: version "9.2.12" @@ -2862,24 +3097,23 @@ react-json-tree@^0.11.0: prop-types "^15.5.8" react-base16-styling "^0.5.1" -react-window@^1.8.5: - version "1.8.5" - resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz#a56b39307e79979721021f5d06a67742ecca52d1" - integrity sha512-HeTwlNa37AFa8MDZFZOKcNEkuF2YflA0hpGPiTT9vR7OawEt+GZbfM6wqkBahD3D3pUjIabQYzsnY/BSJbgq6Q== +react-window@^1.8.6: + version "1.8.6" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112" + integrity sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg== dependencies: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@^16.13.1: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" - integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w== +react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.2" -readable-stream@^2.0.2, readable-stream@^2.2.2: +readable-stream@^2.0.2, readable-stream@^2.0.6, 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== @@ -3035,6 +3269,11 @@ request@^2.79.0: tunnel-agent "^0.6.0" uuid "^3.3.2" +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= + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -3072,6 +3311,13 @@ rimraf@2: dependencies: glob "^7.1.3" +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== + dependencies: + glob "^7.1.3" + rope-sequence@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b" @@ -3123,10 +3369,10 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -3141,6 +3387,18 @@ semver@^5.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== +semver@^6.0.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.4: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -3160,14 +3418,14 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -sentence-splitter@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.0.tgz#fb2cd2f61f40006643ba83d9acf4609233c1c68c" - integrity sha512-lKX2tZ1rsA9Tu0gW8vRmMDmIEJoZ1d7cKpzcbFZdUrSpCR6gy/7OPPh7jjT/6Oc6Z79ToUmC2l8tyTEGanVmiA== +sentence-splitter@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.2.tgz#b02a28c08bbad4bd3b6ec6f619d50e3fd3596d07" + integrity sha512-hMvaodgK9Fay928uiQoTMEWjXpCERdKD2uKo7BbSyP+uWTo+wHiRjN+ZShyI99rW0VuoV4Cuw8FUmaRcnpN7Ug== dependencies: - "@textlint/ast-node-types" "^4.2.5" + "@textlint/ast-node-types" "^4.4.2" concat-stream "^2.0.0" - object.values "^1.1.0" + object_values "^0.1.2" structured-source "^3.0.2" serve-static@1.14.1: @@ -3180,6 +3438,11 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" @@ -3205,6 +3468,11 @@ shorthash@0.0.2: resolved "https://registry.yarnpkg.com/shorthash/-/shorthash-0.0.2.tgz#59b268eecbde59038b30da202bcfbddeb2c4a4eb" integrity sha1-WbJo7sveWQOLMNogK8+93rLEpOs= +signal-exit@^3.0.0: + version "3.0.5" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" + integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== + signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -3349,7 +3617,16 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" -string-width@^2.1.0: +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2", string-width@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -3357,21 +3634,14 @@ string-width@^2.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string.prototype.trimend@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" - integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.5" - -string.prototype.trimstart@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" - integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== +string-width@^4.1.0, string-width@^4.2.0: + 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== dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.5" + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" string_decoder@^1.1.1: version "1.3.0" @@ -3392,6 +3662,13 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" @@ -3399,6 +3676,13 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + structured-source@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz#dd802425e0f53dc4a6e7aca3752901a1ccda7af5" @@ -3423,6 +3707,18 @@ supports-color@^5.3.0, supports-color@^5.4.0: dependencies: has-flag "^3.0.0" +tar@^6.1.0: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + terser@^4.6.2: version "4.6.4" resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00" @@ -3509,6 +3805,18 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + +transliteration@*, transliteration@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/transliteration/-/transliteration-2.2.0.tgz#e6333cc74b25ef4465bc27086ed8465c9a19211d" + integrity sha512-o29GDWtecNoK4TNfnJQesGluFPiza+U8NoiKrErU8eTNlVgma6w1LV/tTiGo+waFLkhtL9WxrW0lXhZKmm7msQ== + dependencies: + yargs "^16.1.0" + "traverse@>=0.3.0 <0.4": version "0.3.9" resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" @@ -3799,11 +4107,40 @@ watch@^1.0.1: exec-sh "^0.2.0" minimist "^1.2.0" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -3817,6 +4154,16 @@ ws@^1.1.1: options ">=0.0.5" ultron "1.0.x" +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +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== + yaml@^1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" @@ -3824,6 +4171,24 @@ yaml@^1.7.2: dependencies: "@babel/runtime" "^7.6.3" +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@^16.1.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + 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" + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" diff --git a/pkgs/applications/editors/rstudio/yarndeps.nix b/pkgs/applications/editors/rstudio/yarndeps.nix index be4480a67c667..21d267f841cd2 100644 --- a/pkgs/applications/editors/rstudio/yarndeps.nix +++ b/pkgs/applications/editors/rstudio/yarndeps.nix @@ -6,15 +6,23 @@ path = fetchurl { name = "_babel_code_frame___code_frame_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; + sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.15.4.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; - sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; + name = "_babel_helper_module_imports___helper_module_imports_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz"; + sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha512 = "pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="; }; } { @@ -22,7 +30,7 @@ path = fetchurl { name = "_babel_highlight___highlight_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; - sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg=="; }; } { @@ -30,7 +38,7 @@ path = fetchurl { name = "_babel_runtime___runtime_7.9.6.tgz"; url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; - sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; }; } { @@ -38,15 +46,15 @@ path = fetchurl { name = "_babel_runtime___runtime_7.8.4.tgz"; url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz"; - sha1 = "d79f5a2040f7caa24d53e563aad49cbc05581308"; + sha512 = "neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ=="; }; } { - name = "_babel_types___types_7.8.6.tgz"; + name = "_babel_types___types_7.15.6.tgz"; path = fetchurl { - name = "_babel_types___types_7.8.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz"; - sha1 = "629ecc33c2557fcde7126e58053127afdb3e6d01"; + name = "_babel_types___types_7.15.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz"; + sha512 = "BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig=="; }; } { @@ -54,7 +62,7 @@ path = fetchurl { name = "_emotion_babel_utils___babel_utils_0.6.10.tgz"; url = "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz"; - sha1 = "83dbf3dfa933fae9fc566e54fbb45f14674c6ccc"; + sha512 = "/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow=="; }; } { @@ -62,7 +70,7 @@ path = fetchurl { name = "_emotion_hash___hash_0.6.6.tgz"; url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz"; - sha1 = "62266c5f0eac6941fece302abad69f2ee7e25e44"; + sha512 = "ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="; }; } { @@ -70,7 +78,7 @@ path = fetchurl { name = "_emotion_is_prop_valid___is_prop_valid_0.6.8.tgz"; url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz"; - sha1 = "68ad02831da41213a2089d2cab4e8ac8b30cbd85"; + sha512 = "IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA=="; }; } { @@ -78,7 +86,7 @@ path = fetchurl { name = "_emotion_memoize___memoize_0.6.6.tgz"; url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz"; - sha1 = "004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"; + sha512 = "h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="; }; } { @@ -86,7 +94,7 @@ path = fetchurl { name = "_emotion_serialize___serialize_0.9.1.tgz"; url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz"; - sha1 = "a494982a6920730dba6303eb018220a2b629c145"; + sha512 = "zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ=="; }; } { @@ -94,7 +102,7 @@ path = fetchurl { name = "_emotion_stylis___stylis_0.7.1.tgz"; url = "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz"; - sha1 = "50f63225e712d99e2b2b39c19c70fff023793ca5"; + sha512 = "/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ=="; }; } { @@ -102,7 +110,7 @@ path = fetchurl { name = "_emotion_unitless___unitless_0.6.7.tgz"; url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz"; - sha1 = "53e9f1892f725b194d5e6a1684a7b394df592397"; + sha512 = "Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="; }; } { @@ -110,15 +118,23 @@ path = fetchurl { name = "_emotion_utils___utils_0.8.2.tgz"; url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz"; - sha1 = "576ff7fb1230185b619a75d258cbc98f0867a8dc"; + sha512 = "rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw=="; }; } { - name = "_textlint_ast_node_types___ast_node_types_4.3.4.tgz"; + name = "_mapbox_node_pre_gyp___node_pre_gyp_1.0.5.tgz"; path = fetchurl { - name = "_textlint_ast_node_types___ast_node_types_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.3.4.tgz"; - sha1 = "f6596c45c32c85dc06915c3077bb7686033efd32"; + name = "_mapbox_node_pre_gyp___node_pre_gyp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz"; + sha512 = "4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA=="; + }; + } + { + name = "_textlint_ast_node_types___ast_node_types_4.4.3.tgz"; + path = fetchurl { + name = "_textlint_ast_node_types___ast_node_types_4.4.3.tgz"; + url = "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.4.3.tgz"; + sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; } { @@ -126,15 +142,15 @@ path = fetchurl { name = "_types_ace___ace_0.0.43.tgz"; url = "https://registry.yarnpkg.com/@types/ace/-/ace-0.0.43.tgz"; - sha1 = "9f0916174b6060dabbccd36ba4868ea769a1c633"; + sha512 = "eQdX8AQ7CfSHym07MZMBQ8FKUj9AZ2Wcc26W5Ct8J4KOMjFY6SFUaf2YA8YHBut0Fwl//2kZ+0GLZNp+NQNRIA=="; }; } { - name = "_types_clipboard___clipboard_2.0.1.tgz"; + name = "_types_clipboard___clipboard_2.0.7.tgz"; path = fetchurl { - name = "_types_clipboard___clipboard_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.1.tgz"; - sha1 = "75a74086c293d75b12bc93ff13bc7797fef05a40"; + name = "_types_clipboard___clipboard_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.7.tgz"; + sha512 = "VwVFUHlneOsWfv/GaaY7Kwk4XasDqkAlyFQtsHxnOw0yyBYWTrlEXtmb9RtC+VFBCdtuOeIXECmELNd5RrKp/g=="; }; } { @@ -142,15 +158,15 @@ path = fetchurl { name = "_types_diff_match_patch___diff_match_patch_1.0.32.tgz"; url = "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz"; - sha1 = "d9c3b8c914aa8229485351db4865328337a3d09f"; + sha512 = "bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A=="; }; } { - name = "_types_js_yaml___js_yaml_3.12.3.tgz"; + name = "_types_js_yaml___js_yaml_4.0.3.tgz"; path = fetchurl { - name = "_types_js_yaml___js_yaml_3.12.3.tgz"; - url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.3.tgz"; - sha1 = "abf383c5b639d0aa8b8c4a420d6a85f703357d6c"; + name = "_types_js_yaml___js_yaml_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz"; + sha512 = "5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg=="; }; } { @@ -158,7 +174,15 @@ path = fetchurl { name = "_types_lodash.debounce___lodash.debounce_4.0.6.tgz"; url = "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.6.tgz"; - sha1 = "c5a2326cd3efc46566c47e4c0aa248dc0ee57d60"; + sha512 = "4WTmnnhCfDvvuLMaF3KV4Qfki93KebocUF45msxhYyjMttZDQYzHkO639ohhk8+oco2cluAFL3t5+Jn4mleylQ=="; + }; + } + { + name = "_types_lodash.orderby___lodash.orderby_4.6.6.tgz"; + path = fetchurl { + name = "_types_lodash.orderby___lodash.orderby_4.6.6.tgz"; + url = "https://registry.yarnpkg.com/@types/lodash.orderby/-/lodash.orderby-4.6.6.tgz"; + sha512 = "wQzu6xK+bSwhu45OeMI7fjywiIZiiaBzJB8W3fwnF1SJXHoOXRLutrSnVmq4yHPOM036qsy8lx9wHQcAbXNjJw=="; }; } { @@ -166,7 +190,7 @@ path = fetchurl { name = "_types_lodash.uniqby___lodash.uniqby_4.7.6.tgz"; url = "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz"; - sha1 = "672827a701403f07904fe37f0721ae92abfa80e8"; + sha512 = "9wBhrm1y6asW50Joj6tsySCNUgzK2tCqL7vtKIej0E9RyeBFdcte7fxUosmFuMoOU0eHqOMK76kCCrK99jxHgg=="; }; } { @@ -174,7 +198,7 @@ path = fetchurl { name = "_types_lodash___lodash_4.14.154.tgz"; url = "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.154.tgz"; - sha1 = "069e3c703fdb264e67be9e03b20a640bc0198ecc"; + sha512 = "VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ=="; }; } { @@ -182,7 +206,7 @@ path = fetchurl { name = "_types_node___node_14.0.4.tgz"; url = "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz"; - sha1 = "43a63fc5edce226bed106b31b875165256271107"; + sha512 = "k3NqigXWRzQZVBDS5D1U70A5E8Qk4Kh+Ha/x4M8Bt9pF0X05eggfnC9+63Usc9Q928hRUIpIhTQaXsZwZBl4Ew=="; }; } { @@ -190,7 +214,7 @@ path = fetchurl { name = "_types_orderedmap___orderedmap_1.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/orderedmap/-/orderedmap-1.0.0.tgz"; - sha1 = "807455a192bba52cbbb4517044bc82bdbfa8c596"; + sha512 = "dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw=="; }; } { @@ -198,7 +222,15 @@ path = fetchurl { name = "_types_parse_json___parse_json_4.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; + }; + } + { + name = "_types_pinyin___pinyin_2.10.0.tgz"; + path = fetchurl { + name = "_types_pinyin___pinyin_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/@types/pinyin/-/pinyin-2.10.0.tgz"; + sha512 = "YLty6FPYiBgxNbQNaTRJquvflRdG026jjOpjNXR7HdGEJPGtmPBp1x9LkWePCNA/ClaTT0hYem080TbRCMLbew=="; }; } { @@ -206,7 +238,7 @@ path = fetchurl { name = "_types_prop_types___prop_types_15.7.3.tgz"; url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz"; - sha1 = "2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"; + sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="; }; } { @@ -214,55 +246,55 @@ path = fetchurl { name = "_types_prosemirror_commands___prosemirror_commands_1.0.3.tgz"; url = "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.3.tgz"; - sha1 = "e9fa5653cffd1c75c260594cf3ec5244c9004dbf"; + sha512 = "AjFCJqBvAhQ4gOzXPgUcnEZwu4jd7se7ani3dYAv8p4L+cWEPD6Pshrpp5uJDI5/pzvNXLWQ/4c2Qk4h9IML1w=="; }; } { - name = "_types_prosemirror_dev_tools___prosemirror_dev_tools_2.1.0.tgz"; + name = "_types_prosemirror_commands___prosemirror_commands_1.0.4.tgz"; path = fetchurl { - name = "_types_prosemirror_dev_tools___prosemirror_dev_tools_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.0.tgz"; - sha1 = "91e2ef4f36129f5155f924296e306de187e86bdb"; + name = "_types_prosemirror_commands___prosemirror_commands_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.4.tgz"; + sha512 = "utDNYB3EXLjAfYIcRWJe6pn3kcQ5kG4RijbT/0Y/TFOm6yhvYS/D9eJVnijdg9LDjykapcezchxGRqFD5LcyaQ=="; }; } { - name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.0.tgz"; + name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.3.tgz"; path = fetchurl { - name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.0.tgz"; - sha1 = "2df872bc6431a9f06bc1a4a0eac7c2dc527e7f12"; + name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.3.tgz"; + sha512 = "b0/8njnJ4lwyHKcGuCMf3x7r1KjxyugB1R/c2iMCjplsJHSC7UY9+OysqgJR5uUXRekUSGniiLgBtac/lvH6wg=="; }; } { - name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.1.tgz"; + name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.4.tgz"; path = fetchurl { - name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.1.tgz"; - sha1 = "56a6274ef39f62c339adcc64305294b800211a5e"; + name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz"; + sha512 = "9xKjFIG5947dzerFvkLWp6F53JwrUYoYwh3SgcTFEp8SbSfNNrez/PFYVZKPnoqPoaK5WtTdQTaMwpCV9rXQIg=="; }; } { - name = "_types_prosemirror_history___prosemirror_history_1.0.1.tgz"; + name = "_types_prosemirror_history___prosemirror_history_1.0.3.tgz"; path = fetchurl { - name = "_types_prosemirror_history___prosemirror_history_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.1.tgz"; - sha1 = "b8d7595f73788b63fc9f2b57a763ba8375abfe87"; + name = "_types_prosemirror_history___prosemirror_history_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.3.tgz"; + sha512 = "5TloMDRavgLjOAKXp1Li8u0xcsspzbT1Cm9F2pwHOkgvQOz1jWQb2VIXO7RVNsFjLBZdIXlyfSLivro3DuMWXg=="; }; } { - name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.3.tgz"; + name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.4.tgz"; path = fetchurl { - name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.3.tgz"; - sha1 = "3f8f07921f692b6c7e4781fa426aee3e76b9018c"; + name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.4.tgz"; + sha512 = "lJIMpOjO47SYozQybUkpV6QmfuQt7GZKHtVrvS+mR5UekA8NMC5HRIVMyaIauJLWhKU6oaNjpVaXdw41kh165g=="; }; } { - name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.3.tgz"; + name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.4.tgz"; path = fetchurl { - name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.3.tgz"; - sha1 = "09cc469a69222a4c8a3d415d02eeb459bb74269c"; + name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.4.tgz"; + sha512 = "ycevwkqUh+jEQtPwqO7sWGcm+Sybmhu8MpBsM8DlO3+YTKnXbKA6SDz/+q14q1wK3UA8lHJyfR+v+GPxfUSemg=="; }; } { @@ -270,15 +302,15 @@ path = fetchurl { name = "_types_prosemirror_model___prosemirror_model_1.7.2.tgz"; url = "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz"; - sha1 = "9c7aff2fd62f0f56eb76e2e0eb27bf6996e6c28a"; + sha512 = "2l+yXvidg3AUHN07mO4Jd8Q84fo6ksFsy7LHUurLYrZ74uTahBp2fzcO49AKZMzww2EulXJ40Kl/OFaQ/7A1fw=="; }; } { - name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; + name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.3.tgz"; path = fetchurl { - name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz"; - sha1 = "7f53e3c0326b1359755f3971b8c448d98b722f21"; + name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.3.tgz"; + sha512 = "uWybOf+M2Ea7rlbs0yLsS4YJYNGXYtn4N+w8HCw3Vvfl6wBAROzlMt0gV/D/VW/7J/LlAjwMezuGe8xi24HzXA=="; }; } { @@ -286,15 +318,7 @@ path = fetchurl { name = "_types_prosemirror_state___prosemirror_state_1.2.3.tgz"; url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.3.tgz"; - sha1 = "7f5f871acf7b8c22e1862ff0068f9bf7e9682c0e"; - }; - } - { - name = "_types_prosemirror_state___prosemirror_state_1.2.5.tgz"; - path = fetchurl { - name = "_types_prosemirror_state___prosemirror_state_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.5.tgz"; - sha1 = "a91304e9aab6e71f868e23b3a1ae514a75033f8f"; + sha512 = "6m433Hubix9bx+JgcLW7zzyiZuzwjq5mBdSMYY4Yi5c5ZpV2RiVmg7Cy6f9Thtts8vuztilw+PczJAgDm1Frfw=="; }; } { @@ -302,7 +326,7 @@ path = fetchurl { name = "_types_prosemirror_tables___prosemirror_tables_0.9.1.tgz"; url = "https://registry.yarnpkg.com/@types/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz"; - sha1 = "d2203330f0fa1161c04152bf02c39e152082d408"; + sha512 = "zoY1qcAC6kG4UjnaQQXuoyYQdDJMQmY9uzRKdyUppP8rWRR5/kXBHOd84CD9ZvrYUBo3uDmS20qQnc3knr2j9A=="; }; } { @@ -310,7 +334,7 @@ path = fetchurl { name = "_types_prosemirror_transform___prosemirror_transform_1.1.1.tgz"; url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.1.tgz"; - sha1 = "5a0de16e8e0123b4c3d9559235e19f39cee85e5c"; + sha512 = "yYCYSoiRH+Wcbl8GJc0PFCzeyMzNQ1vL2xrHHSXZuNcIlH75VoiKrZFeZ6BS9cl8mYXjZrlmdBe8YOxYvyKM6A=="; }; } { @@ -318,23 +342,23 @@ path = fetchurl { name = "_types_prosemirror_view___prosemirror_view_1.11.2.tgz"; url = "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.11.2.tgz"; - sha1 = "58af5dcb7de20b7de874de99147552d5627209a1"; + sha512 = "EKcQmR4KdkFZU13wS5pWrkSojRCPGqz/l/uzpZFfW5cgdr7fQsftf2/ttvIjpk1a94ISifEY4UZwflVJ+uL4Rg=="; }; } { - name = "_types_react_dom___react_dom_16.9.6.tgz"; + name = "_types_react_dom___react_dom_17.0.9.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.6.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.6.tgz"; - sha1 = "9e7f83d90566521cc2083be2277c6712dcaf754c"; + name = "_types_react_dom___react_dom_17.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz"; + sha512 = "wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg=="; }; } { - name = "_types_react_window___react_window_1.8.2.tgz"; + name = "_types_react_window___react_window_1.8.5.tgz"; path = fetchurl { - name = "_types_react_window___react_window_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.2.tgz"; - sha1 = "a5a6b2762ce73ffaab7911ee1397cf645f2459fe"; + name = "_types_react_window___react_window_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.5.tgz"; + sha512 = "V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw=="; }; } { @@ -342,7 +366,31 @@ path = fetchurl { name = "_types_react___react_16.9.32.tgz"; url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz"; - sha1 = "f6368625b224604148d1ddf5920e4fefbd98d383"; + sha512 = "fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ=="; + }; + } + { + name = "_types_react___react_17.0.20.tgz"; + path = fetchurl { + name = "_types_react___react_17.0.20.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz"; + sha512 = "wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA=="; + }; + } + { + name = "_types_scheduler___scheduler_0.16.2.tgz"; + path = fetchurl { + name = "_types_scheduler___scheduler_0.16.2.tgz"; + url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz"; + sha512 = "hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="; + }; + } + { + name = "_types_transliteration___transliteration_1.6.6.tgz"; + path = fetchurl { + name = "_types_transliteration___transliteration_1.6.6.tgz"; + url = "https://registry.yarnpkg.com/@types/transliteration/-/transliteration-1.6.6.tgz"; + sha512 = "drgWFeHgZt16bXKhsu4cP6TlunW3Pu9MS1l9w7Qnm+bcsqf4/pnjnO6/uMAziCV8rnmuU3iCSk7J2zio1nR1+A=="; }; } { @@ -350,15 +398,15 @@ path = fetchurl { name = "_types_unzip___unzip_0.1.1.tgz"; url = "https://registry.yarnpkg.com/@types/unzip/-/unzip-0.1.1.tgz"; - sha1 = "96e80dc5e2917a769c8be01aa49c4fe660e7bab3"; + sha512 = "skD6Um7Pk2l7y+tVOKSgOA9vXViyhk/qJYmr17Ek4Uw3Zgo/DWPScphTPztPbApTIngyYSJnkEW87xrHzRYaew=="; }; } { - name = "_types_zenscroll___zenscroll_4.0.0.tgz"; + name = "_types_zenscroll___zenscroll_4.0.1.tgz"; path = fetchurl { - name = "_types_zenscroll___zenscroll_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.0.tgz"; - sha1 = "9acc7df6c87cc9e064f5a6230df499835dee1972"; + name = "_types_zenscroll___zenscroll_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.1.tgz"; + sha512 = "r1h1/SPJQn8kL4rzyJvf4HJvqv20YrTV++qRGiPuA1mYbCSkMBaUOsCXLN780gI6BZfRzDbmjU0/sWq9yi1WgQ=="; }; } { @@ -366,7 +414,7 @@ path = fetchurl { name = "abbrev___abbrev_1.1.1.tgz"; url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; } { @@ -374,7 +422,7 @@ path = fetchurl { name = "accepts___accepts_1.3.7.tgz"; url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; - sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; } { @@ -382,7 +430,7 @@ path = fetchurl { name = "acorn_jsx___acorn_jsx_4.1.1.tgz"; url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz"; - sha1 = "e8e41e48ea2fe0c896740610ab6a4ffd8add225e"; + sha512 = "JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw=="; }; } { @@ -390,7 +438,15 @@ path = fetchurl { name = "acorn___acorn_5.7.3.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; + }; + } + { + name = "agent_base___agent_base_6.0.2.tgz"; + path = fetchurl { + name = "agent_base___agent_base_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } { @@ -398,7 +454,7 @@ path = fetchurl { name = "ajax_request___ajax_request_1.2.3.tgz"; url = "https://registry.yarnpkg.com/ajax-request/-/ajax-request-1.2.3.tgz"; - sha1 = "99fcbec1d6d2792f85fa949535332bd14f5f3790"; + sha1 = "mfy+wdbSeS+F+pSVNTMr0U9fN5A="; }; } { @@ -406,7 +462,7 @@ path = fetchurl { name = "ajv___ajv_6.12.0.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz"; - sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7"; + sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; }; } { @@ -414,7 +470,15 @@ path = fetchurl { name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -422,7 +486,15 @@ path = fetchurl { name = "ansi_regex___ansi_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + sha1 = "7QMXwyIGT3lGbAKWa922Bas32Zg="; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } { @@ -430,7 +502,15 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } { @@ -438,7 +518,7 @@ path = fetchurl { name = "ansi___ansi_0.3.1.tgz"; url = "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz"; - sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + sha1 = "DELU+xcWDVqa8eSEus4cZpIsGyE="; }; } { @@ -446,7 +526,7 @@ path = fetchurl { name = "anymatch___anymatch_1.3.2.tgz"; url = "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz"; - sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a"; + sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA=="; }; } { @@ -454,7 +534,7 @@ path = fetchurl { name = "app_root_path___app_root_path_1.4.0.tgz"; url = "https://registry.yarnpkg.com/app-root-path/-/app-root-path-1.4.0.tgz"; - sha1 = "6335d865c9640d0fad99004e5a79232238e92dfa"; + sha1 = "YzXYZclkDQ+tmQBOWnkjIjjpLfo="; }; } { @@ -462,7 +542,23 @@ path = fetchurl { name = "app_root_path___app_root_path_2.2.1.tgz"; url = "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz"; - sha1 = "d0df4a682ee408273583d43f6f79e9892624bc9a"; + sha512 = "91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA=="; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; } { @@ -470,7 +566,7 @@ path = fetchurl { name = "arg___arg_4.1.3.tgz"; url = "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz"; - sha1 = "269fc7ad5b8e42cb63c896d5666017261c144089"; + sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; }; } { @@ -478,7 +574,15 @@ path = fetchurl { name = "argparse___argparse_1.0.10.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; } { @@ -486,7 +590,7 @@ path = fetchurl { name = "arr_diff___arr_diff_2.0.0.tgz"; url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz"; - sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + sha1 = "jzuCf5Vai9ZpaX5KQlasPOrjVs8="; }; } { @@ -494,7 +598,7 @@ path = fetchurl { name = "arr_diff___arr_diff_4.0.0.tgz"; url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; - sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + sha1 = "1kYQdP6/7HHn4VI1dhoyml3HxSA="; }; } { @@ -502,7 +606,7 @@ path = fetchurl { name = "arr_flatten___arr_flatten_1.1.0.tgz"; url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; }; } { @@ -510,7 +614,7 @@ path = fetchurl { name = "arr_union___arr_union_3.1.0.tgz"; url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; - sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + sha1 = "45sJrqne+Gao8gbiiK9jkZuuOcQ="; }; } { @@ -518,7 +622,7 @@ path = fetchurl { name = "array_flatten___array_flatten_1.1.1.tgz"; url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + sha1 = "ml9pkFGx5wczKPKgCJaLZOopVdI="; }; } { @@ -526,7 +630,7 @@ path = fetchurl { name = "array_unique___array_unique_0.2.1.tgz"; url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz"; - sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + sha1 = "odl8yvy8JiXMcPrc6zalDFiwGlM="; }; } { @@ -534,7 +638,7 @@ path = fetchurl { name = "array_unique___array_unique_0.3.2.tgz"; url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; - sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + sha1 = "qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="; }; } { @@ -542,7 +646,7 @@ path = fetchurl { name = "asn1___asn1_0.2.4.tgz"; url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; - sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; } { @@ -550,7 +654,7 @@ 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 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; }; } { @@ -558,7 +662,7 @@ path = fetchurl { name = "assign_symbols___assign_symbols_1.0.0.tgz"; url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + sha1 = "WWZ/QfrdTyDMvCu5a41Pf3jsA2c="; }; } { @@ -566,7 +670,7 @@ path = fetchurl { name = "async_each___async_each_1.0.3.tgz"; url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; - sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; } { @@ -574,7 +678,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; }; } { @@ -582,7 +686,7 @@ path = fetchurl { name = "atob___atob_2.1.2.tgz"; url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; - sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; } { @@ -590,7 +694,7 @@ path = fetchurl { name = "aws_sign2___aws_sign2_0.7.0.tgz"; url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + sha1 = "tG6JCTSpWR8tL2+G1+ap8bP+dqg="; }; } { @@ -598,7 +702,7 @@ path = fetchurl { name = "aws4___aws4_1.9.1.tgz"; url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; - sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; + sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; } { @@ -606,7 +710,7 @@ path = fetchurl { name = "babel_plugin_emotion___babel_plugin_emotion_9.2.11.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz"; - sha1 = "319c005a9ee1d15bb447f59fe504c35fd5807728"; + sha512 = "dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ=="; }; } { @@ -614,7 +718,7 @@ path = fetchurl { name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; - sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; + sha512 = "SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg=="; }; } { @@ -622,7 +726,7 @@ path = fetchurl { name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; - sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + sha1 = "CvMqmm4Tyno/1QaeYtew9Y0NiUY="; }; } { @@ -630,7 +734,7 @@ path = fetchurl { name = "babel_runtime___babel_runtime_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + sha1 = "llxwWGaOgrVde/4E/yM3vItWR/4="; }; } { @@ -638,7 +742,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.0.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + sha1 = "ibTRmasr7kneFk6gK4nORi1xt2c="; }; } { @@ -646,7 +750,7 @@ path = fetchurl { name = "base16___base16_1.0.0.tgz"; url = "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz"; - sha1 = "e297f60d7ec1014a7a971a39ebc8a98c0b681e70"; + sha1 = "4pf2DX7BAUp6lxo568ipjAtoHnA="; }; } { @@ -654,7 +758,7 @@ path = fetchurl { name = "base64_img___base64_img_1.0.4.tgz"; url = "https://registry.yarnpkg.com/base64-img/-/base64-img-1.0.4.tgz"; - sha1 = "3e22d55d6c74a24553d840d2b1bc12a7db078d35"; + sha1 = "PiLVXWx0okVT2EDSsbwSp9sHjTU="; }; } { @@ -662,7 +766,7 @@ path = fetchurl { name = "base64_js___base64_js_1.3.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; }; } { @@ -670,7 +774,7 @@ path = fetchurl { name = "base___base_0.11.2.tgz"; url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; - sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; } { @@ -678,15 +782,15 @@ path = fetchurl { name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + sha1 = "pDAdOJtqQ/m2f/PKEaP2Y342Dp4="; }; } { - name = "biblatex_csl_converter___biblatex_csl_converter_1.9.1.tgz"; + name = "biblatex_csl_converter___biblatex_csl_converter_2.0.2.tgz"; path = fetchurl { - name = "biblatex_csl_converter___biblatex_csl_converter_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-1.9.1.tgz"; - sha1 = "50aacfef172997f1c98d72837ffdd3b19c62f8c4"; + name = "biblatex_csl_converter___biblatex_csl_converter_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-2.0.2.tgz"; + sha512 = "od1JdAkQYh2T1Pzpq11eYtuNb3nNXQ0w+17CAnYqRsX+QFtoiK0XcvBE7N6rpDJyUo0acoaB6Of7EDhFQOcblA=="; }; } { @@ -694,7 +798,7 @@ path = fetchurl { name = "binary_extensions___binary_extensions_1.13.1.tgz"; url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; - sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; } { @@ -702,7 +806,7 @@ path = fetchurl { name = "binary___binary_0.3.0.tgz"; url = "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz"; - sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + sha1 = "n2BVO8XOjDOG87VTz/R0Yq3sqnk="; }; } { @@ -710,7 +814,7 @@ path = fetchurl { name = "bindings___bindings_1.5.0.tgz"; url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; - sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; } { @@ -718,7 +822,7 @@ path = fetchurl { name = "body_parser___body_parser_1.19.0.tgz"; url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; - sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; } { @@ -726,7 +830,7 @@ path = fetchurl { name = "boundary___boundary_1.0.1.tgz"; url = "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz"; - sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; + sha1 = "TWfcJgLAzBbdm85+v4fpSCkPWBI="; }; } { @@ -734,7 +838,7 @@ path = fetchurl { name = "bowser___bowser_2.9.0.tgz"; url = "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz"; - sha1 = "3bed854233b419b9a7422d9ee3e85504373821c9"; + sha512 = "2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA=="; }; } { @@ -742,7 +846,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -750,7 +854,7 @@ path = fetchurl { name = "braces___braces_1.8.5.tgz"; url = "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz"; - sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + sha1 = "uneWLhLf+WnWt2cR6RS3N4V79qc="; }; } { @@ -758,7 +862,7 @@ path = fetchurl { name = "braces___braces_2.3.2.tgz"; url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; - sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; } { @@ -766,7 +870,7 @@ path = fetchurl { name = "buffer_from___buffer_from_1.1.1.tgz"; url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; } { @@ -774,7 +878,7 @@ path = fetchurl { name = "buffers___buffers_0.1.1.tgz"; url = "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz"; - sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; + sha1 = "skV5w77U1tOWru5tmorn9Ugqt7s="; }; } { @@ -782,7 +886,7 @@ path = fetchurl { name = "builtin_modules___builtin_modules_1.1.1.tgz"; url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + sha1 = "Jw8HbFpywC9bZaR9+Uxf46J4iS8="; }; } { @@ -790,7 +894,7 @@ path = fetchurl { name = "bytes___bytes_3.1.0.tgz"; url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; } { @@ -798,7 +902,7 @@ path = fetchurl { name = "cache_base___cache_base_1.0.1.tgz"; url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; - sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; } { @@ -806,7 +910,7 @@ path = fetchurl { name = "callsites___callsites_3.1.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; } { @@ -814,7 +918,7 @@ path = fetchurl { name = "caseless___caseless_0.12.0.tgz"; url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + sha1 = "G2gcIf+EAzyCZUMJBolCDRhxUdw="; }; } { @@ -822,7 +926,7 @@ path = fetchurl { name = "chain_able___chain_able_1.0.1.tgz"; url = "https://registry.yarnpkg.com/chain-able/-/chain-able-1.0.1.tgz"; - sha1 = "b48ac9bdc18f2192ec730abc66609f90aab5605f"; + sha1 = "tIrJvcGPIZLscwq8ZmCfkKq1YF8="; }; } { @@ -830,7 +934,7 @@ path = fetchurl { name = "chain_able___chain_able_3.0.0.tgz"; url = "https://registry.yarnpkg.com/chain-able/-/chain-able-3.0.0.tgz"; - sha1 = "dcffe8b04f3da210941a23843bc1332bb288ca9f"; + sha512 = "26MoELhta86n7gCsE2T1hGRyncZvPjFXTkB/DEp4+i/EJVSxXQNwXMDZZb2+SWcbPuow18wQtztaW7GXOel9DA=="; }; } { @@ -838,7 +942,7 @@ path = fetchurl { name = "chainsaw___chainsaw_0.1.0.tgz"; url = "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz"; - sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + sha1 = "XqtQsor+WAdNDVgpE4iCi15fvJg="; }; } { @@ -846,7 +950,7 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -854,7 +958,7 @@ path = fetchurl { name = "chardet___chardet_0.4.2.tgz"; url = "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz"; - sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + sha1 = "tUc7M9yXxCTl2Y3IfVXU2KKci/I="; }; } { @@ -862,7 +966,15 @@ path = fetchurl { name = "chokidar___chokidar_1.7.0.tgz"; url = "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz"; - sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; + sha1 = "eY5ol3gVHIB2tLNg5e3SjNortGg="; + }; + } + { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; } { @@ -870,7 +982,7 @@ path = fetchurl { name = "class_utils___class_utils_0.3.6.tgz"; url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; - sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; } { @@ -878,7 +990,7 @@ path = fetchurl { name = "clean_css___clean_css_4.2.3.tgz"; url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; - sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; + sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; } { @@ -886,7 +998,7 @@ path = fetchurl { name = "cli_cursor___cli_cursor_2.1.0.tgz"; url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + sha1 = "s12sN2R5+sw+lHR9QdDQ9SOP/LU="; }; } { @@ -894,15 +1006,31 @@ path = fetchurl { name = "cli_width___cli_width_2.2.0.tgz"; url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + sha1 = "/xnt6Kml5XkyQUewwR8PvLq+1jk="; + }; + } + { + name = "clipboard___clipboard_2.0.8.tgz"; + path = fetchurl { + name = "clipboard___clipboard_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz"; + sha512 = "Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ=="; }; } { - name = "clipboard___clipboard_2.0.6.tgz"; + name = "cliui___cliui_7.0.4.tgz"; path = fetchurl { - name = "clipboard___clipboard_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz"; - sha1 = "52921296eec0fdf77ead1749421b21c968647376"; + 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 = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; }; } { @@ -910,7 +1038,7 @@ path = fetchurl { name = "collection_visit___collection_visit_1.0.0.tgz"; url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; - sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + sha1 = "S8A3PBZLwykbTTaMgpzxqApZ3KA="; }; } { @@ -918,7 +1046,15 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -926,7 +1062,15 @@ 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 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } { @@ -934,7 +1078,7 @@ path = fetchurl { name = "combined_stream___combined_stream_1.0.8.tgz"; url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; } { @@ -942,7 +1086,15 @@ path = fetchurl { name = "commander___commander_2.20.3.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + } + { + name = "commander___commander_1.1.1.tgz"; + path = fetchurl { + name = "commander___commander_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-1.1.1.tgz"; + sha1 = "UNFlGGiuYOzP8KLZ80WVN2vGsEE="; }; } { @@ -950,7 +1102,7 @@ path = fetchurl { name = "component_emitter___component_emitter_1.3.0.tgz"; url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; - sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; } { @@ -958,7 +1110,7 @@ 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 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -966,7 +1118,7 @@ path = fetchurl { name = "concat_stream___concat_stream_1.6.2.tgz"; url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } { @@ -974,7 +1126,15 @@ path = fetchurl { name = "concat_stream___concat_stream_2.0.0.tgz"; url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz"; - sha1 = "414cf5af790a48c60ab9be4527d56d5e41133cb1"; + sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + 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"; + sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; }; } { @@ -982,7 +1142,7 @@ path = fetchurl { name = "content_disposition___content_disposition_0.5.3.tgz"; url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; - sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; } { @@ -990,7 +1150,7 @@ path = fetchurl { name = "content_type___content_type_1.0.4.tgz"; url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; - sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; } { @@ -998,7 +1158,15 @@ path = fetchurl { name = "convert_source_map___convert_source_map_1.7.0.tgz"; url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + }; + } + { + name = "convert_source_map___convert_source_map_1.8.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=="; }; } { @@ -1006,7 +1174,7 @@ path = fetchurl { name = "cookie_signature___cookie_signature_1.0.6.tgz"; url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + sha1 = "4wOogrNCzD7oylE6eZmXNNqzriw="; }; } { @@ -1014,7 +1182,7 @@ path = fetchurl { name = "cookie___cookie_0.4.0.tgz"; url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; - sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; } { @@ -1022,7 +1190,7 @@ path = fetchurl { name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + sha1 = "Z29us8OZl8LuGsOpJP1hJHSPV40="; }; } { @@ -1030,7 +1198,7 @@ path = fetchurl { name = "core_js___core_js_2.6.11.tgz"; url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; - sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; } { @@ -1038,7 +1206,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 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; }; } { @@ -1046,7 +1214,7 @@ path = fetchurl { name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; - sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; }; } { @@ -1054,7 +1222,7 @@ path = fetchurl { name = "create_emotion_styled___create_emotion_styled_9.2.8.tgz"; url = "https://registry.yarnpkg.com/create-emotion-styled/-/create-emotion-styled-9.2.8.tgz"; - sha1 = "c0050e768ba439609bec108600467adf2de67cc3"; + sha512 = "2LrNM5MREWzI5hZK+LyiBHglwE18WE3AEbBQgpHQ1+zmyLSm/dJsUZBeFAwuIMb+TjNZP0KsMZlV776ufOtFdg=="; }; } { @@ -1062,7 +1230,7 @@ path = fetchurl { name = "create_emotion___create_emotion_9.2.12.tgz"; url = "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz"; - sha1 = "0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f"; + sha512 = "P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA=="; }; } { @@ -1070,7 +1238,7 @@ path = fetchurl { name = "create_react_context___create_react_context_0.1.6.tgz"; url = "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.1.6.tgz"; - sha1 = "0f425931d907741127acc6e31acb4f9015dd9fdc"; + sha512 = "eCnYYEUEc5i32LHwpE/W7NlddOB9oHwsPaWtWzYtflNkkwa3IfindIcoXdVWs12zCbwaMCavKNu84EXogVIWHw=="; }; } { @@ -1078,15 +1246,23 @@ path = fetchurl { name = "csstype___csstype_2.6.10.tgz"; url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; - sha1 = "e63af50e66d7c266edb6b32909cfd0aabe03928b"; + sha512 = "D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w=="; }; } { - name = "csstype___csstype_2.6.9.tgz"; + name = "csstype___csstype_2.6.18.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz"; - sha1 = "05141d0cd557a56b8891394c1911c40c8a98d098"; + name = "csstype___csstype_2.6.18.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.18.tgz"; + sha512 = "RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ=="; + }; + } + { + name = "csstype___csstype_3.0.9.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.9.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz"; + sha512 = "rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="; }; } { @@ -1094,7 +1270,7 @@ path = fetchurl { name = "dashdash___dashdash_1.14.1.tgz"; url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + sha1 = "hTz6D3y+L+1d4gMmuN1YEDX24vA="; }; } { @@ -1102,7 +1278,15 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + } + { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; } { @@ -1110,7 +1294,7 @@ path = fetchurl { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + sha1 = "6zkTMzRYd1y4TNGh+uBiEGu4dUU="; }; } { @@ -1118,15 +1302,7 @@ path = fetchurl { name = "deep_is___deep_is_0.1.3.tgz"; url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }; - } - { - name = "define_properties___define_properties_1.1.3.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"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha1 = "s2nW+128E+7PUk+RsHD+7cNXzzQ="; }; } { @@ -1134,7 +1310,7 @@ path = fetchurl { name = "define_property___define_property_0.2.5.tgz"; url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + sha1 = "w1se+RjsPJkPmlvFe+BKrOxcgRY="; }; } { @@ -1142,7 +1318,7 @@ path = fetchurl { name = "define_property___define_property_1.0.0.tgz"; url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + sha1 = "dp66rz9KY6rTr56NMEybvnm/sOY="; }; } { @@ -1150,7 +1326,7 @@ path = fetchurl { name = "define_property___define_property_2.0.2.tgz"; url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; - sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; } { @@ -1158,7 +1334,7 @@ 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 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; }; } { @@ -1166,7 +1342,15 @@ path = fetchurl { name = "delegate___delegate_3.2.0.tgz"; url = "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz"; - sha1 = "b66b71c3158522e8ab5744f720d8ca0c2af59166"; + sha512 = "IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="; + }; + } + { + 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"; + sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; }; } { @@ -1174,7 +1358,7 @@ path = fetchurl { name = "depd___depd_1.1.2.tgz"; url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; }; } { @@ -1182,7 +1366,15 @@ path = fetchurl { name = "destroy___destroy_1.0.4.tgz"; url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + sha1 = "l4hXRCxEdJ5CBmE+N5RiBYJqvYA="; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; }; } { @@ -1190,7 +1382,15 @@ path = fetchurl { name = "diff_match_patch___diff_match_patch_1.0.4.tgz"; url = "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz"; - sha1 = "6ac4b55237463761c4daf0dc603eb869124744b1"; + sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="; + }; + } + { + name = "diff_match_patch___diff_match_patch_1.0.5.tgz"; + path = fetchurl { + name = "diff_match_patch___diff_match_patch_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz"; + sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; } { @@ -1198,7 +1398,7 @@ path = fetchurl { name = "diff___diff_4.0.2.tgz"; url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; - sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; } { @@ -1206,7 +1406,7 @@ path = fetchurl { name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + sha1 = "OoOpBOVDUyh4dMVkt1SThoSamMk="; }; } { @@ -1214,7 +1414,15 @@ path = fetchurl { name = "ee_first___ee_first_1.1.1.tgz"; url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + sha1 = "WQxhFWsK4vTwJVcyoViyZrxWsh0="; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -1222,7 +1430,7 @@ path = fetchurl { name = "emotion___emotion_9.2.12.tgz"; url = "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz"; - sha1 = "53925aaa005614e65c6e43db8243c843574d1ea9"; + sha512 = "hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ=="; }; } { @@ -1230,7 +1438,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -1238,31 +1446,23 @@ path = fetchurl { name = "error_ex___error_ex_1.3.2.tgz"; url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; - }; - } - { - name = "es_abstract___es_abstract_1.17.6.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.17.6.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; - sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; } { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz"; + sha1 = "wsNYJlYkfDnqEHyx5mUrb58kUjw="; }; } { - name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; + name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { - name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz"; - sha1 = "c2c3582656247c39ea107cb1e6652b6f9f24523c"; + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -1270,7 +1470,7 @@ path = fetchurl { name = "escape_html___escape_html_1.0.3.tgz"; url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + sha1 = "Aljq5NPQwJdN4cFpGI7wBR0dGYg="; }; } { @@ -1278,7 +1478,7 @@ 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 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -1286,7 +1486,7 @@ path = fetchurl { name = "escodegen___escodegen_1.14.1.tgz"; url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; - sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + sha512 = "Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ=="; }; } { @@ -1294,7 +1494,7 @@ path = fetchurl { name = "esprima___esprima_4.0.1.tgz"; url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; } { @@ -1302,7 +1502,7 @@ path = fetchurl { name = "estraverse___estraverse_4.3.0.tgz"; url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; } { @@ -1310,7 +1510,7 @@ path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; } { @@ -1318,7 +1518,7 @@ path = fetchurl { name = "etag___etag_1.8.1.tgz"; url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + sha1 = "Qa4u62XvpiJorr/qg6x9eSmbCIc="; }; } { @@ -1326,7 +1526,7 @@ path = fetchurl { name = "exec_sh___exec_sh_0.2.2.tgz"; url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz"; - sha1 = "2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"; + sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; }; } { @@ -1334,7 +1534,7 @@ path = fetchurl { name = "expand_brackets___expand_brackets_0.1.5.tgz"; url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz"; - sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + sha1 = "3wcoTjQqgHzXM6xa9yQR5YHRF3s="; }; } { @@ -1342,7 +1542,7 @@ path = fetchurl { name = "expand_brackets___expand_brackets_2.1.4.tgz"; url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + sha1 = "t3c14xXOMPa27/D4OwQVGiJEliI="; }; } { @@ -1350,7 +1550,7 @@ path = fetchurl { name = "expand_range___expand_range_1.8.2.tgz"; url = "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz"; - sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + sha1 = "opnv/TNf4nIeuujiV+x5ZE/IUzc="; }; } { @@ -1358,7 +1558,7 @@ path = fetchurl { name = "express___express_4.17.1.tgz"; url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; - sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; } { @@ -1366,7 +1566,7 @@ path = fetchurl { name = "extend_shallow___extend_shallow_2.0.1.tgz"; url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + sha1 = "Ua99YUrZqfYQ6huvu5idaxxWiQ8="; }; } { @@ -1374,7 +1574,7 @@ path = fetchurl { name = "extend_shallow___extend_shallow_3.0.2.tgz"; url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + sha1 = "Jqcarwc7OfshJxcnRhMcJwQCjbg="; }; } { @@ -1382,7 +1582,7 @@ path = fetchurl { name = "extend___extend_3.0.2.tgz"; url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; - sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; } { @@ -1390,7 +1590,7 @@ path = fetchurl { name = "external_editor___external_editor_2.2.0.tgz"; url = "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz"; - sha1 = "045511cfd8d133f3846673d1047c154e214ad3d5"; + sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; }; } { @@ -1398,7 +1598,7 @@ path = fetchurl { name = "extglob___extglob_0.3.2.tgz"; url = "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz"; - sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + sha1 = "Lhj/PS9JqydlzskCPwEdqo2DSaE="; }; } { @@ -1406,7 +1606,7 @@ path = fetchurl { name = "extglob___extglob_2.0.4.tgz"; url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; - sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; } { @@ -1414,7 +1614,7 @@ path = fetchurl { name = "extsprintf___extsprintf_1.3.0.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + sha1 = "lpGEQOMEGnpBT4xS48V06zw+HgU="; }; } { @@ -1422,7 +1622,7 @@ path = fetchurl { name = "extsprintf___extsprintf_1.4.0.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + sha1 = "4mifjzVvrWLMplo6kcXfX5VRaS8="; }; } { @@ -1430,7 +1630,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; }; } { @@ -1438,7 +1638,7 @@ path = fetchurl { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -1446,7 +1646,7 @@ 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 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; }; } { @@ -1454,7 +1654,7 @@ path = fetchurl { name = "fast_xml_parser___fast_xml_parser_3.17.1.tgz"; url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.17.1.tgz"; - sha1 = "579fa64346cc891ce240d378268c6216e74aab10"; + sha512 = "jZ0EVn1iBuZtx/sbQnfvhSaaUltz+0+yfR+6QRyzrlt5yMiU+8ZfGj9i3/hoXJxm+aFri7dycBWbncox7frCAQ=="; }; } { @@ -1462,7 +1662,7 @@ path = fetchurl { name = "figures___figures_2.0.0.tgz"; url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + sha1 = "OrGi0qYsi/tDGgyUy3l6L84nyWI="; }; } { @@ -1470,7 +1670,7 @@ path = fetchurl { name = "file_match___file_match_1.0.2.tgz"; url = "https://registry.yarnpkg.com/file-match/-/file-match-1.0.2.tgz"; - sha1 = "c9cad265d2c8adf3a81475b0df475859069faef7"; + sha1 = "ycrSZdLIrfOoFHWw30dYWQafrvc="; }; } { @@ -1478,7 +1678,7 @@ path = fetchurl { name = "file_system___file_system_2.2.2.tgz"; url = "https://registry.yarnpkg.com/file-system/-/file-system-2.2.2.tgz"; - sha1 = "7d65833e3a2347dcd956a813c677153ed3edd987"; + sha1 = "fWWDPjojR9zZVqgTxncVPtPt2Yc="; }; } { @@ -1486,7 +1686,7 @@ path = fetchurl { name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; } { @@ -1494,7 +1694,7 @@ path = fetchurl { name = "filename_regex___filename_regex_2.0.1.tgz"; url = "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz"; - sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + sha1 = "wcS5vuPglyXdsQa3XB4wH+LxiyY="; }; } { @@ -1502,7 +1702,7 @@ path = fetchurl { name = "fill_range___fill_range_2.2.4.tgz"; url = "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz"; - sha1 = "eb1e773abb056dcd8df2bfdf6af59b8b3a936565"; + sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q=="; }; } { @@ -1510,7 +1710,7 @@ path = fetchurl { name = "fill_range___fill_range_4.0.0.tgz"; url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + sha1 = "1USBHUKPmOsGpj3EAtJAPDKMOPc="; }; } { @@ -1518,7 +1718,7 @@ path = fetchurl { name = "finalhandler___finalhandler_1.1.2.tgz"; url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; - sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; } { @@ -1526,7 +1726,7 @@ path = fetchurl { name = "find_root___find_root_1.1.0.tgz"; url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; - sha1 = "abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"; + sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; }; } { @@ -1534,7 +1734,7 @@ path = fetchurl { name = "fliplog___fliplog_0.3.13.tgz"; url = "https://registry.yarnpkg.com/fliplog/-/fliplog-0.3.13.tgz"; - sha1 = "dd0d786e821822aae272e0ddc84012596a96154c"; + sha512 = "R504CdX+mdhMYpmyrdiQ9PW6ncAyZnxyeA85fS1/P/Y9qmbMiQsqt6QzsYhq5kbqMb84PibVOcS1oz98GJl6EQ=="; }; } { @@ -1542,7 +1742,7 @@ path = fetchurl { name = "for_in___for_in_1.0.2.tgz"; url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + sha1 = "gQaNKVqBQuwKxybG4iAMMPttXoA="; }; } { @@ -1550,7 +1750,7 @@ path = fetchurl { name = "for_own___for_own_0.1.5.tgz"; url = "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz"; - sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + sha1 = "UmXGgaTylNq78XyVCbZ2OqhFEM4="; }; } { @@ -1558,7 +1758,7 @@ path = fetchurl { name = "forever_agent___forever_agent_0.6.1.tgz"; url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + sha1 = "+8cfDEGt6zf5bFd60e1C2P2sypE="; }; } { @@ -1566,7 +1766,7 @@ path = fetchurl { name = "form_data___form_data_2.3.3.tgz"; url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; - sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; } { @@ -1574,7 +1774,7 @@ path = fetchurl { name = "forwarded___forwarded_0.1.2.tgz"; url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + sha1 = "mMI9qxF1ZXuMBXPozszZGw/xjIQ="; }; } { @@ -1582,7 +1782,7 @@ path = fetchurl { name = "fragment_cache___fragment_cache_0.2.1.tgz"; url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + sha1 = "QpD60n8T6Jvn8zeZxrxaCr//DRk="; }; } { @@ -1590,7 +1790,7 @@ path = fetchurl { name = "fresh___fresh_0.5.2.tgz"; url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + sha1 = "PYyt2Q2XZWn6g1qx+OSyOhBWBac="; }; } { @@ -1598,7 +1798,15 @@ path = fetchurl { name = "fs_extra___fs_extra_7.0.1.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; - sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; + }; + } + { + 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=="; }; } { @@ -1606,7 +1814,7 @@ 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 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; }; } { @@ -1614,7 +1822,7 @@ path = fetchurl { name = "fsevents___fsevents_1.2.11.tgz"; url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz"; - sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3"; + sha512 = "+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw=="; }; } { @@ -1622,15 +1830,7 @@ path = fetchurl { name = "fstream___fstream_0.1.31.tgz"; url = "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; - }; - } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + sha1 = "czfwWPu7vvqMn1YaKMqwhJICyYg="; }; } { @@ -1638,7 +1838,7 @@ path = fetchurl { name = "fuse_box___fuse_box_3.7.1.tgz"; url = "https://registry.yarnpkg.com/fuse-box/-/fuse-box-3.7.1.tgz"; - sha1 = "d32879ceee4c8bcec9bbd8fcfe5b29e7142371cd"; + sha512 = "aM7t9bUcRpNNQu9M+YjXXzx9JSJQVPWeY+8iTyv7OhvJNWHrqqEWPzbn9OfcyFa2AfPwAUyC/uzWexBbjtTvsA=="; }; } { @@ -1646,15 +1846,23 @@ path = fetchurl { name = "fuse_concat_with_sourcemaps___fuse_concat_with_sourcemaps_1.0.5.tgz"; url = "https://registry.yarnpkg.com/fuse-concat-with-sourcemaps/-/fuse-concat-with-sourcemaps-1.0.5.tgz"; - sha1 = "9c6a521f675cff5cdbb48db1ca9c181ae49a7b97"; + sha512 = "tKsRJIxn9tU3IH8JHMwFhGbObqkDKXhNKOvcM+QyflAlYb2EgOvIQe8D6WB/cocA3puldHatsp9SN5SKryasrw=="; + }; + } + { + name = "fuse.js___fuse.js_6.4.6.tgz"; + path = fetchurl { + name = "fuse.js___fuse.js_6.4.6.tgz"; + url = "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.4.6.tgz"; + sha512 = "/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw=="; }; } { - name = "fuse.js___fuse.js_6.0.4.tgz"; + name = "gauge___gauge_2.7.4.tgz"; path = fetchurl { - name = "fuse.js___fuse.js_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.0.4.tgz"; - sha1 = "9f5af976f836247ad5d2c338090d6ce13cf9a4d2"; + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; }; } { @@ -1662,7 +1870,15 @@ path = fetchurl { name = "get_caller_file___get_caller_file_1.0.3.tgz"; url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -1670,7 +1886,7 @@ path = fetchurl { name = "get_value___get_value_2.0.6.tgz"; url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + sha1 = "3BXKHGcjh8p2vTesCjlbogQqLCg="; }; } { @@ -1678,7 +1894,7 @@ path = fetchurl { name = "getopts___getopts_2.2.5.tgz"; url = "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz"; - sha1 = "67a0fe471cacb9c687d817cab6450b96dde8313b"; + sha512 = "9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA=="; }; } { @@ -1686,7 +1902,7 @@ path = fetchurl { name = "getpass___getpass_0.1.7.tgz"; url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + sha1 = "Xv+OPmhNVprkyysSgmBOi6YhSfo="; }; } { @@ -1694,7 +1910,7 @@ path = fetchurl { name = "glob_base___glob_base_0.3.0.tgz"; url = "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz"; - sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + sha1 = "27Fk9iIbHAscz4Kuoyi0l98Oo8Q="; }; } { @@ -1702,7 +1918,7 @@ path = fetchurl { name = "glob_parent___glob_parent_2.0.0.tgz"; url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz"; - sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + sha1 = "gTg9ctsFT8zPUzbaqQLxgvbtuyg="; }; } { @@ -1710,7 +1926,7 @@ path = fetchurl { name = "glob___glob_7.1.6.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; - sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; } { @@ -1718,7 +1934,7 @@ path = fetchurl { name = "good_listener___good_listener_1.2.2.tgz"; url = "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz"; - sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; + sha1 = "1TswzfkxPf+33JoNR3CWqm0UXFA="; }; } { @@ -1726,7 +1942,7 @@ path = fetchurl { name = "graceful_fs___graceful_fs_4.2.3.tgz"; url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; + sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; }; } { @@ -1734,7 +1950,7 @@ path = fetchurl { name = "graceful_fs___graceful_fs_3.0.12.tgz"; url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz"; - sha1 = "0034947ce9ed695ec8ab0b854bc919e82b1ffaef"; + sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg=="; }; } { @@ -1742,7 +1958,7 @@ path = fetchurl { name = "har_schema___har_schema_2.0.0.tgz"; url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + sha1 = "qUwiJOvKwEeCoNkDVSHyRzW37JI="; }; } { @@ -1750,7 +1966,7 @@ path = fetchurl { name = "har_validator___har_validator_5.1.3.tgz"; url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; } { @@ -1758,15 +1974,15 @@ 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 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { - name = "has_symbols___has_symbols_1.0.1.tgz"; + name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; - sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; }; } { @@ -1774,7 +1990,7 @@ path = fetchurl { name = "has_value___has_value_0.3.1.tgz"; url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + sha1 = "ex9YutpiyoJ+wKIHgCVlSEWZXh8="; }; } { @@ -1782,7 +1998,7 @@ path = fetchurl { name = "has_value___has_value_1.0.0.tgz"; url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + sha1 = "GLKB2lhbHFxR3vJMkw7SmgvmsXc="; }; } { @@ -1790,7 +2006,7 @@ path = fetchurl { name = "has_values___has_values_0.1.4.tgz"; url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + sha1 = "bWHeldkd/Km5oCCJrThL/49it3E="; }; } { @@ -1798,15 +2014,7 @@ path = fetchurl { name = "has_values___has_values_1.0.0.tgz"; url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; - }; - } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + sha1 = "lbC2P+whRmGab+V/51Yo1aOe/k8="; }; } { @@ -1814,7 +2022,7 @@ path = fetchurl { name = "html___html_1.0.0.tgz"; url = "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz"; - sha1 = "a544fa9ea5492bfb3a2cca8210a10be7b5af1f61"; + sha1 = "pUT6nqVJK/s6LMqCEKEL57WvH2E="; }; } { @@ -1822,7 +2030,7 @@ path = fetchurl { name = "http_errors___http_errors_1.7.2.tgz"; url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; - sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; } { @@ -1830,7 +2038,7 @@ path = fetchurl { name = "http_errors___http_errors_1.7.3.tgz"; url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; - sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; } { @@ -1838,7 +2046,15 @@ path = fetchurl { name = "http_signature___http_signature_1.2.0.tgz"; url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + sha1 = "muzZJRFHcvPZW2WmCruPfBj7rOE="; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_5.0.0.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=="; }; } { @@ -1846,7 +2062,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.4.24.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; } { @@ -1854,7 +2070,7 @@ path = fetchurl { name = "ie_array_find_polyfill___ie_array_find_polyfill_1.1.0.tgz"; url = "https://registry.yarnpkg.com/ie-array-find-polyfill/-/ie-array-find-polyfill-1.1.0.tgz"; - sha1 = "5078e533f026831da22bd7476513d9460d65a142"; + sha1 = "UHjlM/Amgx2iK9dHZRPZRg1loUI="; }; } { @@ -1862,7 +2078,7 @@ path = fetchurl { name = "ieee754___ieee754_1.1.13.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; - sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; } { @@ -1870,7 +2086,7 @@ path = fetchurl { name = "import_fresh___import_fresh_3.2.1.tgz"; url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; } { @@ -1878,7 +2094,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -1886,7 +2102,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -1894,7 +2110,7 @@ path = fetchurl { name = "inherits___inherits_2.0.3.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4="; }; } { @@ -1902,7 +2118,7 @@ path = fetchurl { name = "inquirer___inquirer_3.3.0.tgz"; url = "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz"; - sha1 = "9dd2f2ad765dcab1ff0443b491442a20ba227dc9"; + sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ=="; }; } { @@ -1910,7 +2126,7 @@ path = fetchurl { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; } { @@ -1918,7 +2134,7 @@ path = fetchurl { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + sha1 = "qeEss66Nh2cn7u84Q/igiXtcmNY="; }; } { @@ -1926,7 +2142,7 @@ path = fetchurl { name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; } { @@ -1934,7 +2150,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 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; }; } { @@ -1942,7 +2158,7 @@ path = fetchurl { name = "is_binary_path___is_binary_path_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; - sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + sha1 = "dfFmQrSA8YenEcgUFh/TpKdlWJg="; }; } { @@ -1950,15 +2166,7 @@ path = fetchurl { name = "is_buffer___is_buffer_1.1.6.tgz"; url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; - }; - } - { - name = "is_callable___is_callable_1.2.0.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz"; - sha1 = "83336560b54a38e35e3a2df7afd0454d691468bb"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; } { @@ -1966,7 +2174,7 @@ path = fetchurl { name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + sha1 = "C17mSDiOLIYCgueT8YVv7D8wG1Y="; }; } { @@ -1974,15 +2182,7 @@ path = fetchurl { name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; - }; - } - { - name = "is_date_object___is_date_object_1.0.2.tgz"; - path = fetchurl { - name = "is_date_object___is_date_object_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; - sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; } { @@ -1990,7 +2190,7 @@ path = fetchurl { name = "is_descriptor___is_descriptor_0.1.6.tgz"; url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; }; } { @@ -1998,7 +2198,7 @@ path = fetchurl { name = "is_descriptor___is_descriptor_1.0.2.tgz"; url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; } { @@ -2006,7 +2206,7 @@ path = fetchurl { name = "is_dotfile___is_dotfile_1.0.3.tgz"; url = "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz"; - sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + sha1 = "pqLzL/0t+wT1yiXs0Pa4PPeYoeE="; }; } { @@ -2014,7 +2214,7 @@ path = fetchurl { name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; url = "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; - sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + sha1 = "IjgJj8Ih3gvPpdnqxMRdY4qhxTQ="; }; } { @@ -2022,7 +2222,7 @@ path = fetchurl { name = "is_extendable___is_extendable_0.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + sha1 = "YrEQ4omkcUGOPsNqYX1HLjAd/Ik="; }; } { @@ -2030,7 +2230,7 @@ path = fetchurl { name = "is_extendable___is_extendable_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; - sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; }; } { @@ -2038,7 +2238,15 @@ path = fetchurl { name = "is_extglob___is_extglob_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz"; - sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + sha1 = "rEaBd8SUNAWgkvyPKXYMb/xiBsA="; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -2046,7 +2254,15 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + sha1 = "o7MKXE8ZkYMWeqq5O+764937ZU8="; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -2054,7 +2270,7 @@ path = fetchurl { name = "is_glob___is_glob_2.0.1.tgz"; url = "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz"; - sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + sha1 = "0Jb5JqPe1WAPP9/ZEZjLCIjC2GM="; }; } { @@ -2062,7 +2278,7 @@ path = fetchurl { name = "is_number___is_number_2.1.0.tgz"; url = "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz"; - sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + sha1 = "Afy7s5NGOlSPL0ZszhbezknbkI8="; }; } { @@ -2070,7 +2286,7 @@ path = fetchurl { name = "is_number___is_number_3.0.0.tgz"; url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + sha1 = "JP1iAaR4LPUFYcgQJ2r8fRLXEZU="; }; } { @@ -2078,7 +2294,7 @@ path = fetchurl { name = "is_number___is_number_4.0.0.tgz"; url = "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz"; - sha1 = "0026e37f5454d73e356dfe6564699867c6a7f0ff"; + sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="; }; } { @@ -2086,7 +2302,7 @@ 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"; - sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; } { @@ -2094,7 +2310,7 @@ path = fetchurl { name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; url = "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + sha1 = "MzTceXdDaOkvAW5vvAqI9c1ua8Q="; }; } { @@ -2102,7 +2318,7 @@ path = fetchurl { name = "is_primitive___is_primitive_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz"; - sha1 = "207bab91638499c07b2adf240a41a87210034575"; + sha1 = "IHurkWOEmcB7Kt8kCkGochADRXU="; }; } { @@ -2110,23 +2326,7 @@ path = fetchurl { name = "is_promise___is_promise_2.1.0.tgz"; url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - } - { - name = "is_regex___is_regex_1.1.0.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; - sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; - }; - } - { - name = "is_symbol___is_symbol_1.0.3.tgz"; - path = fetchurl { - name = "is_symbol___is_symbol_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; - sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; + sha1 = "eaKp7OfwlugPNtKy87wWwf9L8/o="; }; } { @@ -2134,7 +2334,7 @@ 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 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; }; } { @@ -2142,7 +2342,7 @@ path = fetchurl { name = "is_windows___is_windows_1.0.2.tgz"; url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; - sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; } { @@ -2150,7 +2350,7 @@ path = fetchurl { name = "isarray___isarray_0.0.1.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + sha1 = "ihis/Kmo9Bd+Cav8YDiTmwXR7t8="; }; } { @@ -2158,7 +2358,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; }; } { @@ -2166,7 +2366,7 @@ path = fetchurl { name = "isobject___isobject_2.1.0.tgz"; url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + sha1 = "8GVWEJaj8dou9GJy+BXIQNh+DIk="; }; } { @@ -2174,7 +2374,7 @@ path = fetchurl { name = "isobject___isobject_3.0.1.tgz"; url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + sha1 = "TkMekrEalzFjaqH5yNHMvP2reN8="; }; } { @@ -2182,7 +2382,7 @@ path = fetchurl { name = "isstream___isstream_0.1.2.tgz"; url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + sha1 = "R+Y/evVa+m+S4VAOaQ64uFKcCZo="; }; } { @@ -2190,7 +2390,7 @@ path = fetchurl { name = "js_tokens___js_tokens_4.0.0.tgz"; url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; } { @@ -2198,7 +2398,15 @@ path = fetchurl { name = "js_yaml___js_yaml_3.13.1.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; - sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + } + { + name = "js_yaml___js_yaml_4.1.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; } { @@ -2206,7 +2414,7 @@ path = fetchurl { name = "jsbn___jsbn_0.1.1.tgz"; url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + sha1 = "peZUwuWi3rXyAdls77yoDA7y9RM="; }; } { @@ -2214,7 +2422,7 @@ path = fetchurl { name = "jsesc___jsesc_0.5.0.tgz"; url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + sha1 = "597mbjXW/Bb3EP6R1c9p9w8IkR0="; }; } { @@ -2222,7 +2430,7 @@ path = fetchurl { name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; } { @@ -2230,7 +2438,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -2238,7 +2446,7 @@ path = fetchurl { name = "json_schema___json_schema_0.2.3.tgz"; url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + sha1 = "tIDIkuWaLwWVTOcnvT8qTogvnhM="; }; } { @@ -2246,7 +2454,7 @@ 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 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; }; } { @@ -2254,7 +2462,7 @@ path = fetchurl { name = "jsondiffpatch___jsondiffpatch_0.3.11.tgz"; url = "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz"; - sha1 = "43f9443a0d081b5f79d413fe20f302079e493201"; + sha512 = "Xi3Iygdt/BGhml6bdUFhgDki1TgOsp3hG3iiH3KtzP+CahtGcdPfKRLlnZbSw+3b1umZkhmKrqXUgUcKenyhtA=="; }; } { @@ -2262,7 +2470,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; }; } { @@ -2270,7 +2478,15 @@ path = fetchurl { name = "jsprim___jsprim_1.4.1.tgz"; url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + sha1 = "MT5mvB5cwG5Di8G3SZwuXFastqI="; + }; + } + { + name = "keypress___keypress_0.1.0.tgz"; + path = fetchurl { + name = "keypress___keypress_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz"; + sha1 = "SjGI1CkbZrT2XtuZ+AaqmuKTWSo="; }; } { @@ -2278,7 +2494,7 @@ path = fetchurl { name = "kind_of___kind_of_3.2.2.tgz"; url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + sha1 = "MeohpzS6ubuw8yRm2JOupR5KPGQ="; }; } { @@ -2286,7 +2502,7 @@ path = fetchurl { name = "kind_of___kind_of_4.0.0.tgz"; url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; + sha1 = "IIE989cSkosgc3hpGkUGb65y3Vc="; }; } { @@ -2294,7 +2510,7 @@ path = fetchurl { name = "kind_of___kind_of_5.1.0.tgz"; url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; - sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; }; } { @@ -2302,7 +2518,7 @@ path = fetchurl { name = "kind_of___kind_of_6.0.3.tgz"; url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; - sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; } { @@ -2310,7 +2526,7 @@ path = fetchurl { name = "lego_api___lego_api_1.0.8.tgz"; url = "https://registry.yarnpkg.com/lego-api/-/lego-api-1.0.8.tgz"; - sha1 = "5e26be726c5e11d540f89e7c6b1abf8c5834bd01"; + sha512 = "pZD0mf32+RL1bUMJztRcXiNBB1gE8gd/h4MDLWdZp7vaMZyjPiYK/zNpNNGoJvmoa7D/wf9dll+5z7pDObdLFg=="; }; } { @@ -2318,7 +2534,7 @@ path = fetchurl { name = "levn___levn_0.3.0.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4="; }; } { @@ -2326,7 +2542,7 @@ path = fetchurl { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + sha1 = "HADHQ7QzzQpOgHWPe2SldEDZ/wA="; }; } { @@ -2334,7 +2550,7 @@ path = fetchurl { name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; + sha1 = "VwvH3t5G1hzc3mh9ZdPuy6o6r/U="; }; } { @@ -2342,7 +2558,7 @@ path = fetchurl { name = "lodash.curry___lodash.curry_4.1.1.tgz"; url = "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz"; - sha1 = "248e36072ede906501d75966200a86dab8b23170"; + sha1 = "JI42By7ekGUB11lmIAqG2riyMXA="; }; } { @@ -2350,7 +2566,7 @@ path = fetchurl { name = "lodash.debounce___lodash.debounce_3.1.1.tgz"; url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; - sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; + sha1 = "gSIRw3ipTMKdWqTjNGzwv846ffU="; }; } { @@ -2358,7 +2574,7 @@ path = fetchurl { name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + sha1 = "gteb/zCmfEAF/9XiUVMArZyk168="; }; } { @@ -2366,7 +2582,15 @@ path = fetchurl { name = "lodash.flow___lodash.flow_3.5.0.tgz"; url = "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz"; - sha1 = "87bf40292b8cf83e4e8ce1a3ae4209e20071675a"; + sha1 = "h79AKSuM+D5OjOGjrkIJ4gBxZ1o="; + }; + } + { + name = "lodash.orderby___lodash.orderby_4.6.0.tgz"; + path = fetchurl { + name = "lodash.orderby___lodash.orderby_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz"; + sha1 = "5pfwTOXXhSL1TZM4syuBozk+TrM="; }; } { @@ -2374,7 +2598,7 @@ path = fetchurl { name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; url = "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; - sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + sha1 = "2ZwHpmnp5tJOE2Lf4mbGdhavEwI="; }; } { @@ -2382,7 +2606,7 @@ path = fetchurl { name = "lodash___lodash_4.17.15.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; } { @@ -2390,7 +2614,23 @@ path = fetchurl { name = "loose_envify___loose_envify_1.4.0.tgz"; url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; } { @@ -2398,7 +2638,7 @@ path = fetchurl { name = "make_error___make_error_1.3.6.tgz"; url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz"; - sha1 = "2eb2e37ea9b67c4891f684a1394799af484cf7a2"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; } { @@ -2406,7 +2646,7 @@ path = fetchurl { name = "map_cache___map_cache_0.2.2.tgz"; url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + sha1 = "wyq9C9ZSXZsFFkW7TyasXcmKDb8="; }; } { @@ -2414,7 +2654,7 @@ path = fetchurl { name = "map_visit___map_visit_1.0.0.tgz"; url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + sha1 = "7Nyo8TFE5mDxtb1B8S80edmN+48="; }; } { @@ -2422,7 +2662,7 @@ path = fetchurl { name = "match_stream___match_stream_0.0.2.tgz"; url = "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz"; - sha1 = "99eb050093b34dffade421b9ac0b410a9cfa17cf"; + sha1 = "mesFAJOzTf+t5CG5rAtBCpz6F88="; }; } { @@ -2430,7 +2670,7 @@ path = fetchurl { name = "math_random___math_random_1.0.4.tgz"; url = "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz"; - sha1 = "5dd6943c938548267016d4e34f057583080c514c"; + sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; }; } { @@ -2438,7 +2678,7 @@ path = fetchurl { name = "media_typer___media_typer_0.3.0.tgz"; url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; }; } { @@ -2446,7 +2686,7 @@ path = fetchurl { name = "memoize_one___memoize_one_5.1.1.tgz"; url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz"; - sha1 = "047b6e3199b508eaec03504de71229b8eb1d75c0"; + sha512 = "HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="; }; } { @@ -2454,7 +2694,7 @@ path = fetchurl { name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha1 = "sAqqVW3YtEVoFQ7J0blT8/kMu2E="; }; } { @@ -2462,7 +2702,7 @@ path = fetchurl { name = "merge___merge_1.2.1.tgz"; url = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz"; - sha1 = "38bebf80c3220a8a487b6fcfb3941bb11720c145"; + sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; }; } { @@ -2470,7 +2710,7 @@ path = fetchurl { name = "methods___methods_1.1.2.tgz"; url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha1 = "VSmk1nZUE07cxSZmVoNbD4Ua/O4="; }; } { @@ -2478,7 +2718,7 @@ path = fetchurl { name = "micromatch___micromatch_2.3.11.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz"; - sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + sha1 = "hmd8l9FyCzY0MdBNDRUpO9OMFWU="; }; } { @@ -2486,7 +2726,7 @@ path = fetchurl { name = "micromatch___micromatch_3.1.10.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; - sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; } { @@ -2494,7 +2734,7 @@ path = fetchurl { name = "mime_db___mime_db_1.43.0.tgz"; url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; - sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; + sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; }; } { @@ -2502,7 +2742,7 @@ path = fetchurl { name = "mime_types___mime_types_2.1.26.tgz"; url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; - sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; + sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; }; } { @@ -2510,7 +2750,7 @@ path = fetchurl { name = "mime___mime_1.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; - sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; } { @@ -2518,7 +2758,7 @@ path = fetchurl { name = "mimic_fn___mimic_fn_1.2.0.tgz"; url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha1 = "820c86a39334640e99516928bd03fca88057d022"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; } { @@ -2526,7 +2766,7 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { @@ -2534,7 +2774,7 @@ path = fetchurl { name = "minimist___minimist_0.0.8.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + sha1 = "hX/Kv8M5fSYluCKCYuhqp6ARsF0="; }; } { @@ -2542,7 +2782,7 @@ path = fetchurl { name = "minimist___minimist_1.2.0.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + sha1 = "o1AIsg9BOD7sH7kU9M1d95omQoQ="; }; } { @@ -2550,7 +2790,23 @@ path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + } + { + name = "minipass___minipass_3.1.5.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + }; + } + { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; } { @@ -2558,7 +2814,7 @@ path = fetchurl { name = "mixin_deep___mixin_deep_1.3.2.tgz"; url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; } { @@ -2566,7 +2822,7 @@ path = fetchurl { name = "mkdirp___mkdirp_0.5.5.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; } { @@ -2574,7 +2830,15 @@ path = fetchurl { name = "mkdirp___mkdirp_0.5.1.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + sha1 = "MAV0OOrGz3+MR2fzhkjWaX11yQM="; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; } { @@ -2582,7 +2846,7 @@ path = fetchurl { name = "mock_require___mock_require_3.0.3.tgz"; url = "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz"; - sha1 = "ccd544d9eae81dd576b3f219f69ec867318a1946"; + sha512 = "lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg=="; }; } { @@ -2590,7 +2854,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -2598,7 +2862,15 @@ path = fetchurl { name = "ms___ms_2.1.1.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; } { @@ -2606,7 +2878,7 @@ path = fetchurl { name = "mustache___mustache_2.3.2.tgz"; url = "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz"; - sha1 = "a6d4d9c3f91d13359ab889a812954f9230a3d0c5"; + sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; }; } { @@ -2614,7 +2886,7 @@ path = fetchurl { name = "mute_stream___mute_stream_0.0.7.tgz"; url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + sha1 = "MHXOk7whuPq0PhvE2n6BFe0ee6s="; }; } { @@ -2622,7 +2894,7 @@ path = fetchurl { name = "nan___nan_2.14.0.tgz"; url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; - sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; }; } { @@ -2630,7 +2902,7 @@ path = fetchurl { name = "nanomatch___nanomatch_1.2.13.tgz"; url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; - sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; } { @@ -2638,7 +2910,7 @@ path = fetchurl { name = "nanoseconds___nanoseconds_0.1.0.tgz"; url = "https://registry.yarnpkg.com/nanoseconds/-/nanoseconds-0.1.0.tgz"; - sha1 = "69ec39fcd00e77ab3a72de0a43342824cd79233a"; + sha1 = "aew5/NAOd6s6ct4KQzQoJM15Izo="; }; } { @@ -2646,7 +2918,7 @@ path = fetchurl { name = "natives___natives_1.1.6.tgz"; url = "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz"; - sha1 = "a603b4a498ab77173612b9ea1acdec4d980f00bb"; + sha512 = "6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA=="; }; } { @@ -2654,7 +2926,39 @@ path = fetchurl { name = "negotiator___negotiator_0.6.2.tgz"; url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; - sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + } + { + 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_fetch___node_fetch_2.6.5.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; + sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; + }; + } + { + name = "nodejieba___nodejieba_2.5.2.tgz"; + path = fetchurl { + name = "nodejieba___nodejieba_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/nodejieba/-/nodejieba-2.5.2.tgz"; + sha512 = "ByskJvaBrQ2eV+5M0OeD80S5NKoGaHc9zi3Z/PTKl/95eac2YF8RmWduq9AknLpkQLrLAIcqurrtC6BzjpKwwg=="; + }; + } + { + name = "nopt___nopt_5.0.0.tgz"; + path = fetchurl { + name = "nopt___nopt_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; } { @@ -2662,7 +2966,7 @@ path = fetchurl { name = "nopt___nopt_1.0.10.tgz"; url = "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz"; - sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + sha1 = "bd0hvSoxQXuScn3Vhfim83YI6+4="; }; } { @@ -2670,7 +2974,23 @@ path = fetchurl { name = "normalize_path___normalize_path_2.1.1.tgz"; url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + sha1 = "GrKLVW4Zg2Oowab35vogE3/mrtk="; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; }; } { @@ -2678,7 +2998,7 @@ path = fetchurl { name = "oauth_sign___oauth_sign_0.9.0.tgz"; url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; } { @@ -2686,7 +3006,7 @@ path = fetchurl { name = "object_assign___object_assign_4.1.1.tgz"; url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; }; } { @@ -2694,23 +3014,7 @@ path = fetchurl { name = "object_copy___object_copy_0.1.0.tgz"; url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; - }; - } - { - name = "object_inspect___object_inspect_1.8.0.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; - sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; - }; - } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha1 = "fn2Fi3gb18mRpBupde04EnVOmYw="; }; } { @@ -2718,15 +3022,7 @@ path = fetchurl { name = "object_visit___object_visit_1.0.1.tgz"; url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; - }; - } - { - name = "object.assign___object.assign_4.1.0.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + sha1 = "95xEk68MU3e1n+OdOV5BBC3QRbs="; }; } { @@ -2734,7 +3030,7 @@ path = fetchurl { name = "object.omit___object.omit_2.0.1.tgz"; url = "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz"; - sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + sha1 = "Gpx0SCnznbuFjHbKNXmuKlTr0fo="; }; } { @@ -2742,15 +3038,15 @@ path = fetchurl { name = "object.pick___object.pick_1.3.0.tgz"; url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + sha1 = "h6EKxMFpS9Lhy/U1kaZhQftd10c="; }; } { - name = "object.values___object.values_1.1.1.tgz"; + name = "object_values___object_values_0.1.2.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + name = "object_values___object_values_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/object_values/-/object_values-0.1.2.tgz"; + sha512 = "tZgUiKLraVH+4OAedBYrr4/K6KmAQw2RPNd1AuNdhLsuz5WP3VB7WuiKBWbOcjeqqAjus2ChIIWC8dSfmg7ReA=="; }; } { @@ -2758,7 +3054,7 @@ path = fetchurl { name = "on_finished___on_finished_2.3.0.tgz"; url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + sha1 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; }; } { @@ -2766,7 +3062,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -2774,7 +3070,7 @@ path = fetchurl { name = "onetime___onetime_2.0.1.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + sha1 = "BnQoIw/WdEOyeUsiu6UotoZ5YtQ="; }; } { @@ -2782,7 +3078,7 @@ path = fetchurl { name = "optionator___optionator_0.8.3.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; }; } { @@ -2790,7 +3086,7 @@ path = fetchurl { name = "options___options_0.0.6.tgz"; url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + sha1 = "7CLTEoBrtT5zF3Pnza788cZDEo8="; }; } { @@ -2798,7 +3094,7 @@ path = fetchurl { name = "orderedmap___orderedmap_1.1.1.tgz"; url = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz"; - sha1 = "c618e77611b3b21d0fe3edc92586265e0059c789"; + sha512 = "3Ux8um0zXbVacKUkcytc0u3HgC0b0bBLT+I60r2J/En72cI0nZffqrA7Xtf2Hqs27j1g82llR5Mhbd0Z1XW4AQ=="; }; } { @@ -2806,7 +3102,7 @@ path = fetchurl { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + sha1 = "u+Z0BseaqFxc/sdm/lc0VV36EnQ="; }; } { @@ -2814,7 +3110,7 @@ path = fetchurl { name = "over___over_0.0.5.tgz"; url = "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz"; - sha1 = "f29852e70fd7e25f360e013a8ec44c82aedb5708"; + sha1 = "8phS5w/X4l82DgE6jsRMgq7bVwg="; }; } { @@ -2822,7 +3118,7 @@ path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; } { @@ -2830,7 +3126,7 @@ path = fetchurl { name = "parse_glob___parse_glob_3.0.4.tgz"; url = "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz"; - sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + sha1 = "ssN2z7EfNVE7rdFz7wu246OIORw="; }; } { @@ -2838,7 +3134,7 @@ path = fetchurl { name = "parse_json___parse_json_5.0.0.tgz"; url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; - sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; }; } { @@ -2846,7 +3142,7 @@ path = fetchurl { name = "parseurl___parseurl_1.3.3.tgz"; url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; - sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; } { @@ -2854,7 +3150,7 @@ path = fetchurl { name = "pascalcase___pascalcase_0.1.1.tgz"; url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + sha1 = "s2PlXoAGym/iF4TS2yK9FdeRfxQ="; }; } { @@ -2862,7 +3158,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 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -2870,7 +3166,7 @@ path = fetchurl { name = "path_parse___path_parse_1.0.6.tgz"; url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; } { @@ -2878,7 +3174,7 @@ path = fetchurl { name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha1 = "32BBeABfUi8V60SQ5yR6G/qmf4w="; }; } { @@ -2886,7 +3182,7 @@ path = fetchurl { name = "path_type___path_type_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; - sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; } { @@ -2894,7 +3190,15 @@ path = fetchurl { name = "performance_now___performance_now_2.1.0.tgz"; url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + sha1 = "Ywn04OX6kT7BxpMHrjZLSzd8nns="; + }; + } + { + name = "pinyin___pinyin_2.10.2.tgz"; + path = fetchurl { + name = "pinyin___pinyin_2.10.2.tgz"; + url = "https://registry.yarnpkg.com/pinyin/-/pinyin-2.10.2.tgz"; + sha512 = "qAcp7+2vnjm6sAd0B9pp5JpyvHbYoQO1v9zCeJQMEgyw2VeRi02l0gR22ZBgfjjvZ1c2EGoVjJHJ1h0rwr34Ug=="; }; } { @@ -2902,7 +3206,7 @@ path = fetchurl { name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + sha1 = "AerA/jta9xoqbAL+q7jB/vfgDqs="; }; } { @@ -2910,7 +3214,7 @@ path = fetchurl { name = "postcss___postcss_6.0.23.tgz"; url = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz"; - sha1 = "61c82cc328ac60e677645f979054eb98bc0e3324"; + sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; } { @@ -2918,7 +3222,7 @@ 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 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + sha1 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="; }; } { @@ -2926,7 +3230,7 @@ path = fetchurl { name = "preserve___preserve_0.2.0.tgz"; url = "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz"; - sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + sha1 = "gV7R9uvGWSb4ZbMQwHE7yzMVzks="; }; } { @@ -2934,7 +3238,7 @@ path = fetchurl { name = "prettier___prettier_1.19.1.tgz"; url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; - sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; + sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; } { @@ -2942,7 +3246,7 @@ path = fetchurl { name = "pretty_time___pretty_time_0.2.0.tgz"; url = "https://registry.yarnpkg.com/pretty-time/-/pretty-time-0.2.0.tgz"; - sha1 = "7a3bdec4049c620cd7c42b7f342b74d56e73d74e"; + sha1 = "ejvexAScYgzXxCt/NCt01W5z104="; }; } { @@ -2950,7 +3254,7 @@ path = fetchurl { name = "prettysize___prettysize_0.0.3.tgz"; url = "https://registry.yarnpkg.com/prettysize/-/prettysize-0.0.3.tgz"; - sha1 = "14afff6a645e591a4ddf1c72919c23b4146181a1"; + sha1 = "FK//amReWRpN3xxykZwjtBRhgaE="; }; } { @@ -2958,7 +3262,7 @@ 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"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -2966,7 +3270,7 @@ path = fetchurl { name = "prop_types___prop_types_15.7.2.tgz"; url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; }; } { @@ -2974,15 +3278,15 @@ path = fetchurl { name = "prosemirror_changeset___prosemirror_changeset_2.1.2.tgz"; url = "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.1.2.tgz"; - sha1 = "91dee900eb4618b21ed0c38c8d41dc7539303864"; + sha512 = "/eeAM2XeOFmtiPsFVfVkM3Iq4xfNlFuDB6MlC8Hqch/ibq3YlH3YxDi8fqg78fT8fkrfvN6zRu9EE0HkSmH8PA=="; }; } { - name = "prosemirror_commands___prosemirror_commands_1.1.4.tgz"; + name = "prosemirror_commands___prosemirror_commands_1.1.10.tgz"; path = fetchurl { - name = "prosemirror_commands___prosemirror_commands_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.4.tgz"; - sha1 = "991563e67623acab4f8c510fad1570f8b4693780"; + name = "prosemirror_commands___prosemirror_commands_1.1.10.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.10.tgz"; + sha512 = "IWyBBXNAd44RM6NnBPljwq+/CM2oYCQJkF+YhKEAZNwzW0uFdGf4qComhjbKZzqFdu6Iub2ZhNsXgwPibA0lCQ=="; }; } { @@ -2990,15 +3294,15 @@ path = fetchurl { name = "prosemirror_dev_tools___prosemirror_dev_tools_2.1.1.tgz"; url = "https://registry.yarnpkg.com/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.1.tgz"; - sha1 = "0c4304b05b437608b3666b72fdb4b21e24fa29fc"; + sha512 = "d9MG4PF82meg5Ru64ox6WCKPkQNsiZEaG5xR5a+l88RJ0VRButMZq5JzPh28vUlTBq+TXnpdTJRlPQIgTOtpqg=="; }; } { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.2.tgz"; + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.5.tgz"; path = fetchurl { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz"; - sha1 = "28738c4ed7102e814d7a8a26d70018523fc7cd6d"; + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.5.tgz"; + sha512 = "tNUwcF2lPAkwKBZPZRtbxpwljnODRNZ3eiYloN1DSUqDjMT1nBZm0nejaEMS1TvNQ+3amibUSAiV4hX+jpASFA=="; }; } { @@ -3006,23 +3310,23 @@ path = fetchurl { name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; url = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz"; - sha1 = "0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246"; + sha512 = "SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w=="; }; } { - name = "prosemirror_history___prosemirror_history_1.1.3.tgz"; + name = "prosemirror_history___prosemirror_history_1.2.0.tgz"; path = fetchurl { - name = "prosemirror_history___prosemirror_history_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz"; - sha1 = "4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489"; + name = "prosemirror_history___prosemirror_history_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.2.0.tgz"; + sha512 = "B9v9xtf4fYbKxQwIr+3wtTDNLDZcmMMmGiI3TAPShnUzvo+Rmv1GiUrsQChY1meetHl7rhML2cppF3FTs7f7UQ=="; }; } { - name = "prosemirror_inputrules___prosemirror_inputrules_1.1.2.tgz"; + name = "prosemirror_inputrules___prosemirror_inputrules_1.1.3.tgz"; path = fetchurl { - name = "prosemirror_inputrules___prosemirror_inputrules_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz"; - sha1 = "487e46c763e1212a4577397aba7706139084f012"; + name = "prosemirror_inputrules___prosemirror_inputrules_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz"; + sha512 = "ZaHCLyBtvbyIHv0f5p6boQTIJjlD6o2NPZiEaZWT2DA+j591zS29QQEMT4lBqwcLW3qRSf7ZvoKNbf05YrsStw=="; }; } { @@ -3030,7 +3334,7 @@ path = fetchurl { name = "prosemirror_keymap___prosemirror_keymap_1.1.3.tgz"; url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz"; - sha1 = "be22d6108df2521608e9216a87b1a810f0ed361e"; + sha512 = "PRA4NzkUMzV/NFf5pyQ6tmlIHiW/qjQ1kGWUlV2rF/dvlOxtpGpTEjIMhWgLuMf+HiDEFnUEP7uhYXu+t+491g=="; }; } { @@ -3038,7 +3342,7 @@ path = fetchurl { name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz"; - sha1 = "8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d"; + sha512 = "Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg=="; }; } { @@ -3046,23 +3350,23 @@ path = fetchurl { name = "prosemirror_model___prosemirror_model_1.9.1.tgz"; url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz"; - sha1 = "8c08cf556f593c5f015548d2c1a6825661df087f"; + sha512 = "Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q=="; }; } { - name = "prosemirror_model___prosemirror_model_1.11.0.tgz"; + name = "prosemirror_model___prosemirror_model_1.14.3.tgz"; path = fetchurl { - name = "prosemirror_model___prosemirror_model_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.0.tgz"; - sha1 = "dc36cdb3ad6442b9f6325c7d89170c624f9dc520"; + name = "prosemirror_model___prosemirror_model_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.3.tgz"; + sha512 = "yzZlBaSxfUPIIP6U5Edh5zKxJPZ5f7bwZRhiCuH3UYkWhj+P3d8swHsbuAMOu/iDatDc5J/Qs5Mb3++mZf+CvQ=="; }; } { - name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.5.tgz"; path = fetchurl { - name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz"; - sha1 = "471f9caf2d2bed93641d2e490434c0d2d4330df1"; + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.5.tgz"; + sha512 = "9gadhga/wySVfb/iZ2vOpndbG0XroeLw0HkkZN5demNbOea6U5oQtJmvyYWC7ZVf3WkhmVdVsOXrllM9JcC20A=="; }; } { @@ -3070,15 +3374,15 @@ path = fetchurl { name = "prosemirror_state___prosemirror_state_1.3.2.tgz"; url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.2.tgz"; - sha1 = "1b910b0dc01c1f00926bb9ba1589f7b7ac0d658b"; + sha512 = "t/JqE3aR0SV9QrzFVkAXsQwsgrQBNs/BDbcFH20RssW0xauqNNdjTXxy/J/kM7F+0zYi6+BRmz7cMMQQFU3mwQ=="; }; } { - name = "prosemirror_state___prosemirror_state_1.3.3.tgz"; + name = "prosemirror_state___prosemirror_state_1.3.4.tgz"; path = fetchurl { - name = "prosemirror_state___prosemirror_state_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz"; - sha1 = "b2862866b14dec2b3ae1ab18229f2bd337651a2c"; + name = "prosemirror_state___prosemirror_state_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.4.tgz"; + sha512 = "Xkkrpd1y/TQ6HKzN3agsQIGRcLckUMA9u3j207L04mt8ToRgpGeyhbVv0HI7omDORIBHjR29b7AwlATFFf2GLA=="; }; } { @@ -3086,7 +3390,7 @@ path = fetchurl { name = "prosemirror_tables___prosemirror_tables_1.0.0.tgz"; url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.0.0.tgz"; - sha1 = "ec3d0b11e638c6a92dd14ae816d0a2efd1719b70"; + sha512 = "zFw5Us4G5Vdq0yIj8GiqZOGA6ud5UKpMKElux9O0HrfmhkuGa1jf1PCpz2R5pmIQJv+tIM24H1mox/ODBAX37Q=="; }; } { @@ -3094,7 +3398,7 @@ path = fetchurl { name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz"; - sha1 = "ad66300cc49500455cf1243bb129c9e7d883321e"; + sha512 = "LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA=="; }; } { @@ -3102,15 +3406,15 @@ path = fetchurl { name = "prosemirror_transform___prosemirror_transform_1.2.3.tgz"; url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.3.tgz"; - sha1 = "239d17591af24d39ef3f1999daa09e1f1c76b06a"; + sha512 = "PUfayeskQfuUBXktvL6207ZWRwHBFNPNPiek4fR+LgCPnBofuEb2+L0FfbNtrAwffHVs6M3DaFvJB1W2VQdV0A=="; }; } { - name = "prosemirror_transform___prosemirror_transform_1.2.8.tgz"; + name = "prosemirror_transform___prosemirror_transform_1.3.2.tgz"; path = fetchurl { - name = "prosemirror_transform___prosemirror_transform_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.8.tgz"; - sha1 = "4b86544fa43637fe381549fb7b019f4fb71fe65c"; + name = "prosemirror_transform___prosemirror_transform_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.3.2.tgz"; + sha512 = "/G6d/u9Mf6Bv3H1XR8VxhpjmUO75LYmnvj+s3ZfZpakU1hnQbsvCEybml1B3f2IWUAAQRFkbO1PnsbFhLZsYsw=="; }; } { @@ -3118,7 +3422,7 @@ path = fetchurl { name = "prosemirror_utils___prosemirror_utils_0.9.6.tgz"; url = "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz"; - sha1 = "3d97bd85897e3b535555867dc95a51399116a973"; + sha512 = "UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA=="; }; } { @@ -3126,15 +3430,15 @@ path = fetchurl { name = "prosemirror_view___prosemirror_view_1.14.2.tgz"; url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.14.2.tgz"; - sha1 = "23eb89f6101e9671b5e0c19d82ee0ad9de5608de"; + sha512 = "9yPVH6OLyaEraHjWHbSk2DB0R/1TsEE6AA1LI+vmCypXXA+zTzNrktUFzBhSJHehXDoEJcQfnl1Wdp5GPSh2+g=="; }; } { - name = "prosemirror_view___prosemirror_view_1.15.6.tgz"; + name = "prosemirror_view___prosemirror_view_1.20.1.tgz"; path = fetchurl { - name = "prosemirror_view___prosemirror_view_1.15.6.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.6.tgz"; - sha1 = "446bf7662235300c5f47362af2db805c6df3ad24"; + name = "prosemirror_view___prosemirror_view_1.20.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.20.1.tgz"; + sha512 = "djWORhy3a706mUH4A2dgEEV0IPZqQd1tFyz/ZVHJNoqhSgq82FwG6dq7uqHeUB2KdVSNfI2yc3rwfqlC/ll2pA=="; }; } { @@ -3142,7 +3446,7 @@ path = fetchurl { name = "proxy_addr___proxy_addr_2.0.6.tgz"; url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; } { @@ -3150,7 +3454,7 @@ path = fetchurl { name = "psl___psl_1.7.0.tgz"; url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; - sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; + sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; } { @@ -3158,7 +3462,7 @@ path = fetchurl { name = "pullstream___pullstream_0.4.1.tgz"; url = "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz"; - sha1 = "d6fb3bf5aed697e831150eb1002c25a3f8ae1314"; + sha1 = "1vs79a7Wl+gxFQ6xACwlo/iuExQ="; }; } { @@ -3166,7 +3470,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -3174,7 +3478,7 @@ path = fetchurl { name = "pure_color___pure_color_1.3.0.tgz"; url = "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz"; - sha1 = "1fe064fb0ac851f0de61320a8bf796836422f33e"; + sha1 = "H+Bk+wrIUfDeYTIKi/eWg2Qi8z4="; }; } { @@ -3182,7 +3486,7 @@ path = fetchurl { name = "qs___qs_6.7.0.tgz"; url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; - sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; } { @@ -3190,7 +3494,7 @@ path = fetchurl { name = "qs___qs_6.5.2.tgz"; url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; - sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; } { @@ -3198,7 +3502,7 @@ path = fetchurl { name = "randomatic___randomatic_3.1.1.tgz"; url = "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz"; - sha1 = "b776efc59375984e36c537b2f51a1f0aff0da1ed"; + sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; }; } { @@ -3206,7 +3510,7 @@ path = fetchurl { name = "range_parser___range_parser_1.2.1.tgz"; url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; - sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; } { @@ -3214,7 +3518,7 @@ path = fetchurl { name = "raw_body___raw_body_2.4.0.tgz"; url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; - sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; } { @@ -3222,7 +3526,7 @@ path = fetchurl { name = "react_base16_styling___react_base16_styling_0.5.3.tgz"; url = "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz"; - sha1 = "3858f24e9c4dd8cbd3f702f3f74d581ca2917269"; + sha1 = "OFjyTpxN2MvT9wLz901YHKKRcmk="; }; } { @@ -3230,15 +3534,15 @@ path = fetchurl { name = "react_dock___react_dock_0.2.4.tgz"; url = "https://registry.yarnpkg.com/react-dock/-/react-dock-0.2.4.tgz"; - sha1 = "e727dc7550b3b73116635dcb9c0e04d0b7afe17c"; + sha1 = "5yfcdVCztzEWY13LnA4E0Lev4Xw="; }; } { - name = "react_dom___react_dom_16.13.1.tgz"; + name = "react_dom___react_dom_17.0.2.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz"; - sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f"; + name = "react_dom___react_dom_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz"; + sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; }; } { @@ -3246,7 +3550,7 @@ path = fetchurl { name = "react_emotion___react_emotion_9.2.12.tgz"; url = "https://registry.yarnpkg.com/react-emotion/-/react-emotion-9.2.12.tgz"; - sha1 = "74d1494f89e22d0b9442e92a33ca052461955c83"; + sha512 = "qt7XbxnEKX5sZ73rERJ92JMbEOoyOwG3BuCRFRkXrsJhEe+rFBRTljRw7yOLHZUCQC4GBObZhjXIduQ8S0ZpYw=="; }; } { @@ -3254,7 +3558,7 @@ path = fetchurl { name = "react_is___react_is_16.13.0.tgz"; url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz"; - sha1 = "0f37c3613c34fe6b37cd7f763a0d6293ab15c527"; + sha512 = "GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA=="; }; } { @@ -3262,23 +3566,23 @@ path = fetchurl { name = "react_json_tree___react_json_tree_0.11.2.tgz"; url = "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.11.2.tgz"; - sha1 = "af70199fcbc265699ade2aec492465c51608f95e"; + sha512 = "aYhUPj1y5jR3ZQ+G3N7aL8FbTyO03iLwnVvvEikLcNFqNTyabdljo9xDftZndUBFyyyL0aK3qGO9+8EilILHUw=="; }; } { - name = "react_window___react_window_1.8.5.tgz"; + name = "react_window___react_window_1.8.6.tgz"; path = fetchurl { - name = "react_window___react_window_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz"; - sha1 = "a56b39307e79979721021f5d06a67742ecca52d1"; + name = "react_window___react_window_1.8.6.tgz"; + url = "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz"; + sha512 = "8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg=="; }; } { - name = "react___react_16.13.1.tgz"; + name = "react___react_17.0.2.tgz"; path = fetchurl { - name = "react___react_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; - sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; + name = "react___react_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz"; + sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; }; } { @@ -3286,7 +3590,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -3294,7 +3598,7 @@ path = fetchurl { name = "readable_stream___readable_stream_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { @@ -3302,7 +3606,7 @@ path = fetchurl { name = "readable_stream___readable_stream_1.0.34.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + sha1 = "Elgg40vIQtLyqq+v5MKRbuMsFXw="; }; } { @@ -3310,7 +3614,7 @@ path = fetchurl { name = "readdirp___readdirp_2.2.1.tgz"; url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; - sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; } { @@ -3318,7 +3622,7 @@ path = fetchurl { name = "realm_utils___realm_utils_1.0.9.tgz"; url = "https://registry.yarnpkg.com/realm-utils/-/realm-utils-1.0.9.tgz"; - sha1 = "5c76a5ff39e4816af2c133a161f4221d6628eff4"; + sha1 = "XHal/znkgWrywTOhYfQiHWYo7/Q="; }; } { @@ -3326,7 +3630,7 @@ path = fetchurl { name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; - sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + sha512 = "LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA=="; }; } { @@ -3334,7 +3638,7 @@ path = fetchurl { name = "regenerate___regenerate_1.4.0.tgz"; url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; - sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; + sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; }; } { @@ -3342,7 +3646,7 @@ path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; } { @@ -3350,7 +3654,7 @@ path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; + sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="; }; } { @@ -3358,7 +3662,7 @@ path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; } { @@ -3366,7 +3670,7 @@ path = fetchurl { name = "regex_cache___regex_cache_0.4.4.tgz"; url = "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz"; - sha1 = "75bdc58a2a1496cec48a12835bc54c8d562336dd"; + sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="; }; } { @@ -3374,7 +3678,7 @@ path = fetchurl { name = "regex_not___regex_not_1.0.2.tgz"; url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; - sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; } { @@ -3382,7 +3686,7 @@ path = fetchurl { name = "regexpu_core___regexpu_core_4.6.0.tgz"; url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; - sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; + sha512 = "YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg=="; }; } { @@ -3390,7 +3694,7 @@ path = fetchurl { name = "regjsgen___regjsgen_0.5.1.tgz"; url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; - sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; + sha512 = "5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg=="; }; } { @@ -3398,7 +3702,7 @@ path = fetchurl { name = "regjsparser___regjsparser_0.6.3.tgz"; url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; - sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"; + sha512 = "8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA=="; }; } { @@ -3406,7 +3710,7 @@ path = fetchurl { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + sha1 = "wkvOKig62tW8P1jg1IJJuSN52O8="; }; } { @@ -3414,7 +3718,7 @@ path = fetchurl { name = "repeat_element___repeat_element_1.1.3.tgz"; url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; }; } { @@ -3422,7 +3726,7 @@ path = fetchurl { name = "repeat_string___repeat_string_1.6.1.tgz"; url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + sha1 = "jcrkcOHIirwtYA//Sndihtp15jc="; }; } { @@ -3430,7 +3734,15 @@ path = fetchurl { name = "request___request_2.88.2.tgz"; url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; - sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + } + { + name = "require_directory___require_directory_2.1.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="; }; } { @@ -3438,7 +3750,7 @@ path = fetchurl { name = "resolve_from___resolve_from_4.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; } { @@ -3446,7 +3758,7 @@ path = fetchurl { name = "resolve_url___resolve_url_0.2.1.tgz"; url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + sha1 = "LGN/53yJOv0qZj/iGqkIAGjiBSo="; }; } { @@ -3454,7 +3766,7 @@ path = fetchurl { name = "resolve___resolve_1.15.1.tgz"; url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz"; - sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"; + sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; }; } { @@ -3462,7 +3774,7 @@ path = fetchurl { name = "restore_cursor___restore_cursor_2.0.0.tgz"; url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + sha1 = "n37ih/gv0ybU/RYpI9YhKe7g368="; }; } { @@ -3470,7 +3782,7 @@ path = fetchurl { name = "ret___ret_0.1.15.tgz"; url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; - sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; } { @@ -3478,7 +3790,15 @@ path = fetchurl { name = "rimraf___rimraf_2.7.1.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -3486,7 +3806,7 @@ path = fetchurl { name = "rope_sequence___rope_sequence_1.3.2.tgz"; url = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz"; - sha1 = "a19e02d72991ca71feb6b5f8a91154e48e3c098b"; + sha512 = "ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg=="; }; } { @@ -3494,7 +3814,7 @@ path = fetchurl { name = "run_async___run_async_2.4.0.tgz"; url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz"; - sha1 = "e59054a5b86876cfae07f431d18cbaddc594f1e8"; + sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; }; } { @@ -3502,7 +3822,7 @@ path = fetchurl { name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz"; url = "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; - sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + sha1 = "dTuHqJoRyVRnxKwWJsTvxOBcZ74="; }; } { @@ -3510,7 +3830,7 @@ path = fetchurl { name = "rx_lite___rx_lite_4.0.8.tgz"; url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz"; - sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + sha1 = "Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="; }; } { @@ -3518,7 +3838,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.1.2.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -3526,7 +3846,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.2.0.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; }; } { @@ -3534,7 +3854,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.2.1.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { @@ -3542,7 +3862,7 @@ path = fetchurl { name = "safe_regex___safe_regex_1.1.0.tgz"; url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + sha1 = "QKNmnzsHfR6UPURinhV91IAjvy4="; }; } { @@ -3550,15 +3870,15 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { - name = "scheduler___scheduler_0.19.1.tgz"; + name = "scheduler___scheduler_0.20.2.tgz"; path = fetchurl { - name = "scheduler___scheduler_0.19.1.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; - sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; + name = "scheduler___scheduler_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz"; + sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; }; } { @@ -3566,7 +3886,7 @@ path = fetchurl { name = "select___select_1.1.2.tgz"; url = "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz"; - sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d"; + sha1 = "DnNQrN7ICxEIUoeG7B1EGNEbOW0="; }; } { @@ -3574,7 +3894,23 @@ path = fetchurl { name = "semver___semver_5.7.1.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + } + { + name = "semver___semver_7.3.5.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=="; }; } { @@ -3582,15 +3918,15 @@ path = fetchurl { name = "send___send_0.17.1.tgz"; url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; - sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; } { - name = "sentence_splitter___sentence_splitter_3.2.0.tgz"; + name = "sentence_splitter___sentence_splitter_3.2.2.tgz"; path = fetchurl { - name = "sentence_splitter___sentence_splitter_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.0.tgz"; - sha1 = "fb2cd2f61f40006643ba83d9acf4609233c1c68c"; + name = "sentence_splitter___sentence_splitter_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.2.tgz"; + sha512 = "hMvaodgK9Fay928uiQoTMEWjXpCERdKD2uKo7BbSyP+uWTo+wHiRjN+ZShyI99rW0VuoV4Cuw8FUmaRcnpN7Ug=="; }; } { @@ -3598,7 +3934,15 @@ path = fetchurl { name = "serve_static___serve_static_1.14.1.tgz"; url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; - sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + } + { + 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"; + sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; }; } { @@ -3606,7 +3950,7 @@ path = fetchurl { name = "set_value___set_value_2.0.1.tgz"; url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; - sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; } { @@ -3614,7 +3958,7 @@ path = fetchurl { name = "setimmediate___setimmediate_1.0.5.tgz"; url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + sha1 = "KQy7Iy4waULX1+qbg3Mqt4VvgoU="; }; } { @@ -3622,7 +3966,7 @@ path = fetchurl { name = "setprototypeof___setprototypeof_1.1.1.tgz"; url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; } { @@ -3630,7 +3974,15 @@ path = fetchurl { name = "shorthash___shorthash_0.0.2.tgz"; url = "https://registry.yarnpkg.com/shorthash/-/shorthash-0.0.2.tgz"; - sha1 = "59b268eecbde59038b30da202bcfbddeb2c4a4eb"; + sha1 = "WbJo7sveWQOLMNogK8+93rLEpOs="; + }; + } + { + name = "signal_exit___signal_exit_3.0.5.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; + sha512 = "KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="; }; } { @@ -3638,7 +3990,7 @@ path = fetchurl { name = "signal_exit___signal_exit_3.0.2.tgz"; url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + sha1 = "tf3AjxKH6hF4Yo5BXiUTK3NkbG0="; }; } { @@ -3646,7 +3998,7 @@ path = fetchurl { name = "slice_stream___slice_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz"; - sha1 = "5b33bd66f013b1a7f86460b03d463dec39ad3ea0"; + sha1 = "WzO9ZvATsaf4ZGCwPUY97DmtPqA="; }; } { @@ -3654,7 +4006,7 @@ path = fetchurl { name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; }; } { @@ -3662,7 +4014,7 @@ path = fetchurl { name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; } { @@ -3670,7 +4022,7 @@ path = fetchurl { name = "snapdragon___snapdragon_0.8.2.tgz"; url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; - sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; }; } { @@ -3678,7 +4030,7 @@ path = fetchurl { name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; } { @@ -3686,7 +4038,7 @@ path = fetchurl { name = "source_map_support___source_map_support_0.5.19.tgz"; url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; - sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; } { @@ -3694,7 +4046,7 @@ path = fetchurl { name = "source_map_support___source_map_support_0.5.16.tgz"; url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; - sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; + sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; }; } { @@ -3702,7 +4054,7 @@ path = fetchurl { name = "source_map_url___source_map_url_0.4.0.tgz"; url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + sha1 = "PpNdfd1zYxuXZZlW1VEo6HtQhKM="; }; } { @@ -3710,7 +4062,7 @@ 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 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; }; } { @@ -3718,7 +4070,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -3726,7 +4078,7 @@ path = fetchurl { name = "source_map___source_map_0.7.3.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; - sha1 = "5302f8169031735226544092e64981f751750383"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; } { @@ -3734,7 +4086,7 @@ path = fetchurl { name = "sourcemap_blender___sourcemap_blender_1.0.5.tgz"; url = "https://registry.yarnpkg.com/sourcemap-blender/-/sourcemap-blender-1.0.5.tgz"; - sha1 = "d361f3d12381c4e477178113878fdf984a91bdbc"; + sha512 = "GPhjCmDtJ8YY6zt1L6kP6WtBg6WrdWt5hw2Wmgt9rwC3yiwLo9vEuabh/YYSZ5KmFV20hVkGdkTwpXtT2E65TA=="; }; } { @@ -3742,7 +4094,7 @@ path = fetchurl { name = "split_string___split_string_3.1.0.tgz"; url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; - sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; } { @@ -3750,7 +4102,7 @@ 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 = "04e6926f662895354f3dd015203633b857297e2c"; + sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; }; } { @@ -3758,7 +4110,7 @@ path = fetchurl { name = "sshpk___sshpk_1.16.1.tgz"; url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; - sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; } { @@ -3766,7 +4118,7 @@ path = fetchurl { name = "static_extend___static_extend_0.1.2.tgz"; url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + sha1 = "YICcOcv/VTNyJv1eC1IPNB8ftcY="; }; } { @@ -3774,7 +4126,7 @@ path = fetchurl { name = "statuses___statuses_1.5.0.tgz"; url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + sha1 = "Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="; }; } { @@ -3782,31 +4134,31 @@ path = fetchurl { name = "stream_browserify___stream_browserify_2.0.2.tgz"; url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; - sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; } { - name = "string_width___string_width_2.1.1.tgz"; + name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + name = "string_width___string_width_2.1.1.tgz"; path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; } { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + name = "string_width___string_width_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } { @@ -3814,7 +4166,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -3822,7 +4174,7 @@ path = fetchurl { name = "string_decoder___string_decoder_0.10.31.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + sha1 = "YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="; }; } { @@ -3830,7 +4182,15 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } { @@ -3838,7 +4198,15 @@ path = fetchurl { name = "strip_ansi___strip_ansi_4.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + sha1 = "qEeQIusaw2iocTibY1JixQXuNo8="; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } { @@ -3846,7 +4214,7 @@ path = fetchurl { name = "structured_source___structured_source_3.0.2.tgz"; url = "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz"; - sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; + sha1 = "3YAkJeD1PcSm56yjdSkBoczaevU="; }; } { @@ -3854,7 +4222,7 @@ path = fetchurl { name = "stylis_rule_sheet___stylis_rule_sheet_0.0.10.tgz"; url = "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz"; - sha1 = "44e64a2b076643f4b52e5ff71efc04d8c3c4a430"; + sha512 = "nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="; }; } { @@ -3862,7 +4230,7 @@ path = fetchurl { name = "stylis___stylis_3.5.4.tgz"; url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz"; - sha1 = "f665f25f5e299cf3d64654ab949a57c768b73fbe"; + sha512 = "8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="; }; } { @@ -3870,7 +4238,15 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + } + { + name = "tar___tar_6.1.11.tgz"; + path = fetchurl { + name = "tar___tar_6.1.11.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; } { @@ -3878,7 +4254,7 @@ path = fetchurl { name = "terser___terser_4.6.4.tgz"; url = "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz"; - sha1 = "40a0b37afbe5b57e494536815efa68326840fc00"; + sha512 = "5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w=="; }; } { @@ -3886,7 +4262,7 @@ path = fetchurl { name = "thenby___thenby_1.3.3.tgz"; url = "https://registry.yarnpkg.com/thenby/-/thenby-1.3.3.tgz"; - sha1 = "016c3427772a284bbfef982d978f7574fd15ee9d"; + sha512 = "vCzp0TxrQ+2bfRJoWNhMwk6RNfboOUN2S+nbEfhJfj7RwJHD6PlgtXH/hXiSmv6UJs35IQDtVqiI45J+cAgLqg=="; }; } { @@ -3894,7 +4270,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; }; } { @@ -3902,7 +4278,7 @@ path = fetchurl { name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; - sha1 = "1d1a56edfc51c43e863cbb5382a72330e3555423"; + sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; }; } { @@ -3910,7 +4286,7 @@ path = fetchurl { name = "tlite___tlite_0.1.9.tgz"; url = "https://registry.yarnpkg.com/tlite/-/tlite-0.1.9.tgz"; - sha1 = "e886e4a305b7522242e2453b7ca4fb84f2d9de0f"; + sha512 = "5QOBAvDxZZwW1i+2YXMgF6/PuV/KhA0LyE9PyVi8Ywr3bfIPziZcQD+RpdJaQurCU8zIGtBo/XuPCEHdvyeFuQ=="; }; } { @@ -3918,7 +4294,7 @@ path = fetchurl { name = "tmp___tmp_0.0.33.tgz"; url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; - sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; } { @@ -3926,7 +4302,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 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; }; } { @@ -3934,7 +4310,7 @@ path = fetchurl { name = "to_object_path___to_object_path_0.3.0.tgz"; url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + sha1 = "KXWIt7Dn4KwI4E5nL4XB9JmeF68="; }; } { @@ -3942,7 +4318,7 @@ path = fetchurl { name = "to_regex_range___to_regex_range_2.1.1.tgz"; url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + sha1 = "fIDBe53+vlmeJzZ+DU3VWQFB2zg="; }; } { @@ -3950,7 +4326,7 @@ path = fetchurl { name = "to_regex___to_regex_3.0.2.tgz"; url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; - sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; }; } { @@ -3958,7 +4334,7 @@ path = fetchurl { name = "toidentifier___toidentifier_1.0.0.tgz"; url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; - sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; } { @@ -3966,7 +4342,7 @@ path = fetchurl { name = "touch___touch_2.0.2.tgz"; url = "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz"; - sha1 = "ca0b2a3ae3211246a61b16ba9e6cbf1596287164"; + sha512 = "qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A=="; }; } { @@ -3974,7 +4350,23 @@ path = fetchurl { name = "tough_cookie___tough_cookie_2.5.0.tgz"; url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + } + { + name = "tr46___tr46_0.0.3.tgz"; + path = fetchurl { + name = "tr46___tr46_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; + sha1 = "gYT9NH2snNwYWZLzpmIuFLnZq2o="; + }; + } + { + name = "transliteration___transliteration_2.2.0.tgz"; + path = fetchurl { + name = "transliteration___transliteration_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/transliteration/-/transliteration-2.2.0.tgz"; + sha512 = "o29GDWtecNoK4TNfnJQesGluFPiza+U8NoiKrErU8eTNlVgma6w1LV/tTiGo+waFLkhtL9WxrW0lXhZKmm7msQ=="; }; } { @@ -3982,7 +4374,7 @@ path = fetchurl { name = "traverse___traverse_0.3.9.tgz"; url = "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz"; - sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + sha1 = "cXuPIgzAu3tE5AUUwisui7xw2Lk="; }; } { @@ -3990,7 +4382,7 @@ path = fetchurl { name = "ts_node___ts_node_8.10.2.tgz"; url = "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz"; - sha1 = "eee03764633b1234ddd37f8db9ec10b75ec7fb8d"; + sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA=="; }; } { @@ -3998,7 +4390,7 @@ path = fetchurl { name = "tslib___tslib_1.11.1.tgz"; url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; - sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; + sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; }; } { @@ -4006,7 +4398,7 @@ path = fetchurl { name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; url = "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz"; - sha1 = "75f140bde947d35d8f0d238e0ebf809d64592c37"; + sha512 = "xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg=="; }; } { @@ -4014,7 +4406,7 @@ path = fetchurl { name = "tslint_react___tslint_react_5.0.0.tgz"; url = "https://registry.yarnpkg.com/tslint-react/-/tslint-react-5.0.0.tgz"; - sha1 = "d0ae644e8163bdd3e134012e9353094904e8dd44"; + sha512 = "/IbcSmoBPlFic8kQaRfQ4knTY4mivwo5LVzvozvX6Dyu2ynEnrh1dIcR2ujjyp/IodXqY/H5GbxFxSMo/Kf2Hg=="; }; } { @@ -4022,7 +4414,7 @@ path = fetchurl { name = "tslint___tslint_5.20.1.tgz"; url = "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz"; - sha1 = "e401e8aeda0152bc44dd07e614034f3f80c67b7d"; + sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; }; } { @@ -4030,7 +4422,7 @@ path = fetchurl { name = "tsutils___tsutils_2.29.0.tgz"; url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; - sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; + sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; } { @@ -4038,7 +4430,7 @@ path = fetchurl { name = "tsutils___tsutils_3.17.1.tgz"; url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; - sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; + sha512 = "kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g=="; }; } { @@ -4046,7 +4438,7 @@ path = fetchurl { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha1 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; }; } { @@ -4054,7 +4446,7 @@ path = fetchurl { name = "tweetnacl___tweetnacl_0.14.5.tgz"; url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + sha1 = "WuaBd/GS1EViadEIr6k/+HQ/T2Q="; }; } { @@ -4062,7 +4454,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 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + sha1 = "WITKtRLPHTVeP7eE8wgEsrUg23I="; }; } { @@ -4070,7 +4462,7 @@ path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; - sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; } { @@ -4078,7 +4470,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; }; } { @@ -4086,7 +4478,7 @@ path = fetchurl { name = "typescript_tslint_plugin___typescript_tslint_plugin_0.5.5.tgz"; url = "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz"; - sha1 = "673875c43640251f1ab3d63745d7d49726ff961c"; + sha512 = "tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA=="; }; } { @@ -4094,7 +4486,7 @@ path = fetchurl { name = "typescript___typescript_3.8.3.tgz"; url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; - sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; + sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w=="; }; } { @@ -4102,7 +4494,7 @@ path = fetchurl { name = "uglify_js___uglify_js_3.8.0.tgz"; url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz"; - sha1 = "f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805"; + sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; }; } { @@ -4110,7 +4502,7 @@ path = fetchurl { name = "ultron___ultron_1.0.2.tgz"; url = "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + sha1 = "rOEWq1V80Zc4ak6I9GhTeMiy5Po="; }; } { @@ -4118,7 +4510,7 @@ path = fetchurl { name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; }; } { @@ -4126,7 +4518,7 @@ path = fetchurl { name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; }; } { @@ -4134,7 +4526,7 @@ path = fetchurl { name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; - sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + sha512 = "hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g=="; }; } { @@ -4142,7 +4534,7 @@ path = fetchurl { name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + sha512 = "L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="; }; } { @@ -4150,7 +4542,7 @@ path = fetchurl { name = "union_value___union_value_1.0.1.tgz"; url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; - sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; } { @@ -4158,7 +4550,7 @@ path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; } { @@ -4166,7 +4558,7 @@ path = fetchurl { name = "unpipe___unpipe_1.0.0.tgz"; url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha1 = "sr9O6FFKrmFltIF4KdIbLvSZBOw="; }; } { @@ -4174,7 +4566,7 @@ path = fetchurl { name = "unset_value___unset_value_1.0.0.tgz"; url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + sha1 = "g3aHP30jNRef+x5vw6jtDfyKtVk="; }; } { @@ -4182,7 +4574,7 @@ path = fetchurl { name = "unstated___unstated_2.1.1.tgz"; url = "https://registry.yarnpkg.com/unstated/-/unstated-2.1.1.tgz"; - sha1 = "36b124dfb2e7a12d39d0bb9c46dfb6e51276e3a2"; + sha512 = "fORlTWMZxq7NuMJDxyIrrYIZKN7wEWYQ9SiaJfIRcSpsowr6Ph/JIfK2tgtXLW614JfPG/t5q9eEIhXRCf55xg=="; }; } { @@ -4190,7 +4582,7 @@ path = fetchurl { name = "unzip___unzip_0.1.11.tgz"; url = "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz"; - sha1 = "89749c63b058d7d90d619f86b98aa1535d3b97f0"; + sha1 = "iXScY7BY19kNYZ+GuYqhU107l/A="; }; } { @@ -4198,7 +4590,7 @@ path = fetchurl { name = "uri_js___uri_js_4.2.2.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; } { @@ -4206,7 +4598,7 @@ path = fetchurl { name = "urix___urix_0.1.0.tgz"; url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + sha1 = "2pN/emLiH+wf0Y1Js1wpNQZ6bHI="; }; } { @@ -4214,7 +4606,7 @@ path = fetchurl { name = "use___use_3.1.1.tgz"; url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; - sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; } { @@ -4222,7 +4614,7 @@ 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 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -4230,7 +4622,7 @@ path = fetchurl { name = "utils_extend___utils_extend_1.0.8.tgz"; url = "https://registry.yarnpkg.com/utils-extend/-/utils-extend-1.0.8.tgz"; - sha1 = "ccfd7b64540f8e90ee21eec57769d0651cab8a5f"; + sha1 = "zP17ZFQPjpDuIe7Fd2nQZRyril8="; }; } { @@ -4238,7 +4630,7 @@ path = fetchurl { name = "utils_merge___utils_merge_1.0.1.tgz"; url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + sha1 = "n5VxD1CiZ5R7LMwSR0HBAoQn5xM="; }; } { @@ -4246,7 +4638,7 @@ path = fetchurl { name = "uuid___uuid_3.4.0.tgz"; url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; - sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; } { @@ -4254,7 +4646,7 @@ path = fetchurl { name = "vary___vary_1.1.2.tgz"; url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha1 = "IpnwLG3tMNSllhsLn3RSShj2NPw="; }; } { @@ -4262,7 +4654,7 @@ path = fetchurl { name = "verror___verror_1.10.0.tgz"; url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + sha1 = "OhBcoXBTr1XW4nDB+CiGguGNpAA="; }; } { @@ -4270,7 +4662,7 @@ path = fetchurl { name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; url = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz"; - sha1 = "a7bf74ef3254d0a0c272fab15c82128e378b3be9"; + sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; }; } { @@ -4278,7 +4670,7 @@ path = fetchurl { name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; url = "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz"; - sha1 = "b8aab6afae2849c84a8983d39a1cf742417afe2f"; + sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; }; } { @@ -4286,7 +4678,7 @@ path = fetchurl { name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz"; - sha1 = "d3b5952246d30e5241592b6dde8280e03942e743"; + sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="; }; } { @@ -4294,7 +4686,7 @@ path = fetchurl { name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; url = "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz"; - sha1 = "0d2feddd33f92aadf5da32450df498d52f6f14eb"; + sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; }; } { @@ -4302,7 +4694,7 @@ path = fetchurl { name = "vscode_uri___vscode_uri_1.0.8.tgz"; url = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz"; - sha1 = "9769aaececae4026fb6e22359cb38946580ded59"; + sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="; }; } { @@ -4310,7 +4702,7 @@ path = fetchurl { name = "w3c_keyname___w3c_keyname_2.2.2.tgz"; url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.2.tgz"; - sha1 = "7ea63170454bb19f1a3c6b628fc3dc8889276e91"; + sha512 = "8Vs/aVwcy0IJACaPm4tyzh1fzehZE70bGSjEl3dDms5UXtWnaBElrSHC8lDDeak0Gk5jxKOFstL64/65o7Ge2A=="; }; } { @@ -4318,7 +4710,31 @@ path = fetchurl { name = "watch___watch_1.0.2.tgz"; url = "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz"; - sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; + sha1 = "NApxe952Vyb6CqB9ch4BR6VR3ww="; + }; + } + { + name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "JFNCdeKnvGvnvIZhHMFq4KVlSHE="; + }; + } + { + name = "whatwg_url___whatwg_url_5.0.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha1 = "lmRU6HZUYuN2RNNib2dCzotwll0="; + }; + } + { + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; } { @@ -4326,7 +4742,15 @@ path = fetchurl { name = "word_wrap___word_wrap_1.2.3.tgz"; url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -4334,7 +4758,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { @@ -4342,7 +4766,23 @@ path = fetchurl { name = "ws___ws_1.1.5.tgz"; url = "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz"; - sha1 = "cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"; + sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; + }; + } + { + name = "y18n___y18n_5.0.8.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; + }; + } + { + name = "yallist___yallist_4.0.0.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=="; }; } { @@ -4350,7 +4790,23 @@ path = fetchurl { name = "yaml___yaml_1.7.2.tgz"; url = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz"; - sha1 = "f26aabf738590ab61efaca502358e48dc9f348b2"; + sha512 = "qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw=="; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.9.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 = "yargs___yargs_16.2.0.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=="; }; } { @@ -4358,7 +4814,7 @@ path = fetchurl { name = "yn___yn_3.1.1.tgz"; url = "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz"; - sha1 = "1e87401a09d767c1d5eab26a6e4c185182d2eb50"; + sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; } { @@ -4366,7 +4822,7 @@ path = fetchurl { name = "zenscroll___zenscroll_4.0.2.tgz"; url = "https://registry.yarnpkg.com/zenscroll/-/zenscroll-4.0.2.tgz"; - sha1 = "e8d5774d1c0738a47bcfa8729f3712e2deddeb25"; + sha1 = "6NV3TRwHOKR7z6hynzcS4t7d6yU="; }; } ]; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index cc1d08cc3f9b6..10fb4e0a97e65 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg - pdfminer + pdfminer-six pycairo pexpect ]; diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 074584e3360e5..6c9a43779f763 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index a5cf2d560c015..e1d5b3d4d36e3 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation (rec { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 81eaa442425bc..de9bf276aa5bf 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -142,6 +142,7 @@ in stdenv.mkDerivation (rec { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix deleted file mode 100644 index fe22f3424f2ec..0000000000000 --- a/pkgs/applications/editors/textadept/10/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: - -stdenv.mkDerivation rec { - version = "10.8"; - pname = "textadept"; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ - gtk2 ncurses glib zip - ]; - - src = fetchhg { - url = "http://foicica.com/hg/textadept"; - rev = "textadept_${version}"; - sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s="; - }; - - preConfigure = - lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: - "ln -s ${fetchurl params} $PWD/src/${name}" - ) (import ./deps.nix)) + '' - - cd src - make deps - ''; - - postBuild = '' - make curses - ''; - - preInstall = '' - mkdir -p $out/share/applications - mkdir -p $out/share/pixmaps - ''; - - postInstall = '' - make curses install PREFIX=$out MAKECMDGOALS=curses - ''; - - makeFlags = [ - "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" - ]; - - meta = with lib; { - description = "An extensible text editor based on Scintilla with Lua scripting"; - homepage = "http://foicica.com/textadept"; - license = licenses.mit; - maintainers = with maintainers; [ raskin mirrexagon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/textadept/10/deps.nix b/pkgs/applications/editors/textadept/10/deps.nix deleted file mode 100644 index 3ab778dddb2a1..0000000000000 --- a/pkgs/applications/editors/textadept/10/deps.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - "99fa62b828ee.zip" = { - url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip"; - sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc="; - }; - "lua-5.3.5.tar.gz" = { - url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; - sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; - }; - "lpeg-1.0.2.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; - }; - "v1_7_0_2.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; - sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg="; - }; - "db67f8a489e8.zip" = { - url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip"; - sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM="; - }; - "cdk-5.0-20150928.tgz" = { - url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; - sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; - }; - "libtermkey-0.20.tar.gz" = { - url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; - sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc"; - }; - "pdcurs36.zip" = { - url = "http://prdownloads.sourceforge.net/pdcurses/pdcurs36.zip"; - sha256 = "0y91zpygrxms7d1l5ksrz42bkvq8jd2xqlj5j7wgyxcl58chcw9b"; - }; - "bombay.zip" = { - url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip"; - sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h"; - }; - "cloc-1.60.pl" = { - url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl"; - sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a"; - }; -} diff --git a/pkgs/applications/editors/textadept/11/deps.nix b/pkgs/applications/editors/textadept/11/deps.nix deleted file mode 100644 index b9c7e94ee3bcd..0000000000000 --- a/pkgs/applications/editors/textadept/11/deps.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - "scintilla445.tgz" = { - url = "https://www.scintilla.org/scintilla445.tgz"; - sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag"; - }; - "6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip" = { - url = "https://github.com/orbitalquark/scinterm/archive/6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip"; - sha256 = "083xvpw14dxbyrv4i48q76bmr44hs637qv363n6ibfs8xv1kq7iv"; - }; - "scintillua_4.4.5-2.zip" = { - url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-2.zip"; - sha256 = "1061y2gg78zb2mml8msyarxgdwbf7g8g2v08fr1qqsqi2pbb7mfc"; - }; - "lua-5.3.5.tar.gz" = { - url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; - sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; - }; - "lpeg-1.0.2.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; - }; - "v1_8_0.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; - sha256 = "12p1p5qpdql44y3cc035h8rs8rgdqp6nrnrixlp5544agb5bx9p3"; - }; - "64587546482a1a6324706d75c80b77d2f87118a4.zip" = { - url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip"; - sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9"; - }; - "cdk-5.0-20200923.tgz" = { - url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; - sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0"; - }; - "libtermkey-0.20.tar.gz" = { - url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; - sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc"; - }; - "pdcurs39.zip" = { - url = "https://github.com/wmcbrine/PDCurses/archive/3.9.zip"; - sha256 = "0ydsa15d6fgk15zcavbxsi4vj3knlr2495dc5v4f5xzvv2qwlb2w"; - }; - "bombay.zip" = { - url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip"; - sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h"; - }; - "cloc-1.60.pl" = { - url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl"; - sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a"; - }; -} diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/default.nix index 3050599ba580f..74298e059f7cf 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,20 +1,22 @@ { lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { - version = "11.1"; - pname = "textadept11"; + version = "11.3"; + pname = "textadept"; nativeBuildInputs = [ pkg-config unzip zip ]; buildInputs = [ gtk2 ncurses glib ]; + enableParallelBuilding = true; + src = fetchFromGitHub { name = "textadept11"; owner = "orbitalquark"; repo = "textadept"; - rev = "1df99d561dd2055a01efa9183bb9e1b2ad43babc"; - sha256 = "0g4bh5dp391vi32aa796vszpbxyl2dm5231v9dwc8l9v0b2786qn"; + rev = "textadept_${version}"; + sha256 = "sha256-C7J/Qr/58hLbyw39R+GU4wot1gbAXf51Cv6KGk3kg30="; }; preConfigure = @@ -46,10 +48,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An extensible text editor based on Scintilla with Lua scripting. Version 11_beta"; + description = "An extensible text editor based on Scintilla with Lua scripting."; homepage = "http://foicica.com/textadept"; license = licenses.mit; - maintainers = with maintainers; [ raskin mirrexagon ]; + maintainers = with maintainers; [ raskin mirrexagon patricksjackson ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/deps.nix new file mode 100644 index 0000000000000..c0744875e7a89 --- /dev/null +++ b/pkgs/applications/editors/textadept/deps.nix @@ -0,0 +1,44 @@ +{ + "scintilla514.tgz" = { + url = "https://www.scintilla.org/scintilla514.tgz"; + sha256 = "sha256-3IJcVUmJBWsmMURsfKKLFHyUw2XZI90Kkoq3oR3To2U="; + }; + "lexilla510.tgz" = { + url = "https://www.scintilla.org/lexilla510.tgz"; + sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; + }; + "475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip" = { + url = + "https://github.com/orbitalquark/scinterm/archive/475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip"; + sha256 = "sha256-lNMK0RFcOLg9RRE5a6VelhSzUYVl5TiAiXcje2JOedE="; + }; + "4cb1464ef738a098f008d6530b776fe780b19c34.zip" = { + url = + "https://github.com/orbitalquark/scintillua/archive/4cb1464ef738a098f008d6530b776fe780b19c34.zip"; + sha256 = "sha256-OgmZ5iWnjG1cI6wprHOyeLY86DcLpU/4omGJ6stEe0c="; + }; + "lua-5.4.2.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.4.2.tar.gz"; + sha256 = "sha256-EVcNl+nXMDwKWVZ+0ax8ZINAzQ2xDV/VlMCSI+8vUk8="; + }; + "lpeg-1.0.2.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; + }; + "v1_8_0.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; + sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; + }; + "gtdialog_1.5.zip" = { + url = "https://github.com/orbitalquark/gtdialog/archive/gtdialog_1.5.zip"; + sha256 = "sha256-kk85ajgMG0okUwPAyL0TYq6BfS5cuyFmsk6i8pn7pbw="; + }; + "cdk-5.0-20200923.tgz" = { + url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; + sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; + }; + "libtermkey-0.20.tar.gz" = { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; + sha256 = "sha256-bA2HyUq5kV527NMTuuwI3t871W3oN0PZqpI6CBk10vU="; + }; +} diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 8c50586584955..ffcfcc373abe5 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4816"; + version = "9.0.0001"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1lgqr3ki50hwkz4vhdyaryirrs99qq4kgkhmpx7ygvn6aj2wapg5"; + sha256 = "sha256-WnMm3q5Stn3s33rxQt76goURSa1Rq+jMVWYiS+uJTX0="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index d8167f6098791..42a1b730fe15f 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkg-config +{ lib, stdenv, fetchurl, callPackage, ncurses, bash, gawk, gettext, pkg-config # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -18,9 +18,11 @@ stdenv.mkDerivation { inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; nativeBuildInputs = [ gettext pkg-config ]; - buildInputs = [ ncurses ] + buildInputs = [ ncurses bash gawk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; + strictDeps = true; + configureFlags = [ "--enable-multibyte" "--enable-nls" @@ -36,6 +38,13 @@ stdenv.mkDerivation { "vim_cv_memmove_handles_overlap=yes" ]; + # which.sh is used to for vim's own shebang patching, so make it find + # binaries for the host platform. + preConfigure = '' + export HOST_PATH + substituteInPlace src/which.sh --replace '$PATH' '$HOST_PATH' + ''; + postInstall = '' ln -s $out/bin/vim $out/bin/vi mkdir -p $out/share/vim diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 4773cfb9e43e4..9e7bb1be2d5c8 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -4,6 +4,7 @@ , vimCommandCheckHook , vimGenDocHook , neovimRequireCheckHook +, toVimPlugin }: rec { @@ -23,12 +24,6 @@ rec { let drv = stdenv.mkDerivation (attrs // { name = namePrefix + name; - # dont move the doc folder since vim expects it - forceShare= [ "man" "info" ]; - - nativeBuildInputs = attrs.nativeBuildInputs or [] - ++ [ vimCommandCheckHook ] - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; installPhase = '' @@ -41,9 +36,9 @@ rec { runHook postInstall ''; }); - in drv.overrideAttrs(oa: { + in toVimPlugin(drv.overrideAttrs(oa: { rtp = "${drv}"; - }); + })); buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ # vim plugins may override this diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index c6ef409d637b8..17e03b7dd76d3 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -1,5 +1,8 @@ # TODO check that no license information gets lost -{ callPackage, config, lib, vimUtils, vim, darwin, llvmPackages, luaPackages }: +{ callPackage, config, lib, vimUtils, vim, darwin, llvmPackages +, neovimUtils +, luaPackages +}: let @@ -8,24 +11,11 @@ let inherit (lib) extends; - initialPackages = self: { - # Convert derivation to a vim plugin. - toVimPlugin = drv: - drv.overrideAttrs(oldAttrs: { - - nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ - vimGenDocHook - vimCommandCheckHook - ]; - passthru = (oldAttrs.passthru or {}) // { - vimPlugin = true; - }; - }); - }; + initialPackages = self: { }; plugins = callPackage ./generated.nix { inherit buildVimPluginFrom2Nix; - inherit (vimUtils) buildNeovimPluginFrom2Nix; + inherit (neovimUtils) buildNeovimPluginFrom2Nix; }; # TL;DR diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4e35fd632b1f2..e78c3e6b55678 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-05-10"; + version = "2022-05-19"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ba1659dc1e3e38cd59d5bef19a51bdcf704abce5"; - sha256 = "1zqj4j3y970kpr29kp2lx6ggd49d03dv6hxffg58v8kc1v3ibf14"; + rev = "2fc990977e3ec0fb626b2004645c4180954584e0"; + sha256 = "1w5i0dsbwprkaykbvm1qlr05aj9226h248b9mhjmi9v0zxax8pld"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -77,12 +77,12 @@ final: prev: FTerm-nvim = buildVimPluginFrom2Nix { pname = "FTerm.nvim"; - version = "2022-04-21"; + version = "2022-05-28"; src = fetchFromGitHub { owner = "numToStr"; repo = "FTerm.nvim"; - rev = "11ec9290389d22215df93e1c9c35f782c5ceec4a"; - sha256 = "16nli4nwsqn3zrc05m6w2h05ab423w8jjk81lys5kd609521wi0y"; + rev = "2628685bddb50370bec6c65be95b68b343ed8443"; + sha256 = "0r43ddrr7nyrd8fpmrapcgbjh592a86dqay869zqnil6wrxlfxi5"; }; meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; @@ -111,6 +111,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/"; }; + Ionide-vim = buildVimPluginFrom2Nix { + pname = "Ionide-vim"; + version = "2022-05-13"; + src = fetchFromGitHub { + owner = "ionide"; + repo = "Ionide-vim"; + rev = "3092ca0fed470c01457d0cecbe5e108e2b008f0d"; + sha256 = "0fbkmsqpnwrh8skv5yiva8y4aj4d7zm2z5vxbzl0hl6k728dwxvz"; + }; + meta.homepage = "https://github.com/ionide/Ionide-vim/"; + }; + Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { pname = "Jenkinsfile-vim-syntax"; version = "2021-01-26"; @@ -125,12 +137,12 @@ final: prev: LanguageClient-neovim = buildVimPluginFrom2Nix { pname = "LanguageClient-neovim"; - version = "2020-12-10"; + version = "2022-06-07"; src = fetchFromGitHub { owner = "autozimu"; repo = "LanguageClient-neovim"; - rev = "a42594c9c320b1283e9b9058b85a8097d8325fed"; - sha256 = "0lj9na3g2cl0vj56jz8rhz9lm2d3xps5glk8ds491i2ixy4vdm37"; + rev = "cf6dd11baf62fb6ce18308e96c0ab43428b7c686"; + sha256 = "0jmbxc0li4w59dzpzadq2phnfhnibggwxb3rvlmhr88dbglm0s8n"; }; meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; }; @@ -149,12 +161,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-05-11"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "f1da1ca2a4a71e79f4a625f62d8973de5cd2fab9"; - sha256 = "1jny8r8fs0z1gdcb75r3in7jp9gl9mwc4wvjslb8qp8yh1ja0ddv"; + rev = "ec37183a3ad41dc3cb58bde8693ad355488fda53"; + sha256 = "10a34fmdfw8b9sbcbr0fpz1rgldn9z588jqs2psqaf0m9a9p0qib"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -269,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-05-13"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "dc964c3caecd8f8fc477fc308187d47147b33d81"; - sha256 = "1z8g04d7hd4qxag2b9rqyzvxvg8xya98zsxyd2rll51n2hw22bk1"; + rev = "e936d016c448388f88ff7ae46b96cf0687304776"; + sha256 = "01438v20ryfg239sg13f7m337fil6pcaw0vb47wz6khhiz719w1q"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -329,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-05-11"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "48c57041f9b7ceeff3e3d476f4ddf2cfc8a9f321"; - sha256 = "0qfh948fykmbhvhlqs5zq1qglfl09wrnnrzssqfi8j8h64yqajnh"; + rev = "5b9ae1e1684440a15fb6b2401b426d55f82c74ee"; + sha256 = "1hqpa24b74k2bxn3szdhm8i9n50xfy1rkjvmys6vsfdb0zfmq80b"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -365,12 +377,12 @@ final: prev: TrueZen-nvim = buildVimPluginFrom2Nix { pname = "TrueZen.nvim"; - version = "2021-10-12"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "Pocco81"; repo = "TrueZen.nvim"; - rev = "508b977d71650da5c9243698614a9a1416f116d4"; - sha256 = "0sr4y1mg83l28l5ias2pv0gxkcgwailfjn2skx35z63f2il3zkbx"; + rev = "fd0af396aa06c4aaa7c021cffca3a64a66a4b11f"; + sha256 = "1q88knxcasjn17yx93lmhlynvrmybg2gxy7933ii49r36nqk0hqi"; }; meta.homepage = "https://github.com/Pocco81/TrueZen.nvim/"; }; @@ -437,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-04-02"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "3ededaed2f9923d50bf3860ba8dace0f7d2724cd"; - sha256 = "1n2h5wsp9vclsvzr40m1ffb6kjmcg0mccfj790giw77qa2i9s1rl"; + rev = "4237c4647ec30215223d597f6172c8c46b8b239e"; + sha256 = "17krclvg5y645g9vk43bpmhg1pzf4m8dlif5ar5h92qvbih8sw7i"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,16 +498,28 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-05-13"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "19e739139283c8ac5e2c147f870d2a038496688e"; - sha256 = "16h1kkyczqifw0d4lwfaq3smx5scsap1d2pv00kcmwvs56ws5sx9"; + rev = "bd6de885a03df4b4fe9d2cadb5e4674a2bdf5cd3"; + sha256 = "1ln6wr0r4wygz8wn59p8pdxz7bi7x4clx390pxk1c0l20siidk6x"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; + ag-nvim = buildVimPluginFrom2Nix { + pname = "ag.nvim"; + version = "2021-07-15"; + src = fetchFromGitHub { + owner = "Numkil"; + repo = "ag.nvim"; + rev = "196a78e9287d6f01d6d6e607fb212b40b798b496"; + sha256 = "0w1dnmhhdipzs1xhmlvzj4b6x0zl4cghcn8qgzmxhrjscv6djrgn"; + }; + meta.homepage = "https://github.com/Numkil/ag.nvim/"; + }; + agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; version = "2021-10-28"; @@ -522,12 +546,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-05-13"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "044a6c956bfb557ec6c6d37921db6ee11de879f9"; - sha256 = "1sz58bn0h65bkh29047ps8wm9fni0k9q2gmf69w7q5njlynk4ah9"; + rev = "d6f3d4976d21e516193da5907db3f06e56d3e5c8"; + sha256 = "1qxcwpmzagxq7c4lkf5gy7lby7cy2q34gwx9vr7ply2n307994zp"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -544,14 +568,26 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/align/"; }; + alpha-nvim = buildVimPluginFrom2Nix { + pname = "alpha-nvim"; + version = "2022-06-13"; + src = fetchFromGitHub { + owner = "goolord"; + repo = "alpha-nvim"; + rev = "ef27a59e5b4d7b1c2fe1950da3fe5b1c5f3b4c94"; + sha256 = "0w4864v6lgyzjckrsim8si9d6g7w979n81y96hx2h840xgcj22iw"; + }; + meta.homepage = "https://github.com/goolord/alpha-nvim/"; + }; + aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-04-27"; + version = "2022-05-14"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "618c2115d5046cc04c8a4af7727ee4d90fc2061c"; - sha256 = "1pz021rk2y0ngprhhhavs7xxnzf5sa9002rgs2wxlf36czqlf75q"; + rev = "bfaefa11c9e6b36b17a7fe11f8f005198411c3e5"; + sha256 = "0fddy9c2bzzbmvc7kqci0cdavnrj5a3vk8gnsciylzp2z2c4hcr9"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -642,12 +678,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-03-08"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "9f8e50033cb724d8856907a5fbf4685eb3efda24"; - sha256 = "00j0fp57lqcn3qvkb392shj1mqfv9vmn5wjcsibf0y6vbcq17xxh"; + rev = "aa8a99e87e64276d52556f4d9d4f4a19afd37556"; + sha256 = "0r79iq6fl4rcpadwvwma70gxk57lri15bqb5p12xad67fxd40320"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -678,12 +714,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-05-05"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "315831585d8de6c7787eb05c5bea56f430c851e1"; - sha256 = "19w3qmk6q1dj4jnwmvmd1af2bjwrfjmfnsrmjim9qmv6w0c2pbav"; + rev = "b19bbfe041c67f3f1144e4c88a1d88a7314bfa5b"; + sha256 = "0ha9b3612i42ldjkq4ip00pbwr7za5bfjrph745c4xdy5dhbx2m5"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -714,12 +750,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-05-06"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "7c9477614fb95b103c277a98bf3f588e337cd7ac"; - sha256 = "1d502bfkr6qxrqr0jxwngj22cz4bh7v36kakpb9g4qbxdd3h1r30"; + rev = "2c0103eb26b41cf4b58c3063d7549746d0f5fa73"; + sha256 = "0m93a89as399bj29mw8nnx0s9bn3kmy74bys97hv4r1n5nc720fy"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -762,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-05-10"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "9d024d646c3fa0281a5ddcf189e2a620010f43ff"; - sha256 = "05fh6992q7npnar82ijf67nf1c3rj6sxg2wk3ckb22qks2hxq8nd"; + rev = "b3695e9825e33cd534d142383271557755370f3f"; + sha256 = "016yh81z1h49c9wn7ls6fzzimx24qdacwfz7b30fw2g1d0cvnmzg"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -870,12 +906,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-05-07"; + version = "2022-05-22"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "93e71aabbc3d534d70bb5d1913778eb42afb96f9"; - sha256 = "0qzf6mmws0f1nmlk8m4pwfsbkkpq5nr024n9l2jvmchax63w1bds"; + rev = "46255e4a76c4fb450a94885527f5e58a7d96983c"; + sha256 = "1z6m9bavyx2ln2dik05fcaf6gq6jdrpcgrq5i1l1sy45h447a3hw"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -894,24 +930,36 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-05-12"; + version = "2022-06-23"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "29d5789aa407e7105968c43dba566defd3ca96bd"; - sha256 = "0skrqpxszp2z2zv21vh2prxdyizps43qjyyy56rxs25cl6hrzb1j"; + rev = "68839d62785edfb4ff7a7b3c1e9f4b64d55749e8"; + sha256 = "0my620rnl3c6d22rgwm824bgflhbhjjk7ryvggbfaap2rw98alq3"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; + bullets-vim = buildVimPluginFrom2Nix { + pname = "bullets.vim"; + version = "2022-01-30"; + src = fetchFromGitHub { + owner = "dkarter"; + repo = "bullets.vim"; + rev = "f3b4ae71f60b5723077a77cfe9e8776a3ca553ac"; + sha256 = "1dfgxdmvzjqjc1viqx2nmzzrjr2n7c6931d3iypv96p2zywld99s"; + }; + meta.homepage = "https://github.com/dkarter/bullets.vim/"; + }; + calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2022-03-21"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "896360bfd9d5347b2726dd247df2d2cbdb8cf1d6"; - sha256 = "06xvggyq0saf9mj330vnlh0q4176w46w09335iwhc3fp999vl07p"; + rev = "3fbe34e21e5847fb40314eb0848faabfa609301a"; + sha256 = "0qgs27ms71zsmp0sx7prvsq3j4qfiw2nigvykdd90931ssb089s6"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -978,12 +1026,12 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2022-01-11"; + version = "2022-06-05"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "3847feed23fa3ba6abecdf1b17a6c7d2022ebe65"; - sha256 = "1wxfix1fd8qwflc7id3g0yr7838j4vgnrk1nixv5q99d7wj0hadr"; + rev = "8339b7e9023dfd4fa83e3aa597c210c01de41746"; + sha256 = "165l7jm5rmkhvy77q00rvzhri6ic4l599brfscg4mb1sazm6gpwv"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; @@ -1000,6 +1048,18 @@ final: prev: meta.homepage = "https://github.com/xavierd/clang_complete/"; }; + clangd_extensions-nvim = buildVimPluginFrom2Nix { + pname = "clangd_extensions.nvim"; + version = "2022-05-31"; + src = fetchFromGitHub { + owner = "p00f"; + repo = "clangd_extensions.nvim"; + rev = "81b56d41d8ab791509a8464b0afc54144be9f23d"; + sha256 = "13mainbpndl3mlvalghkvykbqjpvdp5pbhk5ma93vgj38sk6ph0d"; + }; + meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; + }; + clever-f-vim = buildVimPluginFrom2Nix { pname = "clever-f.vim"; version = "2021-07-07"; @@ -1038,12 +1098,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2022-05-09"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "12463cfcd9b14052f9effccbf1d84caa7a2d57f0"; - sha256 = "11fbxw8rrhypazd256qwjvf8gg0laqb9b4h9yqdgvwj810y6n6wg"; + rev = "62fc67a2b0205136bc3e312664624ba2ab4a9323"; + sha256 = "0wcys2z1yw6raxr9x5nm19ac04q8gfri4pw9mfsh18smv4rnl8zs"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -1060,6 +1120,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; + cmp-clippy = buildVimPluginFrom2Nix { + pname = "cmp-clippy"; + version = "2021-10-24"; + src = fetchFromGitHub { + owner = "vappolinario"; + repo = "cmp-clippy"; + rev = "9f8dd021f7b9326407a439105b0c646983191a49"; + sha256 = "02k0zwjbd98f76f3v46lvd8wfm8wibkh703g8vxr26yv1fwghs4n"; + }; + meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; + }; + cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; version = "2022-05-02"; @@ -1072,6 +1144,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; + cmp-cmdline-history = buildVimPluginFrom2Nix { + pname = "cmp-cmdline-history"; + version = "2022-05-04"; + src = fetchFromGitHub { + owner = "dmitmel"; + repo = "cmp-cmdline-history"; + rev = "003573b72d4635ce636234a826fa8c4ba2895ffe"; + sha256 = "1v2xyspm7k9jmnzbfg0js15c6sha7ravf4lddsk85icdw16fxji1"; + }; + meta.homepage = "https://github.com/dmitmel/cmp-cmdline-history/"; + }; + cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; version = "2021-10-09"; @@ -1084,6 +1168,66 @@ final: prev: meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; + cmp-conventionalcommits = buildVimPluginFrom2Nix { + pname = "cmp-conventionalcommits"; + version = "2021-10-28"; + src = fetchFromGitHub { + owner = "davidsierradz"; + repo = "cmp-conventionalcommits"; + rev = "5518362bc4f5dfbc9d242d9379fdec48b6278c5e"; + sha256 = "02jvz8sjrr4xw0wg5y03gnv5sc78gqvmblmqi02y748qgsd5grb6"; + }; + meta.homepage = "https://github.com/davidsierradz/cmp-conventionalcommits/"; + }; + + cmp-copilot = buildVimPluginFrom2Nix { + pname = "cmp-copilot"; + version = "2022-04-11"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-copilot"; + rev = "1f3f31c54bd71e41ed157430702bc2837ea582ab"; + sha256 = "14nza4r8vr58s74f3fpzlmvrv9lcxzvfvizkz71p47f1zgddhgfs"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-copilot/"; + }; + + cmp-dap = buildVimPluginFrom2Nix { + pname = "cmp-dap"; + version = "2022-06-05"; + src = fetchFromGitHub { + owner = "rcarriga"; + repo = "cmp-dap"; + rev = "2c4cecbb9c4d255acc87ccaca727d1ad2f2b8c90"; + sha256 = "11wg62nf37ka40l9acwxcklzghapwiw3x549vnp397sl70r3w6b2"; + }; + meta.homepage = "https://github.com/rcarriga/cmp-dap/"; + }; + + cmp-dictionary = buildVimPluginFrom2Nix { + pname = "cmp-dictionary"; + version = "2022-05-04"; + src = fetchFromGitHub { + owner = "uga-rosa"; + repo = "cmp-dictionary"; + rev = "0ba3df56258b48a5a6a0130d31ae3cf4908c9567"; + sha256 = "1ny42i913w476bwyrlkwkiv14bdakvnkqx26py45f9qlzrfqj2m5"; + }; + meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; + }; + + cmp-digraphs = buildVimPluginFrom2Nix { + pname = "cmp-digraphs"; + version = "2021-12-13"; + src = fetchFromGitHub { + owner = "dmitmel"; + repo = "cmp-digraphs"; + rev = "5efc1f0078d7c5f3ea1c8e3aad04da3fd6e081a9"; + sha256 = "061rf7c4lfghsryldmgk5inmwa1994imp1j0l94qgaig6s6hb0kg"; + }; + meta.homepage = "https://github.com/dmitmel/cmp-digraphs/"; + }; + cmp-emoji = buildVimPluginFrom2Nix { pname = "cmp-emoji"; version = "2021-09-28"; @@ -1096,26 +1240,122 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; + cmp-fish = buildVimPluginFrom2Nix { + pname = "cmp-fish"; + version = "2022-06-23"; + src = fetchFromGitHub { + owner = "mtoohey31"; + repo = "cmp-fish"; + rev = "8ce7517d74c11a55bf2d0e52e4649e49cea6c7a1"; + sha256 = "0nlcx39hycl15bw1vn35lcw0lmgckn396m2pwfk22lyijdqdgnlk"; + }; + meta.homepage = "https://github.com/mtoohey31/cmp-fish/"; + }; + + cmp-fuzzy-buffer = buildVimPluginFrom2Nix { + pname = "cmp-fuzzy-buffer"; + version = "2022-01-13"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "cmp-fuzzy-buffer"; + rev = "c00e59019c5b3c00cb5590f9ae1fad4446fb855d"; + sha256 = "0zax13arc36db2w1l0xyriqskknnvg1wxs809737san70gh74p0w"; + }; + meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; + }; + + cmp-fuzzy-path = buildVimPluginFrom2Nix { + pname = "cmp-fuzzy-path"; + version = "2022-06-30"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "cmp-fuzzy-path"; + rev = "b5f137ccee80b6c1f9b9243bb56c943d278b7166"; + sha256 = "1szhcbj31xndf1pi9ra8ikdp7r8qnj3llg96xjak60biw266sbbd"; + }; + meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; + }; + + cmp-git = buildVimPluginFrom2Nix { + pname = "cmp-git"; + version = "2022-05-11"; + src = fetchFromGitHub { + owner = "petertriho"; + repo = "cmp-git"; + rev = "60e3de62b925ea05c7aa37883408859c72d498fb"; + sha256 = "0qbfby0b7ix1x5ak130ja2h1ngq0p20jb9msr29bijfy68afpdw1"; + }; + meta.homepage = "https://github.com/petertriho/cmp-git/"; + }; + + cmp-greek = buildVimPluginFrom2Nix { + pname = "cmp-greek"; + version = "2022-01-10"; + src = fetchFromGitHub { + owner = "max397574"; + repo = "cmp-greek"; + rev = "799110b976f9194055e9d506931ac38171bc6bcd"; + sha256 = "049xi4ifla86fd5k68vqxwxxq5hg05y24z7yqg671hbw3lzpi0h9"; + }; + meta.homepage = "https://github.com/max397574/cmp-greek/"; + }; + cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2021-09-10"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "29dc9e53d17cd1f26605888f85500c8ba79cebff"; - sha256 = "17qjw0yp0cmgyjy593qq6rfh7fgfwgb7mxg7a0kg1drjpncwv8gl"; + rev = "46e7627afa8c8ff57158d1c29d721d8efebbc39f"; + sha256 = "10354d12in7sr5hdamj0cw8hgja6pwl70i9lcxlnha5jzkx8xm03"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; + cmp-look = buildVimPluginFrom2Nix { + pname = "cmp-look"; + version = "2022-06-26"; + src = fetchFromGitHub { + owner = "octaltree"; + repo = "cmp-look"; + rev = "b39c50bcdf6199dddda56adc466c2bd9c951a960"; + sha256 = "10526mczd6l68zikd78qs2hlxbhaz7x3v9z1y83palx3aby0ihvq"; + }; + meta.homepage = "https://github.com/octaltree/cmp-look/"; + }; + + cmp-neosnippet = buildVimPluginFrom2Nix { + pname = "cmp-neosnippet"; + version = "2022-01-06"; + src = fetchFromGitHub { + owner = "notomo"; + repo = "cmp-neosnippet"; + rev = "2d14526af3f02dcea738b4cea520e6ce55c09979"; + sha256 = "0xf3nfkgbrfhac8nadkzq22pzi9gsidax4ddavqkqqivlcgllrgf"; + }; + meta.homepage = "https://github.com/notomo/cmp-neosnippet/"; + }; + + cmp-npm = buildVimPluginFrom2Nix { + pname = "cmp-npm"; + version = "2021-10-27"; + src = fetchFromGitHub { + owner = "David-Kunz"; + repo = "cmp-npm"; + rev = "4b6166c3feeaf8dae162e33ee319dc5880e44a29"; + sha256 = "0lkrbj5pswyb161hi424bii394qfdhm7v86x18a5fs2cmkwi0222"; + }; + meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; + }; + cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-05-01"; + version = "2022-05-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "e6b5feb2e6560b61f31c756fb9231a0d7b10c73d"; - sha256 = "0jzgd9g874w507y40fzggbm40n467g8br5xcmgf2mscdb9kcsgvc"; + rev = "affe808a5c56b71630f17aa7c38e15c59fd648a8"; + sha256 = "1v88bw8ri8w4s8yn7jw5anyiwyw8swwzrjf843zqzai18kh9mlnp"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1132,6 +1372,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; }; + cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { + pname = "cmp-nvim-lsp-signature-help"; + version = "2022-06-20"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-nvim-lsp-signature-help"; + rev = "007dd2740d9b70f2688db01a39d6d25b7169cd57"; + sha256 = "194i2b6qbl3z4j2p2s6sig2fac8i9kglkdwdc5h3x2q7avw70yrg"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; + }; + cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; version = "2021-10-11"; @@ -1144,6 +1396,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; + cmp-nvim-tags = buildVimPluginFrom2Nix { + pname = "cmp-nvim-tags"; + version = "2022-03-31"; + src = fetchFromGitHub { + owner = "quangnguyen30192"; + repo = "cmp-nvim-tags"; + rev = "98b15fee0cd64760345be3a30f1a592b5a9abb20"; + sha256 = "19fgzaxapazrl07q0ikximgm8k77vasz5fras3xnbax7r3bln127"; + }; + meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/"; + }; + cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; version = "2022-04-22"; @@ -1180,18 +1444,54 @@ final: prev: meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; + cmp-pandoc-nvim = buildVimPluginFrom2Nix { + pname = "cmp-pandoc.nvim"; + version = "2022-05-03"; + src = fetchFromGitHub { + owner = "aspeddro"; + repo = "cmp-pandoc.nvim"; + rev = "cb2980263e14fb3c1b776edbd2c7a312b67c65ae"; + sha256 = "0d439njzdnm1qhnig2qr9ywq3q72vpb6wqxwil9czhqzn80swrj9"; + }; + meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; + }; + cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2022-02-02"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "466b6b8270f7ba89abd59f402c73f63c7331ff6e"; - sha256 = "15ksxnwxssv1yr1ss66mbl5w0layq0f4baisd9ki192alnkd7365"; + rev = "981baf9525257ac3269e1b6701e376d6fbff6921"; + sha256 = "14i80iajwnjnnb6c5cmrhcvjdy1p8zvy0hn4gr7qm5pivfh88n74"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; + cmp-rg = buildVimPluginFrom2Nix { + pname = "cmp-rg"; + version = "2022-01-13"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "cmp-rg"; + rev = "fd92d70ff36b30924401b0cf7d4ce7344c8235f7"; + sha256 = "0z8knl4l5a7miw081h290s0g4icqqvn6qibr6jx4x71qwqb21w2y"; + }; + meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; + }; + + cmp-snippy = buildVimPluginFrom2Nix { + pname = "cmp-snippy"; + version = "2021-09-20"; + src = fetchFromGitHub { + owner = "dcampos"; + repo = "cmp-snippy"; + rev = "9af1635fe40385ffa3dabf322039cb5ae1fd7d35"; + sha256 = "1ag31kvd2q1awasdrc6pbbbsf0l3c99crz4h03337wj1kcssiixy"; + }; + meta.homepage = "https://github.com/dcampos/cmp-snippy/"; + }; + cmp-spell = buildVimPluginFrom2Nix { pname = "cmp-spell"; version = "2021-10-19"; @@ -1206,12 +1506,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-05-12"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "30629b30791b42dcaadc7680cc5cb078a7a3075f"; - sha256 = "1zs6dmaxx0af62v32c5l7cpywq2sd8fiw8j102mc4pn3s0vdcbgm"; + rev = "a5081776185e3c7f406e7fc3dd5f0a0ae0288e59"; + sha256 = "0sccxvdsgy8n57cs6h8mh5inhgl4x6r7pqpp29ms88f4wz5z15p2"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1230,12 +1530,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2022-04-25"; + version = "2022-06-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "c5187c31abd081ecef8b41e5eb476b7340442310"; - sha256 = "1jhzw7myrwqgybvkm53mk8zgfz56pzr7cnsrzcr4fl6wnm59a3b5"; + rev = "c2886bbb09ef6daf996a258db29546cc1e7c12a7"; + sha256 = "1ar6d6pqybn4vqynbh18mc7fy1ybv0s9mi1r2j1nfcmgvh4wsvwk"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1252,6 +1552,30 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; }; + cmp-vim-lsp = buildVimPluginFrom2Nix { + pname = "cmp-vim-lsp"; + version = "2021-10-26"; + src = fetchFromGitHub { + owner = "dmitmel"; + repo = "cmp-vim-lsp"; + rev = "b13312a8c1a74a8747e64117f26f17390e8abfa8"; + sha256 = "1f43qwxr8l2qj4mq1lfk5z3c0bqs8dlgyy1yj1acpnknrgi8572p"; + }; + meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/"; + }; + + cmp-vimwiki-tags = buildVimPluginFrom2Nix { + pname = "cmp-vimwiki-tags"; + version = "2022-04-25"; + src = fetchFromGitHub { + owner = "pontusk"; + repo = "cmp-vimwiki-tags"; + rev = "a9e631c8f4d64e009d253f741b035eb5d1bd404f"; + sha256 = "0j75bdcxbzm24mkq3lynm1crv5rqhw966aa7l27y12dlp6rbfvn0"; + }; + meta.homepage = "https://github.com/pontusk/cmp-vimwiki-tags/"; + }; + cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; version = "2021-11-10"; @@ -1264,6 +1588,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; + cmp-zsh = buildVimPluginFrom2Nix { + pname = "cmp-zsh"; + version = "2022-01-18"; + src = fetchFromGitHub { + owner = "tamago324"; + repo = "cmp-zsh"; + rev = "1d8133e5637c73b3eb392682ae9661d521738268"; + sha256 = "0122lf44yqjp01znp7gnc682yx7fikjkzc5njp73lmys76321lz3"; + }; + meta.homepage = "https://github.com/tamago324/cmp-zsh/"; + }; + cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; version = "2022-05-01"; @@ -1302,24 +1638,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-11-11"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "60828294b9ba846c78893389d4772021043d2fa1"; - sha256 = "1y7rslksa558fdh3m4m626vpvs424pvxkkk70mr57is47cminm3m"; + rev = "44bcdc4c62a773a52f0a09cff074e61890870b59"; + sha256 = "1d0ryxqs6jx2vm5db6ca2aciqsl0559clbskif4kjp3j7ybnz9my"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-04-26"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "3601c8ddde380349764fc0bc016b915703c9ad86"; - sha256 = "1w9b4kicsa0r0fxcgcxq3wn0scyyyzfh3akp3zznli9g1fgbiqnx"; + rev = "48a8755e6432b8eb6447e4d51d3a9c8c13fdf33a"; + sha256 = "04mbrl0fars2mcy7ihwdvcb59a136yqm11pczy7r77gbzjm50agq"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1374,12 +1710,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-05-13"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a1edaee28938ce266c2543e2552bc6ee1ad29ffa"; - sha256 = "132jvk2wf53qbn2qgnr0zjh7nw05lr91p2jhykam77gxkmgzazpq"; + rev = "87e5dd692ec8ed7be25b15449fd0ab15a48bfb30"; + sha256 = "17a7vg7yb1qxzz4a4b0bwqrh3mv1y31233xd1wihw81a0jzc5jkf"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1398,12 +1734,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-05-11"; + version = "2022-05-25"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "4da94d813cfcd83434098a24a277d6be43f5bf50"; - sha256 = "0rr5i704bqw2w600jvgvxl35sx2gak2bbxz59wk7k7jyxrzbjam6"; + rev = "c120785c950f9991d32d3d4d2f3696fa8a8b5582"; + sha256 = "0fq01fh717fkq1qlr4ykn7b97l8775c8ja6q3gqs368nf6l94a4i"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1432,14 +1768,26 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; + com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix { + pname = "com.cloudedmountain.ide.neovim"; + version = "2022-05-19"; + src = fetchFromGitHub { + owner = "Domeee"; + repo = "com.cloudedmountain.ide.neovim"; + rev = "d5d6c5151e8643abfabd22e9fe7e31467c679be2"; + sha256 = "1h2379ibzadv7549i13zjzavya7n7q8z532awvwqdr8incja5b4c"; + }; + meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; + }; + command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-02-25"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "c797e8b76155e24ebdf180cef28e1a409604492e"; - sha256 = "0903l7q223id6b91sji8cxk22fmpj1shv3dgxjka8av0wgz7v93w"; + rev = "81dba1e2741686514f466701ca62ce3831d49a08"; + sha256 = "0mmvdhxzj8nv38nw1vddzzg7xkair72x7lwk4lkd369yc3bbwv6g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -1447,12 +1795,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-05-12"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "40f5587789681b3453e4a27831b7d293e1c3da7b"; - sha256 = "1lbjqq3h6434gwzc0bmnz64xlkrkjc11nlya6kp4amb6ajj3bg9i"; + rev = "4086630ce2aaf76b2652516ee3169f0b558f6be1"; + sha256 = "0pzjvwfbd9zlzvwf5k4nrfl64vlrwhahks0nkqjmwqijqyrrbl1q"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1591,12 +1939,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-04-29"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "842c81892648de759e639ad2d395757b98be06d5"; - sha256 = "1g67miifvysa4lbbvpa5bpxyw2fvjkq7anj6bqx65m81d4krlwr8"; + rev = "2e7f449d06753f2996e186954e96afc60edd5862"; + sha256 = "0p2c1dcircd30gmln6rx83x8xs1fxfx9fdnc4bvry8wri0yjypb5"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1615,16 +1963,40 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-05-09"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "df203c1356b72032df32d7b0b5facb4895139b6e"; - sha256 = "18v21b314p4firiz0xhqnfl45g5wbcigiqq4ypnhf1lgwd6ngpqd"; + rev = "c2e75a3a7519c126c6fdb35984976df9ae13f564"; + sha256 = "0m65y0pvc7sdj2xc3r97nb5md1i0iqcyri6h83hvs88skrmwnpap"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; + coq-artifacts = buildVimPluginFrom2Nix { + pname = "coq.artifacts"; + version = "2022-07-02"; + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "coq.artifacts"; + rev = "d88505eae803d35851d6259b4da48eccc96867ce"; + sha256 = "1lfccvjgcxqz84i0h4ll0mi7s6sdakc1kdv3gvjgrra7mz2i6b6a"; + }; + meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; + }; + + coq-thirdparty = buildVimPluginFrom2Nix { + pname = "coq.thirdparty"; + version = "2022-07-02"; + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "coq.thirdparty"; + rev = "1cb8859284beb6d281ed8db18f34453afa15894a"; + sha256 = "08dnz5w0gca4hx89cni7qdi09gqc41mb166vgc73zxq159gahlmc"; + }; + meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; + }; + coq-vim = buildVimPluginFrom2Nix { pname = "coq.vim"; version = "2013-01-16"; @@ -1639,12 +2011,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-05-13"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "ca1c0df28b235bdce65ac87c0bed31da8f9e8be4"; - sha256 = "17g7qd44jx5l8903m2hk8ja4hl4n2x43b0wmzvlpgjmpvgvhskzm"; + rev = "2f0c723b619c481bf5777b06a086cb6104d8ba67"; + sha256 = "0m98w1dj8ir82m42xllk8yp231l7ycm57k5xbdh35l2x3p720q3d"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -1675,12 +2047,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-05-02"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383"; - sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q"; + rev = "eb34985d420d8f5dffc1de8c428772e73d95ecee"; + sha256 = "0m32565wz3643kad8j7sz04rzlw5p4p4sp8s8l6x9qfin7928y5x"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1697,6 +2069,18 @@ final: prev: meta.homepage = "https://github.com/godlygeek/csapprox/"; }; + csharpls-extended-lsp-nvim = buildVimPluginFrom2Nix { + pname = "csharpls-extended-lsp.nvim"; + version = "2022-03-08"; + src = fetchFromGitHub { + owner = "Decodetalkers"; + repo = "csharpls-extended-lsp.nvim"; + rev = "a1985fd1cd3c67d5e1b1be7c9283222fd46e7615"; + sha256 = "159mlvz9bb91v8nld2g52r0v4gbdp182l489jdm5pvxc5yf5zl3w"; + }; + meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; + }; + csv-vim = buildVimPluginFrom2Nix { pname = "csv.vim"; version = "2022-01-12"; @@ -1759,24 +2143,24 @@ final: prev: dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2022-05-10"; + version = "2022-05-23"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "ceecea7895e469fc998d383818b2107d97cec06a"; - sha256 = "1h2glyi5zyskc9ld6gz8p3k84npfg2b1in5rjv3hhwg6d14d6xd8"; + rev = "81e50e80329e5eac2c115f45585b1838a614d07a"; + sha256 = "0xi8iv3ycam3ypcxl0zn418qi2m1g0zcbfj6zvdbnfbi0nbqwj9n"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-05-09"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "3b31a80513969752a8c53ff8b16a8e060404cf50"; - sha256 = "0gcjyywjdsigq7a4jmcg8zgj6na5zagncdgp2a5qs81sa962k798"; + rev = "88a6077812b1f54819a941d824896f3a75fe5ce4"; + sha256 = "1v4x5rhjs766j33wz20ws94fc4qii299jw377mpbswkbzjxvf6j6"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -1989,12 +2373,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2022-03-12"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "c466c955e85d995984a8135e16da71463712e5e5"; - sha256 = "0s14m5k1vw5pfgi9wc9jhvwfwv57hdcrji24vspid8yjzgfjf5yd"; + rev = "21a873f2d84e5316108ac1b3ebd766f8fc99f18f"; + sha256 = "0ps6dhl4wxx25xrww2zhxd1xygpkwcps5id2izwdzv8zam1xwvnk"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -2085,12 +2469,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete.nvim"; - version = "2021-11-02"; + version = "2022-05-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "1c40f648d2b00e70beb4c473b7c0e32b633bd9ae"; - sha256 = "1256k6pi6vx7zvh74px4p4kyd9rnsipjrf59mydix3a39k2xfyld"; + rev = "33ed4fa0cd704999f9f74b37640bf6d7334bac37"; + sha256 = "1gabd83gy3skx3q3prk6drn3dzwag5jmzmp43492mihdak0iks3i"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -2145,12 +2529,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-05-09"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "91e99ae14e9e6e360540007e6785146458a138da"; - sha256 = "1sghkg75y62rcc0jy7ra6rsmx05gxz4nv944i4lywn952vc49nd7"; + rev = "a1ab9602ee1d4c78e81bc6032edca6df480aa296"; + sha256 = "11cqcd0jgqxbqqygx1grgwmwx3xpvvr9zb2s9ivmx24hmj8d6gwc"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2169,60 +2553,60 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-04-05"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "5aa443597811208f5d3afbdbe9d4ead79339de58"; - sha256 = "0jwm03fhwi9q57fgis31kgdf7l8jdb8glbh1is6rl9g0vb0a40ba"; + rev = "da277b3a52c7c2de42c30ed09ce1987ba2105499"; + sha256 = "11z064q6bc9rcpf66dwshz1ak0y98d5jq609cm4jdwg3c6gdahm6"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-05-11"; + version = "2022-06-08"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "55e4ceae81d9169f46ea4452ce6e8c58cca00651"; - sha256 = "1i34pk9l76n8ianz9hww8kn7dnnzivv8sbyf0vf7w21r2bh1p1k4"; + rev = "af179837e1cdddfb164f0296883951b2255c46d2"; + sha256 = "1i38j2zq6g7rypkwfc0hglp9va6l55jcwpy63fa27jq81bp37nnw"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2021-11-26"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "42b7fb45c6a45e90410203d9c248b79bc46ea933"; - sha256 = "14as4q6dnc540in68039c1bbdn4ag86872pbra6h06s5rbhbgzky"; + rev = "945cdbbbd0e3c93d6514c0283425c32c35cddb17"; + sha256 = "0jqy96mc5kdgh7gxcxlgl94fvaxgazhkwkydki78vpgszvshrbry"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-05-04"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "93e92e161edfca2cef1534efb88e2aa2138834d9"; - sha256 = "0y24hdaqq9dsfy4di0pql1zj7a7jj48m44nm2a1g1dsra8k94jm2"; + rev = "b5f94a1edb63956d3897f60d67d33a64f5f018ae"; + sha256 = "1yzpjzhiqa8mn57wy9ami9v9p0lpydlgp85r58adrbfd0fplr5qw"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2022-01-22"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "a8e3e66deefb6122f476c27cee505aaae93f7109"; - sha256 = "19k6nii3p6a4vfyf7xxrkhj7wfamjivdp22bn1mhx4zcw8h01lkn"; + rev = "d354117b72b3b43b75a29b8e816c0f91af10efe9"; + sha256 = "12qvximadgb9z2i0hgvj4p4nxaqk0aqbnaqpafpma73xyb23hx5v"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2230,12 +2614,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2022-02-17"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "495d3e2f56ee392de0d55902c82849f94b6fc86b"; - sha256 = "1m80hjm1m04dsivwqhxk5753gd8yzww62130wvgdsac3z394zzrn"; + rev = "b96a75a470e5c26caf4e57c594e85ee5d0dc7bf1"; + sha256 = "0xbb0d4m1m8a406kpia71bnnjkk5w5yfp8ra1s8jj66c3j1hp3d7"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -2291,12 +2675,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-05-04"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "f748681a3fac2496aedf694f5bd09a30f80cd3c0"; - sha256 = "0w9gv52y806bn7az9yl2anx7yiv2ildslw4rvj82v5ni0b6mq4j5"; + rev = "933f827d75620b4f65c53a671f4178dd92d27cbd"; + sha256 = "0a0sglmkz773f9qlzn8ppzl06088w0083scqkgrf5926qi17vbf6"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2351,12 +2735,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-05-06"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "f63f17bc9b845dd4cca4112f243b551aea141ced"; - sha256 = "1l088yjqkjs8vfgc738qgbd8w72a4rni1bzk5wc9q2z8m1rzf7kr"; + rev = "1ea42671c523a080a01c62c40c2c8e7fc0139a8f"; + sha256 = "0yrkdzikpcq9phybbzfggdfj4y983y9qw1fvnzpvff7mp11jskqw"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2375,36 +2759,36 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-04-14"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "ab237a1e9e9ff2ea28f2d5d0c945beefd1c07d5b"; - sha256 = "1ij2s7pb0lk532zdqg1j9anqagqhb9c8lmn17mabhrmi65a9dg6c"; + rev = "951a05d3f6ebc785db728ccfdf1759a2cf7c15ff"; + sha256 = "1d0g3cylci2ph7crmw888jjjpindbmab5h4z9y7qsvl5633aclk4"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2022-04-17"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "35757c7c9364d940efd8a46877acde04193819c2"; - sha256 = "0b8y7qailjg2366dw03pbfsr7lq9js8jzfcpw8ljyfim94fcj650"; + rev = "3d064304876941e4197db6b4264db6b72bd9f83d"; + sha256 = "1lkznmavw2f4ckh3yjjvdhja313ia0aayn5pkf6ygjny1089gcih"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-05-08"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "99b306167d1d305ca084e3bb475d6eadf32a365b"; - sha256 = "0pxxsz0g2qklnl16pfbv0178fd34ff2vvx4qwndwkfgx4qmlkj8q"; + rev = "46d1110435f1f023c22fa95bb10b3906aecd7bde"; + sha256 = "0v0jnzj288swbp0w8xa7287sbql1rfgziqdk1gbcgvzs7zlvczbr"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2470,14 +2854,26 @@ final: prev: meta.homepage = "https://github.com/floobits/floobits-neovim/"; }; + flutter-tools-nvim = buildVimPluginFrom2Nix { + pname = "flutter-tools.nvim"; + version = "2022-06-26"; + src = fetchFromGitHub { + owner = "akinsho"; + repo = "flutter-tools.nvim"; + rev = "6b13345dd7ffe3b0a08536b8fadfa288af137616"; + sha256 = "15nz011qqkbkphkk7vky2mgxxbgr07ffqr33sn9w5xkgg0nb55ll"; + }; + meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; + }; + formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-05-12"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "fb814e0e18a2ced247c40736d395d15a2517486e"; - sha256 = "19dav8ajydd4b9ziw6l4k9pn3dpc2z6zh1sb8a1hxcv02xfc71xg"; + rev = "27ea7a8cf689e0b5dd742bada416c00f64450360"; + sha256 = "1dw240wxrqm8i3mijb5bynsy2gfr360x8jwf8nyra7sr4gdd2pcj"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2496,12 +2892,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-05-09"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "4ef45d099453a26d23084a04ae7dced19e6d5ae5"; - sha256 = "0l3hkg97w26k01f4arifnnaws4m50b2phig2pq8kqr80rz5i0gk7"; + rev = "688691050074f39e6ec987321738494e08ba562e"; + sha256 = "0bc22z4iml7v1myj92c6rbpnzwl43s98fsalxhsh3fkqk46qq9y4"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2520,12 +2916,12 @@ final: prev: fugitive-gitlab-vim = buildVimPluginFrom2Nix { pname = "fugitive-gitlab.vim"; - version = "2021-09-20"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "85d4e16e03b05964560514afe53bc74f9d445b02"; - sha256 = "1zvn4rz765yjxyhv71dxly9lzdp9r94762jprff0srpnsyjiypz2"; + rev = "b73a8e97de95d26280082abb7f51465a3d3b239e"; + sha256 = "1iimamr8b5vv988x6zz5hv508md485i48vclahrm5y3m41pi7g5a"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; @@ -2542,6 +2938,18 @@ final: prev: meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/"; }; + fuzzy-nvim = buildVimPluginFrom2Nix { + pname = "fuzzy.nvim"; + version = "2022-02-20"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "fuzzy.nvim"; + rev = "d5fee69b54ef400f0ccedf37917c4782e8929424"; + sha256 = "1xnmwmbrjsfj3v4vk57gcf4l3wl9n8jks50ds8gaawz5bpy54yff"; + }; + meta.homepage = "https://github.com/tzachar/fuzzy.nvim/"; + }; + fwatch-nvim = buildVimPluginFrom2Nix { pname = "fwatch.nvim"; version = "2021-07-25"; @@ -2566,38 +2974,50 @@ final: prev: meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; + fzf-hoogle-vim = buildVimPluginFrom2Nix { + pname = "fzf-hoogle.vim"; + version = "2022-05-01"; + src = fetchFromGitHub { + owner = "monkoose"; + repo = "fzf-hoogle.vim"; + rev = "16c08d1534aea2cd1cea1a1e20783bd22f634c77"; + sha256 = "0k7cdi00ixqdkqmyqnapn5aplyn0w78iwvm7ifyi9j3smz57hzhf"; + }; + meta.homepage = "https://github.com/monkoose/fzf-hoogle.vim/"; + }; + fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-05-04"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "13fec018f619a14f0fcc90d1ff32f235d3344315"; - sha256 = "1wmmahy62dk04dplf96qh9aqfamjr3nm1fn3ky5lbw6ij8kgk5y8"; + rev = "f19d6902dfdecb3150a9dbe153599524ae080dd8"; + sha256 = "0rii15z51gz97vc688w5si0jb9vdnzq8vvz3yx52rghm535yv46y"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-05-12"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "de7ac64e742c21afae5dae93e8207408fde5042c"; - sha256 = "14hqkwsg4sgah0nyxd08iqzl8aycy6hgxn7wnyk0xdpr0nkhlm24"; + rev = "786d06bc51de2dba9ccf5b80571ad03c65080f80"; + sha256 = "07nv0cjk4h0m0i1p4qhd0cwxlxbrxp55gw8gkpny8clqaj7ii9g9"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-04-07"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "d5f1f8641b24c0fd5b10a299824362a2a1b20ae0"; - sha256 = "19yidjybsp41yj1yvdq5b01yph7sbd976bfq476hh7920ij6zqh2"; + rev = "c311c0a95fc2529c26ab36a8f530e9dd4426304c"; + sha256 = "12mxrvvvq6dkka0dp1kipmf6dncl0mx4169amkwxk62a18a894q2"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2676,12 +3096,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-05-08"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "8ab29dd555de8f1791a4d34f47f21c8a2fdae8be"; - sha256 = "1bknqk0xc85n9qc1mhg9w95yniyk0j9jq7pxc2wwdn5zrfig1vjw"; + rev = "1bb73289929107309d2d90f7582ece5e9436bfd8"; + sha256 = "02ybfv5pm7m8mbciccz0j9k21bjhf6kjpp527y6m4r2mdc4q808r"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2724,24 +3144,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2022-01-29"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "ff33d07bb64e104b387fff7d91650a35274f81ea"; - sha256 = "1sxhcbww0f780lp0zda1iaiyp89c6cirs0ncihjxr106a47zpya4"; + rev = "782e98dd1f8f2c97186b13b5c59a472b585a4504"; + sha256 = "10fwbq6pwcxlvg2xlp1qd5k4miri0d4a2f7q1a26bc41pcw8s22n"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-05-12"; + version = "2022-06-23"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ffd06e36f6067935d8cb9793905dd2e84e291310"; - sha256 = "00lm0685mwrm4c4r4vprb0ksmylnrlz8silghaqdg80zlhbn729v"; + rev = "4883988cf8b623f63cc8c7d3f11b18b7e81f06ff"; + sha256 = "1ljqm90vmam9zisq4z8js4z1nqg3ybmib1y3x0s6g6b2kyyfy1dv"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2772,24 +3192,24 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-05-11"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "da265c328f5e4f102dbdbb1a0fd8627afdaf0320"; - sha256 = "1pmj8rjhf80jrgxp8iim9i36qqc6jwx8c73z6nqs6nkmnccychih"; + rev = "900042f7dda528cb980b7f1056ed7c21d4402826"; + sha256 = "05dhbxclnn5fz9wapa6gvf7p9qk88ir6ix72sahv0vpjcccr6gk6"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; golden-ratio = buildVimPluginFrom2Nix { pname = "golden-ratio"; - version = "2022-04-21"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "roman"; repo = "golden-ratio"; - rev = "7df80253680e4755b82955425da31d8c1f8e23b6"; - sha256 = "0ds2slbg03b8dcgvi1svyn391mr2zaabb4x80wrmyxkrnfzr1rsq"; + rev = "636b8a1ea6bfe18296e61a8ac271b0101cb2ad3b"; + sha256 = "0fqczgbfqxbchmp4kqs6n0d1pvhgkx7aw3y9fb9fmy31dqc9fi6b"; }; meta.homepage = "https://github.com/roman/golden-ratio/"; }; @@ -2808,12 +3228,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-12-25"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "7f842e981f81cce14f28c49befad9146c18c3931"; - sha256 = "018lf4z50j25j5y3lhcw1al2jp6dm9xy39mi9732zx4wa8my8gix"; + rev = "99407d8e63305a5c68627cee156ca3991a75fd19"; + sha256 = "12izx7nl094ydi0bdxb4bh4w83gg36jrl024givqqh74i659p2am"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2830,6 +3250,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; + grammar-guard-nvim = buildVimPluginFrom2Nix { + pname = "grammar-guard.nvim"; + version = "2022-01-03"; + src = fetchFromGitHub { + owner = "brymer-meneses"; + repo = "grammar-guard.nvim"; + rev = "ea163c4adfd68fdd40e095cdf39cb506bf3ce3b2"; + sha256 = "0wdbpkg1y0s7fhaybyj735dxdkvfgnng49i8k0zrsy16d75md4bs"; + }; + meta.homepage = "https://github.com/brymer-meneses/grammar-guard.nvim/"; + }; + graphviz-vim = buildVimPluginFrom2Nix { pname = "graphviz.vim"; version = "2021-04-09"; @@ -2868,24 +3300,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-05-04"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "f943521890297076cdcd629182a0405f6b9a83f0"; - sha256 = "06x45ygxmqsgxrghvc4l6zdf1waxrwg3lk7m0lq4sh6nygdzhw1h"; + rev = "14310c87ba290f74eaae7d221255298f482a9672"; + sha256 = "1ly97qjggwiwpkm9nxlbyw3ahjz7cxa44hkm3pcpq9rabsz7im5n"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-05-12"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "72930977a442a2de2592ed39168c018bef90e086"; - sha256 = "1k6rbn4ksmgi36f3zqlz52c99x3ilpjmv6q3y93j5kp2lxp1yz6r"; + rev = "79419f9313192d238c58feccac887dacb4db9276"; + sha256 = "0a2rxbb8s77qdhjii8q8716ll4mi2zb8qciz1jngmih0k3a4p83k"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2904,12 +3336,12 @@ final: prev: gv-vim = buildVimPluginFrom2Nix { pname = "gv.vim"; - version = "2021-10-19"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "386d770e916dd680d1d622e715b9eb3a77f21bd1"; - sha256 = "184kvydzz9nyg0sv3crn38v04s24km0ma8vfg4i3agmffb1riibk"; + rev = "1507838ee67f9b298def89cbfc404a0fee4a4b8c"; + sha256 = "0fkwhyywjhh2r6c8534kvfn3shv3rjvcc53wm2pz3yqk73b6r2c9"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -2976,11 +3408,11 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2022-03-13"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "7bd3ffb073dde94c8d86c1b49c47ef9d2f2bc605"; + rev = "d6d3ebe931529681c99aff18bc4d4c2487867e06"; sha256 = "0hld4cr09bd0y4k9yz1lls5dqdak605zf5rnv75zi5scbgwly19c"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; @@ -3000,24 +3432,24 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-04-25"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "b93ed4cea9c7df625d04e41cb15370b5c43cb578"; - sha256 = "12mc8fa3k5x9l84qw930bbjqi5hgc4y61s5p3kqx9nma2db2686v"; + rev = "86e03769392f824ed8ed08de5b6afe6acc7fbdb3"; + sha256 = "0rx41cdrsbwh4p96ylb5agmjd9a3ry8jvl380schij89sdsbms16"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-04-24"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "f481b30f1d93df6016092623199ddc8bfe1624d0"; - sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj"; + rev = "104aa65f9155d34629c9623d5dac39b5b2ad555c"; + sha256 = "0m0w69mmy471c2axr8n15c8spd7w8zdb0ri2cnf571kpmb68szxr"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3072,12 +3504,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-03-31"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "2337df7d778e17a58d8709f651653b9039946d8d"; - sha256 = "06gz1qsdqil1f2wsfyslk8vsdxxjjrsak0gfar2298ardaqb3dhp"; + rev = "969f2c5c90457612c09cf2a13fee1adaa986d350"; + sha256 = "10nlz4hq1bqjsnj9pkadi3xjj74wn36f2vr66hqp7wm2z7i5zbq3"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -3120,12 +3552,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-05-10"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "8567ac8ccd19ee41a6ec55bf044884799fa3f56b"; - sha256 = "0gbdgn8031i4wgl5w2halaxjir39710n5cs8997cf3fhjj8zk5ss"; + rev = "4a58fe6e9854ccfe6c6b0f59abb7cb8301e23025"; + sha256 = "1wppsqpi5h0qb1vhxryjw0sn0g8yhkpald47cwnr5r3ix5w99wfa"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -3289,48 +3721,48 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2022-05-06"; + version = "2022-05-21"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "d743b99ff8321f4a80d21692bf536442d841bd55"; - sha256 = "07x3zayahbp2dm7lc5kvrpd0c4i8qivs1brbdv9b1rv9b45qx5nf"; + rev = "2bd1c7516ef15381cdc82c66cf214ccdb103ba31"; + sha256 = "0ysvfivkdrqh5ginlz89wr642ix3ds435pbsms3b7jfzih83az2w"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-05-04"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "50e7b43552072696d26757aff5f6307e2ab5e3ea"; - sha256 = "051asspplaw9m1iqv78gfv8dzg3c96c1mhhv5swih4r3zcbylhhi"; + rev = "dd13260478149f787753b72689076b34c6a4ded9"; + sha256 = "15f816yq0igh6lgf3zrp7sk1drxsa88lhpg0pk41f5369yjvf09r"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2022-02-15"; + version = "2022-05-27"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "12ecde4ed3ecb39964000a5fd034ae4c1d307388"; - sha256 = "0zf9p181rlkn0d0d53ckg4992wgdgnxpkgmn9hv2sajsrih4m0z9"; + rev = "533d768a140b248443da8346b88e88db704212ab"; + sha256 = "1lgwvpiddvxlcakypa4cj5wvlw0fwcbjpim0rav7cgh15vzibwk0"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2021-11-08"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "6fec676fe552cb30165dc8977dab9353c4c3ab26"; - sha256 = "08sz0fmlk4bzzkg5j0zbjd1dki1ykigar4rzyc05xfynvkcxh4fg"; + rev = "1261f851e5fb2192b3a5e1691650597c71dfce2f"; + sha256 = "0ly58dcxgwyfv5wdbi5i4g187zv6gw3bzxck0402jwadvxnq7x6d"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -3373,24 +3805,24 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-05-10"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "1f9f372b9fc137b8123d12a78c22a26c0fa78f0a"; - sha256 = "1s4bpi7i86246p28pjk99rv1qj1gp7l7zwfch0f23nwnggm8s6pm"; + rev = "9c73fd69a4c1cb3b3fc35b741ac968e331642600"; + sha256 = "0mij8mrh7fmynhz7d3i11bbsvykf2pdp3ldk8w0sbi15cgfp8fr4"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-05-09"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "725ff1f12e908001d2d42e9b06725cd8117e16f8"; - sha256 = "0i93k3izl9b8lsax7s1bz53jwkjsjh9iv2wgwk7bf9a6c34g9mq5"; + rev = "ac7eeddcd0ed45d9f18611107df076e494c3fa39"; + sha256 = "0w8zwsc85chfmpkx1j6cixlmd870f94dnkmbp29j79chzwwhwi5d"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3433,12 +3865,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-03-22"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "fbc05de53ca98b7f36a82f566db1df49864e58ef"; - sha256 = "1gyxa9larwz8brfs47ivxcrx03fa52pvc6kw31c7nl03j5p91f8m"; + rev = "f06d2fa627c66689ec0ef68fe95765f0af0ded88"; + sha256 = "00d27f9h4s83c1bsqskv48fhcyd2yf1fn7bpzqgqipbdsj7n04hn"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3493,12 +3925,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2022-04-28"; + version = "2022-06-24"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "fda87ff20e3b9c6a058cfbb6ca3c1f25877f4cab"; - sha256 = "0apd1fm59plqhnc65zs5ayx2sijlhbcsrci2s674nr4w4w5rhvsj"; + rev = "3a8a4efba81f6c65b94510e93160e0e4061bf03d"; + sha256 = "0h6g99092cnkcnvx65gzppf68p9x0gxy6rp4gf077ci9xc010kyl"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -3541,12 +3973,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-05-13"; + version = "2022-06-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "c5b93fc1d76a708cb698417326e04f4786a38d90"; - sha256 = "0lgk9i240mgzf7f3j3z93dkj00fi3rypn79zc60wqdyzhpg4r4lm"; + rev = "79519bfae95741bc99872582ef0f268fd842115b"; + sha256 = "043ldfhd7b5c3f016rsf9hy9ha27w97d7cmbw8klvddpxg6kxyvs"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3577,12 +4009,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-05-07"; + version = "2022-05-17"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "4fc9dcaccb31301cb6ad938e1f40c211ab1115e2"; - sha256 = "08bn39smzdsh4whqk8icmf39fixnivw0bmvh9c90260mqj7329xr"; + rev = "41b57761d118ab919d265ad2983a696ca1081562"; + sha256 = "0rxdqbndzw0qkhy04w00mmb1wv1r2i13rq0msvz10rc3060lisvp"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3601,48 +4033,48 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-03-20"; + version = "2022-05-19"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "3f3c25e584558949b1eda38ded76eade28fa5fd6"; - sha256 = "1k1i4c8rydnhk36pcwa9dhvlbawda0dbwh6ppgypm1xnda10hv3h"; + rev = "71f7eee870d8dcf8f8719238eb7ef8435de567a7"; + sha256 = "1php9n68bw3l1344zz4q0n2pg6cx6ihpva8rzmm8xipxwwvxk8my"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-05-11"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "91d403620dafeb30410aa0ed0cc416c9b67d3233"; - sha256 = "1v70qlnwc59agxasvshr5691k00lvahks469pxh0kb0m072ainri"; + rev = "3d3447816beea47ba93753afa7b717f5deb8a26c"; + sha256 = "0p4wp53lpm9awkbf6cwzxzxjbvqf5r272hlygbiwhv048lbz26xk"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-03-20"; + version = "2022-05-20"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "ab90e26d68157d3f016f9a5d5c1d3a46a174618c"; - sha256 = "07cfcmly1xdy4vmng8l2q2cpc99nvpdyihnl8x5xs2i7n1zakmdh"; + rev = "8f13d50dfda93ce188f39a526773ef9fd6c73add"; + sha256 = "0n99r4lhd29yx4n2axnyhx9a5v6y8kk6i075x5088hpdd6yi84jq"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-05-09"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "273bc3389434ff041e65f6c10edbf470763f6a8f"; - sha256 = "1gy6an081phxkzaz0r548lq1idlxwmpgcgxj41jc7cliplfm8h4m"; + rev = "de1a3d65c0917bcb933ad023768f6b6e74f6ca92"; + sha256 = "1qmvqh9xw8y7vgnc532glcgv94mbwr0ilaiw100ri2qlr9lri2np"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3697,27 +4129,39 @@ final: prev: lsp_lines-nvim = buildVimPluginFrom2Nix { pname = "lsp_lines.nvim"; - version = "2022-01-14"; + version = "2022-06-29"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "6267f4234b559f756ec22dade7e8d50eb7325135"; - sha256 = "02gzhvhsd76jx09fnqf0i67k79zygikkplhj25p36qcc0rgw1abf"; + rev = "ec98ce50102a843f34d4895d5af0e60f8cc1d83f"; + sha256 = "12i9v3vnbl0djx43y46xli3f5nbf2yly4c7d0mcq8682yxfq149b"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-05-09"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "db324e2ada5bb795d0016ec0ef2b4ae7f11d8904"; - sha256 = "1swvj79h7bgdm0wmb3a2a730y4gic1aivj371q7k8acc1s824j7d"; + rev = "6c65bc81dd041e7f4e49662bb8fb54cacc66efad"; + sha256 = "1hzf83wf86lb762xb8g4ygvnr68h87504cv9cfnwnb4hqbb386im"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; + lspcontainers-nvim = buildVimPluginFrom2Nix { + pname = "lspcontainers.nvim"; + version = "2022-06-25"; + src = fetchFromGitHub { + owner = "lspcontainers"; + repo = "lspcontainers.nvim"; + rev = "ea430ff6e155dc26f971573eb21422d77cf9d8f0"; + sha256 = "0rv3prk475f8hzhmf888j7kyvc37pmhi3w4xmgmpqqj486jplz39"; + }; + meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; + }; + lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; version = "2022-04-18"; @@ -3732,12 +4176,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-05-05"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "8dde091a61ab07f639baaa82b456d3508d0aa7e8"; - sha256 = "15cimji9x53ki1rrxw2y7vj5g4lp4b91hxljcp9jn9qhkjb7kj47"; + rev = "b4f345998fba6c894d5de3aa42cb71a71e6c6ee9"; + sha256 = "0bxkrjmf56axdhzdnw58dv1i7yqsp57yj675lmmp2agnfifmfvm9"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -3768,24 +4212,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-05-13"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "a4e4517ac32441dd92ba869944741f0b5f468531"; - sha256 = "18q935aicddai7j99ln61wz1di6lhwzs11x8fxgq704kfap1l2fj"; + rev = "5113cdb32f9d9588a2b56de6d1df6e33b06a554a"; + sha256 = "07npk6x4ljq7f3wfcs3liaxpn23x4gdxr5jq8vglhd1xj3l99mh5"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-05-05"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "cc0086390c6cd2eaebae1834b115c891649ec95f"; - sha256 = "1kid880y097jl9ys2zs94fj66fq2dhbgjmd97blpdyhsa9m0mgnc"; + rev = "295cc9e422060b3200234b42cbee6dde1dfee765"; + sha256 = "1cpqq5miskc87az6ckcgbcpi8acb6hvj57mp7kfddq6s4414svz5"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3804,12 +4248,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-05-06"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "0c4acf666eb23acb5ffbd7f29526d801560b696a"; - sha256 = "1khpmlf90yhlqaapk2vkqkwzdjwsrrl3hfb209k3wl25588m9fm8"; + rev = "c3d90d9cac74442069247505a538873b772550cb"; + sha256 = "1kz9y4dvq6g3yg03bvv51vmq1dyyh4f403iawfxz1bdg8bv1ia3x"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3828,12 +4272,12 @@ final: prev: markdown-preview-nvim = buildVimPluginFrom2Nix { pname = "markdown-preview.nvim"; - version = "2021-03-10"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "iamcco"; repo = "markdown-preview.nvim"; - rev = "e5bfe9b89dc9c2fbd24ed0f0596c85fd0568b143"; - sha256 = "0bfkcfjqg2jqm4ss16ks1mfnlnpyg1l4l18g7pagw1dfka14y8fg"; + rev = "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96"; + sha256 = "0hd51c7n8hr5bdhd8xl4gr4jgasdjr90rmcjaxylp475xyz6wl3v"; }; meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; }; @@ -3864,12 +4308,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-05-10"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "255033d6db241cec11d81ee46d81b56122e2000a"; - sha256 = "1zn32xkbn37mqi41rh6d0186rxkq7ry5m1j7f8iliyhvd5gj1a1s"; + rev = "5417c7ebd5cff06045172f5ea5666cb67b07ca76"; + sha256 = "1plf17p72spx8sfgprw114mzdp32b07v9j1yjfjy33f5kmwka6k7"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -3888,24 +4332,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-05-12"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "1764bcfb1450ddef4eb7118a3c16464caad44439"; - sha256 = "0bayg5y0i23pz6x798qyx90l1w6wmf83kgdz9akxn6s5m82v8z4y"; + rev = "1ec280c1d000813a268b16028d040824285a043f"; + sha256 = "0anafgqcrdg6ryb47aa3w3k8liw906dk601xgfnsvg46g2yss37p"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-05-09"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "5d44fe7a3a5f7041c4220a71e8fe83d8c8498042"; - sha256 = "04rqv8c5g1fs8pymlf2fcbm09k64bvpiqmjilf59m843vkvgk1xf"; + rev = "a9f47afe1032d119a1ceff2714d47e4055564d07"; + sha256 = "1ihx2vhrwyj3zmhnzwdcq54kygm5zic14ccyld995s7vjc4d15ig"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3936,12 +4380,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-04-29"; + version = "2022-06-24"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "d8e29b48f959aef96df2cb2ff5875ee02970f2a7"; - sha256 = "0rv2x96l5gcbj969ki6y1c0l468sibjcph5rqzavv6naizmwi8ql"; + rev = "1717c7a5e90d6485386b5d239d55a7a775ce8dfb"; + sha256 = "1ljh3hp1salkk3qmisykm5yy8dc9349r7aj631z8agqvr2hngiak"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3960,12 +4404,12 @@ final: prev: mru = buildVimPluginFrom2Nix { pname = "mru"; - version = "2022-03-12"; + version = "2022-05-24"; src = fetchFromGitHub { owner = "yegappan"; repo = "mru"; - rev = "2698dc2622450645618e6457a81d325954ba725f"; - sha256 = "06w4rmdn48h21wl9mn5v9mfkaaypd1fxhdjiv7ng5zj7jgi1qnsd"; + rev = "8e8220a005d070dbd01caae86e3139d83fc444c4"; + sha256 = "1ysqzx3nwl1ll06rwcl4zq7ff06vzvgyf4bv5m1jm8n6gadywkgi"; }; meta.homepage = "https://github.com/yegappan/mru/"; }; @@ -4200,12 +4644,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2022-04-21"; + version = "2022-05-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "3a913173dcbf7bac303cb5ede8b3a732b6a0a692"; - sha256 = "0wbp4f0gjc3vchyh8xyjcqyd3xlc4wf276r9lalmjd034792a77k"; + rev = "facc3db7c5836fe2424936e8dd06f227e20f96db"; + sha256 = "01rjirflkydx6awc7qwiiv9fln1ckfx2rnvcf1h1cz8ra8zk8qh4"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -4236,24 +4680,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-05-01"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "409ebbba9f4b568ea87ab4f2de90a645cf5d000a"; - sha256 = "13vfy252wv88rbw61ap1vg1x5br28d7rwbf19r28ajvg2xkvw816"; + rev = "c94f230943d9559056bb1157ccda27fb6ac1b649"; + sha256 = "1i0hxjqiqj3s5lni2sz7dmg7srrcvh4ncp7gkml93drz3nj9hyfv"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-05-09"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "84d1eefe9d5af41cc3e5de02f2c9a263d5302781"; - sha256 = "03zrwgk0z534qzbzrf2s3bdk3kcjyrxjhr3xp0qsx7nlpx5ackby"; + rev = "585251902917f33b3574f2bc7670f68543bd3481"; + sha256 = "14fpqhh98kq4fh2sf4rvns8ffrk9zx44k8p5d6z9l39jygwl8xy1"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4308,23 +4752,23 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-05-13"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "509947a6587a83aa755914eb95be605864bb108d"; - sha256 = "0qhq61kl3y282dm06z7kyzda5qpj9nk3mpvz5asc46vfvw98ijyh"; + rev = "b66bbbf6c951410c91720ab707dc31214c100b82"; + sha256 = "185db1nqx9kzh7xsqjni002dd0c4qzagq6k82b0w5ccg4n850qw9"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll.nvim"; - version = "2022-01-13"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "07242b9c29eed0367cb305d41851b2e04de9052e"; + rev = "71c8fadd60362383e5e817e95f64776f5e2737d8"; sha256 = "1xcj3dmrcnqrk2dzzr137n0g0crfyg3zk3220202v6b4vylairnh"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; @@ -4356,24 +4800,24 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2022-04-26"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "05ea81b6424c1576f304bc88c33d5a1f8867b8e9"; - sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq"; + rev = "4881d6428bcaa524ad4686431ce184c6fb9bfe59"; + sha256 = "1i98sfb7vb0fx16zl15lf6ac65f1j0h9hbskmfk6zdiqcfcwhx4f"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-05-11"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "bb0793b661acec468c472f20eb28dbe855428793"; - sha256 = "0nrky5mlh79xzgdbwibrs43yw317gaavhq0p7pfpxsxdxhfjw416"; + rev = "596caf119426b2d88ced6b41904611e025d54045"; + sha256 = "07jkxjjp7nn44574c76r17dj7svp0xj8k69z2m9yq0ihcsdfnjaf"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4416,24 +4860,24 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-02-24"; + version = "2022-05-20"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "f8671f783baeb0739f556d9b6c440ae1767340d6"; - sha256 = "1j0fxxprxw12b70isnfqixnvz2xd657rr1jphjz8277yfqpdnh2i"; + rev = "6d30ebcd428eb5a244229a125420a1e044b42b52"; + sha256 = "1x1y2m1rnwn9rmb9hzhcc4daf6cr0xjr5f6ljzrz65fmyj7bhkfj"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-10-29"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "eed488b1cd1867bd25f19f90e10440c5cc7d6424"; - sha256 = "0hlyn2l9ppjn92zaiw51i6d15li15z5083m13m0710giqx05qrak"; + rev = "fc85a6f07c2cd694be93496ffad75be126240068"; + sha256 = "02z32hrh4ykv4waq22y9ng8hwxxm8s5f2kxqm57pkixyy6b8zvzi"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -4464,12 +4908,12 @@ final: prev: neuron-vim = buildVimPluginFrom2Nix { pname = "neuron.vim"; - version = "2020-12-06"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "neuron.vim"; - rev = "0b820b2191bf239c38e62ffa63501333590d6810"; - sha256 = "0x00y0a46jwqq9gx741m3j7p78ps7nycp5hl3bjxqmwj289gc12y"; + rev = "e4e7f0b012d39d8e5dfb7d13ca199eaa130279ba"; + sha256 = "06qqbg4d0gk8d236f08sr847m5icbfknxsya2q3f52alnlpjry32"; }; meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; @@ -4488,12 +4932,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-05-10"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "63a8eb64e8559e4c910e91025a2959c4b50b8c54"; - sha256 = "1kiryppcg1ng8n5m3b5qyzzw5vnisgpb1n6yw961yddxdzc8hcr4"; + rev = "01bab5495d51500b08e80532ca0ed3c0f5c493cd"; + sha256 = "0996y1ffh8h78yjvdbiqh9gij57n9jvcazvdbksf47qj4d7xvsza"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4524,36 +4968,36 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn.vim"; - version = "2022-01-03"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "169951733371abd152d76d1ce65e2dd867156e2d"; - sha256 = "15prh70imjikmgnk4b161phcfqqz8jfqdq3l3nzhz80b597d6sv5"; + rev = "bc6e2e34d9114c93ce50782949d260b4d4f0e2b6"; + sha256 = "0qhblwqvkxnjjw4jrya6xkcbm4lv8fjajmrasl76mn19mh14dgv5"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2021-09-12"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "c2aaac39e5cb6111dabd24be7098bf04947ca6ca"; - sha256 = "11iwjaypjkjd3s45dx3f7blpj0lkjs4jmp41sj7hlg2r7m64ss1g"; + rev = "bc0f057162491e9228207d74bd88b5efe875316e"; + sha256 = "16fm573my8ysmcy68wy9kxwrm85q8fmpggwr83z1gwq3mmws59xy"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-05-11"; + version = "2022-05-26"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "fb2c13625c711d3ab9303c0d9881437b5b280ba5"; - sha256 = "1pd8wsjp6jg2a8bvwn593sd9wf2czaxaq05xlgjzfwgc9k30mjig"; + rev = "db98740c9429232508a25a98b7d41705f4d2fc1c"; + sha256 = "1iv81g5fg2m72pjl3jc7c6d1j4s8ch96a1qhld3kcgvn6vmpvsaw"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -4584,24 +5028,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-05-06"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "abdbfab89f307151db83b1a5147cd390ef27ff99"; - sha256 = "0z49sfnsr7hmfr4vrd82f1m6kvswfqq31n4fsdmjy9h4qmjb0w5f"; + rev = "acb7287c4a07efbc48bb8b6e6a2cc0baa872d35c"; + sha256 = "1xnaxk0blpika1v3cmr84n0gs24q3gmy72r824yr3sjgiqf2q4xl"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-05-09"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "dcad76eb1abb80cf3a27208823becbf62547abf8"; - sha256 = "1xsgmz1gzrz313whjm2ivc7px7xkcdqqi9gn466d5yyshzqvx3jq"; + rev = "a2b7bf89663c78d58a5494efbb791819a24bb025"; + sha256 = "1vmkvllfkf6l5lpcdpaxlx15wrkmm03122a5qymmfcbw863m6p13"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4644,36 +5088,48 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-05-04"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "aea913109d30c87df329ec9b8fea9aed6ef9f52a"; - sha256 = "0jhw4m552vfxilmn5cp67a9xz1w8jd6ixijyl2bsvp1j56qklfi6"; + rev = "4a95b3982be7397cd8e1370d1a09503f9b002dbf"; + sha256 = "18vn3wy83nscd0znagq9gw7bzf9ljkqiny04xbk5p2l85w4xya7k"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-04-25"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "70fe3102158b2765d5bba46f398bd4213997936f"; - sha256 = "0p53l747hnjrz7wzcyh08vnx3pfdk5gbqmb9vpf4hq2x3lyx1a57"; + rev = "584c63759e0341a8512ba847c7f1459809f47a16"; + sha256 = "1szla0xfxxlg4ignjws5g5rd1jk4vbxi95fpk4pcp6xkm8a30spp"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; + nvim-biscuits = buildVimPluginFrom2Nix { + pname = "nvim-biscuits"; + version = "2022-06-26"; + src = fetchFromGitHub { + owner = "code-biscuits"; + repo = "nvim-biscuits"; + rev = "75f5e457b97ac0ac11cd94f2f861eceae05b19b0"; + sha256 = "0yhiq2ad0jlw1c252fqbxr4ghy6dndyk4gnx30kyqmirsja0dwdv"; + }; + meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; + }; + nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-04-30"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "3d174ca8198bafb3eb341001aafcf74ed4290d70"; - sha256 = "0i5pmk13rkk74bx1a19fz32gsg1f47s8550pqz51ma8h0yyc9cpk"; + rev = "4b0d20a019420ffc28173906e3183a39f9cc2656"; + sha256 = "1arr5ysycysjs7gqcnpp5p8p7ylq08cds5xd7njgqzvsk0gxk8wb"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4704,24 +5160,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-05-13"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "9a0c639ac2324e6e9ecc54dc22b1d32bb6c42ab9"; - sha256 = "06pza2xc5fzmsdz945mascmjd43k48agfq15ds91km8scpvpsx77"; + rev = "9897465a7663997b7b42372164ffc3635321a2fe"; + sha256 = "1ic1h8h1h4v5f9f76vahl7yz7smq55x59r7j5h9gdmj97n0p0fp4"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2022-03-17"; + version = "2022-05-29"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "a864a79c8e024d4f5d95915210188c9c3430b160"; - sha256 = "14m95sp0a6ss71s9ljg1b2m2sz4fyh0rxv9l4mj6brjywsx6agvw"; + rev = "ee599409ed6ab31f6d7115e9c5c4550336470c14"; + sha256 = "09kldrnfy4fz6f706s444rnwkrzl0zx5fpiygs4mgvdcq1maavlw"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4774,6 +5230,18 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-completion-manager/"; }; + nvim-config-local = buildVimPluginFrom2Nix { + pname = "nvim-config-local"; + version = "2022-03-26"; + src = fetchFromGitHub { + owner = "klen"; + repo = "nvim-config-local"; + rev = "af59d6344e555917209f7304709bbff7cea9b5cc"; + sha256 = "1wg6g4rqpj12sjj0g1qxqgcpkzr7x82lk90lf6qczim97r3lj9hy"; + }; + meta.homepage = "https://github.com/klen/nvim-config-local/"; + }; + nvim-cursorline = buildVimPluginFrom2Nix { pname = "nvim-cursorline"; version = "2022-04-15"; @@ -4788,36 +5256,36 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-05-11"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "2249fcfd09cdc27c08e9d2f3be5268ba81db3378"; - sha256 = "0v0gz77dqyd485f9d43q101zcxnsyc13n9bl572xcrshdn6czncs"; + rev = "f4a3be57f61893cffa1e22aa5e1e7bded495fcf2"; + sha256 = "0s86y4x1rxkimaz76mbbxavwakmp317fzimn5gypqi36liwv81zq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-05-11"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "e5c32746aa72e39267803fdf6934d79541d39f42"; - sha256 = "06igsddmjd27wj880vq9l9qq38x438ybrjvizn8dz98paypa6b1d"; + rev = "d33b905770f9c674468b0b83bed3aeab41cf9bb0"; + sha256 = "1a1dpfjkr0pssc3vymzcfwyjnh90qhh7cg3s5qgk2vjvgadixvrg"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2022-04-30"; + version = "2022-06-26"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "9b731b9748d243b60e61eecbe2d114c39554486e"; - sha256 = "14a66zdys50ifhfz4vls7b6grg69iwndailxdcamal7xafvy1dw9"; + rev = "a36982259216afd710f55bcdc220477c74b5bc35"; + sha256 = "1liw94g5hi7nvki3kjxyp90y9lrp24wa4df8p54nmpkdxwd38kz4"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -4836,12 +5304,12 @@ final: prev: nvim-fzf = buildVimPluginFrom2Nix { pname = "nvim-fzf"; - version = "2021-10-25"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf"; - rev = "7cc3670b00f4d6e0968289f8b3bee7481cab3e73"; - sha256 = "1flp9y54fr94gb96x8nrvw2sx61rwwi2rzmjmipa9crl0ckj14pb"; + rev = "e3973c18931e63dc13c5efa8fb0fc3b08f1dc90d"; + sha256 = "1b4m83xsvgr5ikvgy213rkf46nwjv8vsi8pz5bxnvv8ndbg248hz"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; @@ -4860,24 +5328,24 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-05-12"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "9c630705829fbe8c21a9379ae2be948560189d80"; - sha256 = "1cdc2r12k1nma37vicshy4kbk79ap8qj040rscxzl41z96ff8v0b"; + rev = "c617a18561f710c22f521f7efd05c1374a1b8073"; + sha256 = "1rk2z7ibrsh9gqrxisf13ybx846rxhlrx6s3piabhhr5x7m3h79n"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-04-30"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "9552418fcbb9587025f4bd38364259b3888f582b"; - sha256 = "0n2393lb5aad2g7lkgihhg4x9sm35500fb8hds2s23nj0cv0jcj4"; + rev = "be4bb5b903af81f04b316425b8ba8142504d023f"; + sha256 = "0n8a0lnf8jbfds29mk5xxk68cp7i4rb8xsfa1qk50i662l570knn"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4896,12 +5364,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-04-03"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1944094111217db8d40aac697ffc71f16136d9ec"; - sha256 = "0f0lqldrgzi72qrafzwqk3i71v74xvsrhgrfnidnbnvd3jc7sa0b"; + rev = "6cd78e73b28af4618cf67a470e53e13d59899914"; + sha256 = "0g2xvgw1bxz76hil5iiy37gpv69xjqy2s2q79lqc1pcr54c3392i"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4920,12 +5388,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-05-06"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "f582b5be2ae1fee2e5dc974cd9b979a1ab08cca6"; - sha256 = "0bfdp6xbq7qr7185m06ccfmln2gc24vc1215cxczm1bpyrh98ncq"; + rev = "703268d5b8479de4e0c27af93b203d56c1b53d2b"; + sha256 = "1r55jkvrkx7drfs170801nw4ldh96654fg4nr8zay71i1nyb81w8"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4942,38 +5410,50 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; + nvim-lastplace = buildVimPluginFrom2Nix { + pname = "nvim-lastplace"; + version = "2021-10-15"; + src = fetchFromGitHub { + owner = "ethanholz"; + repo = "nvim-lastplace"; + rev = "30fe710d4417cc67950bbce6b2ec2ac0ff430e12"; + sha256 = "04sjh0srlv0yxc8x27yaj9cpfaz0dd116nk5pccam84fk8v3bw1h"; + }; + meta.homepage = "https://github.com/ethanholz/nvim-lastplace/"; + }; + nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2022-05-02"; + version = "2022-06-08"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "407f05c71f757f09f775229d5709a3592f1a6910"; - sha256 = "1j3ksmq91fzmvnmvgkkrs6lp55wry2q7x6ixspm197jd0np8w9k9"; + rev = "1e2844b68a07d3e7ad9e6cc9a2aebc347488ec1b"; + sha256 = "0mff25sbbksfl88zcylqj4p6b9iyr34pqws1lssvrajbqjgprcbq"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lightline-lsp = buildVimPluginFrom2Nix { pname = "nvim-lightline-lsp"; - version = "2022-01-06"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "josa42"; repo = "nvim-lightline-lsp"; - rev = "d9e61801f54c8824b59e93068865e3bc4f1ca0b8"; - sha256 = "0sd38c4cp7i6prgr86b5nq9fhpi2h1yrn3ggs3d7my65ayz759m6"; + rev = "0fe34eed830b223770111c6333fe48d9fca158d5"; + sha256 = "08qxyr998d7zwnk0czfq4hif0q801fm2ijpbwql32kd6a62bnhjf"; }; meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; }; nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-05-11"; + version = "2022-06-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "0407c340a77380e4122dc349efa10fc846c928b4"; - sha256 = "1cagndfqdk505q18iq4wgmwav3hh04vmgxj7h8924v9ffj8wr0wx"; + rev = "5249977a585c3c17d94afdc8f0255a689d3a0057"; + sha256 = "0d5gh1n2r0knhmlqpgqx2f67fg5828p6pwhpf7zi89jap53skrwn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -4992,12 +5472,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-05-12"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9ff2a06cebd4c8c3af5259d713959ab310125bec"; - sha256 = "1jsrbimif11jvkdbb7kz6c9iykbql5kzx4q4p0njfdqmvkn4ybdb"; + rev = "83dceed599b1236de4c18e31db3e0a0878b6fb59"; + sha256 = "06hvmjk1qizr8vq0sz86vjy03pa2d04i7y6h1cxk064zx74kmvvn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5014,14 +5494,26 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; + nvim-luapad = buildVimPluginFrom2Nix { + pname = "nvim-luapad"; + version = "2022-06-14"; + src = fetchFromGitHub { + owner = "rafcamlet"; + repo = "nvim-luapad"; + rev = "171e204ed65dc9308833ff80026fc6b7cec22825"; + sha256 = "1k7zly9xpdrxf6221w2x898fdapagzwjcf8sf6agis7flqhp3j8f"; + }; + meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; + }; + nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-05-13"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "7c74065823e073749652749a7a89c78c81749acf"; - sha256 = "1rbmksw2ia8rvfjncvyy77bcx1zwpragw1k9fv7n50xhpjsgahvc"; + rev = "9e68fd2cae91ec8361b4e60ec89adb9a745b91c7"; + sha256 = "0ggl7pi0ak2xjmxg8d98dcf1sqqbgxh59ii33v37gpkwskpfgh5h"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5052,12 +5544,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-05-04"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "d4a01eedeb2e6c3d453f3aa0f1b303dd8611dc71"; - sha256 = "0i0nikpin6fab7x72mzjsxsfgpyjnk4fhmw7il51i2igllxm5krs"; + rev = "74ba257b6cf7fe2b7bb0f6813088ed488baa4a2a"; + sha256 = "0k27isyrsdqf9is943m51wvvkkh7kw5qxm4c5rbbxd2gzb3ykyn4"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5076,36 +5568,48 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-05-05"; + version = "2022-06-08"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "696b56fec29bad6daadafdc067955cd6010933bc"; - sha256 = "1j9i36ww0krq3k01l2rzd6qc29kc6w5cnl2lvb4m24n3k5rakjd4"; + rev = "f8308c3c91b7879c3286554dda484bcf973df6ad"; + sha256 = "1fjabqq1dkf6vjcgags0ny049ckhnljzzxlc81wpd1kmk06nyg3k"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; + nvim-snippy = buildVimPluginFrom2Nix { + pname = "nvim-snippy"; + version = "2022-06-25"; + src = fetchFromGitHub { + owner = "dcampos"; + repo = "nvim-snippy"; + rev = "0eff6e2826d92e4b37be6711a1e5bbc945ec3b9f"; + sha256 = "0i5702amdvrcs7xw0alny8nvm8s1fxq4f9syf9ck3j997x1kfayy"; + }; + meta.homepage = "https://github.com/dcampos/nvim-snippy/"; + }; + nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2022-05-13"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "a6af3a33cfe78c97f3adb2d86d3165bb25fb0ec3"; - sha256 = "1z7wi72dqrw0fgsnm0s7zmxb72cq564dqvvpl1cqgizf4ab2a42a"; + rev = "faba49ba6b53759b89fc34d12ed7319f8c2e27e0"; + sha256 = "1kfbad6v7azk8lhsjpsli2ba2x5wncjac35iazjhdx6dbv0gw90l"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-04-07"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "345e5dd57773e2b4b425a2515c831108b9808a0f"; - sha256 = "1lyqzzl1722hdx0cwry8659dbd679nilx5lb1w52ym3sixz4a9hy"; + rev = "a52139da068ee4d0860810af7c6b6d48d3cde603"; + sha256 = "1h78va3w6x9xppdn63vq4jfrn86807cnw0dgpxsgc73aqi3m3i24"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -5124,36 +5628,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-05-10"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "82ec79aac5557c05728d88195fb0d008cacbf565"; - sha256 = "1xxxapb093mljrw8yr7qm2nij7j0639pfpyc3pv9zgz6ivd4d6xc"; + rev = "21516f447baf42f6f11421a017cd69306d5d5ff3"; + sha256 = "13zsr6vpsmbaxzwd6hi5ng2n2ny6qhvzkwsi0srkc84xpw7ndp4m"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-05-13"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f1373051e554cc4642cda719c8023e4e8508eb2d"; - sha256 = "1jfcjwyp57scwj164pxzh376mh2i4nx2sxx0gpihl3r4m067gb84"; + rev = "78931d8bf15468d8f11f0c7910d470e88493b36b"; + sha256 = "0839l52dj58splghn4m11as0nb00sjx9avhnlwcf54r2nf1afjsc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-05-12"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "a7916523e8107a57021cabae51917b7dae844aa6"; - sha256 = "0pqc31yp8prq5gkblasyyhf4cxi4gkqglp0jmvqmsax46r82ffz1"; + rev = "50bde20c86238f853520a570208f7e01f1584b74"; + sha256 = "12hzrs14n1mcvlz3lgxi1am0h54jsknr2bv374a8h7dnhxshh5xs"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -5172,24 +5676,24 @@ final: prev: nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2022-01-22"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "0dc8069641226904f9757de786a6ab2273eb73ea"; - sha256 = "193fk657wjxz7hfbkjw566bng62vv7432cjhb5rwcig04xd5izqm"; + rev = "75f5895cc662d61eb919da8050b7a0124400d589"; + sha256 = "1wpszy4mga9piq5c5ywgdw15wvff8l8a7a6agygfv1rahfv3087j"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-04-21"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "094e8ad3cc839e825f8dcc91352837653e365a8f"; - sha256 = "1i7d8yxqffv6rp6n66wqyb0bsrq916qlp88rn8bb92ykyxmjn8bz"; + rev = "c8a393ecb6251d15e76dce8d8da522062090497d"; + sha256 = "101ph3wm3cgg5j4ai85p64rkaipq0zs785bpf2gfhjjb5qg9isa0"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5220,24 +5724,24 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-05-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "190f8c83abb29504877b91c84ed3ceb6009ad3bd"; - sha256 = "1kq54zd1yx6q1ch886jcvhhydbxz9frky9wl60q00q62zgds8vmz"; + rev = "837167f63445821c55e6eed9dbdac1b0b29afa92"; + sha256 = "104rvha3bqsn5rnrii0z023x7a4ph3rljlmqjgaki27crfnxx8sj"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-05-01"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "bdd43421437f2ef037e0dafeaaaa62b31d35ef2f"; - sha256 = "0sknns28ww7xwjyqylk4mxvs4sy8lsk52w5q81ldnwfcyiwl70c5"; + rev = "8d2c5337f0a2d0a17de8e751876eeb192b32310e"; + sha256 = "0jb25z0bw2xyix18pf59lrmbnih8yxxkb81xi9zl034k9l9cmsv3"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -5256,12 +5760,12 @@ final: prev: nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2020-04-08"; + version = "2022-06-08"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "b710bf4daccb603a423754794fb446e5fbb59576"; - sha256 = "16ma42niwsc066s991idfbwvm0dvwqwdr2zfkc3av10hyimxnzbb"; + rev = "bb5f5e038bfe119d3b777845a76b0b919b35ebc8"; + sha256 = "1ddh1cwm3a46vbz10v3n5mxa52mvwhxr7v902ixx0603ndawmk2g"; }; meta.homepage = "https://github.com/roxma/nvim-yarp/"; }; @@ -5280,12 +5784,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-05-04"; + version = "2022-06-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "ef38441a7149087366bfc05654e7cc21a83df60e"; - sha256 = "0chdbsixjw3l6bvqdhf2na2hdwm94lzb66mssafbhgpq328y97wk"; + rev = "4c261a74ec44dc7ca62b0ceb5106f752208b24b3"; + sha256 = "18a0p52c70m8d624frpp8b9hvjrcf1kd1hgxism075mb5nm5rs3s"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5316,16 +5820,28 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-05-13"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "f5bd0c0336d6585a18b3ea95b4a40be068c74bbb"; - sha256 = "1cgkdrnk0yfrls5s4vjvkz0851c5877lmpnkh17nw1zn9rlds165"; + rev = "1f6a770a3b2a463cff474df51dc037ae7a6c2920"; + sha256 = "1p2wwfg4q4apfgfrw475b91d7zim8bkiyx7p6j93adk1zz6dpjbh"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; + omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { + pname = "omnisharp-extended-lsp.nvim"; + version = "2022-05-10"; + src = fetchFromGitHub { + owner = "Hoffs"; + repo = "omnisharp-extended-lsp.nvim"; + rev = "e0dbe96194465f26e2cfff5d170ba8c88287e329"; + sha256 = "119pc3va1g76clvm6c09jldsybjqml8fycx23lyh85f00jrwr2y9"; + }; + meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; + }; + one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; version = "2021-06-10"; @@ -5340,36 +5856,36 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-04-25"; + version = "2022-06-24"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "08cde8acf181b3278dafb9c8284726104a11cc0f"; - sha256 = "01dxnf4pcycp70pzxyv5xd9y9289z14c110w926kwhy1skgwz7f4"; + rev = "4f4bf74bf731cbd779c93a10a6e287ebf16425a2"; + sha256 = "13bjbalj3wdzywspk60bpb2djyhbl075xwi5f9kagm62fw9c2ji2"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2022-03-24"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "7db2ed5b825a311d0f6d12694d4738cf60106dc8"; - sha256 = "0jxnymbj83y0wfwv6ixxzlx1zyh9mlv1krq5g9wqhz4w6n9rkmqx"; + rev = "ff0e0a488ca9d0d146f6e67b6fc3038f760238ea"; + sha256 = "063390s96464m7nw20sgb3zinwvzawa3ck1ali20gfkywb8qjmll"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-05-13"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "1f6e3bbb20f45648f5680606e5e5d5e881133f1f"; - sha256 = "05vhgrsn8fbmrzc5hn9k34qscvdvrq30rl61lgsw0wsn49685ck9"; + rev = "6b66ef86fc473a20d6072fbdb016036c2e3dee37"; + sha256 = "016fxzl1fig6x041j2alzisy3qzkqls7hxl4770dxv84kl8p8xvp"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5412,36 +5928,36 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-05-13"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "675e58f6c7a889871911a5dc3e08491fe7b6b8a8"; - sha256 = "02czyx7gpd85ns2rndx52f5a07iq2qqm2zvhvfnmmmfpz11s26w6"; + rev = "72a7a62530e110bd999e9b55d23308d7dbeb39a4"; + sha256 = "1h2qiga742v6d66181929rw9fdcmp09hmbjfixyhlin6cx6aj2k6"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-02-18"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "10de4d0d50ec1d4d26118c4aa067a9d09e370c9c"; - sha256 = "1mhhff6knqqq6pgmd3w6vfljcig37yyxvmrvhb205y67igy3vcr2"; + rev = "45e409c69063a057250833a747e52e2ff00dd722"; + sha256 = "048rzckb35d4s96kmk6yhbv756yhhcv6kl7nc3y96w18qjjh5ymy"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-03-23"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "4dedd3b08f8c6e3f84afbce0c23b66320cd2a8f2"; - sha256 = "09sqfak384lhqr37003bq4wm9v0hi690ilag89z6cw5c0fnsysbl"; + rev = "d268d2e083ca0abd95a57dfbcc5d5637a615e219"; + sha256 = "1ay155126vky7ngz77dk04jfpwwacw6m1n8691vhyg6nal8wj1yf"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5460,12 +5976,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2022-04-30"; + version = "2022-06-08"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c"; - sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c"; + rev = "9051480ad9129ff4ab4fffb38b44779b9081626f"; + sha256 = "15vx37jy75xs1ibxrwwxi3p4yzgsw7y63l8ksaxvddg4lv63gidi"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -5544,24 +6060,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2022-05-01"; + version = "2022-06-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "71b00a3c665298e5155ad64a9020135808d4e3e8"; - sha256 = "0cn6q7885ffn0yxv6frjsa8yx6mnil8lmdvml8inj3lvakyprzc8"; + rev = "ce7e4b757598f1c785ed0fd94fc65959acd7d39c"; + sha256 = "0r3pjpzwjp1m563n80qp93y7f8gvpqjzlhsrd0hvi67qzm6pj87f"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-05-13"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "0a907364b5cd6e3438e230df7add8b9bb5ef6fd3"; - sha256 = "07k4vlpa1cxg4sxhwg0412ws13djspga16d67lqs545j5pfkgzr0"; + rev = "968a4b9afec0c633bc369662e78f8c5db0eba249"; + sha256 = "05x9hnz960ljcb2psqycxgdmh99j36y16vbb9l92wjv5szkz37x5"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5605,12 +6121,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-02-09"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "ebdf23b9b180c7f162e3afb4a250c313ca2b7271"; - sha256 = "0wygl17k2adbsy3pjyyb6amsrx14r11ldbqj21kmkjq289n58f6n"; + rev = "660bd8815ef8da029fa0058f76ac7fa2ca8f9ec7"; + sha256 = "1v5vxh6kzvk4649x2mxckwcj1g8cggahxqr51knz0gjq5nz0qsp7"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -5641,12 +6157,12 @@ final: prev: project-nvim = buildVimPluginFrom2Nix { pname = "project.nvim"; - version = "2022-04-25"; + version = "2022-05-29"; src = fetchFromGitHub { owner = "ahmedkhalf"; repo = "project.nvim"; - rev = "612443b27f5feda45ea478bd6ddc8f95d4ec7b77"; - sha256 = "1iq16ikd057bg72l39yq3d645wylbdv5i5siqlhfbgdrwiqxqv3w"; + rev = "541115e762764bc44d7d3bf501b6e367842d3d4f"; + sha256 = "0vabnhb5d8nc25ap9zixazmr4sm5ylq0iqzsc89cc3h1907xp6lz"; }; meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; @@ -5665,12 +6181,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2021-04-21"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "d493b57406d2742f6f6c6545de5a3492f2e5b888"; - sha256 = "1qnf8lg4a6xxn335z57nqb4yp7ij62yr408nbc8m6xwnznck3wa7"; + rev = "af5fae0b43241e9fc3e0442782272728844bec3f"; + sha256 = "05v81i4ialja4wq3rp1fy09zjh7rvwb6pjhig7zg9pfddd015pki"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -5714,12 +6230,12 @@ final: prev: quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2022-01-29"; + version = "2022-05-27"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "5e2373e36d774e1cebd58b318346db32c52db21a"; - sha256 = "1dqygvc1gr35niqqdqivz5vgqpca9yj68incq3z73rl9qya96pvx"; + rev = "428e8698347f254d24b248af9f656194a80081e5"; + sha256 = "0vindr83v4q26a7jxfwk87vpl1kymsh6cclhvpkmb6cpq0iv3yii"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -5834,36 +6350,36 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-05-11"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "33ac6f3bcfe97447037ded20291d40de34d8912c"; - sha256 = "1m0bd72pjay9mlmf0lhii7yi4mch77dlqwadlsiyv9qw07w1b1s4"; + rev = "50cc6e4e6010ca41aa60519f640a005e7a0f1f2c"; + sha256 = "0432j6mz7x12hvmn38cdnzg9svij25c6ncxm8hzy882m86fy0bih"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-04-17"; + version = "2022-05-19"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "dfcf0962ce88b52e00dd96dfaabc9997a18f4efe"; - sha256 = "19gjsap19mbrdp1ds4wk4w5hkd6g302afc0m3h3fsg7dxyw1r84j"; + rev = "f354159d34bc17553ad772c633fd7caff8ecb35c"; + sha256 = "0fh1dgv8ika7gbdvx1bm0hrh58k577z3cq94wr2mchscvaj935ch"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; renamer-nvim = buildVimPluginFrom2Nix { pname = "renamer.nvim"; - version = "2022-01-15"; + version = "2022-05-19"; src = fetchFromGitHub { owner = "filipdutescu"; repo = "renamer.nvim"; - rev = "80d627372f90660f135862c8a7f8941b28ee5373"; - sha256 = "00ls708qx4i39gqdjw7l8i5az0k63i4y0ma30m5zsb1cz8gyzrnp"; + rev = "4a4707992a79f481f4882bab9b3823ac6455c942"; + sha256 = "1wgavzbmwgjrhlmqya69n3mfz4d5cz3p4b4q115ydsbidprdwpr5"; }; meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; @@ -5894,12 +6410,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-05-10"; + version = "2022-05-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "9c1e490e5ff882e2f930ec015946a0b5b300037e"; - sha256 = "1msynng52mn47iqfwwi0n6wl37psj67pvyyz9kdb4l9r89ahqxax"; + rev = "5877509cfdbf3a0382ff24198a3f730b476f8262"; + sha256 = "04f3az9mgz1409dblzcmbcja8p712pvrc3ahfj18j3xjxw4wh9yc"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5954,12 +6470,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-05-12"; + version = "2022-05-18"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "fbfcd9c4b7e40202ccf3db5035ac3c2b15a4413f"; - sha256 = "1plxhdr7j088nsq361zq35p4wmv9xd9xbgvi3mxr66mmmcm8k0pd"; + rev = "11dcd674781ba68a951ab4c7b740553cae8fe671"; + sha256 = "0kdwjwj9capwldlv6hzff6q7i8ghk5c37k194s8r9vd0hxgbvcxr"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -6000,18 +6516,42 @@ final: prev: meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; + satellite-nvim = buildVimPluginFrom2Nix { + pname = "satellite.nvim"; + version = "2022-06-26"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "satellite.nvim"; + rev = "320e3c54b507486e3ed0c9dacc656fdf54b40057"; + sha256 = "1qkx0mcrmqgvpx9gmncblkm7km4ap3hvkcp65dqc9nn2h4w63hvy"; + }; + meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; + }; + scrollbar-nvim = buildVimPluginFrom2Nix { pname = "scrollbar.nvim"; - version = "2021-11-16"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "590b23af866a32277cf803aca0fd770d5b39c2e7"; - sha256 = "1dvlmmxykf3vyhyvv5aiqbz8fd7zvpw4xq1nxnf3wyj371caawaq"; + rev = "bc97c132e8367efecb2ecb937d385e7dc04eb5a1"; + sha256 = "14g2q9nzdh9ffp2b8z3sdicrn4xq3ksq8mjxdi7cm44rlfyzfs04"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; + scss-syntax-vim = buildVimPluginFrom2Nix { + pname = "scss-syntax.vim"; + version = "2019-06-30"; + src = fetchFromGitHub { + owner = "cakebaker"; + repo = "scss-syntax.vim"; + rev = "bda22a93d1dcfcb8ee13be1988560d9bb5bd0fef"; + sha256 = "0p6yy6d7lwi87rvk4c6b2ggrvpddrfksrgdwz993gvxxxbnpwi8q"; + }; + meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/"; + }; + securemodelines = buildVimPluginFrom2Nix { pname = "securemodelines"; version = "2019-02-09"; @@ -6062,12 +6602,12 @@ final: prev: seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256.vim"; - version = "2021-11-22"; + version = "2022-05-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "57e545942fff2f796f26715bc0e937243dfa30c0"; - sha256 = "06k8fwi44836vsrcghn1s9wp6grrbddy8fjf60cr5nr29zr0h2gw"; + rev = "8f3dd7d484b17cf5988c12a5dee2889a84a64525"; + sha256 = "05zqi72555bphm3bkpqg50zq8vcspd05998r59cz4qp1vq36ar5k"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -6171,12 +6711,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-05-10"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "06b51526ad1db6359ec65ef5326a020bcae46ab9"; - sha256 = "0yhn3hgqgdp56qcdy18zzhbx8z54g6i39prrbckpxi7mfh0i2lmm"; + rev = "cbbe66c1cb80c942c35f8da0e28c14eb1ac68bc3"; + sha256 = "19hbzkxqfvjwqhy9d4yrdwsfz6q93rjh6ym444xk1acs4yavc3my"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6195,12 +6735,12 @@ final: prev: space-vim = buildVimPluginFrom2Nix { pname = "space-vim"; - version = "2022-05-13"; + version = "2022-06-23"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "space-vim"; - rev = "36f61f8e7157750f0e93d496d68b46d606d313b7"; - sha256 = "0pm630rq3ihjr4ikfzh08cpi2ps0qasp6dm8rdrm3zdf5b58i1bz"; + rev = "ae8237c43787d3d018733a06d1c42bbfe1e3aa55"; + sha256 = "0hk2m12m95p9vkj685bxr34fcqhdy762r8lb3mmxrxh2kr5q9d0n"; }; meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; @@ -6241,6 +6781,30 @@ final: prev: meta.homepage = "https://github.com/edluffy/specs.nvim/"; }; + spellsitter-nvim = buildVimPluginFrom2Nix { + pname = "spellsitter.nvim"; + version = "2022-07-02"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "spellsitter.nvim"; + rev = "2e5db5c75a9953579642bb2c7a822a4febc5c688"; + sha256 = "0hzvn26gasypv0mymdrzy8k6j0zldriznm6yvq1dpj7lchvm3csn"; + }; + meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/"; + }; + + sphinx-nvim = buildVimPluginFrom2Nix { + pname = "sphinx.nvim"; + version = "2021-08-08"; + src = fetchFromGitHub { + owner = "stsewd"; + repo = "sphinx.nvim"; + rev = "65160298c586cab13d94e07ed3ebf4cff20f2be5"; + sha256 = "0l0cvd8pzf1crb5g2zag3v6gxzfzs38i8pyq30ls3l16phaslnny"; + }; + meta.homepage = "https://github.com/stsewd/sphinx.nvim/"; + }; + splice-vim = buildVimPluginFrom2Nix { pname = "splice.vim"; version = "2020-01-15"; @@ -6267,12 +6831,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-05-10"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "37f5e795767ff14d2c8bf9cfb4998b9a0317feed"; - sha256 = "0klfadkqhv8a76qk074h9yll68wbabgsxbbhd4ba58sbv19qz35n"; + rev = "5553f71bbac9f87a3a3f78d01de24a615744a4b3"; + sha256 = "1j3z84n6zjdzdjis54nv8zmh8qxaxazxz43bmzpxjqv7g8jgwqs0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -6280,24 +6844,24 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-03-03"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "9ccd2a6538d8a201d1ea08784bd866950e1b4130"; - sha256 = "16yq3zi8zvr39ihpw8zik7frplpmgcc3a6xf424rsxfzshn92k9f"; + rev = "1ed8bff0f7522bbcb79428f91a5cacacb3ae0331"; + sha256 = "0ckvl97v1jhr7wrrmvvgbi23z5bl29ng7f0l7hvrmm5m6c4cpkny"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2022-03-02"; + version = "2022-06-08"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "15bada8f887d69ed3a3d10330b4ff7f089596464"; - sha256 = "0qix7c1z8r0gkf9g0cffymw5qk2h1bil063ddxf36bwdhpjx433s"; + rev = "0ff514ff249d0e6b6cc4702d6606f196e3827fc8"; + sha256 = "0l5j9y414nxxiw0vxcygxfd09hn1wbwh3d6a735n6n3kn3z42ww5"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6362,6 +6926,18 @@ final: prev: meta.homepage = "https://github.com/teto/stylish.nvim/"; }; + substrata-nvim = buildVimPluginFrom2Nix { + pname = "substrata.nvim"; + version = "2022-06-21"; + src = fetchFromGitHub { + owner = "kvrohit"; + repo = "substrata.nvim"; + rev = "aea8143ceab98ffcb02934773cc3b4249425f76c"; + sha256 = "07jjywqmcnll82hnibdrs42i148whn1x6l9dp2wr52kskq1419l2"; + }; + meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; + }; + suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; version = "2022-02-10"; @@ -6400,16 +6976,28 @@ final: prev: sved = buildVimPluginFrom2Nix { pname = "sved"; - version = "2021-10-22"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "peterbjorgensen"; repo = "sved"; - rev = "2f98472720d0e0c7da5a93b4ab4574f75747f693"; - sha256 = "070fzga0b039wjhfzb7s0s422kv3as7ifv94ma6vh62ml6zm6mpl"; + rev = "7da91cb0eacdaae5e1a41722e95800c98d4ca675"; + sha256 = "0rp5pklym8bnl1npgglh096i9ssrdbn2r99arh42sbdca71spbiw"; }; meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; + swayconfig-vim = buildVimPluginFrom2Nix { + pname = "swayconfig.vim"; + version = "2022-05-25"; + src = fetchFromGitHub { + owner = "jamespeapen"; + repo = "swayconfig.vim"; + rev = "ef79800f4d4864bc3687cfbc92be6dd1988e1fc4"; + sha256 = "0akkpiybyzddnqfgr8fyb74icyyankzq1fhax586l897c083wvga"; + }; + meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; + }; + swift-vim = buildVimPluginFrom2Nix { pname = "swift.vim"; version = "2022-03-04"; @@ -6461,12 +7049,12 @@ final: prev: tabline-nvim = buildVimPluginFrom2Nix { pname = "tabline.nvim"; - version = "2022-04-19"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "kdheepak"; repo = "tabline.nvim"; - rev = "2eb56826bf7b85b9090aff73a696e0e803bf89ae"; - sha256 = "10fqssr8la7y54q7iz2kgx1axv2rwmv0mjvnz0yvadcfz80q2ksv"; + rev = "5d76dc8616b4b7b892229cc05cd0f4cd0200077a"; + sha256 = "0k9yk7drxbjfwjfqmg7iam2vaz05rk3shd5lap8qakwvayvas258"; }; meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; @@ -6534,24 +7122,24 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong.vim"; - version = "2021-11-20"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "e9f58f764bbbd7e8de61785c4c5ee523727f06a2"; - sha256 = "0lkkr42igsnfa5pr55q5a8kh1ggbl6ijig8ppcqs1pmhwwwyzkba"; + rev = "7b8cf57d8b5cbf5ece29e8198e72e8db39d9fe26"; + sha256 = "0qs9vrqc84v62g1qmlf5h07g4s97gg83mvl9jskcz2v3m7wxa6x3"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-05-02"; + version = "2022-06-09"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "a577ee4d650476243d91698f2d1228819c5fa0a5"; - sha256 = "0d26c4qg7d25nzjvzds9p4z544h3zy0iwa51301pxh8s5kqr4s85"; + rev = "0243b19920a683df531f19bb7fb80c0ff83927dd"; + sha256 = "0pkqkcwngasxgm9vywh0rjkq3hdik2a02k1z06rjmsrpnl4g4qvp"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6582,12 +7170,12 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2021-10-24"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "925d8ed2f522229d32d4cc39486080c244d20f7a"; - sha256 = "1vifp4j2rkl6568ax3dsx42djl0gvkxaqgxlwzrnlkygmrwv76vn"; + rev = "22557e7d4281ec915efdc308fc114141f627b1ea"; + sha256 = "0zssxhfwfpgf60q88gpfyq8w1w549y70hyxqcs9pc8ib0d47m577"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -6654,36 +7242,36 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-05-13"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "28e75f6cdb63b4903035c8db2845aaddb89f1610"; - sha256 = "1imyjajrx4irxn3m2plpz9g0crkfyiq5amivhn2mqvawk1l05zy5"; + rev = "61a5521853ac739ae3d0d395f52c1178108e0114"; + sha256 = "18zr37rcr0f0066zkp5v3yrji3y1b48dj0sn4zf543pglppz2kz6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2021-12-06"; + version = "2022-05-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "979a6f3d882b7b5352cc6a751faa9c9427d40e74"; - sha256 = "0fy357m0pb1r3ficlkf89hcl4p8pxqr5il83zv5kzdai4zdnqwa8"; + rev = "68ac8cfe6754bb656b4f84d6c3dafa421b6f9697"; + sha256 = "16w5h2ns324wmn3m4ikphli8kqbm1ldcys43s0a5qrrvriaddrmz"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-04-30"; + version = "2022-06-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "281b07a5cba2dc255e2a35d3fa6e49af0c8cb37f"; - sha256 = "0hlrjc69k7gaxx8y6q7l80jpdp1v9kpvlzcv5ncmpfkl80vh2ld8"; + rev = "6a33ecefa9b3d9ade654f9a7a6396a00c3758ca6"; + sha256 = "1ssznk16fhnqsp2kwff48ccbrgw2cbaxjhbj6wzap9cbw78kxpf9"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -6739,12 +7327,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-04-28"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae"; - sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7"; + rev = "8cd22b696e14b353fe8ea9648a03364cb56c39d4"; + sha256 = "1qrk2i7yvvrqg4yjma1q6c26wdlapc60yriiqx5mhfam9xh28s24"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -6823,12 +7411,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-05-12"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "39b12d84e86f5054e2ed98829b367598ae53ab41"; - sha256 = "12krg8l13j4rqxqn9jx5nkpfpa3ffh2avv9z687ag7k1axvcak9h"; + rev = "7df95f9b208ba7228a25e7f75fb4cc02d6604cce"; + sha256 = "17p91nzrfcmdbniyr99r2k5l8kvamrdsyn0bp4jz1jyrinim4qnn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6931,12 +7519,12 @@ final: prev: tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2021-07-17"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "70c4e222464020edc2809c932b488daaf891eeef"; - sha256 = "1amx220nbh1s51z35pkhvl3110pbha5qj2rdgxvg8dbqha7py9fx"; + rev = "223c696eab4a3a59a33352531e42c74c721510e7"; + sha256 = "1x9s9ypk934lkqpcyvycij5803y1vz5i3q8p8di6d6jv04ylvgvl"; }; meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; @@ -7004,12 +7592,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-05-11"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "ea21c3ef51868a564eeace357f4a3d429f93efb1"; - sha256 = "1y8nb5cdlghf37sl872gx1rd28r437vxz94w90ydijin8hswcdqi"; + rev = "04174e19196ecef43dd159b29d4e6ddb07b80909"; + sha256 = "1vv5hf6ycflf08i8r6flxipmmq991ic3dfx9hc7idx3ivlssj841"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7124,24 +7712,24 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-04-23"; + version = "2022-06-07"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "f5ccf0977c611ffd774ca180774959301baaffad"; - sha256 = "0b4gb031ylm290ciyq72zlrykp4ypn82akjdac886r9zn50r2lpb"; + rev = "5fc4862eea9bc72cf0f03c56a4a09fd76d9fee35"; + sha256 = "04hy5v2brixsg5b3pl3d1m1ihwh5yj98zi3zm1zrj4r4kafnm08x"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-02-16"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "08e259be24d4476c1ee745dc735eefd44f90efdc"; - sha256 = "154k5wrs0lhx8dj2pqkhfgqk11csa1iw1dshn7n07iq0ab2wkimy"; + rev = "bfc9b060c9e84497b15b4d602095ba008383b664"; + sha256 = "1w2r73a73zjbgfnkcnq2xlk2k0fw1zdjqrhigs6bp3ni3335dhjq"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -7232,24 +7820,24 @@ final: prev: verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog.vim"; - version = "2021-01-16"; + version = "2022-05-15"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "0b88f2ccf81983944bf00d15ec810dd807053d19"; - sha256 = "0zaxz1j2v8nvhd9x6bx3sj95i7h7c7029hmccls777ikyp6ynf0r"; + rev = "e63a6d7093ab4a483eac7479e7d9ae8efff67472"; + sha256 = "08x7kw2al6j1sixbkyizyk05rp54577syf121mihwbam935j5sgf"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-05-03"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "d6ae9ca80284bd7df38b102ba280f0d132129c0f"; - sha256 = "087ila6rskhd7vi1yqlqmq781gqajh69y4dk7n9f4sza75hb210x"; + rev = "81f077c12ed1edb39f002fbc1d6ce06429fd3279"; + sha256 = "1hjw57223xyrp1zn1p4shpgaz019pr5gsvzllyg3bh4z8dbib983"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7436,12 +8024,12 @@ final: prev: vim-addon-manager = buildVimPluginFrom2Nix { pname = "vim-addon-manager"; - version = "2022-01-12"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "4da23170ddbba1cac70a1a2678eba26b0e8b65c8"; - sha256 = "1axqblq95d2ry8r35sggr291sr41af0nzm7p7wch2wpqcwz9w0qi"; + rev = "984320ed46ef6612a1c232bb44f5e51f92d12e7e"; + sha256 = "1p7ads4rg2rcgh4rf2p5qy7bf5yrnvnx6nri90bfinzfsyddb00l"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; @@ -7580,12 +8168,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-05-06"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c4655701431a9c79704c827fd88a4783ec946879"; - sha256 = "1qsr3kkfx5vbhmnym0id2h9mph8bw6g75vwpqfi9vfmbg4fddh3l"; + rev = "91b67e3ca2d7bc66544724f9c702265c564a1f2e"; + sha256 = "0b007gl1j8k91h3fwxjkviikaijdhfvsq96k8pqvszaqjsszrksj"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7628,12 +8216,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2022-02-08"; + version = "2022-05-15"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "e9d03b12378b173b39d416df6469ca417b9cac9d"; - sha256 = "1r7jcd8q41v1v0syy097qd34ydx0bczgad9ihsmsz83bdbx51dbl"; + rev = "b8b684f60a26a7208771fc39cbeb6a6421a19ea2"; + sha256 = "04ch5mbc2wgxnwkxis9gwcav90916117vp97biivzq7wsdr49zc8"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -7724,12 +8312,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2022-05-12"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "c833f1dd0398901f5ad3f5f0ec2e07975e246294"; - sha256 = "1vafpp3m75dd8c453zq6w8qnapw7h5kpbzdx2s5fpjdn9qrg2g87"; + rev = "00df1ac5df05247238cb2ae2a0770b62209e3aa7"; + sha256 = "11k6s5qzwd6fcd2hjr6p3w08yqfh0mrnpl3nkyfz8lf8jpd6ps1b"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -7796,11 +8384,11 @@ final: prev: vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2021-09-18"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "c5afbe91d29c5e3be81d5125ddcdc276fd1f1322"; + rev = "1b22dc57a2751c7afbc6025a7da39b7c22db635d"; sha256 = "10xzxavz010a8ildkfmikyi0ly6rqi5d6a2ndzr0frd9ingbk79r"; }; meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; @@ -7952,12 +8540,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-05-10"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5d0662d8d7e640a1ffb64b1b4dbbc41995391218"; - sha256 = "0bz6nrjsz1m2ibhbg4zc2z9slqfwnx5q6mc6favf9nw7j821s95g"; + rev = "81f340af6a7c2456ad7153a7d7700e0e9c93a693"; + sha256 = "0pwrqyrlfynwi5kamfc8p7ijlrddqkd4agzkpqq9sppph59ckkg5"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8000,36 +8588,36 @@ final: prev: vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; - version = "2021-03-24"; + version = "2022-05-22"; src = fetchFromGitHub { owner = "alvan"; repo = "vim-closetag"; - rev = "c0779ef575d5c239162f4ca3506cfb4a95d45a58"; - sha256 = "1mkn6d7m23ak06pl8i328hd9x6qx5fzrg8ijz32lgd4a56k98n6i"; + rev = "d0a562f8bdb107a50595aefe53b1a690460c3822"; + sha256 = "03a7g2xgqhbv71qwqm0arkgy92m5nyl1xv0wn6f4ga1y9vwxwras"; }; meta.homepage = "https://github.com/alvan/vim-closetag/"; }; vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2021-12-17"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "7fe0dc672b20ef62962494560a0bc656fb237346"; - sha256 = "1i9sgxdw6mjv81gmzk17fy3caizr8dhdygjcpqzz5p56njywwags"; + rev = "caf254ffa59b91c41851024a58d1eaa806a81bc9"; + sha256 = "0ympd38yf9wlm37sgamyxi8nal0k7imd173xxfp617sj7lrnnx5q"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-02-09"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "27e5ac299a0714025cc46fc1da11694a8662b058"; - sha256 = "06zp45w1mxq075lrw1x2p87l4gdc5fijgag4mj7j61jd2x92xsx7"; + rev = "b5270ae807fdbad5183f2831a9348f2fb7cfea1d"; + sha256 = "0fq1dcizdvrnq6faw36206wvvnfzgcpz83a3kpn466hfbbysmn45"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -8216,36 +8804,36 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-03-26"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "d6b9957a1e13f34fb66795fad729c611b2513922"; - sha256 = "14a0mbhcw10400g6ybj6h8nq5bis9hba76qvjx5mph7vbb3rhjwn"; + rev = "136d82e1884f86b9f9bbbcc88bab6d199928a46e"; + sha256 = "1chbvrpykswcmph3yjpv17j5j47azvb90i1a4j0pwc2mmak6gnjq"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-03-06"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "1c60988abf17f426b87a1ce2de6b6eabfd5d6b2b"; - sha256 = "0b6mgmaak6vh2adkzdh9s5b5js362hv2hg14zwrb5846cjpbs21i"; + rev = "22ef15e7103b78850473b57ef48233aaec8d9f64"; + sha256 = "1ibr1db06b9bxa7jnspix6wmf1z8fl3g5rrxskgfhfpdb2blwihm"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-05-02"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7"; - sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw"; + rev = "50cbfc825bd58081f916f989d7ae78e5320e858b"; + sha256 = "0y2cnafw3ahxfvjc5g39nrpiwn502hp3xarnp8c3pg85hzf13jrc"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -8444,12 +9032,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2022-03-29"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "edf880c41ec1768faafc480433ae72ceffaf4362"; - sha256 = "14jgwgwynynlipvmr02i9h4q2mc459fz4jyflcngvpyc9ady9ald"; + rev = "6dd03f87d825bf0a9f8611eb54076c7952d4f15c"; + sha256 = "0car62bg681al01bsf7k783m2927shdl5xjl2jlwry54l44b8hry"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -8480,12 +9068,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2022-03-29"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "720b3ee46a86fe8858baeed473e11bca54b997a9"; - sha256 = "1rql1zbzi1ffj0bdw4qkm1rbb5zscxqaml0rx0rh4y3zr7ny7vny"; + rev = "79a3397f7799cb211a7fb803388b96a5f28fd778"; + sha256 = "1fhs01k6nmnik54inx7jq4yxsfpxiawvw7abwxwwd6fshss57k66"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -8660,36 +9248,36 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-05-05"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "ab7876f86c05c1935eb23a193f4f276132902ac1"; - sha256 = "10i6akvr1ib2lwh6xwjchmpjzdabj2qs05h8h1ww9mdycj4q1pli"; + rev = "e3f2d94d722603f8b65088ea1d7e0329951985bd"; + sha256 = "0d7r5g1wrcbq6ahd3hbwpjw54qk8k471wm704cmpdlgfjbjxdfqf"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-02-28"; + version = "2022-06-26"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "47123282f501fc77965e1d3c08357209d991c7f4"; - sha256 = "18fs6pgadffdxl6r03daqnz6v65m7jap3yanx7rzp5g25c0461ps"; + rev = "fb137707b84a328d3f1b53d22894e3c52f4a6ddb"; + sha256 = "1n9gzsiccchvs51i1yfn819h4db96wyghnpaddnsvf0fq1as2g3p"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2021-11-21"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "2292de52c6b2470638b628ed2f3b1332e077cd46"; - sha256 = "137wp2vhlsflnzkcdycn6cgdsclv9w67rkh7gbariqi8s45y9n6f"; + rev = "32b9fa0126a4a4994c296c69ad038dc78aa83d68"; + sha256 = "1yv795yalidcz2y3x6h14764g70l8v4cdj9i4yf2pgs0rl0f4sqw"; }; meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; @@ -8732,12 +9320,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-05-13"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a8139d37b242c5bc5ceeddc4fcd7dddf2b2c2650"; - sha256 = "1n22hjg374rs1412v4yvn3jc5nzd2jfsk3vzhaf8i3zv4b6w2vf1"; + rev = "f809dde0e719f89a6fb5cb80f3be65f5cbc1d1fe"; + sha256 = "0d2ay09pm6vxzfg5a4h503iwm9yfcjn4ia153y3mi0vfr19n5aih"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8756,12 +9344,12 @@ final: prev: vim-gh-line = buildVimPluginFrom2Nix { pname = "vim-gh-line"; - version = "2021-11-27"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "ruanyl"; repo = "vim-gh-line"; - rev = "d2185b18883b911a21b684d4bb9d26f6a41b62f4"; - sha256 = "0wrgjd7l8cnam7nwqyh0m3np2452b18kz4lvnfv3hlsdsdx9xi17"; + rev = "622d7812a268b3e869e8f8c7ee5871e7ee98ab43"; + sha256 = "1bz40bdfhsvh8cdnydf00qixf9yz41c1lzabb4vbrwbb9wizh4zi"; }; meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; @@ -8804,12 +9392,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2022-01-04"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "60b6fc735c198a17657b0bd04f257e59dff184ac"; - sha256 = "0i6qw7rmizrvrzzsccg50hvrhcz7z99r7ndxm9sh19ybhxndnjcw"; + rev = "5143bea9ed17bc32163dbe3ca706344d79507b9d"; + sha256 = "02vk8lgl6zswg6bdg1qy4qrh47bwflil601z8i33yjx5q2qrq0ra"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -8828,12 +9416,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-05-04"; + version = "2022-05-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "719d4ec06a0fb0aa9f1dfaebcf4f9691e8dc3f73"; - sha256 = "1mdpds4xpjcwfsm6r9w65hxwjsxm7pcr3dnkfh6v8xx0kyflmijp"; + rev = "ded11946c04aeab5526f869174044019ae9e3c32"; + sha256 = "144c2ws85wjh335h80alg4k4jghpvkb322p2m15q978i942mh5na"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -8864,24 +9452,24 @@ final: prev: vim-gnupg = buildVimPluginFrom2Nix { pname = "vim-gnupg"; - version = "2020-11-11"; + version = "2022-05-19"; src = fetchFromGitHub { owner = "jamessan"; repo = "vim-gnupg"; - rev = "96be0be1240a848da56d665b38e1b0fe7ee3f1af"; - sha256 = "10syaaylyaqn60zhyx008863b5b1349pygg7lnaqchw6bard1135"; + rev = "f9b608f29003dfde6450931dc0f495a912973a88"; + sha256 = "18lzjsqfmr33zizxvkq92x2z7kf5h1chwd1k1vad09b3wc8m5a07"; }; meta.homepage = "https://github.com/jamessan/vim-gnupg/"; }; vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-04-23"; + version = "2022-06-09"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "e9d7ff3eb4a369f0cb2069c8f77ae68796bca308"; - sha256 = "1gplykwbn8iclliv0ssd728bm3rxfvanppa2svn50h2c3zn7dph7"; + rev = "b7506c6da8ea3a88e268a91aa6630be3e26a20a9"; + sha256 = "1n0b5057q41d32gdlvcxv01xgj7m30428fyqrr6la2maixvv77zw"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8900,12 +9488,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2022-02-07"; + version = "2022-06-05"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "15c5937688490af8dde09e90c9a5585c840ba81c"; - sha256 = "07j704ysc2klqfjk3918b1kjq16pw1yb1fykdsi2a0lamndn9l04"; + rev = "4bf5d33bda83117537aa3c117dee5b9b14fc9333"; + sha256 = "119ldy55w58mq31zb8whlq17rp3ginvx7n45h1r91279p2gl1ch6"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -9285,12 +9873,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2022-03-21"; + version = "2022-06-05"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "e461476ccc931eed1d439984dd98a26ab56eecee"; - sha256 = "0kpifkb03aw3dq6x6vlai0ivdmwxs32v0ajzcym1f005b1n1rydy"; + rev = "a716e32bbe36daaed6ebc9aae76525aad9536245"; + sha256 = "0fz4dlwzpzwzilk3lmxim27i691hl5yi83rcl4sdw73qyw8spzph"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -9490,12 +10078,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-02-10"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "9a2120d9f98b13b3aa37b577a7e769bfdd046130"; - sha256 = "01myc1pbc1q2fkxcy40pibbqszjxvkc9diwjmixfn4a6qmf8n1gp"; + rev = "78fdcae8cab810892c82d555a63bdcd20b8e1397"; + sha256 = "0wr56azflkjx4v7xw44c960byfcak7kjgkk9a482rj19iywk9141"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -9598,12 +10186,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-04-21"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "c075e157fcce4511e537b1f7f3385444d9c80e0d"; - sha256 = "0q7mg3qk0ryh46m6p4pliysrndmz3g6g6m5rqpz86lj6z2ivzzhy"; + rev = "68c018eb1a79e0bbeb496f7040f7205b57cf3750"; + sha256 = "0ykacf1zkiqh66ikfkv9md1qhylyz7n7fb2ql1g2ikc428lh22vc"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -9634,12 +10222,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2022-04-22"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb"; - sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8"; + rev = "80b47c5f636c0ed0915af378b47428a83346a699"; + sha256 = "1fmq4zcx8shrkw1p2sjhncy3g7j4zka4rvr97jplf8fv40yqql1i"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -9658,12 +10246,12 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2022-04-27"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "b9b87339bca7572ffc506165069242b6c06c210b"; - sha256 = "1kgpq8q7rcskwc8y8fcbvpq61qx9ysb846qhlk2s7fqjkwpmgz59"; + rev = "4daedbde2fbfbda89aaa16f0dc25b96538389257"; + sha256 = "0nsb9hciazd029zdgppfilf53r1sffbfmagj5fw4a4w4rbjmav3k"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -9682,12 +10270,12 @@ final: prev: vim-markdown-composer = buildVimPluginFrom2Nix { pname = "vim-markdown-composer"; - version = "2022-05-04"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "euclio"; repo = "vim-markdown-composer"; - rev = "5b79f425ebd28216d9aa472be3ba07cda41d9b24"; - sha256 = "0i4m2x2cw604aczp1ijnrv0wvh1b9bxg9zh0zmf8kk7b00zc1k5c"; + rev = "e6f99bc20cfcb277c63041b1f766e6d5940bcc76"; + sha256 = "0ljv8cvca8nk91g67mnzip81say04b1wbj9bzcgzy8m6qkz1r2h3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; @@ -9707,12 +10295,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-05-06"; + version = "2022-05-29"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "485e71120fea7be22f0ba051a05a00675276ced0"; - sha256 = "0zzn5gspi5811w1drbk362a75q4d697l0ngxgps00bcgvj9l8r6d"; + rev = "976ebfe61b407d0a75d87b4a507bf9ae4ffffbaa"; + sha256 = "182lzlbjfplvhzw36rsizjhjcnhkddswm0yydbqg3gjdxs7y5wdf"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9731,12 +10319,12 @@ final: prev: vim-merginal = buildVimPluginFrom2Nix { pname = "vim-merginal"; - version = "2021-11-26"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "d47689faa5623e8f455c62a9a1016c92cf66c09e"; - sha256 = "0ili5kk0rg85dzn3z606c3p81lyq40rj97b4nzcc61x1s9k4l9z7"; + rev = "0fab5c23255902f975c52e65fbb6dff9be8ed64d"; + sha256 = "0ia7nmhipghw4d7azbgsrdmdd8dc36cqdj9grg5g2xlvfmfj15pv"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -9779,36 +10367,36 @@ final: prev: vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; - version = "2020-10-02"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "phanviet"; repo = "vim-monokai-pro"; - rev = "05e534f9fea9a8e4cbf69a1523c785845deabe4e"; - sha256 = "0hf3iy2ydr6jpraf5zyqg2hl7ma5hn301jyxf6m9ffdsz7722jwm"; + rev = "6c449e5d4ef6086c519de0544d4aca46c0a9596c"; + sha256 = "1ri6m1q0rmflzq2l4fnj4wka1vc70algy9whc66qfcj9zqq68z9s"; }; meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2022-03-14"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "97fc86064eaa95384b5b00f6253e339fba44da5d"; - sha256 = "0h2f47q5dvl5myk5vif9ya4n308i4h5sb9rrg86v0inpbwzjpyas"; + rev = "a4bbedda7ef516b4a1b74d145cd642297e82e800"; + sha256 = "11mr7n0mch48mx14h3vq9v45qfwy7fn6kcvcl7p5vmmibmgg2qdp"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2021-09-01"; + version = "2022-05-25"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "7ef91226beeb382a37b4d4d5f0f54e6acf1eaaee"; - sha256 = "1c9a8hibcrgagrcv41yyg2qq1f6v60316ai25y44rzk9ncx3idsj"; + rev = "71269817dd8f5a9122ae40891bb116050cadbf89"; + sha256 = "1f0rjxb7x6haz96j3wqrayk972k6g8kw4c40m3rcfhp2bxsn1g9m"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; @@ -9827,12 +10415,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2022-01-30"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "595ee332719f397c2441d85f79608113957cc78f"; - sha256 = "0kwiw877izpjqfj4gp4km8ivj6iy2c2jxyiqgxrvjqna62kic0ap"; + rev = "b9a6adbcfacc1ffe42ef3aa888f7c828a0b63746"; + sha256 = "0x0xjijadzk3z3f4bs0k3rbhb760qcdczvn0c8m9gx678wfjshyd"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -9983,12 +10571,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-02-09"; + version = "2022-06-24"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "335ebc6e433afb972aa797be0587895a11dddab5"; - sha256 = "079pfc897zz36mb36as7vq38b9njy42phjvmgarqlyqrwgjc0win"; + rev = "47fb78a015d3ea185dd26cfc162d81dc564aec76"; + sha256 = "08ip8g4b6q5ivfgvrgjs4p0f4x6qj1gsyjrr1vshqg3b1z06877z"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -10091,12 +10679,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-03-23"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "23b0846e26d946bda9ebcd267839fea83435aff2"; - sha256 = "0fydc0xs7pfx681s6v2l4w7z6c7ldajhsaffi23a0p9g5k0vchk6"; + rev = "360ccdc01b18cd434588c34e15e5ea382b436de8"; + sha256 = "14phavx432h16bdm7m99a21xz2gb1s47fd5g8v2b5ig12l4yss92"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -10139,12 +10727,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2021-09-07"; + version = "2022-05-19"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "2f57074fc9f67128b30ce32949130a8dbda0b098"; - sha256 = "0b2kssdbzknc43jx4xjl0c4q4v01735d5wsr77zmb9vq3k48hd7j"; + rev = "fcdb70e6456362e15db95fbe82f56165ab35de8a"; + sha256 = "03k3nhj4d0r9cvzr6fsz9qka3pl6p2xx6hbbakrk8mkws1m3py4r"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -10163,12 +10751,12 @@ final: prev: vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2022-02-16"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "7bea0ba8929749b2a471520af87635163fb28bdf"; - sha256 = "1dqd11qmb5jlkmalp10niysz1c2rv2pzwq332i3incq1v1l5146j"; + rev = "ff52ed9296715988fc3269b64a903415c3bdf322"; + sha256 = "08p51a7alj173j0n8qlg4lpyyr4m2i6jfm7wqxl0k4qnfw3lpyx9"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -10341,6 +10929,18 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-prettyprint/"; }; + vim-printer = buildVimPluginFrom2Nix { + pname = "vim-printer"; + version = "2022-03-01"; + src = fetchFromGitHub { + owner = "meain"; + repo = "vim-printer"; + rev = "55ab49179838d86f92fd847504cef3570000b7f3"; + sha256 = "1h2wh86qph38mgfyahy8ha6zpvn2kvs4h2znipxq9z4ybnwcxmf4"; + }; + meta.homepage = "https://github.com/meain/vim-printer/"; + }; + vim-prisma = buildVimPluginFrom2Nix { pname = "vim-prisma"; version = "2020-04-04"; @@ -10367,12 +10967,12 @@ final: prev: vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2022-03-01"; + version = "2022-05-17"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "68d7c1682b1ec787905294cd980dc86c0398b7c8"; - sha256 = "0w5x4p7267yi2fs653pyw56jy8az0xd3jyyq5yw8xwk4gjr0131m"; + rev = "497de735715fce546a95bc2f94f4a930b4ca42bc"; + sha256 = "1maljd92450fbpyppsi67lm5gs1984f30a9gi106z014fxhgwb7z"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -10415,12 +11015,12 @@ final: prev: vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2022-03-08"; + version = "2022-05-21"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "0385ccda67fe8bdd1fc12cd62a88ec38af303520"; - sha256 = "1vvx1n3fkqkz7zd5b9n8q82m7ar3fskxlhgavg3qycvvnbrniff8"; + rev = "81943d532dee24f8518f855dfb17160809abfdfb"; + sha256 = "0h2gxif4zmba7728p1w2yh1zakfj7phjnzaca5sv16aw9cihzq5g"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -10523,12 +11123,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2022-05-06"; + version = "2022-06-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "9c92dafe6894aed3fa81df7ac52cdd8e7a8ea9a6"; - sha256 = "050vkbj1y80f1kcmb0hfd2mha1bb4v3f2bvnazcymxn08z8frww7"; + rev = "6bc0c7826d68f8c44c8347a3012aa79ade4f0a22"; + sha256 = "047lk3i2b5nbkbnyjgy0i0zm8da3g8kwmzas3ckp4rx2aj49bn51"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -10559,12 +11159,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2022-05-11"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "ab0d42bb31b3317aa66dd1c0b506837cc6ca2835"; - sha256 = "0qv2ppmxpy72gb8ivz5cx19b4y8si4v428d9mmlx9q7mv9q4wmhq"; + rev = "c815057f8e8ace962a1f653b6ab5c35678662a86"; + sha256 = "1saq33a2k692fljsp3yyxhzg66xamzb4vym7dzih3zbwqx47yymb"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -10595,12 +11195,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2022-04-27"; + version = "2022-06-30"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "811d8060f390837c49e8625e29c69672cdc56ec3"; - sha256 = "0cx2xl1qn57fxhc7rwdfcf359yknr0qw3yh7mbpygrm45jlgwnva"; + rev = "a99282403445ac1d008b51d6edd820d5dc053ecb"; + sha256 = "0fapyafzjl00y6xn281m1zjc17hy6hka3ggg29nwkzryvd0hnjxb"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -10619,12 +11219,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-03-12"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "7bdd7fc4b4c9f0342e8cbac617b7e5299bd056a1"; - sha256 = "1c10gcfb43f0zq48kmlmhdvmpmgr8likkl7xbjqhkjcsj520qlj5"; + rev = "e114a5e0c90aefed3d2a48ca326eff9d39bc90a9"; + sha256 = "0kqn9kzwhh1zhymvmpnbkrccj4nn5lda3fwj1hyd4z3iaffxxk9a"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -10667,12 +11267,12 @@ final: prev: vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2022-03-19"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "74bd5bf46a63b982b100466f9fd47d2d0597fcdd"; - sha256 = "1m9zpxlk1iz1wxylq4nrrlyv111f4my11jf1h5ff25l1acbgxvrw"; + rev = "18511d389675d773994215ddb572ccdc2b72f52b"; + sha256 = "1mzs4x6y68akysbibprfif1dksaafhcyhddkcyh3da6by6sp5l0l"; }; meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; @@ -10799,12 +11399,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-05-11"; + version = "2022-07-01"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "6e4b81303968f37346925d6907b96ef07788cc82"; - sha256 = "1z0nmfmn7ijj3hih4dbi1iq3dc6gpprck3fmidhmkv6vms041nx4"; + rev = "32f6f838235bad70b646419026796b86ec75cc71"; + sha256 = "1hjkv5hzpw97raz029w62a64fik0ryr4hyddwir825wn9a614rwv"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -10835,12 +11435,12 @@ final: prev: vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2022-05-04"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "b440f139a55cb5161cde3478729f6603d9d20d81"; - sha256 = "1hvv440zb3bwx1v8nyy3bk9vnhlbjy2a1hdfcmc37rghbni1kp0k"; + rev = "df1e324e9f3395c630c1c523d0555a01d2eb1b7e"; + sha256 = "1c87zc954wk76h9klxyygv19jp729fms2f5m18gwzskars3px076"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -10871,24 +11471,24 @@ final: prev: vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2021-06-04"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "ed3c5426a20bf1c06d7980946ada34fd9f93320e"; - sha256 = "0bxaalza02sgm045cj4vciy3qhmj7pj1rp9bdwm5837ldq8paj1h"; + rev = "525f331320427bf7aeb07651e2536b1f8a23df03"; + sha256 = "0qfai0x9zg52n43ikgxx5x9y1nl3x420q8564csxirnbhnbn5xgx"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-05-12"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "6f270bb2d26c38765ff2243e9337c65f8a96a28b"; - sha256 = "0jzafsk1ri2jfn26k962x2g6ygqrkrf3kwvd1ikx0hql0nhcvrrq"; + rev = "222cf7b44bb569c9a046a9891000c898bd4c43c9"; + sha256 = "0xksa854c8rjp9y2xvhk78z5ha9p8c3pvpzvddii2aay22cfkn8h"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10967,12 +11567,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-03-17"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "61f122ebc41e9bcf1793c752a728db59feee77bb"; - sha256 = "1p9b2xgfcfbikadb2250ja0zbz1hcj02knqj5jw5kr3fp170100h"; + rev = "82c8a5491e13fa307fb2cb47182a30560f930377"; + sha256 = "05bj0cs5m829bdcm9zgmla2ha2nwg5cn1qs9r75haway42dza3s6"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -11013,6 +11613,18 @@ final: prev: meta.homepage = "https://github.com/alx741/vim-stylishask/"; }; + vim-substrata = buildVimPluginFrom2Nix { + pname = "vim-substrata"; + version = "2021-03-23"; + src = fetchFromGitHub { + owner = "arzg"; + repo = "vim-substrata"; + rev = "f7b71f31d2ffa91715964b14b41ad4009d4d97f6"; + sha256 = "1cpmyr63xjx5nm5h619xwryjaljq1kdf3msdrdr082ljci2830z2"; + }; + meta.homepage = "https://github.com/arzg/vim-substrata/"; + }; + vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; version = "2022-01-26"; @@ -11063,12 +11675,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2022-04-05"; + version = "2022-05-28"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "816072c0f50ba753458ea466eb2349799a4467f9"; - sha256 = "1ndj4f1rlyq7kpbmv7y79c2vnh0brz2m8nh13jw1y7sv7gbkxyxf"; + rev = "f47287df379bd5599ab5f118ed9b71c61097b516"; + sha256 = "07xiln2qdb4ldplyx4schc0z1bw24zdnyfk1y03yjfx29rs0yxj4"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -11124,12 +11736,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-04-06"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "2240d7a4b868cb594b7d83544e1b6db4df806e5e"; - sha256 = "12qn395bnmxxsq64c60s46gdz4ad2hbhn3g2kbnw9d56dyb47vag"; + rev = "dfbf93d71b63699d54accd37f12ba328b8ac311a"; + sha256 = "1s5m1d37r10l24x5n0dr6pa7hfb5n0s1kw77vfd04k8jf1w2sphb"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11304,12 +11916,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-05-11"; + version = "2022-06-25"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "2c4417db1d549f96a6a944bf4d85d8c797ab4a31"; - sha256 = "1rzhzl4w9k11maa1iy0a8sss3319jvp1viqqh0l7kgg13595acnk"; + rev = "af7fe78523c7c860d00b79383908322fcb5e6133"; + sha256 = "1wazgrvywmr6hc32l4vbqdd8cjq73fy2pnaiifwcjbpxzxj6qasw"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11364,12 +11976,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-05-05"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "6978fd32e3ca2c1c5591884eea0d57a7ee43d212"; - sha256 = "19dphm7xgfc0xvxrlys21zkp7ixbx62p11x6ms6xmwm8cjjh64pc"; + rev = "c93eb128332f8245776b753407ab6c4432c4c556"; + sha256 = "1y686xrcvkwqmc263syh84a396xanqka39axc460ibl9zav7z4nn"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11388,12 +12000,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2022-04-29"; + version = "2022-05-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "98427183e2b35acee15c7628b1cd587b98025719"; - sha256 = "0w5065ywkr7ygpqjmi1r9s3icm6v0x2w1gfa9flwqhx6y02jfrmk"; + rev = "efdc6475f7ea789346716dabf9900ac04ee8604a"; + sha256 = "1lwi0dpp5jrrnzjwrl4qs88a0q4gfgiqlpjcz62j5hmmdcbj5j4s"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -11436,12 +12048,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2022-05-06"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "046d0d5ac5fb2888447d1dd8b7e52fd0314f9766"; - sha256 = "17masfjxrhjcfqmlgf1jpmmz18j8vb4n88dl34rry6c3abiraprj"; + rev = "e23b98a8852255766e54bf7723a9d61fb5ab3143"; + sha256 = "1zxdbcd4qsqdfrgvn76r0a187hs0krb7w4r39dr10wwgzq69d2vf"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -11460,12 +12072,12 @@ final: prev: vim-vp4 = buildVimPluginFrom2Nix { pname = "vim-vp4"; - version = "2021-01-06"; + version = "2022-06-06"; src = fetchFromGitHub { owner = "ngemily"; repo = "vim-vp4"; - rev = "511ec1cd651a25b30d75ec6df29e61b9ca75d1b9"; - sha256 = "1vr8j4w6s26hjbil2kx57nnslrjczp4jvmc7s8lhl41z0r6nj4fb"; + rev = "c08df4fa9639949c339cbac7835b67288aad63ae"; + sha256 = "1sr75a4rgcgfqxh5ipivpks4y2nzzdxybijawgqyjn1i110iy502"; }; meta.homepage = "https://github.com/ngemily/vim-vp4/"; }; @@ -11508,12 +12120,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-04-29"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "b8e6cc7dc28e2e6198d8c9c30e5c8a2414a7b996"; - sha256 = "1hy0y5v3r5w7y8phkgbi1ff7p8yyhyndxr3yyr1wfvssdilz6xqj"; + rev = "4692ec3e77ade9e65171182296cca74352a39a12"; + sha256 = "16av4rd4ga85w3mnb40i762x6kwk9k29pgbpq5qnldyi1pfiph6f"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11544,12 +12156,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-11-25"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "165772f440bd26c4679eef8b8b493ab11fffc4ae"; - sha256 = "1jhc8x22qgpbwrbmaf02hbq98hxfibg3jqa3wrnyi1qiik0wxzrc"; + rev = "654dfc15cf86946e7e70d12cf095bf55002d93a5"; + sha256 = "168yxiwhvsbkp8bywxcd9mvhh43hjp3xcpwm3ffny15v13rqadcp"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -11700,12 +12312,12 @@ final: prev: vimagit = buildVimPluginFrom2Nix { pname = "vimagit"; - version = "2021-08-10"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "jreybert"; repo = "vimagit"; - rev = "fb71060049f829e48fc392e0be43d1040c271204"; - sha256 = "1yizvf9s9djxar64kp63r45q5vv2k616xskd4adkcfqn8crzyw52"; + rev = "34eaa17ba3f5330fbcf685e48530fb572b11de32"; + sha256 = "0cp28bl56bjbavm43nsqli9s3669hr8pay3vbyjxdrlymk3xk6zd"; }; meta.homepage = "https://github.com/jreybert/vimagit/"; }; @@ -11796,12 +12408,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-05-01"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "960f0444d21ebb20303e1796e4b478df042c3bd3"; - sha256 = "0sx2awi2b22j9wdyi8m1k261qlfj19i2xs93g5lb24lfb53rarmi"; + rev = "bdfa7471ec63e49b7712a8f16ee7d1f96f3783d8"; + sha256 = "0phxs1gkw61g29fcn6ry9v282a6i8dlgkjgnp0nb7r69zrqcigrr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11809,12 +12421,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-05-12"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "dfaca59bbbf0079ab1b4f159337ae7f17d1b5289"; - sha256 = "1sbsirrl822dp9z1vynkhzbd2yhid9vcr9yzp540qrp6flcvf10q"; + rev = "00cb1b9cd9e94a4a52dfa1fc362dad2e24571fc4"; + sha256 = "00z4ny304p8yb1xxgpvwh2d4d48hpcr6zl0wwxsmw0njwq3ga49f"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11917,12 +12529,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2022-04-23"; + version = "2022-06-27"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "777b163e394ba658ef288292efb533b25610ef9d"; - sha256 = "1y7kii77jia3j9jlisjg2x1yfk8r048aas5zja0ag8nlyqldj8xh"; + rev = "86f5fb0962bc5954babf267ded6b144d992aef85"; + sha256 = "0cb2hlyrypfp4c0zp3gmbpnpbmv6sbfh1zxjlm61wk58q9g371q0"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -11941,12 +12553,12 @@ final: prev: winshift-nvim = buildVimPluginFrom2Nix { pname = "winshift.nvim"; - version = "2021-11-15"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "sindrets"; repo = "winshift.nvim"; - rev = "aaa04b97640165eb0877bfc04943f4282887470b"; - sha256 = "0rg7ci0m1hm9jbhjwckvjnfl0w3bl2wfr7wq67k0wdj5vnlzz6w3"; + rev = "9e884748f2857c4ba05e5ee9521dd9a576e22083"; + sha256 = "19n5zp87qmdyz6rshxfp0j150d4sv76aicz08yv8jzsyjkaqrcxw"; }; meta.homepage = "https://github.com/sindrets/winshift.nvim/"; }; @@ -12001,12 +12613,12 @@ final: prev: xptemplate = buildVimPluginFrom2Nix { pname = "xptemplate"; - version = "2020-06-29"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "drmingdrmer"; repo = "xptemplate"; - rev = "359ffe4d426bce2e95f5866b682856b25555396f"; - sha256 = "1rj5k58n1ybcc7qxsxlh09p2v4cps5xyzxmvjfrixy1qm2f85kd5"; + rev = "d8500403b35d5597441773074e3976238b5e8b2c"; + sha256 = "0dpdzx46rrwq9i2rymn0if7ci9h2b5hmdxqfw0dmdiyn1byj2wph"; }; meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; @@ -12025,12 +12637,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2022-01-05"; + version = "2022-06-26"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "3e6a46271fe307741dbd06507e36ec08f118263a"; - sha256 = "06aw72jpssi0ppadqw77cyfn6w9r87984h85f58bfffd8v0s9arg"; + rev = "68cd1da2bcea5fb3fbe6b6266958ae7c72e814da"; + sha256 = "0h4kqfc9mz7wjdqb4ga1400wjj5jfc46f07b80j1npk3bnx8r7cb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -12074,12 +12686,12 @@ final: prev: zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-04-18"; + version = "2022-06-22"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "32c4ea97cc1cd3db1abebd46aff2ee18d66d8d59"; - sha256 = "1ab5ivfddifapc31qbipvajjgx1mclyqqf29cpz7avsc4h6fp3w0"; + rev = "1eea36117a8ca4f3250c0223e78a690cdc720f9e"; + sha256 = "1bizvz1h7dqjplf2fs3w6syn5g3a1n2j84caf6saidr36h6irrns"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; @@ -12110,36 +12722,48 @@ final: prev: zoxide-vim = buildVimPluginFrom2Nix { pname = "zoxide.vim"; - version = "2022-05-07"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "5062d4c17ff873eeed88cabe317d7ee1a43c5731"; - sha256 = "1chq7fnygvb1wm7v0rg8cf0czn1q1i59kggg0jdvrnwf0f6m7nb4"; + rev = "7add42b0474b07c206c94d1693997e52d25c5fec"; + sha256 = "1csr4k4f9nybwa0h6fnd7wgr5cgqzqqqamr0xvrv4z1j4h24i5hr"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-04-18"; + version = "2022-06-24"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "8a67df6da476cba68ecf26a519a5279686edbd2e"; - sha256 = "1w96rvpbm7lk9lcc5i13d6dyb5b10vkjh1902xmklqvpzy1wya19"; + rev = "ffd6f3e10445cb2c92401b75d4eccb75faf8b6b1"; + sha256 = "0970426myaybar4aqf3lz468057q2b88bmr4skmmfy2a2xq3cddc"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; + catppuccin-vim = buildVimPluginFrom2Nix { + pname = "catppuccin-vim"; + version = "2022-07-02"; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "vim"; + rev = "4f4d11c9c6bd9dec003cad2162ba25fbb20180e4"; + sha256 = "0f9vf7p22n4sl4qa7km5pg62dcnn30d63ghhbcipm21777xws8a9"; + }; + meta.homepage = "https://github.com/catppuccin/vim/"; + }; + chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-05-13"; + version = "2022-07-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b6ac01c187359e305a2df8caea540f4527b91ab2"; - sha256 = "14rp8h59bnwpi86nnkmhxsgyszhhd26fzra7wjni2agdhf2410zp"; + rev = "26b9deacd2221851dd1868157be226e33b76c7a5"; + sha256 = "0dp7p0yqfqn25w353xqgrfksl3ssygf38ps8igrhxrsjwqin3ly1"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12206,12 +12830,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-05-06"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "aa69b6a3d77068542c613d96419c3241a9fcbf46"; - sha256 = "0x9pn109my5rw627qmf5xawy3n40l9n3l6hp6np77y2rqlpn8m3y"; + rev = "3f0a6c06da29c7b0f3fa49a313ae4d56f0dc58b8"; + sha256 = "01r34bkfs8kvaw72852sfk5jr1ngg2qf6a3dlpsppkb8l4lwi1k3"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch index 7b09f5b804618..abc37992cb3b5 100644 --- a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch +++ b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch @@ -1,5 +1,5 @@ diff --git a/autoload/health/mkdp.vim b/autoload/health/mkdp.vim -index 9eebb56..0700333 100644 +index 9eebb56..3a0b069 100644 --- a/autoload/health/mkdp.vim +++ b/autoload/health/mkdp.vim @@ -9,8 +9,8 @@ function! health#mkdp#check() abort @@ -13,26 +13,11 @@ index 9eebb56..0700333 100644 let l:mkdp_server_script = s:mkdp_root_dir . '/app/server.js' call health#report_info('Script: ' . l:mkdp_server_script) call health#report_info('Script exists: ' . filereadable(l:mkdp_server_script)) -diff --git a/autoload/mkdp/nvim/rpc.vim b/autoload/mkdp/nvim/rpc.vim -index 5abd807..db1067b 100644 ---- a/autoload/mkdp/nvim/rpc.vim -+++ b/autoload/mkdp/nvim/rpc.vim -@@ -53,8 +53,8 @@ function! mkdp#nvim#rpc#get_command() abort - let l:pre_build = s:root_dir . '/app/bin/markdown-preview-' . mkdp#util#get_platform() - if executable(l:pre_build) - let l:cmd = [l:pre_build, '--path', s:script] -- elseif executable('node') -- let l:cmd = ['node', s:root_dir . '/app/index.js', '--path', s:script] -+ else -+ let l:cmd = ['@node@', s:root_dir . '/app/index.js', '--path', s:script] - endif - if !exists('l:cmd') - echohl Error | echon '[vim-node-rpc] pre build and node not found!' | echohl None diff --git a/autoload/mkdp/rpc.vim b/autoload/mkdp/rpc.vim -index a3361ec..d42f7a6 100644 +index b257571..57f04e7 100644 --- a/autoload/mkdp/rpc.vim +++ b/autoload/mkdp/rpc.vim -@@ -59,9 +59,9 @@ function! mkdp#rpc#start_server() abort +@@ -41,9 +41,9 @@ function! mkdp#rpc#start_server() abort let l:mkdp_server_script = s:mkdp_root_dir . '/app/bin/markdown-preview-' . mkdp#util#get_platform() if executable(l:mkdp_server_script) let l:cmd = [l:mkdp_server_script, '--path', s:mkdp_root_dir . '/app/server.js'] diff --git a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json index a3900a91dffdd..39d649be5de7e 100644 --- a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json +++ b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json @@ -8,6 +8,7 @@ "license": "MIT", "private": true, "dependencies": { + "@chemzqm/neovim": "5.7.9", "log4js": "3.0.6", "neovim": "4.2.1", "socket.io": "2.1.1", diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 494d42a4c46ff..f7e1645d707fd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -19,21 +19,28 @@ , code-minimap , dasht , direnv +, fish , fzf +, gawk +, git , gnome , himalaya +, jq , khard , languagetool , llvmPackages , meson , nim , nodePackages +, pandoc , parinfer-rust +, ripgrep , skim , sqlite , statix , stylish-haskell , tabnine +, tmux , tup , vim , which @@ -43,9 +50,7 @@ , nodejs , xdotool , xorg - -# test dependencies -, neovim-unwrapped +, zsh # command-t dependencies , rake @@ -98,7 +103,6 @@ , golint , gomodifytags , gopls -, gotags , gotools , iferr , impl @@ -131,6 +135,78 @@ self: super: { ''; }); + cmp-clippy = super.cmp-clippy.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp plenary-nvim ]; + }); + + cmp-copilot = super.cmp-copilot.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp copilot-vim ]; + }); + + cmp-dap = super.cmp-dap.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nvim-dap ]; + }); + + cmp-dictionary = super.cmp-dictionary.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-digraphs = super.cmp-digraphs.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-fish = super.cmp-fish.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fish ]; + }); + + cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fuzzy-nvim ]; + }); + + cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fuzzy-nvim ]; + }); + + cmp-git = super.cmp-git.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp curl git ]; + }); + + cmp-greek = super.cmp-greek.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-look = super.cmp-look.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-neosnippet = super.cmp-neosnippet.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp neosnippet-vim ]; + }); + + cmp-npm = super.cmp-npm.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nodejs plenary-nvim ]; + }); + + cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp pandoc plenary-nvim ]; + }); + + cmp-rg = super.cmp-rg.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ripgrep ]; + }); + + cmp-snippy = super.cmp-snippy.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nvim-snippy ]; + }); + cmp-tabnine = super.cmp-tabnine.overrideAttrs (old: { buildInputs = [ tabnine ]; @@ -140,6 +216,28 @@ self: super: { ''; }); + cmp-tmux = super.cmp-tmux.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp tmux ]; + }); + + cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vim-lsp ]; + }); + + cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vimwiki ]; + }); + + cmp-zsh = super.cmp-zsh.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp zsh ]; + }); + + coc-nginx = buildVimPluginFrom2Nix { + pname = "coc-nginx"; + inherit (nodePackages."@yaegassy/coc-nginx") version meta; + src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; + }; + command-t = super.command-t.overrideAttrs (old: { buildInputs = [ ruby rake ]; buildPhase = '' @@ -230,8 +328,15 @@ self: super: { }; }); - direnv-vim = super.direnv-vim.overrideAttrs (oa: { - preFixup = oa.preFixup or "" + '' + diffview-nvim = super.diffview-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + + doInstallCheck = true; + nvimRequireCheck = "diffview"; + }); + + direnv-vim = super.direnv-vim.overrideAttrs (old: { + preFixup = old.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" @@ -271,7 +376,7 @@ self: super: { patches = [ (substituteAll { src = ./patches/fruzzy/get_version.patch; - version = old.version; + inherit (old) version; }) ]; configurePhase = '' @@ -285,6 +390,10 @@ self: super: { ''; }); + fuzzy-nvim = super.fuzzy-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-fzy-native-nvim ]; + }); + fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs (old: { # The plugin has a makefile which tries to run tests in a docker container. # This prevents it. @@ -293,6 +402,18 @@ self: super: { ''; }); + fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs (old: { + + # add this to your lua config to prevent the plugin from trying to write in the + # nix store: + # vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json' + propagatedBuildInputs = [ + jq + gawk + ]; + dependencies = with self; [ fzf-vim ]; + }); + fzf-lua = super.fzf-lua.overrideAttrs (old: { propagatedBuildInputs = [ fzf ]; }); @@ -316,35 +437,18 @@ self: super: { configurePhase = "cd plugins/nvim"; }); - gitsigns-nvim = super.gitsigns-nvim.overrideAttrs (old: { + gitlinker-nvim = super.gitlinker-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); - # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); - - plenary-nvim = super.plenary-nvim.overrideAttrs (old: { - postPatch = '' - sed -Ei lua/plenary/curl.lua \ - -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' - ''; - - doInstallCheck = true; - nvimRequireCheck = "plenary"; + gitsigns-nvim = super.gitsigns-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; }); gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; }); - jedi-vim = super.jedi-vim.overrideAttrs (old: { - # checking for python3 support in vim would be neat, too, but nobody else seems to care - buildInputs = [ python3.pkgs.jedi ]; - meta = { - description = "code-completion for python using python-jedi"; - license = lib.licenses.mit; - }; - }); - himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; inherit (himalaya) src version; @@ -360,6 +464,15 @@ self: super: { ''; }; + jedi-vim = super.jedi-vim.overrideAttrs (old: { + # checking for python3 support in vim would be neat, too, but nobody else seems to care + buildInputs = [ python3.pkgs.jedi ]; + meta = { + description = "code-completion for python using python-jedi"; + license = lib.licenses.mit; + }; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -493,7 +606,7 @@ self: super: { }); null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: { - dependencies = with self; [ plenary-nvim nvim-lspconfig ]; + dependencies = with self; [ plenary-nvim ]; }); nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { @@ -526,11 +639,27 @@ self: super: { }); }); + octo-nvim = super.octo-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim plenary-nvim ]; + }); + onehalf = super.onehalf.overrideAttrs (old: { configurePhase = "cd vim"; }); - parinfer-rust = parinfer-rust; + inherit parinfer-rust; + + # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + + plenary-nvim = super.plenary-nvim.overrideAttrs (old: { + postPatch = '' + sed -Ei lua/plenary/curl.lua \ + -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' + ''; + + doInstallCheck = true; + nvimRequireCheck = "plenary"; + }); range-highlight-nvim = super.range-highlight-nvim.overrideAttrs (old: { dependencies = with self; [ cmd-parser-nvim ]; @@ -547,7 +676,7 @@ self: super: { skim = buildVimPluginFrom2Nix { pname = "skim"; - version = skim.version; + inherit (skim) version; src = skim.vim; }; @@ -660,16 +789,16 @@ self: super: { dependencies = with self; [ sqlite-lua telescope-nvim ]; }); - telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { - dependencies = with self; [ telescope-nvim ]; - }); - telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; buildPhase = "make"; meta.platforms = lib.platforms.all; }); + telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; preFixup = @@ -696,7 +825,7 @@ self: super: { }); telescope-nvim = super.telescope-nvim.overrideAttrs (old: { - dependencies = with self; [ plenary-nvim popup-nvim ]; + dependencies = with self; [ plenary-nvim ]; }); telescope-symbols-nvim = super.telescope-symbols-nvim.overrideAttrs (old: { @@ -830,7 +959,7 @@ self: super: { let maple-bin = rustPlatform.buildRustPackage { name = "maple"; - src = old.src; + inherit (old) src; nativeBuildInputs = [ pkg-config @@ -845,7 +974,7 @@ self: super: { libiconv ]; - cargoSha256 = "0l1x7kprnxa95pbf8ml9ixmj0cmbnnv6nd0v6qry8j67rx8plpmp"; + cargoSha256 = "sha256-9Vr1gpggfAQlMgM/s8j6FTTYFppHql2PQ7cPtg1wNmo="; }; in '' @@ -897,11 +1026,12 @@ self: super: { vim-go = super.vim-go.overrideAttrs (old: let binPath = lib.makeBinPath [ + # TODO: package commented packages asmfmt delve errcheck go-motion - go-tools + go-tools # contains staticcheck gocode gocode-gomod godef @@ -910,18 +1040,20 @@ self: super: { golangci-lint gomodifytags gopls - gotags + # gorename + # gotags gotools + # guru iferr impl + # keyify reftools + # revive ]; in { postPatch = '' - ${gnused}/bin/sed \ - -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \ - -i autoload/go/config.vim + sed -i autoload/go/config.vim -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' ''; }); @@ -971,17 +1103,17 @@ self: super: { vim-markdown-composer = let - vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { + vim-markdown-composer-bin = rustPlatform.buildRustPackage { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx"; + cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; }; in - super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { + super.vim-markdown-composer.overrideAttrs (old: { preFixup = '' substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \ - --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \ - "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']" + --replace "s:plugin_root . '/target/release/markdown-composer'" \ + "'${vim-markdown-composer-bin}/bin/markdown-composer'" ''; }); @@ -1127,6 +1259,7 @@ self: super: { "coc-cmake" "coc-css" "coc-diagnostic" + "coc-docker" "coc-emmet" "coc-eslint" "coc-explorer" @@ -1150,12 +1283,16 @@ self: super: { "coc-r-lsp" "coc-rls" "coc-rust-analyzer" + "coc-sh" "coc-smartf" "coc-snippets" "coc-solargraph" + "coc-sqlfluff" "coc-stylelint" + "coc-sumneko-lua" "coc-tabnine" "coc-texlab" + "coc-toml" "coc-tslint" "coc-tslint-plugin" "coc-tsserver" diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e3806c71a2f65..6dbc0a635cbd9 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -8,6 +8,7 @@ https://github.com/vim-scripts/DoxygenToolkit.vim/,, https://github.com/numToStr/FTerm.nvim/,, https://github.com/antoinemadec/FixCursorHold.nvim/,, https://github.com/vim-scripts/Improved-AnsiEsc/,, +https://github.com/ionide/Ionide-vim/,HEAD, https://github.com/martinda/Jenkinsfile-vim-syntax/,, https://github.com/autozimu/LanguageClient-neovim/,, https://github.com/vigoux/LanguageTool.nvim/,, @@ -40,10 +41,12 @@ https://github.com/vim-scripts/a.vim/,, https://github.com/mileszs/ack.vim/,, https://github.com/eikenb/acp/,, https://github.com/stevearc/aerial.nvim/,, +https://github.com/Numkil/ag.nvim/,, https://github.com/derekelkins/agda-vim/,, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, +https://github.com/goolord/alpha-nvim/,HEAD, https://github.com/Olical/aniseed/,, https://github.com/pearofducks/ansible-vim/,, https://github.com/ckarnell/antonys-macro-repeater/,, @@ -74,6 +77,7 @@ https://github.com/fruit-in/brainfuck-vim/,, https://github.com/famiu/bufdelete.nvim/,, https://github.com/jlanzarotta/bufexplorer/,, https://github.com/akinsho/bufferline.nvim/,, +https://github.com/dkarter/bullets.vim/,, https://github.com/mattn/calendar-vim/,,mattn-calendar-vim https://github.com/itchyny/calendar.vim/,, https://github.com/bkad/camelcasemotion/,, @@ -84,28 +88,52 @@ https://github.com/sudormrfbin/cheatsheet.nvim/,, https://github.com/yunlingz/ci_dark/,, https://github.com/projekt0n/circles.nvim/,, https://github.com/xavierd/clang_complete/,, +https://github.com/p00f/clangd_extensions.nvim/,HEAD, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, https://github.com/winston0410/cmd-parser.nvim/,, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, +https://github.com/vappolinario/cmp-clippy/,HEAD, https://github.com/hrsh7th/cmp-cmdline/,, +https://github.com/dmitmel/cmp-cmdline-history/,HEAD, https://github.com/PaterJason/cmp-conjure/,, +https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD, +https://github.com/hrsh7th/cmp-copilot/,HEAD, +https://github.com/rcarriga/cmp-dap/,HEAD, +https://github.com/uga-rosa/cmp-dictionary/,HEAD, +https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, +https://github.com/mtoohey31/cmp-fish/,HEAD, +https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD, +https://github.com/tzachar/cmp-fuzzy-path/,HEAD, +https://github.com/petertriho/cmp-git/,HEAD, +https://github.com/max397574/cmp-greek/,HEAD, https://github.com/kdheepak/cmp-latex-symbols/,, +https://github.com/octaltree/cmp-look/,HEAD, +https://github.com/notomo/cmp-neosnippet/,HEAD, +https://github.com/David-Kunz/cmp-npm/,HEAD, https://github.com/hrsh7th/cmp-nvim-lsp/,, https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,, +https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,HEAD, https://github.com/hrsh7th/cmp-nvim-lua/,, +https://github.com/quangnguyen30192/cmp-nvim-tags/,HEAD, https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,, https://github.com/hrsh7th/cmp-omni/,, https://github.com/jc-doyle/cmp-pandoc-references/,, +https://github.com/aspeddro/cmp-pandoc.nvim/,HEAD, https://github.com/hrsh7th/cmp-path/,, +https://github.com/lukas-reineke/cmp-rg/,HEAD, +https://github.com/dcampos/cmp-snippy/,HEAD, https://github.com/f3fora/cmp-spell/,, https://github.com/tzachar/cmp-tabnine/,, https://github.com/andersevenrud/cmp-tmux/,, https://github.com/ray-x/cmp-treesitter/,, https://github.com/lukas-reineke/cmp-under-comparator/,, +https://github.com/dmitmel/cmp-vim-lsp/,HEAD, +https://github.com/pontusk/cmp-vimwiki-tags/,HEAD, https://github.com/hrsh7th/cmp-vsnip/,, +https://github.com/tamago324/cmp-zsh/,HEAD, https://github.com/saadparwaiz1/cmp_luasnip/,, https://github.com/vn-ki/coc-clap/,, https://github.com/neoclide/coc-denite/,, @@ -120,6 +148,7 @@ https://github.com/manicmaniac/coconut.vim/,HEAD, https://github.com/metakirby5/codi.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/lilydjwg/colorizer/,, +https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/wincent/command-t/,, https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, @@ -136,12 +165,15 @@ https://github.com/rhysd/conflict-marker.vim/,, https://github.com/Olical/conjure/,, https://github.com/Shougo/context_filetype.vim/,, https://github.com/github/copilot.vim/,, +https://github.com/ms-jpq/coq.artifacts/,HEAD, +https://github.com/ms-jpq/coq.thirdparty/,HEAD, https://github.com/jvoorhis/coq.vim/,, https://github.com/ms-jpq/coq_nvim/,, https://github.com/lfilho/cosco.vim/,, https://github.com/nixprime/cpsm/,, https://github.com/saecki/crates.nvim/,, https://github.com/godlygeek/csapprox/,, +https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD, https://github.com/chrisbra/csv.vim/,, https://github.com/JazzCore/ctrlp-cmatcher/,, https://github.com/FelikZ/ctrlp-py-matcher/,, @@ -206,14 +238,17 @@ https://github.com/andviro/flake8-vim/,, https://github.com/ncm2/float-preview.nvim/,, https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, +https://github.com/akinsho/flutter-tools.nvim/,HEAD, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, https://github.com/rafamadriz/friendly-snippets/,, https://github.com/raghur/fruzzy/,, https://github.com/shumphrey/fugitive-gitlab.vim/,, https://github.com/BeneCollyridam/futhark-vim/,, +https://github.com/tzachar/fuzzy.nvim/,HEAD, https://github.com/rktjmp/fwatch.nvim/,, https://github.com/stsewd/fzf-checkout.vim/,, +https://github.com/monkoose/fzf-hoogle.vim/,HEAD, https://github.com/gfanto/fzf-lsp.nvim/,, https://github.com/ibhagwan/fzf-lua/,HEAD, https://github.com/junegunn/fzf.vim/,, @@ -236,6 +271,7 @@ https://github.com/roman/golden-ratio/,, https://github.com/buoto/gotests-vim/,, https://github.com/rmagatti/goto-preview/,, https://github.com/junegunn/goyo.vim/,, +https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, https://github.com/liuchengxu/graphviz.vim/,, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/morhetz/gruvbox/,, @@ -311,6 +347,7 @@ https://github.com/nvim-lua/lsp-status.nvim/,, https://github.com/nvim-lua/lsp_extensions.nvim/,, https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, +https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/onsails/lspkind-nvim/,, https://github.com/tami5/lspsaga.nvim/,, https://github.com/folke/lua-dev.nvim/,, @@ -381,7 +418,7 @@ https://github.com/EdenEast/nightfox.nvim/,, https://github.com/zah/nim.vim/,, https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, -https://github.com/arcticicestudio/nord-vim/,master, +https://github.com/arcticicestudio/nord-vim/,, https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, https://github.com/jlesquembre/nterm.nvim/,, @@ -393,6 +430,7 @@ https://github.com/catppuccin/nvim/,,catppuccin-nvim https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, https://github.com/RRethy/nvim-base16/,, +https://github.com/code-biscuits/nvim-biscuits/,HEAD, https://github.com/kevinhwang91/nvim-bqf/,, https://github.com/ojroques/nvim-bufdel/,, https://github.com/roxma/nvim-cm-racer/,, @@ -402,6 +440,7 @@ https://github.com/norcalli/nvim-colorizer.lua/,, https://github.com/terrortylor/nvim-comment/,, https://github.com/hrsh7th/nvim-compe/,, https://github.com/roxma/nvim-completion-manager/,, +https://github.com/klen/nvim-config-local/,, https://github.com/yamatsum/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, https://github.com/rcarriga/nvim-dap-ui/,, @@ -416,18 +455,21 @@ https://github.com/kevinhwang91/nvim-hlslens/,, https://github.com/neovimhaskell/nvim-hs.vim/,, https://github.com/mfussenegger/nvim-jdtls/,, https://github.com/gennaro-tedesco/nvim-jqx/,, +https://github.com/ethanholz/nvim-lastplace/,HEAD, https://github.com/kosayoda/nvim-lightbulb/,, https://github.com/josa42/nvim-lightline-lsp/,, https://github.com/mfussenegger/nvim-lint/,, https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, https://github.com/neovim/nvim-lspconfig/,, https://github.com/RishabhRD/nvim-lsputils/,, +https://github.com/rafcamlet/nvim-luapad/,, https://github.com/scalameta/nvim-metals/,, https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/dstein64/nvim-scrollview/,, +https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, https://github.com/nvim-pack/nvim-spectre/,, https://github.com/norcalli/nvim-terminal.lua/,, @@ -448,6 +490,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/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, https://github.com/Th3Whit3Wolf/one-nvim/,, https://github.com/navarasu/onedark.nvim/,, https://github.com/joshdick/onedark.vim/,, @@ -504,7 +547,9 @@ https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, +https://github.com/lewis6991/satellite.nvim/,HEAD, https://github.com/Xuyuanp/scrollbar.nvim/,, +https://github.com/cakebaker/scss-syntax.vim/,, https://github.com/RobertAudi/securemodelines/,, https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, @@ -524,6 +569,8 @@ https://github.com/liuchengxu/space-vim/,, https://github.com/ctjhoa/spacevim/,, https://github.com/chrisgeo/sparkup/,, https://github.com/edluffy/specs.nvim/,, +https://github.com/lewis6991/spellsitter.nvim/,HEAD, +https://github.com/stsewd/sphinx.nvim/,, https://github.com/sjl/splice.vim/,, https://github.com/vimlab/split-term.vim/,, https://github.com/AndrewRadev/splitjoin.vim/,, @@ -534,10 +581,12 @@ https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, https://github.com/darfink/starsearch.vim/,, https://github.com/teto/stylish.nvim/,HEAD, +https://github.com/kvrohit/substrata.nvim/,HEAD, https://github.com/lambdalisue/suda.vim/,, https://github.com/ervandew/supertab/,, https://github.com/ur4ltz/surround.nvim/,, https://github.com/peterbjorgensen/sved/,, +https://github.com/jamespeapen/swayconfig.vim/,, https://github.com/keith/swift.vim/,, https://github.com/AndrewRadev/switch.vim/,, https://github.com/simrat39/symbols-outline.nvim/,, @@ -610,6 +659,7 @@ https://github.com/vhda/verilog_systemverilog.vim/,, https://github.com/vifm/vifm.vim/,, https://github.com/dracula/vim/,,dracula-vim https://github.com/embark-theme/vim/,,embark-vim +https://github.com/catppuccin/vim/,HEAD,catppuccin-vim https://github.com/Konfekt/vim-CtrlXA/,, https://github.com/konfekt/vim-DetectSpellLang/,, https://github.com/dpelle/vim-LanguageTool/,, @@ -867,6 +917,7 @@ https://github.com/jakwings/vim-pony/,, https://github.com/haya14busa/vim-poweryank/,, https://github.com/prettier/vim-prettier/,, https://github.com/thinca/vim-prettyprint/,, +https://github.com/meain/vim-printer/,HEAD, https://github.com/pantharshit00/vim-prisma/,, https://github.com/tpope/vim-projectionist/,, https://github.com/dhruvasagar/vim-prosession/,, @@ -924,6 +975,7 @@ https://github.com/dstein64/vim-startuptime/,, https://github.com/axelf4/vim-strip-trailing-whitespace/,, https://github.com/nbouscal/vim-stylish-haskell/,, https://github.com/alx741/vim-stylishask/,, +https://github.com/arzg/vim-substrata/,HEAD, https://github.com/svermeulen/vim-subversive/,, https://github.com/tpope/vim-surround/,, https://github.com/evanleck/vim-svelte/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 9511e4da19520..60d4856cae6f5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -33,27 +33,6 @@ vim-with-plugins in PATH: # To automatically load a plugin when opening a filetype, add vimrc lines like: # autocmd FileType php :packadd phpCompletion }; - - # plugins can also be managed by VAM - vimrcConfig.vam.knownPlugins = pkgs.vimPlugins; # optional - vimrcConfig.vam.pluginDictionaries = [ - # load always - { name = "youcompleteme"; } - { names = ["youcompleteme" "foo"]; } - - # only load when opening a .php file - { name = "phpCompletion"; ft_regex = "^php\$"; } - { name = "phpCompletion"; filename_regex = "^.php\$"; } - - # provide plugin which can be loaded manually: - { name = "phpCompletion"; tag = "lazy"; } - - # full documentation at github.com/MarcWeber/vim-addon-manager - ]; - - # there is a pathogen implementation as well, but its startup is slower and [VAM] has more feature - # vimrcConfig.pathogen.knownPlugins = vimPlugins; # optional - # vimrcConfig.pathogen.pluginNames = ["vim-addon-nix"]; }; WHAT IS A VIM PLUGIN? @@ -103,7 +82,7 @@ It might happen than a plugin is not known by vim-pi yet. We encourage you to contribute to vim-pi so that plugins can be updated automatically. -CREATING DERVITATIONS AUTOMATICALLY BY PLUGIN NAME +CREATING DERIVATIONS AUTOMATICALLY BY PLUGIN NAME ================================================== Most convenient is to use a ~/.vim-scripts file putting a plugin name into each line as documented by [VAM]'s README.md @@ -208,9 +187,6 @@ let ln -sf ${plugin}/${rtpPath} $out/pack/${packageName}/${dir}/${lib.getName plugin} ''; - link = pluginPath: if hasLuaModule pluginPath - then linkLuaPlugin pluginPath - else linkVimlPlugin pluginPath; packageLinks = packageName: {start ? [], opt ? []}: let @@ -228,9 +204,9 @@ let [ "mkdir -p $out/pack/${packageName}/start" ] # To avoid confusion, even dependencies of optional plugins are added # to `start` (except if they are explicitly listed as optional plugins). - ++ (builtins.map (x: link x packageName "start") allPlugins) + ++ (builtins.map (x: linkVimlPlugin x packageName "start") allPlugins) ++ ["mkdir -p $out/pack/${packageName}/opt"] - ++ (builtins.map (x: link x packageName "opt") opt) + ++ (builtins.map (x: linkVimlPlugin x packageName "opt") opt) # Assemble all python3 dependencies into a single `site-packages` to avoid doing recursive dependency collection # for each plugin. # This directory is only for python import search path, and will not slow down the startup time. @@ -277,36 +253,30 @@ let }: let - /* pathogen mostly can set &rtp at startup time. Its used very commonly. + /* pathogen mostly can set &rtp at startup time. Deprecated. */ pathogenImpl = let knownPlugins = pathogen.knownPlugins or vimPlugins; plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); - pluginsEnv = buildEnv { - name = "pathogen-plugin-env"; - paths = map (x: "${x}/${rtpPath}") plugins; + pathogenPackages.pathogen = { + start = plugins; }; in - '' - let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.vim-pathogen.rtp}" - execute pathogen#infect('${pluginsEnv}/{}') - - filetype indent plugin on | syn on - ''; + nativeImpl pathogenPackages; /* vim-plug is an extremely popular vim plugin manager. */ plugImpl = - ('' + '' source ${vimPlugins.vim-plug.rtp}/plug.vim silent! call plug#begin('/dev/null') '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + '' call plug#end() - ''); + ''; /* vim-addon-manager = VAM @@ -325,71 +295,26 @@ let yet */ - vamImpl = lib.optionalString (vam != null) - (let + vamImpl = + let knownPlugins = vam.knownPlugins or vimPlugins; # plugins specified by the user specifiedPlugins = map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries); # plugins with dependencies plugins = findDependenciesRecursively specifiedPlugins; - - # Convert scalars, lists, and attrs, to VimL equivalents - toVimL = x: - if builtins.isString x then "'${lib.replaceStrings [ "\n" "'" ] [ "\n\\ " "''" ] x}'" - else if builtins.isAttrs x && builtins ? out then toVimL x # a derivation - else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toVimL n}: ${toVimL v}") x)}}" - else if builtins.isList x then "[${lib.concatMapStringsSep ", " toVimL x}]" - else if builtins.isInt x || builtins.isFloat x then builtins.toString x - else if builtins.isBool x then (if x then "1" else "0") - else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; - - in assert builtins.hasAttr "vim-addon-manager" knownPlugins; - '' - filetype indent plugin on | syn on - - let g:nix_plugin_locations = {} - ${lib.concatMapStrings (plugin: '' - let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}" - '') plugins} - let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins.vim-addon-manager.rtp}" - - let g:vim_addon_manager = {} - - if exists('g:nix_plugin_locations') - " nix managed config - - " override default function making VAM aware of plugin locations: - fun! NixPluginLocation(name) - let path = get(g:nix_plugin_locations, a:name, "") - return path == "" ? vam#DefaultPluginDirFromName(a:name) : path - endfun - let g:vim_addon_manager.plugin_dir_by_name = 'NixPluginLocation' - " tell Vim about VAM: - let &rtp.=(empty(&rtp)?"":','). g:nix_plugin_locations['vim-addon-manager'] - else - " standalone config - - let &rtp.=(empty(&rtp)?"":',').c.plugin_root_dir.'/vim-addon-manager' - if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload') - " checkout VAM - execute '!git clone --depth=1 https://github.com/MarcWeber/vim-addon-manager ' - \ shellescape(c.plugin_root_dir.'/vim-addon-manager', 1) - endif - endif - - " tell vam which plugins to load, and when: - let l = [] - ${lib.concatMapStrings (p: "call add(l, ${toVimL p})\n") vam.pluginDictionaries} - call vam#Scripts(l, {}) - ''); + vamPackages.vam = { + start = plugins; + }; + in + nativeImpl vamPackages; entries = [ beforePlugins - vamImpl ] + ++ lib.optional (vam != null) (lib.warn "'vam' attribute is deprecated. Use 'packages' instead in your vim configuration" vamImpl) ++ lib.optional (packages != null && packages != []) (nativeImpl packages) - ++ lib.optional (pathogen != null) pathogenImpl + ++ lib.optional (pathogen != null) (lib.warn "'pathogen' attribute is deprecated. Use 'packages' instead in your vim configuration" pathogenImpl) ++ lib.optional (plug != null) plugImpl ++ [ customRC ]; @@ -454,8 +379,8 @@ rec { mkdir -p "$out/bin" for exe in ${ - if standalone then "{,g,r,rg,e}vim {,g}vimdiff" - else "{,g,r,rg,e}{vim,view} {,g}vimdiff ex" + if standalone then "{,g,r,rg,e}vim {,g}vimdiff vi" + else "{,g,r,rg,e}{vim,view} {,g}vimdiff ex vi" }; do if [[ -e ${vim}/bin/$exe ]]; then dest="$out/bin/${executableName}" @@ -480,37 +405,6 @@ rec { vimWithRC = throw "vimWithRC was removed, please use vim.customize instead"; - pluginnames2Nix = {name, namefiles} : vim_configurable.customize { - inherit name; - vimrcConfig.vam.knownPlugins = vimPlugins; - vimrcConfig.vam.pluginDictionaries = ["vim2nix"]; - vimrcConfig.customRC = '' - " Yes - this is impure and will create the cache file and checkout vim-pi - " into ~/.vim/vim-addons - let g:vim_addon_manager.plugin_root_dir = "/tmp/vim2nix-".$USER - if !isdirectory(g:vim_addon_manager.plugin_root_dir) - call mkdir(g:vim_addon_manager.plugin_root_dir) - else - echom repeat("=", 80) - echom "WARNING: reusing cache directory :".g:vim_addon_manager.plugin_root_dir - echom repeat("=", 80) - endif - let opts = {} - let opts.nix_prefetch_git = "${nix-prefetch-git}/bin/nix-prefetch-git" - let opts.nix_prefetch_hg = "${nix-prefetch-hg}/bin/nix-prefetch-hg" - let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache' - let opts.plugin_dictionaries = [] - ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles } - - " uncomment for debugging failures - " let opts.try_catch = 0 - - " add more files - " let opts.plugin_dictionaries += map(.. other file ) - call nix#ExportPluginsForNix(opts) - ''; - }; - vimGenDocHook = callPackage ({ vim }: makeSetupHook { name = "vim-gen-doc-hook"; @@ -542,16 +436,11 @@ rec { } ./neovim-require-check-hook.sh) {}; inherit (import ./build-vim-plugin.nix { - inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook neovimRequireCheckHook; + inherit lib stdenv rtpPath vim vimGenDocHook + toVimPlugin vimCommandCheckHook neovimRequireCheckHook; }) buildVimPlugin buildVimPluginFrom2Nix; - # TODO placeholder to ease working on automatic plugin detection - # this should be a luarocks "flat" install with appropriate vim hooks - buildNeovimPluginFrom2Nix = attrs: let drv = (buildVimPluginFrom2Nix attrs); in drv.overrideAttrs(oa: { - nativeBuildInputs = oa.nativeBuildInputs ++ [ neovimRequireCheckHook ]; - }); - # used to figure out which python dependencies etc. neovim needs requiredPlugins = { packages ? {}, @@ -575,4 +464,21 @@ rec { nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs; in nativePlugins ++ nonNativePlugins; + + toVimPlugin = drv: + drv.overrideAttrs(oldAttrs: { + # dont move the "doc" folder since vim expects it + forceShare = [ "man" "info" ]; + + nativeBuildInputs = oldAttrs.nativeBuildInputs or [] + ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + vimCommandCheckHook vimGenDocHook + # many neovim plugins keep using buildVimPlugin + neovimRequireCheckHook + ]; + + passthru = (oldAttrs.passthru or {}) // { + vimPlugin = true; + }; + }); } diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix index cc935876ded35..65f833a3fb74b 100644 --- a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix @@ -1,7 +1,8 @@ { lib, vscode-utils -, fetchurl, mono, writeScript, runtimeShell +, fetchurl, writeScript, runtimeShell , jq, clang-tools , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. +, autoPatchelfHook, makeWrapper, stdenv, lttng-ust, libkrb5, zlib }: /* @@ -29,47 +30,27 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; - - - openDebugAD7Script = writeScript "OpenDebugAD7" '' - #!${runtimeShell} - BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" - ${if gdbUseFixed - then '' - export PATH=''${PATH}''${PATH:+:}${gdb}/bin - '' - else ""} - ${mono}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $* - ''; in - vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "1.9.1"; + version = "1.11.0"; + sha256 = "c0725d3914aeb2515627691727455cc27e7a75031fa02ca957be02cc210bd64d"; + arch = "linux-x64"; }; - vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.gz"; - url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64"; - sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI="; - }; - - unpackPhase = '' - runHook preUnpack - - gzip -d $src --stdout &> temporary.zip - unzip temporary.zip - rm temporary.zip - - cd extension/ - - runHook postUnpack - ''; + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; buildInputs = [ jq + lttng-ust + libkrb5 + zlib + stdenv.cc.cc.lib ]; postPatch = '' @@ -85,27 +66,25 @@ vscode-utils.buildVscodeMarketplaceExtension rec { # Prevent download/install of extensions touch "./install.lock" - # Mono runtimes from nix package (used by generated `OpenDebugAD7`). - mv ./debugAdapters/bin/OpenDebugAD7 ./debugAdapters/bin/OpenDebugAD7_orig - cp -p "${openDebugAD7Script}" "./debugAdapters/bin/OpenDebugAD7" - # Clang-format from nix package. - mv ./LLVM/ ./LLVM_orig + mv ./LLVM/ ./LLVM_orig mkdir "./LLVM/" find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" - # Patching cpptools and cpptools-srv - elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools - patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools-srv - chmod a+x ./bin/cpptools{-srv,} + # Patching binaries + chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp debugAdapters/bin/OpenDebugAD7 + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so ''; - meta = with lib; { - license = licenses.unfree; - maintainers = [ maintainers.jraygauthier ]; - # A 32 bit linux would also be possible with some effort (specific download of binaries + - # patching of the elf files with 32 bit interpreter). - platforms = [ "x86_64-linux" ]; - }; + postFixup = lib.optionalString gdbUseFixed '' + wrapProgram $out/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7 --prefix PATH : ${lib.makeBinPath [ gdb ]} + ''; + + meta = with lib; { + description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging."; + homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools"; + license = licenses.unfree; + maintainers = with maintainers; [ jraygauthier stargate01 ]; + platforms = [ "x86_64-linux" ]; + }; } diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh b/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh index f5eb08d78a5dc..e282e126f83bc 100755 --- a/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh +++ b/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh @@ -11,7 +11,7 @@ function get_pkg_out() { echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}" } -interpreter="$(get_pkg_out "stdenv.glibc" "/lib/ld-linux-x86-64.so.2")" +interpreter="$(get_pkg_out "stdenv.cc.libc" "/lib/ld-linux-x86-64.so.2")" echo "interpreter='$interpreter'" # For clangformat dep on 'libtinfo.so.5'. @@ -49,4 +49,3 @@ function print_nix_version_mono() { echo "nixMonoBin='$nixMonoBin'" $nixMonoBin/mono --version } - diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ac8ae6885625d..fd8e0092ea75b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -30,6 +30,18 @@ let # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { + _1Password.op-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "1Password"; + name = "op-vscode"; + version = "1.0.0"; + sha256 = "sha256-ZeKTP3WKjyuR/ryBdJRHXJT+l2gbY4QnWNTsN9+4nOA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + _4ops.terraform = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "4ops"; @@ -131,8 +143,8 @@ let mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "12.2.0"; - sha256 = "sha256-CChkWKiLi/OcOm268d45pNwiyrKhztqYsQvJV/9z+Ag="; + version = "13.3.4"; + sha256 = "sha256-odFh4Ms60tW+JOEbzzglgKe7BL1ccv3TKGir5NlvIrQ="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; @@ -206,8 +218,8 @@ let mktplcRef = { name = "nord-visual-studio-code"; publisher = "arcticicestudio"; - version = "0.18.0"; - sha256 = "sha256-Uo6peR+2ZNX6nwJ0Yar32Pe0rfBZ+f6ef1cYhUvVUbE="; + version = "0.19.0"; + sha256 = "sha256-awbqFv6YuYI0tzM/QbHRTUl4B2vNUdy52F4nPmv+dRU="; }; meta = with lib; { description = "An arctic, north-bluish clean and elegant Visual Studio Code theme."; @@ -235,8 +247,8 @@ let mktplcRef = { name = "nix-env-selector"; publisher = "arrterian"; - version = "1.0.7"; - sha256 = "0e76885c9dbb6dca4eac8a75866ec372b948cc64a3a3845327d7c3ef6ba42a57"; + version = "1.0.9"; + sha256 = "sha256-TkxqWZ8X+PAonzeXQ+sI9WI+XlqUHll7YyM7N9uErk0="; }; meta = { license = lib.licenses.mit; @@ -269,26 +281,47 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.0.83"; - sha256 = "1giybf12p0h0fm950w9bwvzdk77771zfkylrqs9h0lhbdzr92qbl"; + version = "0.0.86"; + sha256 = "sha256-XZd2xTcTqT6LytVwN+CybaFT71nwdobgZQQddMFdjU4="; }; meta = { license = lib.licenses.mit; }; }; + attilabuti.brainfuck-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "brainfuck-syntax"; + publisher = "attilabuti"; + version = "0.0.1"; + sha256 = "sha256-ZcZlHoa2aoCeruMWbUUgfFHsPqyWmd2xFY6AKxJysYE="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/attilabuti.brainfuck-syntax/changelog"; + description = "VSCode extension providing syntax highlighting support for Brainfuck"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=attilabuti.brainfuck-syntax"; + homepage = "https://github.com/attilabuti/brainfuck-syntax"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2022.1.5"; - sha256 = "1b5ihrac9xsq35a39vlq7krr1ffqpdjxdlhv9s056hs033kayazl"; + version = "2022.7.11"; + sha256 = "sha256-JatjLZXO7iwpBwjL1hrNafBiF81CaozWWANyRm8A36Y="; }; buildInputs = [ nodePackages.pyright ]; - meta = { - license = lib.licenses.unfree; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog"; + description = "A performant, feature-rich language server for Python in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; + homepage = "https://github.com/microsoft/pylance-release"; + license = licenses.unfree; }; }; @@ -321,6 +354,22 @@ let }; }; + badochov.ocaml-formatter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ocaml-formatter"; + publisher = "badochov"; + version = "1.14.0"; + sha256 = "sha256-Iekh3vwu8iz53rPRsuu1Fx9iA/A97iMd8cPETWavnyA="; + }; + meta = with lib; { + description = "VSCode Extension Formatter for OCaml language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=badochov.ocaml-formatter"; + homepage = "https://github.com/badochov/ocamlformatter-vscode"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + }; + bbenoist.nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; @@ -410,15 +459,27 @@ let }; }; + bierner.markdown-mermaid = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-mermaid"; + publisher = "bierner"; + version = "1.14.2"; + sha256 = "RZyAY2d3imnLhm1mLur+wTx/quxrNWYR9PCjC+co1FE="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.6.13"; - sha256 = "098vrm28b7jpzk0c2d0cgxvdw4jsswzf18cx1m9jwsm1j40fp5f4"; + version = "0.8.6"; + sha256 = "sha256-v15KuD3eYFCsrworCJ1SZAMkyZKztAwWKmfwmbirleI="; }; meta = with lib; { - license = licenses.mpl20; + license = licenses.mit; }; }; @@ -457,8 +518,8 @@ let mktplcRef = { name = "path-intellisense"; publisher = "christian-kohler"; - version = "2.6.1"; - sha256 = "sha256-ol98g3pliBlyEQ+n7cR4O04J/0QB9U8+fvf+FC0j0Fc="; + version = "2.8.0"; + sha256 = "sha256-VPzy9o0DeYRkNwTGphC51vzBTNgQwqKg+t7MpGPLahM="; }; meta = with lib; { description = "Visual Studio Code plugin that autocompletes filenames"; @@ -611,8 +672,8 @@ let mktplcRef = { name = "vscode-deno"; publisher = "denoland"; - version = "3.9.1"; - sha256 = "sha256-OuGTjmJQFAWrYp7YnFpyo0NnnCcXYF8itYjGKMa3FCs="; + version = "3.12.0"; + sha256 = "sha256-ZsHCWQtEQKkdZ3uk072ZBfHFRzk4Owf4h7+szHLgIeo="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; @@ -683,8 +744,8 @@ let mktplcRef = { name = "githistory"; publisher = "donjayamanne"; - version = "0.6.14"; - sha256 = "11x116hzqnhgbryp2kqpki1z5mlnwxb0ly9r1513m5vgbisrsn0i"; + version = "0.6.19"; + sha256 = "15s2mva9hg2pw499g890v3jycncdps2dmmrmrkj3rns8fkhjn8b3"; }; }; @@ -706,8 +767,8 @@ let mktplcRef = { name = "theme-dracula"; publisher = "dracula-theme"; - version = "2.22.3"; - sha256 = "0wni9sriin54ci8rly2s68lkfx8rj1cys6mgcizvps9sam6377w6"; + version = "2.24.2"; + sha256 = "sha256-YNqWEIvlEI29mfPxOQVdd4db9G2qNodhz8B0MCAAWK8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/dracula-theme.theme-dracula/changelog"; @@ -722,8 +783,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.0.6"; - sha256 = "sha256-Q8l/GryB9iMhFnu5npUcDjWuImfrmVZF3xvm7nX/77Q="; + version = "12.1.1"; + sha256 = "0i1wxgc61rrf11zff0481dg9s2lmv1ngpwx8nb2ygf6lh0axr7cj"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -886,8 +947,8 @@ let mktplcRef = { name = "file-icons"; publisher = "file-icons"; - version = "1.0.28"; - sha256 = "1lyx0l42xhi2f3rdnjddc3mw7m913kjnchawi98i6vqsx3dv7091"; + version = "1.0.29"; + sha256 = "05x45f9yaivsz8a1ahlv5m8gy2kkz71850dhdvwmgii0vljc8jc6"; }; }; @@ -895,8 +956,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.14.1"; - sha256 = "sha256-w9xGkezS3A9z6sTk8WWgW7g8qYX6mJFfRV0lv5cu160="; + version = "0.18.3"; + sha256 = "sha256-qbF4k3GP7UdQrw0x/egVRkv5TYDwYWoycxY/HJSFTkI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -976,6 +1037,54 @@ let }; }; + gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "html-slim-scss-css-class-completion"; + publisher = "gencer"; + version = "1.7.8"; + sha256 = "18qws35qvnl0ahk5sxh4mzkw0ib788y1l97ijmpjszs0cd4bfsa6"; + }; + meta = with lib; { + description = "VSCode extension for SCSS"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=gencer.html-slim-scss-css-class-completion"; + homepage = "https://github.com/gencer/SCSS-Everywhere"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + }; + + gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gitlab-workflow"; + publisher = "gitlab"; + version = "3.44.2"; + sha256 = "sha256-S2PI+r4LrHA7tW2EMfcAkP5jUnd0mCEV72oTXMa9Xkc="; + }; + meta = with lib; { + description = "GitLab extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=gitlab.gitlab-workflow"; + homepage = "https://gitlab.com/gitlab-org/gitlab-vscode-extension#readme"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + }; + + grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gc-excelviewer"; + publisher = "grapecity"; + version = "4.2.55"; + sha256 = "sha256-yHl6ZTGIKOEsqmyeYtgDUhNAN9uRpoFApA7FKkPWW3E="; + }; + meta = with lib; { + description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=grapecity.gc-excelviewer"; + homepage = "https://github.com/jjuback/gc-excelviewer"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + humao.rest-client = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "humao"; @@ -1045,8 +1154,8 @@ let mktplcRef = { name = "vscode-pull-request-github"; publisher = "github"; - version = "0.37.2022030309"; - sha256 = "1icmg2ssdkxvwp8mn8zzakwn42hrdglsdgfnaf8va4vd9mqixl1v"; + version = "0.45.2022062709"; + sha256 = "119dz79vl2pngf6327zbfw97qnci8xg14d23wdd4n75jmra2wrbz"; }; meta = { license = lib.licenses.mit; }; }; @@ -1056,8 +1165,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.25.1"; - sha256 = "sha256-ZDUWN9lzDnR77W7xcMFQaaFl/6Lf/x1jgaBkwZPqGGw="; + version = "0.33.1"; + sha256 = "0dsjxs04dchw1dbzf45ryhxsb5xhalqwy40xw6cngxkp69lhf91g"; }; meta = { license = lib.licenses.mit; @@ -1147,8 +1256,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "6.0.4"; - sha256 = "sha256-gdM7mG5ykBiwLHodZ2VyF4uYYuAPhXP2MturNvfQ5iM="; + version = "6.0.5"; + sha256 = "sha256-vlmLr/1rBreqZifzEwAlhyGzHG28oZa+kmMzRl53tOI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; @@ -1184,6 +1293,22 @@ let }; }; + irongeek.vscode-env = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-env"; + publisher = "irongeek"; + version = "0.1.0"; + sha256 = "sha256-URq90lOFtPCNfSIl2NUwihwRQyqgDysGmBc3NG7o7vk="; + }; + meta = with lib; { + description = "Adds formatting and syntax highlighting support for env files (.env) to Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=IronGeek.vscode-env"; + homepage = "https://github.com/IronGeek/vscode-env.git"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + }; + jakebecker.elixir-ls = buildVscodeMarketplaceExtension { mktplcRef = { name = "elixir-ls"; @@ -1205,8 +1330,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "8.23.0"; - sha256 = "sha256-IHLsAuTi+GBZViL2KozudebNY745RiOYNATzabQfnOY="; + version = "8.27.2"; + sha256 = "sha256-scvT6cjlMrfG4yrhWlUwGM7ozu1E0xAryPRpV7FGCas="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1237,8 +1362,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.1.19"; - sha256 = "1ms96ij6z4bysdhqgdaxx2znvczyhzx57iifbqws50m1c3m7pkx7"; + version = "0.1.20"; + sha256 = "16mmivdssjky11gmih7zp99d41m09r0ii43n17d4i6xwivagi9a3"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -1381,8 +1506,8 @@ let mktplcRef = { name = "vscode-clangd"; publisher = "llvm-vs-code-extensions"; - version = "0.1.15"; - sha256 = "0skasnc490wp0l5xzpdmwdzjr4qiy63kg2qi27060m5yqkq3h8xn"; + version = "0.1.17"; + sha256 = "1vgk4xsdbx0v6sy09wkb63qz6i64n6qcmpiy49qgh2xybskrrzvf"; }; meta = { license = lib.licenses.mit; @@ -1401,6 +1526,22 @@ let }; }; + lucperkins.vrl-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "lucperkins"; + name = "vrl-vscode"; + version = "0.1.4"; + sha256 = "sha256-xcGa43iPwUR6spOJGTmmWA1dOMNMQEdiuhMZPYZ+dTU="; + }; + meta = { + description = "VS Code extension for Vector Remap Language (VRL)"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=lucperkins.vrl-vscode"; + homepage = "https://github.com/lucperkins/vrl-vscode"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ lucperkins ]; + }; + }; + mads-hartmann.bash-ide-vscode = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "mads-hartmann"; @@ -1414,6 +1555,23 @@ let }; }; + mattn.lisp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "lisp"; + publisher = "mattn"; + version = "0.1.12"; + sha256 = "sha256-x6aFrcX0YElEFEr0qA669/LPlab15npmXd5Q585pIEw="; + }; + meta = with lib; { + description = "Lisp syntax for vscode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mattn.lisp"; + homepage = "https://github.com/mattn/vscode-lisp"; + changelog = "https://marketplace.visualstudio.com/items/mattn.lisp/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; @@ -1538,8 +1696,8 @@ let mktplcRef = { name = "pyright"; publisher = "ms-pyright"; - version = "1.1.222"; - sha256 = "sha256-QMX/SawDEnG1xVrug8mvN7EvRrRDkJffcXBUFpQi1XE="; + version = "1.1.250"; + sha256 = "sha256-UHSY32F5wzqAHmmBWyCUkLL0z+LMWDwn/YvUOF3q87I="; }; meta = with lib; { description = "VS Code static type checking for Python"; @@ -1622,6 +1780,23 @@ let }; }; + njpwerner.autodocstring = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "autodocstring"; + publisher = "njpwerner"; + version = "0.6.1"; + sha256 = "sha256-NI0cbjsZPW8n6qRTRKoqznSDhLZRUguP7Sa/d0feeoc="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/njpwerner.autodocstring/changelog"; + description = "Generates python docstrings automatically"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=njpwerner.autodocstring"; + homepage = "https://github.com/NilsJPWerner/autoDocstring"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + octref.vetur = buildVscodeMarketplaceExtension { mktplcRef = { name = "vetur"; @@ -1650,6 +1825,22 @@ let }; }; + phoenixframework.phoenix = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "phoenix"; + publisher = "phoenixframework"; + version = "0.1.1"; + sha256 = "sha256-AfCwU4FF8a8C9D6+lyUDbAOLlD5SpZZw8CZVGpzRoV0="; + }; + meta = with lib; { + description = "Syntax highlighting support for HEEx / Phoenix templates"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=phoenixframework.phoenix"; + homepage = "https://github.com/phoenixframework/vscode-phoenix"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + }; + redhat.java = buildVscodeMarketplaceExtension { mktplcRef = { name = "java"; @@ -1668,8 +1859,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.5.1"; - sha256 = "sha256-JXhmgBFZdKNjgX6K7U+M/T7HEmIOBQOzQEJ5957TUuM="; + version = "1.7.0"; + sha256 = "1bbjpaypp0mq5akww5f0pkpq01j0xhhvkfr44f4lb2rdhr5nmnvc"; }; meta = { license = lib.licenses.mit; @@ -1700,7 +1891,8 @@ let }; }; - matklad.rust-analyzer = callPackage ./rust-analyzer { }; + rust-lang.rust-analyzer = callPackage ./rust-analyzer { }; + matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = with lib; { @@ -1714,8 +1906,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.8.4"; - sha256 = "sha256-T1eYAuYMv4B7rdECxYzNfIpydjzCDjeo7gmb1uhr6VM="; + version = "1.10.4"; + sha256 = "sha256-Qk4wD6gh/xvH6nFBonje4Stz6Y6yaIyxx1TdAXQEycM="; }; }; @@ -1743,6 +1935,39 @@ let }; }; + piousdeer.adwaita-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "adwaita-theme"; + publisher = "piousdeer"; + version = "1.0.7"; + sha256 = "zfG9ktxOCUOJaNrWtblq+ktSMppwp1SaB/39F1qfQew="; + }; + meta = with lib; { + description = "Theme for the GNOME desktop"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=piousdeer.adwaita-theme"; + homepage = "https://github.com/piousdeer/vscode-adwaita"; + license = licenses.gpl3; + maintainers = with maintainers; [ wyndon ]; + }; + }; + + prisma.prisma = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "prisma"; + publisher = "Prisma"; + version = "3.14.0"; + sha256 = "09dlm2awd2h0xmx1vcx95kdvz3xf4f5pd7zcdg3mb0g2az4nfld7"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; + description = "VSCode extension for syntax highlighting, formatting, auto-completion, jump-to-definition and linting for .prisma files"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Prisma.prisma"; + homepage = "https://github.com/prisma/language-tools"; + license = licenses.asl20; + maintainers = with maintainers; [ superherointj ]; + }; + }; + richie5um2.snake-trail = buildVscodeMarketplaceExtension { mktplcRef = { name = "snake-trail"; @@ -1929,6 +2154,22 @@ let }; }; + stefanjarina.vscode-eex-snippets = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-eex-snippets"; + publisher = "stefanjarina"; + version = "0.0.8"; + sha256 = "0j8pmrs1lk138vhqx594pzxvrma4yl3jh7ihqm2kgh0cwnkbj36m"; + }; + meta = with lib; { + description = "VSCode extension for Elixir EEx and HTML (EEx) code snippets"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=stefanjarina.vscode-eex-snippets"; + homepage = "https://github.com/stefanjarina/vscode-eex-snippets"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + }; + stephlin.vscode-tmux-keybinding = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tmux-keybinding"; @@ -1967,8 +2208,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.1.7"; - sha256 = "sha256-C0jYDIDBK1JH8eFaFmCUilBXCbU5y2TRF3OZAw9ijoY="; + version = "2.2.5"; + sha256 = "0ayhlzh3b2mcdx6mdj00y4qxvv6mirfpnp8q5zvidm6sv3vwlcj0"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2045,6 +2286,22 @@ let }; }; + theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "language-pascal"; + publisher = "theangryepicbanana"; + version = "0.1.6"; + sha256 = "096wwmwpas21f03pbbz40rvc792xzpl5qqddzbry41glxpzywy6b"; + }; + meta = with lib; { + description = "VSCode extension for high-quality Pascal highlighting"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=theangryepicbanana.language-pascal"; + homepage = "https://github.com/ALANVF/vscode-pascal-magic"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + }; + tiehuis.zig = buildVscodeMarketplaceExtension { mktplcRef = { name = "zig"; @@ -2062,8 +2319,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.18.4"; - sha256 = "00cii58md6v028h0xfvbdjvg3r44451mi0lfmjwiwif5xcw3wnlx"; + version = "0.19.3"; + sha256 = "0l8fbim19jgcdgxxgidnhdczxvhls920vrffwrac8k1y34lgfl3v"; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' @@ -2130,8 +2387,8 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.4.1"; - sha256 = "1mr8si7jglpjw8qzl4af1k7r68vz03fpal1dr8i0iy4ly26pz7bh"; + version = "3.5.1"; + sha256 = "17xbbr5hjrs67yazicb9qillbkp3wnaccjpnl1jlp07s0n7q4f8f"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; @@ -2205,8 +2462,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.21.5"; - sha256 = "1v1xs1wcigisr6xip31i02cfryxrb157sla34y59pwlnhc5x1gny"; + version = "1.23.1"; + sha256 = "sha256-k3z3n+29vqvC/FqjrHUBnYIVcKuJpiT+nITbqVm0Low="; }; meta = { license = lib.licenses.mit; @@ -2217,8 +2474,8 @@ let mktplcRef = { name = "vspacecode"; publisher = "VSpaceCode"; - version = "0.10.1"; - sha256 = "sha256-H7SCC/ZhDswMQjLX+qpQa6A1N83MobJRPC4pyIbZ1kA="; + version = "0.10.9"; + sha256 = "sha256-16oC2BghY7mB/W0niTDtKGMAC9pt6m0utSOJ0lgbpAU="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix index a781250fc18b2..e871baa608efa 100644 --- a/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix +++ b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix @@ -1,6 +1,9 @@ -{ publisher, name, version, sha256 ? "" }: +{ publisher, name, version, arch ? "", sha256 ? "" }: +let + archurl = (if arch == "" then "" else "?targetPlatform=${arch}"); +in { - url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"; + url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage${archurl}"; sha256 = sha256; # The `*.vsix` file is in the end a simple zip file. Change the extension # so that existing `unzip` hooks takes care of the unpacking. diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix index 6be5e225fa38b..ab3403852409b 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -7,8 +7,8 @@ in buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2021.9.1101343141"; - sha256 = "1c5dgkk5yn6a8k3blbqakqdy8ppwgfbm0ciki7ix696bvlksbpdg"; + version = "2022.5.1001411044"; + sha256 = "0z6i7a5sba42yc2inp3yvw6lm6m0kings2iv18h4d6zyhm2lb61p"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index 8d6834dceebf8..6b12320161716 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, vscode-utils, extractNuGet +{ lib, stdenv, fetchurl, fetchpatch, vscode-utils, extractNuGet , icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook , python3, musl , pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified. @@ -28,6 +28,17 @@ let url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2"; sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; }; + patches = (oldAttrs.patches or []) ++ [ + # Pull upstream fix for -fno-common toolchain. Without it build fails on + # upstream gcc-10 as: + # ld: libustsnprintf.a(libustsnprintf_la-core.o):snprintf/core.c:23: multiple definition of + # `ust_loglevel'; ustctl.o:liblttng-ust-ctl/ustctl.c:80: first defined here + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/lttng/lttng-ust/commit/21a934df4c683e73e0a66a9afca33573fcf9d789.patch"; + sha256 = "122lw9rdmr80gmz7814235ibqs47c6pzvg0ryh01805x0cymx74z"; + }) + ]; }); pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python"; diff --git a/pkgs/applications/editors/vscode/extensions/rescript/default.nix b/pkgs/applications/editors/vscode/extensions/rescript/default.nix index 5bad9b2e62836..fb0f1db8d59f8 100644 --- a/pkgs/applications/editors/vscode/extensions/rescript/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rescript/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "rescript-vscode"; publisher = "chenglou92"; - version = "1.1.3"; - sha256 = "1c1ipxgm0f0a3vlnhr0v85jr5l3rwpjzh9w8nv2jn5vgvpas0b2a"; + version = "1.3.0"; + sha256 = "sha256-Sgi7FFOpI/XOeyPOrDhwZdZ+43ilUz7oQ49yB7tiMXk="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 3f4555430a68a..9f85c9f9a1502 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0yahcv64jblmz5q0ylgg1sghcnyam4nq47var3y18ndjpaqyb1fl"; - x86_64-darwin = "0zsizwrhc0na9dfics27i48q4x3kz0qq5m2vdjvrgi69y2iy5z4c"; - aarch64-linux = "01wpi9pdf1fjxfx8w5g5da31q561qw7ykjm9spb3arvnivq20dp2"; - aarch64-darwin = "0qk22jyn0vypsx8x4cmpab5wrmhqx6hdkm314k8k06mz5cg1v4r3"; - armv7l-linux = "04r0x31flahzw8y0kkbzqnvcwllifaa0ysr163bb5b8kiyc189kk"; + x86_64-linux = "0rq0bc99hsji4ni5mqw1rhzn2rng9rldm4xbdxlkrjyprc6qvffz"; + x86_64-darwin = "1yjcb65w0anxyjc1nd9kbwr4hwnrlk9c6kp1a2ncy1g181klzarl"; + aarch64-linux = "1fk7887clz9sd7fmz7lkxql7bnsvnbjd9fjixym2746x9if5ds42"; + aarch64-darwin = "1bfgsjnm5r1wpss69ncx310j23mbwhixdxmg07m3kpcfqrmznvgc"; + armv7l-linux = "0131i5cx2737wmngybvlw7d9c4gnilmla33nlrhf74ihic98jwlc"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.67.2"; + version = "1.68.1"; 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 4686c532373cb..721cfbabf82bd 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -14,11 +14,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ns4cpkihbrwgh8pvn1kjlnipssinjkxy28szidnz6q71zyvsjyw"; - x86_64-darwin = "05v0gxal74igc29qjy0ficlyna17bzh1lpfqvyxdpg22is894h2l"; - aarch64-linux = "1x6lhcvdly3a2n0shp2vlgk3s2pj9byxn9dc9pjg4k5ff24dql7l"; - aarch64-darwin = "03knkj0y6n45lin0v6288zbq1nz5qh81ijyw1w3zrpd7pijn9j0x"; - armv7l-linux = "0iwlr5q1qwq3jgldrhz4bbyl3xmdhd4ss690x1lqb4vxm2m7v5jw"; + x86_64-linux = "1gx64ff9sgjqn8vw2hjpn3qlfpfyyhc5ivzc52vqyczaj1fcny65"; + x86_64-darwin = "0sv0iyqfw24k14r28qzvlpdb81b7fqhbgb1lqzb75adhdfpjwz31"; + aarch64-linux = "13mg7nn43k4bs1gl8cx1kly90yxz7iial6a1fpy4grxsk8mna1rj"; + aarch64-darwin = "0mnj3lckpqwb3kmg7x7r34idaxyhy55gpiiyj0gmpqp8hp0ai5sc"; + armv7l-linux = "0cvvigzmqp21jxwdfpkspdj7sva9bj977f9689qgb012kqvy41b2"; }.${system}; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -28,7 +28,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.67.2"; + version = "1.68.1"; pname = "vscodium"; executableName = "codium"; @@ -59,6 +59,7 @@ in homepage = "https://github.com/VSCodium/vscodium"; downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ synthetica turion bobby285271 ]; mainProgram = "codium"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ]; diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/applications/editors/xedit/default.nix index 5971c3a6e5d9d..d032ef2da66e7 100644 --- a/pkgs/applications/editors/xedit/default.nix +++ b/pkgs/applications/editors/xedit/default.nix @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-WF+4avzRRL0+OA3KxzK7JwmArkPu9fEl+728R6ouXmg="; }; + # ./lisp/mathimp.c:493:10: error: implicitly declaring library function 'finite' with type 'int (double)' + postPatch = lib.optionalString stdenv.isDarwin '' + for i in $(find . -type f -name "*.c"); do + substituteInPlace $i --replace "finite" "isfinite" + done + ''; + nativeBuildInputs = [ autoreconfHook pkg-config utilmacros ]; buildInputs = [ libX11 @@ -40,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/xorg/app/xedit"; license = with licenses; [ mit ]; maintainers = with maintainers; [ shamilton ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index d00be198c8ff6..094274aa7bd7b 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 = "1400"; + version = "1403"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-qF+fMFHfY1fdWPAFEoCxcKHB++sFNwOaHeaMv+6gakg="; + sha256 = "sha256-hG0ZRAxWOdFtDgKcDysu89LOdULZmJHLi7grfVjAbwM="; }; installPhase = '' diff --git a/pkgs/applications/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix index 37e0d83f14060..c1f685827047a 100644 --- a/pkgs/applications/emulators/atari800/default.nix +++ b/pkgs/applications/emulators/atari800/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "atari800"; - version = "4.2.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "atari800"; repo = "atari800"; rev = "ATARI800_${replaceChars ["."] ["_"] version}"; - sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; + sha256 = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/emulators/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix index 1f02219c8314e..8b7cc9fad0674 100644 --- a/pkgs/applications/emulators/bochs/default.nix +++ b/pkgs/applications/emulators/bochs/default.nix @@ -18,12 +18,12 @@ , wxGTK }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bochs"; version = "2.7"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/project/${finalAttrs.pname}/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo="; }; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { libtool pkg-config ]; + buildInputs = [ SDL2 curl @@ -130,7 +131,8 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; -} +}) # TODO: a better way to organize the options # TODO: docbook (docbook-tools from RedHat mirrors should help) diff --git a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index edb397a49d366..6410189699493 100644 --- a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation { license = licenses.gpl3Only; maintainers = with maintainers; [ stevebob ]; platforms = platforms.unix; + # ../nall/traits.hpp:19:14: error: no member named 'is_floating_point_v' in namespace 'std'; did you mean 'is_floating_point'? + # using std::is_floating_point_v; + broken = (stdenv.isDarwin && stdenv.isx86_64); mainProgram = "bsnes"; }; } diff --git a/pkgs/applications/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix index 8b7b1c32628a8..742b3dc88ae28 100644 --- a/pkgs/applications/emulators/ccemux/default.nix +++ b/pkgs/applications/emulators/ccemux/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A modular ComputerCraft emulator"; homepage = "https://github.com/CCEmuX/CCEmuX"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; }; diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index 8a3c20c664cfc..ee34286c3d151 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://citra-emu.org"; description = "The ${branch} branch of an open-source emulator for the Ninteno 3DS"; longDescription = '' diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 8780975a84ad5..63a638640800b 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-16101"; + version = "5.0-16380"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "8ecfa537a242de74d2e372e30d9d79b14584b2fb"; - sha256 = "3jLGVzTDzEtHWvIb9DFTbJiA9dE9Pm14vYER998Zln0="; + rev = "8335ec70e5fe253eb21509408ca6b5736ed57dfc"; + sha256 = "sha256-WRQ3WfMTlIPoYrEFWLHL9KSfhzQl24AlkbWjh3a4fPE="; fetchSubmodules = true; }; @@ -81,9 +81,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ MP2E ashkitten xfix ]; branch = "master"; - # x86_32 is an unsupported platform. - # Enable generic build if you really want a JIT-less binary. broken = stdenv.isDarwin; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index fdfc6d44ecade..93ed03097be90 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu-primehack"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "shiiion"; repo = "dolphin"; rev = version; - sha256 = "011qghswgh9l7k993lfn1hrwhgyrv9m33smgspsjq50jww6r27fl"; + sha256 = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; fetchSubmodules = true; }; @@ -143,9 +143,7 @@ stdenv.mkDerivation rec { description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; maintainers = with maintainers; [ MP2E ashkitten Madouura ]; - # x86_32 is an unsupported platform. - # Enable generic build if you really want a JIT-less binary. broken = stdenv.isDarwin; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 87ac444ae4919..b197742ce2767 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -1,7 +1,8 @@ { lib , stdenv , fetchurl -, SDL +, autoreconfHook +, SDL_compat , SDL_net , SDL_sound , copyDesktopItems @@ -22,12 +23,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + autoreconfHook copyDesktopItems graphicsmagick ]; buildInputs = [ - SDL + SDL_compat SDL_net SDL_sound libGL diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix index 26ff779ba05ac..9c7261f093014 100644 --- a/pkgs/applications/emulators/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dynamips"; - version = "0.2.21"; + version = "0.2.22"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - hash = "sha256-JQJa3NZ9mQqqvuTzU7XmAr1WRB4zuLIwBx18OY3GbV8="; + sha256 = "1fjjjdaxlw1k95kyq73fndn21qfhrm4cn79av0i4sn7anhg8m83f"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix index 4a8d3e3b85ec2..5ff25efbf151a 100644 --- a/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/pkgs/applications/emulators/goldberg-emu/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://gitlab.com/Mr_Goldberg/goldberg_emulator"; changelog = "https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/releases"; description = "Program that emulates steam online features"; diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix index e8feb1ea7ed50..1b95dec89face 100644 --- a/pkgs/applications/emulators/kega-fusion/default.nix +++ b/pkgs/applications/emulators/kega-fusion/default.nix @@ -72,6 +72,7 @@ in stdenv.mkDerivation { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; homepage = "https://www.carpeludum.com/kega-fusion/"; maintainers = with maintainers; [ abbradar ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; }; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index bf6426f3121f4..eb0f9076a17da 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Is a multi-purpose emulation framework"; homepage = "https://www.mamedev.org/"; license = with licenses; [ bsd3 gpl2Plus ]; diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index 2c178dc72f5c5..1c0fba3df1c56 100644 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Playstation 1 emulator"; homepage = "https://github.com/iCatButler/pcsxr"; maintainers = with maintainers; [ rardiol ]; diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index b553640d144e8..9a2f7e07102f6 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -672,7 +672,7 @@ in license = "MAME"; extraBuildInputs = [ libpng SDL ]; - SDL_CONFIG = "${SDL.dev}/bin/sdl-config"; + SDL_CONFIG = "${lib.getDev SDL}/bin/sdl-config"; dontAddPrefix = true; configurePlatforms = [ ]; makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index e9aa7d80d57fc..0a078f68c7a35 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -126,7 +126,12 @@ stdenv.mkDerivation rec { # Workaround for the following error affecting newer versions of Clang: # ./config.def.h:xxx:x: error: 'TARGET_OS_TV' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] - NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang [ "-Wno-undef-prefix" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-Wno-undef-prefix" ] + # Workaround build failure on -fno-common toolchains: + # duplicate symbol '_apple_platform' in:ui_cocoa.o cocoa_common.o + # TODO: drop when upstream gets a fix for it: + # https://github.com/libretro/RetroArch/issues/14025 + ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; meta = with lib; { homepage = "https://libretro.com"; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 60aa9debfb001..5fc9a5388a426 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -26,9 +26,6 @@ buildDotnetModule rec { sha256 = "09wjygkdr9sr0hwv77czi0x5xw8y585k9pghdm5s3iqjn9gbb45k"; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; - projectFile = "Ryujinx.sln"; nugetDeps = ./deps.nix; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 4ecbd6ca80677..dc831080d7fd9 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -12,9 +12,9 @@ (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) (fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.5"; sha256 = "0br5ms806jsgc2jghcjb6lm2h1ifq8wa3cgxp5ginrhzzj3p145i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.5"; sha256 = "15fbzv7yywhzfmkkrqi9xxwi0h6fy9miz5ihl8j4hd0psqc8wil3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.5"; sha256 = "1wl227mbbda039dznl2lvd65kh3k978qa88pa2ayqjx3vb6394q9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) @@ -23,11 +23,11 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.5"; sha256 = "1bx0bbzwnbp7r7dcxcq5222zbhmgirs75lcm6azqw5f5qxrvv5x8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.5"; sha256 = "19lfp3lbvsvc51q46jwy5l39skx5rfiyhk6f6djdc3g5l55kb871"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.5"; sha256 = "0hzsvhk5hzk0iav7cc2i8dgyx02a5jks2g0jljychw18ck9s2ilg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.5"; sha256 = "0xyvhhksdxjdwn1bfkhvxrgyd92p01r9mdjsand05dmba4q7gxqq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.5"; sha256 = "1ihlnzp7zclc76d1ig3dc71l0gm7z5lqqwppjj06aa4yhrsa2baj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.6"; sha256 = "12b6ya9q5wszfq6yp38lpan8zws95gbp1vs9pydk3v82gai336r3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0l15md6rzr2dvwvnk8xj1qz1dcjcbmp0aglnflrj8av60g5r1kwd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; }) (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.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/applications/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix index 64f311c4a8a62..aeceb0dc6f841 100644 --- a/pkgs/applications/emulators/uae/default.nix +++ b/pkgs/applications/emulators/uae/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 alsa-lib SDL ]; hardeningDisable = [ "format" ]; + # Workaround build failure on -fno-common toolchains: + # ld: bsdsocket.o:(.bss+0x0): multiple definition of + # `socketbases'; main.o:(.bss+0x2792c0): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; LDFLAGS = [ "-lm" ]; meta = { diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 7788b13b4ecb5..e3875e130a189 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -191,6 +191,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { inherit version; homepage = "https://www.winehq.org/"; license = with lib.licenses; [ lgpl21Plus ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode # mono, gecko + ]; description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index febbece46f579..a7cc12db5527a 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,22 +46,22 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.8"; + version = "7.10"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-j3bpyWtQ8qyOJOXe7fo+DZWWpXBnCSJvZalMahYAGbg="; + sha256 = "sha256-P+skzYWYwQ9q9xHnSsK10kQrtNO4wHj506JTroc2SA0="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { - version = "7.2.0"; + version = "7.3.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-Xwbq+646SezDHfzqd3B1vUTwzBJuT7Tijs76ButDYyM="; + sha256 = "sha256-k54vVmlyDQ0Px+MFQmYioRozt644XE1+WB4p6iZOIv8="; }; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-payP+lx/aGZErGbkpogNMgsE393e7F2VGrllDKu/Lws="; + sha256 = "sha256-5Pt98pla6t+B3FjB80hOWJUO64jY1EmOPQ0hEkFBWxY="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index a14109bc85722..956604cd6cc62 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -32,6 +32,10 @@ in stdenv.mkDerivation { done ''; + # Workaround build failure on -fno-common toolchains: + # ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' cd src sed -i "/^STRIP/d" configure diff --git a/pkgs/applications/misc/cfm/default.nix b/pkgs/applications/file-managers/cfm/default.nix index 4e56f376c8069..0955403e7eb81 100644 --- a/pkgs/applications/misc/cfm/default.nix +++ b/pkgs/applications/file-managers/cfm/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "cfm"; @@ -17,10 +20,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + homepage = "https://github.com/willeccles/cfm"; description = "Simple and fast TUI file manager with no dependencies"; license = licenses.mpl20; maintainers = with maintainers; [ lom ]; - homepage = "https://github.com/willeccles/cfm"; platforms = platforms.all; }; } diff --git a/pkgs/applications/file-managers/clex/default.nix b/pkgs/applications/file-managers/clex/default.nix new file mode 100644 index 0000000000000..a2ac0df9801dd --- /dev/null +++ b/pkgs/applications/file-managers/clex/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "clex"; + version = "4.6.patch10"; + + src = fetchurl { + sha256 = "03niihqk57px7rm2c84qira5jm5vw8lj5s58dximk0w5gsis4fhw"; + url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; + }; + + buildInputs = [ ncurses ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "File manager with full-screen terminal interface"; + longDescription = '' + CLEX (pronounced KLEKS) displays directory contents including the file + status details and provides features like command history, filename + insertion, or name completion in order to help users to create commands + to be executed by the shell. There are no built-in commands, CLEX is an + add-on to your favorite shell. + ''; + homepage = "http://www.clex.sk"; + license = licenses.gpl2Plus; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/misc/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 981f055679067..981f055679067 100644 --- a/pkgs/applications/misc/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/file-managers/dfilemanager/default.nix index 6a9453eb583a3..6a9453eb583a3 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/file-managers/dfilemanager/default.nix diff --git a/pkgs/applications/file-managers/doublecmd/default.nix b/pkgs/applications/file-managers/doublecmd/default.nix new file mode 100644 index 0000000000000..0222f5be48381 --- /dev/null +++ b/pkgs/applications/file-managers/doublecmd/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, dbus +, fpc +, getopt +, glib +, lazarus +, libX11 +, libqt5pas +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "doublecmd"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "doublecmd"; + repo = "doublecmd"; + rev = "v${version}"; + hash = "sha256-aEWu/bRVOwjK6QTWsMntRYwAfjuwo9SNuH4qkQn0mOY="; + }; + + nativeBuildInputs = [ + fpc + getopt + lazarus + wrapQtAppsHook + ]; + + buildInputs = [ + dbus + glib + libX11 + libqt5pas + ]; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + postPatch = '' + patchShebangs build.sh install/linux/install.sh + substituteInPlace build.sh \ + --replace '$(which lazbuild)' '"${lazarus}/bin/lazbuild --lazarusdir=${lazarus}/share/lazarus"' + substituteInPlace install/linux/install.sh \ + --replace '$DC_INSTALL_PREFIX/usr' '$DC_INSTALL_PREFIX' + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + ./build.sh release qt5 + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install/linux/install.sh -I $out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://doublecmd.sourceforge.io/"; + description = "Two-panel graphical file manager written in Pascal"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} +# TODO: deal with other platforms too diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/file-managers/joshuto/default.nix index 024334aca5061..024334aca5061 100644 --- a/pkgs/applications/misc/joshuto/default.nix +++ b/pkgs/applications/file-managers/joshuto/default.nix diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix new file mode 100644 index 0000000000000..9895cc108ef66 --- /dev/null +++ b/pkgs/applications/file-managers/krusader/default.nix @@ -0,0 +1,47 @@ +{ mkDerivation +, lib +, fetchurl +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, karchive +, kconfig +, kcrash +, kguiaddons +, kinit +, kparts +, kwindowsystem +}: + +mkDerivation rec { + pname = "krusader"; + version = "2.7.2"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-QaOaQ7PELdHR7K6obfMMr/agYf7MHWb2CFmyo8qXYQk="; + }; + + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + karchive + kconfig + kcrash + kguiaddons + kinit + kparts + kwindowsystem + ]; + + meta = with lib; { + homepage = "http://www.krusader.org"; + description = "Norton/Total Commander clone for KDE"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ sander turion ]; + }; +} diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix new file mode 100644 index 0000000000000..dd267e7ce4d07 --- /dev/null +++ b/pkgs/applications/file-managers/lf/default.nix @@ -0,0 +1,40 @@ +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: + +buildGoModule rec { + pname = "lf"; + version = "27"; + + src = fetchFromGitHub { + owner = "gokcehan"; + repo = "lf"; + rev = "r${version}"; + hash = "sha256-CrtVw3HhrC+D3c4ltHX8FSQnDvBpQJ890oJHoD6qPt4="; + }; + + vendorSha256 = "sha256-evkQT624EGj6MUwx3/ajdIbUMYjA1QyOnIQFtTLt0Yo="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" "-X main.gVersion=r${version}" ]; + + postInstall = '' + install -D --mode=444 lf.desktop $out/share/applications/lf.desktop + installManPage lf.1 + installShellCompletion etc/lf.{bash,zsh,fish} + ''; + + meta = with lib; { + description = "A terminal file manager written in Go and heavily inspired by ranger"; + longDescription = '' + lf (as in "list files") is a terminal file manager written in Go. It is + heavily inspired by ranger with some missing and extra features. Some of + the missing features are deliberately omitted since it is better if they + are handled by external tools. + ''; + homepage = "https://godoc.org/github.com/gokcehan/lf"; + changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/misc/llama/default.nix b/pkgs/applications/file-managers/llama/default.nix index f1822c674116c..f1822c674116c 100644 --- a/pkgs/applications/misc/llama/default.nix +++ b/pkgs/applications/file-managers/llama/default.nix diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix new file mode 100644 index 0000000000000..6f80c2c5e928d --- /dev/null +++ b/pkgs/applications/file-managers/mc/default.nix @@ -0,0 +1,96 @@ +{ lib, stdenv +, fetchurl +, pkg-config +, glib +, gpm +, file +, e2fsprogs +, libX11 +, libICE +, perl +, zip +, unzip +, gettext +, slang +, libssh2 +, openssl +, coreutils +, autoreconfHook +, autoSignDarwinBinariesHook + +# updater only +, writeScript +}: + +stdenv.mkDerivation rec { + pname = "mc"; + version = "4.8.28"; + + src = fetchurl { + url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; + sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook 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) [ + autoSignDarwinBinariesHook + ]; + + buildInputs = [ + file + gettext + glib + libICE + libX11 + libssh2 + openssl + slang + zip + ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + + enableParallelBuilding = true; + + configureFlags = [ "PERL=${perl}/bin/perl" ]; + + postPatch = '' + substituteInPlace src/filemanager/ext.c \ + --replace /bin/rm ${coreutils}/bin/rm + + substituteInPlace misc/ext.d/misc.sh.in \ + --replace /bin/cat ${coreutils}/bin/cat + ''; + + preFixup = '' + # remove unwanted build-dependency references + sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc + ''; + + postFixup = lib.optionalString (!stdenv.isDarwin) '' + # libX11.so is loaded dynamically so autopatch doesn't detect it + patchelf \ + --add-needed ${libX11}/lib/libX11.so \ + $out/bin/mc + ''; + + passthru.updateScript = writeScript "update-mc" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of "Current version is: 4.8.27; ...". + new_version="$(curl -s https://midnight-commander.org/ | pcregrep -o1 'Current version is: (([0-9]+\.?)+);')" + update-source-version mc "$new_version" + ''; + + meta = with lib; { + description = "File Manager and User Shell for the GNU Project"; + downloadPage = "https://www.midnight-commander.org/downloads/"; + homepage = "https://www.midnight-commander.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sander ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 681e2d3eb4e69..a91bb273f3e68 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation { homepage = "http://www.mucommander.com/"; description = "Cross-platform file manager"; license = licenses.gpl3; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/terminal-emulators/nimmm/default.nix b/pkgs/applications/file-managers/nimmm/default.nix index 0e0d75ab80125..0e0d75ab80125 100644 --- a/pkgs/applications/terminal-emulators/nimmm/default.nix +++ b/pkgs/applications/file-managers/nimmm/default.nix diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index 87c43628c4f01..87c43628c4f01 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/file-managers/noice/default.nix index e67346c517159..e67346c517159 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/file-managers/noice/default.nix diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/file-managers/pcmanfm/default.nix index deb9a98a517c3..deb9a98a517c3 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/file-managers/pcmanfm/default.nix diff --git a/pkgs/applications/misc/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index 48039b64fb60a..48039b64fb60a 100644 --- a/pkgs/applications/misc/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index 95f85430ba0b5..95f85430ba0b5 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/file-managers/sfm/default.nix index 800ea9419cbe3..800ea9419cbe3 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/file-managers/sfm/default.nix diff --git a/pkgs/applications/misc/shfm/default.nix b/pkgs/applications/file-managers/shfm/default.nix index 602151075fc71..602151075fc71 100644 --- a/pkgs/applications/misc/shfm/default.nix +++ b/pkgs/applications/file-managers/shfm/default.nix diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 3d9f720487541..433109cd86af3 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { ./x11-only.patch ]; + # Workaround build failure on -fno-common toolchains: + # ld: spacefm-item-prop.o:src/settings.h:123: multiple definition of + # `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here + # TODO: can be removed once https://github.com/IgnorantGuru/spacefm/pull/772 + # or equivalent is merged upstream. + NIX_CFLAGS_COMPILE = "-fcommon"; + configureFlags = [ "--with-bash-path=${pkgs.bash}/bin/bash" ]; diff --git a/pkgs/applications/misc/spacefm/glibc-fix.patch b/pkgs/applications/file-managers/spacefm/glibc-fix.patch index b8e9f1e9195e7..b8e9f1e9195e7 100644 --- a/pkgs/applications/misc/spacefm/glibc-fix.patch +++ b/pkgs/applications/file-managers/spacefm/glibc-fix.patch diff --git a/pkgs/applications/misc/spacefm/x11-only.patch b/pkgs/applications/file-managers/spacefm/x11-only.patch index 1b2f9f1458242..1b2f9f1458242 100644 --- a/pkgs/applications/misc/spacefm/x11-only.patch +++ b/pkgs/applications/file-managers/spacefm/x11-only.patch diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/file-managers/vifm/default.nix index e3f2e80c47a5f..e3f2e80c47a5f 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/file-managers/vifm/default.nix diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/file-managers/worker/default.nix index 3aa01d9372c46..3aa01d9372c46 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/file-managers/worker/default.nix diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index d59b936608c84..d59b936608c84 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix diff --git a/pkgs/applications/file-managers/ytree/default.nix b/pkgs/applications/file-managers/ytree/default.nix new file mode 100644 index 0000000000000..fcfbdbd10da1b --- /dev/null +++ b/pkgs/applications/file-managers/ytree/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv +, fetchurl +, ncurses +, readline +}: + +stdenv.mkDerivation rec { + pname = "ytree"; + version = "2.04"; + + src = fetchurl { + url = "https://han.de/~werner/${pname}-${version}.tar.gz"; + sha256 = "sha256-bnqLf2jv5tNlq+M6HQbXOa2F8io9VN3QrsJKNHjWZkI="; + }; + + buildInputs = [ + ncurses + readline + ]; + + # don't save timestamp, in order to improve reproducibility + postPatch = '' + substituteInPlace Makefile --replace 'gzip' 'gzip -n' + ''; + + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man1 + ''; + + meta = with lib; { + description = "A curses-based file manager similar to DOS Xtree(TM)"; + homepage = "https://www.han.de/~werner/ytree.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} +# TODO: X11 support diff --git a/pkgs/applications/finance/cryptowatch/default.nix b/pkgs/applications/finance/cryptowatch/default.nix index 09531e4650e8f..4bf7a1a0b4f35 100644 --- a/pkgs/applications/finance/cryptowatch/default.nix +++ b/pkgs/applications/finance/cryptowatch/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://cryptowat.ch"; description = "Application for visualising real-time cryptocurrency market data"; platforms = platforms.linux; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ livnev ]; }; diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix index 2c821b73ba78f..d855586c4381d 100644 --- a/pkgs/applications/finance/irpf/default.nix +++ b/pkgs/applications/finance/irpf/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "irpf"; - version = "2022-1.5"; + version = "2022-1.6"; src = let year = lib.head (lib.splitVersion version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; - sha256 = "sha256-FJqLjERTVQC6KvLSrCzR9RTIiJEfHvOwX7CRdUmHf/U="; + sha256 = "sha256-/4dND4CMl4xnGGIb+FWqgL0wbt7fqUE78m737U0kAdw="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; @@ -68,6 +68,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.gov.br/receitafederal/pt-br"; license = licenses.unfree; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ atila ]; }; } diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index bd8b21aa5aa06..c755b0fb6678a 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -1,14 +1,14 @@ { stdenv , lib , fetchurl -, python3 +, python39 , nodePackages , wkhtmltopdf , nixosTests }: let - python = python3.override { + python = python39.override { packageOverrides = self: super: { click = super.click.overridePythonAttrs (old: rec { version = "7.1.2"; diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 0420619e87790..c6e0846e54dc3 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "gmt"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; - sha256 = "sha256-LNBz2LHxG4elmziqeq+OOceUDStVpGoyZ+I4AuyKCNE="; + sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index d186d36efcf87..b73fb71f698fc 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,45 +1,33 @@ -{ lib, stdenv +{ lib +, stdenv , mkDerivation , fetchFromGitHub , fetchpatch -, substituteAll -, gdal +, clipper , cmake +, cups +, doxygen +, gdal , ninja , proj -, clipper -, zlib -, qttools +, qtimageformats , qtlocation , qtsensors +, qttools , qttranslations -, doxygen -, cups -, qtimageformats +, substituteAll +, zlib }: mkDerivation rec { pname = "OpenOrienteering-Mapper"; version = "0.9.5"; - buildInputs = [ - gdal - qtlocation - qtimageformats - qtsensors - clipper - zlib - proj - cups - ]; - - nativeBuildInputs = [ cmake doxygen ninja qttools ]; - src = fetchFromGitHub { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5"; + hash = "sha256-BQbryRV5diBkOtva9sYuLD8yo3IwFqrkz3qC+C6eEfE="; }; patches = [ @@ -55,6 +43,24 @@ mkDerivation rec { }) ]; + nativeBuildInputs = [ + cmake + doxygen + ninja + qttools + ]; + + buildInputs = [ + clipper + cups + gdal + proj + qtimageformats + qtlocation + qtsensors + zlib + ]; + cmakeFlags = [ # Building the manual and bundling licenses fails # See https://github.com/NixOS/nixpkgs/issues/85306 @@ -81,14 +87,12 @@ mkDerivation rec { ''; meta = with lib; { - description = '' - OpenOrienteering Mapper is an orienteering mapmaking program - and provides a free alternative to the existing proprietary solution. - ''; homepage = "https://www.openorienteering.org/apps/mapper/"; + description = "An orienteering mapmaking program"; changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}"; license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ mpickering sikmir ]; + platforms = with platforms; unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index e6bf2250b64a3..0ad11bc630bf9 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -69,14 +69,14 @@ let six ]; in mkDerivation rec { - version = "3.22.6"; + version = "3.22.8"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-ACNEIU+kYmOa+/1nbFPTSDgyvviXqKP9kvL6aRykueY="; + sha256 = "sha256-YxF7FzyNNt+bdk96g2sWWv9haqV0L6Ab96D0hV0BFrA="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 32ee893cbaa17..1c46cd81f65ab 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -69,14 +69,14 @@ let six ]; in mkDerivation rec { - version = "3.24.2"; + version = "3.26.0"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-skoepsX9xREqN5SoA4eUN7LKa6KGvixPd5k0KKXzKJo="; + sha256 = "sha256-yHQi5ai7fdgznTf562Bj0QPE+SXg972O7+r01RY7itE="; }; passthru = { diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix index e4abddbcde002..808b70ed5ec93 100644 --- a/pkgs/applications/gis/udig/default.nix +++ b/pkgs/applications/gis/udig/default.nix @@ -6,11 +6,11 @@ let srcs = { x86_64-linux = fetchurl { url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip"; - sha256 = "03hj1mdd6sq0gbpa838wkccibp3l2hvnwxxf5dyc0jk3mmd94fwa"; + hash = "sha256-ijuSWq1jSsB8K653bjcUdNwVGZscDaTuegBr01oNEg4="; }; x86_64-darwin = fetchurl { url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip"; - sha256 = "16rcyp1zy3lr1hwjhzh6vwcgck52w66dm1qsc52gppy1f4i3f692"; + hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs="; }; }; src = srcs.${stdenv.hostPlatform.system}; @@ -18,6 +18,7 @@ let meta = with lib; { description = "User-friendly Desktop Internet GIS"; homepage = "http://udig.refractions.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ epl10 bsd3 ]; maintainers = with maintainers; [ sikmir ]; platforms = builtins.attrNames srcs; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index c60523e3e996f..fc4648eb9dce1 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: + rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; version = "2.0.0"; @@ -7,20 +13,22 @@ rustPlatform.buildRustPackage rec { owner = "jblindsay"; repo = "whitebox-tools"; rev = "7551aa70e8d9cbd8b3744fde48e82aa40393ebf8"; - sha256 = "0mngw99aj60bf02y3piimxc1z1zbw1dhwyixndxh3b3m9xqhk51h"; + hash = "sha256-MJQJcU91rAF7sz16Dlvg64cfWK8x3uEFcAsYqVLiz1Y="; }; - cargoPatches = [./update-cargo-lock.patch]; + cargoSha256 = "sha256-+IFLv/mIgqyDKNC5aZgQeW6Ymu6+desOD8dDvEdwsSM="; - buildInputs = lib.optional stdenv.isDarwin Security; + cargoPatches = [ + ./update-cargo-lock.patch + ]; - cargoSha256 = "08xif13vqhy71w7fnxdyxsd9hvkr22c6kffh521sr0l8z6zlp0gq"; + buildInputs = lib.optional stdenv.isDarwin Security; doCheck = false; meta = with lib; { - description = "An advanced geospatial data analysis platform"; homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; + description = "An advanced geospatial data analysis platform"; license = licenses.mit; maintainers = [ maintainers.mpickering ]; }; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e15b82404760c..14525e6d5fcc5 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-35"; + version = "7.1.0-39"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-KLS7gKUVeOAA89Kfrk07JzSXEF6TH6AgfheECbWi0lE="; + hash = "sha256-2KSsRkzaC3muNwH4GJfIiMy4pnSjh8waDpYRTuu6GG0="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 0459d1d04ac24..d903ce1adf8ef 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; - maintainers = with maintainers; [ skrzyp xzfc ]; + maintainers = with maintainers; [ xzfc ]; license = licenses.mit; # Unintentionally not working on Darwin: # https://github.com/ahodesuka/ahoviewer/issues/62 diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 27d5ece57fe63..c37bc92a4065d 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { an expanded range of ideas and possibilities in a serendipitous way. ''; homepage = "http://al.chemy.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/ascii-image-converter/default.nix b/pkgs/applications/graphics/ascii-image-converter/default.nix index a6ce22b52fcb1..556a9e1126363 100644 --- a/pkgs/applications/graphics/ascii-image-converter/default.nix +++ b/pkgs/applications/graphics/ascii-image-converter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ascii-image-converter"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "TheZoraiz"; repo = "ascii-image-converter"; rev = "v${version}"; - sha256 = "DitJnWIz1Dt9yXtyQp/z738IAmG4neYmfc49Wdjos7Q="; + sha256 = "5Sa9PqhoJ/LCAHrymqVCO4bI39mQeVa4xv1z235Cxvg="; }; - vendorSha256 = "sha256-pKgukWKF4f/kLASjh8aKU7x9UBW/H+4C/02vxmh+qOU="; + vendorSha256 = "rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs="; meta = with lib; { description = "Convert images into ASCII art on the console"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 4d2db993b8d1f..a6a3563743b36 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://avocode.com/"; description = "The bridge between designers and developers"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ megheaiulian ]; diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix new file mode 100644 index 0000000000000..925b1112b30b0 --- /dev/null +++ b/pkgs/applications/graphics/curtail/default.nix @@ -0,0 +1,66 @@ +{ lib +, python3 +, fetchFromGitHub +, wrapGAppsHook +, appstream-glib +, desktop-file-utils +, gettext +, gtk3 +, meson +, ninja +, pkg-config +, gobject-introspection +, jpegoptim +, libwebp +, optipng +, pngquant +}: + +python3.pkgs.buildPythonApplication rec { + pname = "curtail"; + version = "1.3.0"; + format = "other"; + + src = fetchFromGitHub { + owner = "Huluti"; + repo = "Curtail"; + rev = version; + sha256 = "sha256-tNk+KI+DEMR63zfcBpfPTxAFKzvGWvpa9erK9SAAtPc="; + }; + + nativeBuildInputs = [ + wrapGAppsHook + appstream-glib + desktop-file-utils + gettext + gtk3 + meson + ninja + pkg-config + ]; + + propagatedBuildInputs = [ + appstream-glib + python3.pkgs.pygobject3 + gobject-introspection + gettext + ]; + + # Currently still required for the gobject-introspection setup hook + strictDeps = false; + + preInstall = '' + patchShebangs ../build-aux/meson/postinstall.py + ''; + + postInstall = '' + wrapProgram $out/bin/curtail --prefix PATH : ${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]} + ''; + + meta = with lib; { + description = "Simple & useful image compressor"; + homepage = "https://github.com/Huluti/Curtail"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ anselmschueler ]; + }; +} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 0fe5a0b183e8c..c9d5afce614ca 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -57,12 +57,12 @@ }: stdenv.mkDerivation rec { - version = "3.8.1"; + version = "4.0.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1xmyn9haagizh8qqg91bm1lx3dq1v8failxj943mipnvaj80dvl1"; + sha256 = "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 088b0de158fb3..7de66b87f8f58 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -56,21 +56,13 @@ mkDerivation rec { pname = "digikam"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE="; + sha256 = "sha256-wMbdLqigdRSsvyRi86VFGOfoCZszN/iBM2Foz/Y9dxw="; }; - patches = [ - (fetchpatch { - name = "akonadi-22.04.patch"; - url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch"; - sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko="; - }) - ]; - nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index ef100e5f7bd52..244f0c27648fe 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -44,6 +44,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"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 3e4ea214c47ec..85d201f32dcd8 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "18.0.6"; + version = "19.0.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "939d23f45f82bc4978ff3cb5d15d096f8af9658fb9f9211d3849998f6a0bd3a9"; + sha256 = "be456d396a19dcb8881ad4bff315197306ae05cca5e47332a1e5ad572948614e"; }; nativeBuildInputs = [ @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A desktop application for creating diagrams"; homepage = "https://about.draw.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ darkonion0 ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 9c75742d52ba3..3865848ff209d 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, makeWrapper -, xorg, imlib2, libjpeg, libpng +{ lib, stdenv, fetchFromGitHub, makeWrapper +, xorg, imlib2, libjpeg, libpng, fetchpatch , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation rec { pname = "feh"; - version = "3.8"; + version = "3.9"; - src = fetchurl { - url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "1a9bsq5j9sl2drzkab0hdhnamalpaszw9mz2prz6scrr5dak8g3z"; + src = fetchFromGitHub { + owner = "derf"; + repo = pname; + rev = version; + sha256 = "sha256-rgNC4M1TJ5EPeWmVHVzgaxTGLY7CYQf7uOsOn5bkwKE="; }; + patches = [ + # fix test failure when magic=0 is set + (fetchpatch { + url = "https://github.com/derf/feh/commit/3c1076b31e2e4e3429a5c3d334d555e549fb72d2.patch"; + sha256 = "sha256-F9N+N/BAeclyPHQYlO9ZV1U8S1VWfHl/8dMKUqA7DF8="; + }) + ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper xorg.libXt ]; diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 77ffc4b44c861..039eb45a29670 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -66,6 +66,10 @@ stdenv.mkDerivation rec { homepage = "https://imagej.net/software/fiji/"; description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; maintainers = with maintainers; [ zane ]; }; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8f5404cf3ae92..6c3f6fac3039b 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -42,19 +42,20 @@ , swig , vtk , wrapQtAppsHook +, wrapGAppsHook , xercesc , zlib }: mkDerivation rec { pname = "freecad"; - version = "0.19.2"; + version = "0.20"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = version; - hash = "sha256-XZ+fRl3CPCIFu3nHeMTLibwwFBlG/cWpKJlI58hTAuU="; + hash = "sha256-Em4XVxDfvVG1Kf7q+6uHNA/VcMGLKMTv5TCh2XF/BtQ="; }; nativeBuildInputs = [ @@ -64,6 +65,7 @@ mkDerivation rec { pyside2-tools gfortran wrapQtAppsHook + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 0e79f981fbc08..5caa541670470 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, gtk2, perlPackages, pkg-config } : +{lib, stdenv, fetchurl, fetchpatch, gtk2, perlPackages, pkg-config } : let version = "0.4"; in stdenv.mkDerivation { @@ -16,9 +16,18 @@ stdenv.mkDerivation { ''; # from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches - patches = if stdenv.hostPlatform.system == "x86_64-linux" then + patches = (if stdenv.hostPlatform.system == "x86_64-linux" then [ ./gcolor2-amd64.patch ] else - [ ]; + [ ]) + ++ [ + # Pull patch pending upstream inclusion for -fno-common toolchains: + # https://sourceforge.net/p/gcolor2/patches/8/ + (fetchpatch { + name = "fno-common.patch"; + url = "https://sourceforge.net/p/gcolor2/patches/8/attachment/0001-gcolor2-fix-build-on-gcc-10-fno-common.patch"; + sha256 = "0187zc8as9g3d6mpm3isg87jfpryj0hajb4inwvii8gxrzbi5l5f"; + }) + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 55c95c95cf734..ee733a0b1b0c0 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -18,6 +18,7 @@ , lcms , libpng , libjpeg +, libjxl , poppler , poppler_data , libtiff @@ -53,13 +54,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.30"; + version = "2.10.32"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "iIFdqnbtfUJ37rNTNYuvoRbNL80shh2VuVE1wdUrZ9w="; + sha256 = "PxXHBVSvXcwbRubcaPPY8KbMn+VrbXisCMD9hZq4miU="; }; patches = [ @@ -100,6 +101,7 @@ in stdenv.mkDerivation rec { lcms libpng libjpeg + libjxl poppler poppler_data libtiff @@ -115,6 +117,8 @@ in stdenv.mkDerivation rec { libwebp libheif python + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files + python2.pkgs.pygtk libexif xorg.libXpm glib-networking diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 79760bb31a650..ae44b47643cd6 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -229,6 +229,10 @@ in Filters/Enhance/Wavelet sharpen */ name = "wavelet-sharpen-0.1.2"; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; src = fetchurl { url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; @@ -250,6 +254,15 @@ in rev = "v${version}"; sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo="; }; + patches = [ + # Pull upstream fix for -fno-common toolchain support: + # https://github.com/carlobaldassi/gimp-lqr-plugin/pull/6 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/carlobaldassi/gimp-lqr-plugin/commit/ae3464a82e1395fc577cc94999bdc7c4a7bb35f1.patch"; + sha256 = "EdjZWM6U1bhUmsOnLA8iJ4SFKuAXHIfNPzxZqel+JrY="; + }) + ]; }; gmic = pkgs.gmic-qt.override { diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index fdf6831b974e7..97fc3d1f8ff9a 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools }: @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain support: + # https://github.com/jimevins/glabels/pull/76 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/jimevins/glabels/commit/f64e3f34e3631330fff2fb48ab271ff9c6160229.patch"; + sha256 = "13q6g4bxzvzwjnvzkvijds2b6yvc4xqbdwgqnwmj65ln6ngxz8sa"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools diff --git a/pkgs/applications/graphics/glimpse/default.nix b/pkgs/applications/graphics/glimpse/default.nix deleted file mode 100644 index 09e58fccf9d1f..0000000000000 --- a/pkgs/applications/graphics/glimpse/default.nix +++ /dev/null @@ -1,200 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, substituteAll -, pkg-config -, intltool -, babl -, gegl -, gtk2 -, glib -, gdk-pixbuf -, isocodes -, pango -, cairo -, freetype -, fontconfig -, lcms -, libpng -, libjpeg -, poppler -, poppler_data -, libtiff -, libmng -, librsvg -, libwmf -, zlib -, libzip -, ghostscript -, aalib -, shared-mime-info -, python2 -, libexif -, gettext -, xorg -, glib-networking -, libmypaint -, gexiv2 -, harfbuzz -, mypaint-brushes1 -, libwebp -, libheif -, libgudev -, openexr -, AppKit -, Cocoa -, gtk-mac-integration-gtk2 -, libxslt -, automake -, autoconf -, libtool -, makeWrapper -, autoreconfHook -, gtk-doc -, graphviz -}: -let - python = python2.withPackages (pp: [ pp.pygtk ]); -in -stdenv.mkDerivation rec { - pname = "glimpse"; - version = "0.2.0"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "glimpse-editor"; - repo = "Glimpse"; - rev = "v${version}"; - sha256 = "sha256-qbZQmAo7fuJWWbn0QTyxAwAenZOdsGueUq5/3IV8Njc="; - }; - - patches = [ - # to remove compiler from the runtime closure, reference was retained via - # gimp --version --verbose output - (substituteAll { - src = ./remove-cc-reference.patch; - cc_version = stdenv.cc.cc.name; - }) - ../gimp/hardcode-plugin-interpreters.patch - ]; - - postPatch = '' - ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . - ''; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - intltool - gettext - automake - autoconf - makeWrapper - gtk-doc - libxslt - libtool - ]; - - buildInputs = [ - babl - gegl - gtk2 - glib - gdk-pixbuf - pango - cairo - gexiv2 - harfbuzz - isocodes - freetype - fontconfig - lcms - libpng - libjpeg - poppler - poppler_data - libtiff - openexr - libmng - librsvg - libwmf - zlib - libzip - ghostscript - aalib - shared-mime-info - libwebp - libheif - python - libexif - xorg.libXpm - glib-networking - libmypaint - mypaint-brushes1 - ] ++ lib.optionals stdenv.isDarwin [ - AppKit - Cocoa - gtk-mac-integration-gtk2 - ] ++ lib.optionals stdenv.isLinux [ - libgudev - ]; - - # needed by gimp-2.0.pc - propagatedBuildInputs = [ - gegl - ]; - - # Check if librsvg was built with --disable-pixbuf-loader. - PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; - - preAutoreconf = '' - # The check runs before glib-networking is registered - export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" - ''; - - postFixup = '' - wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix PATH ":" ${ lib.makeBinPath [ graphviz ] } - ''; - - passthru = rec { - # The declarations for `glimpse-with-plugins` wrapper, - # used for determining plug-in installation paths - majorVersion = "2.0"; - targetPluginDir = "lib/glimpse/${majorVersion}/plug-ins"; - targetScriptDir = "share/glimpse/${majorVersion}/scripts"; - targetDataDir = "share/gimp/${majorVersion}"; - targetLibDir = "lib/gimp/${majorVersion}"; - - # probably its a good idea to use the same gtk in plugins ? - gtk = gtk2; - }; - - configureFlags = [ - "--without-webkit" # old version is required - "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" - "--with-icc-directory=/run/current-system/sw/share/color/icc" - # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) - "--libdir=\${exec_prefix}/lib" - ]; - - # on Darwin, - # test-eevl.c:64:36: error: initializer element is not a compile-time constant - doCheck = !stdenv.isDarwin; - - enableParallelBuilding = true; - - meta = with lib; { - description = "An open source image editor based on the GNU Image Manipulation Program"; - longDescription = '' - Glimpse is an open source image editor based on the GNU Image Manipulation Program (GIMP). The goal is to experiment with new ideas and expand the use of free software. - ''; - homepage = "https://glimpse-editor.org"; - maintainers = with maintainers; [ ashkitten erictapen ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; - mainProgram = "glimpse"; - }; -} diff --git a/pkgs/applications/graphics/glimpse/plugins/default.nix b/pkgs/applications/graphics/glimpse/plugins/default.nix deleted file mode 100644 index 48c65c3d5646a..0000000000000 --- a/pkgs/applications/graphics/glimpse/plugins/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Use `glimpse-with-plugins` package for Glimpse with all plug-ins. -# If you just want a subset of plug-ins, you can specify them explicitly: -# `glimpse-with-plugins.override { plugins = with glimpsePlugins; [ gap ]; }`. - -{ gimpPlugins, glimpse }: - -# This attrs can be extended in the future if there happen to be glimpse-only -# plugins or some that need further modification in order to work with Glimpse. -gimpPlugins.overrideScope' (self: super: { - gimp = glimpse; -}) diff --git a/pkgs/applications/graphics/glimpse/remove-cc-reference.patch b/pkgs/applications/graphics/glimpse/remove-cc-reference.patch deleted file mode 100644 index e63bf88dfdd71..0000000000000 --- a/pkgs/applications/graphics/glimpse/remove-cc-reference.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/app/gimp-version.c b/app/gimp-version.c -index b584398231..1b40a1570f 100644 ---- a/app/gimp-version.c -+++ b/app/gimp-version.c -@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, - GIMP_BUILD_ID, - gimp_version_get_revision (), - GIMP_BUILD_PLATFORM_FAMILY, -- CC_VERSION, -+ "@cc_version@", - lib_versions); - g_free (lib_versions); - diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix deleted file mode 100644 index 63697a9bb66b7..0000000000000 --- a/pkgs/applications/graphics/glimpse/wrapper.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }: - -let - allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); - selectedPlugins = if plugins == null then allPlugins else plugins; - extraArgs = map (x: x.wrapArgs or "") selectedPlugins; - versionBranch = lib.versions.majorMinor glimpse.version; - -in -symlinkJoin { - name = "glimpse-with-plugins-${glimpse.version}"; - - paths = [ glimpse ] ++ selectedPlugins; - - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do - wrapProgram $out/bin/$each \ - --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ - --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ - --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ - ${toString extraArgs} - done - - for each in glimpse glimpse-console; do - ln -sf "$each-${versionBranch}" $out/bin/$each - done - ''; - - inherit (glimpse) meta; -} diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 8cb4208e26723..1fca4d2004e24 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -8,7 +8,7 @@ , pkg-config , python3 , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 , appstream-glib , desktop-file-utils @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "gnome-obfuscate"; - version = "0.0.4"; + version = "0.0.7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Obfuscate"; rev = version; - sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4="; + sha256 = "sha256-jEMOg2yHi6K57XhA/7hkwwvedmikoB8pGV3ka+jixq8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U="; + sha256 = "sha256-P04BeidLXouPLzT/vsa4VC5AOENF0W4gqXqzdmRFhmE="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 39eefb0034520..dcebff3fcf3a8 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "483"; + version = "488d"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UU3XQ0NC/apJ0S/uDDNG+8DOD+sRyX98yMcjtL2Htig="; + sha256 = "sha256-FWiopOf+eabiWAfjQW83V7I/e5lOLUVW3djoQePHPRs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/image_optim/Gemfile.lock b/pkgs/applications/graphics/image_optim/Gemfile.lock index 3ffadb5acbe31..db55fa8be3eea 100644 --- a/pkgs/applications/graphics/image_optim/Gemfile.lock +++ b/pkgs/applications/graphics/image_optim/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - exifr (1.3.6) - fspath (3.1.0) - image_optim (0.26.3) + exifr (1.3.9) + fspath (3.1.2) + image_optim (0.31.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) - image_size (>= 1.5, < 3) + image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_size (2.0.0) - in_threads (1.5.1) - progress (3.5.0) + image_size (3.0.2) + in_threads (1.6.0) + progress (3.6.0) PLATFORMS ruby @@ -20,4 +20,4 @@ DEPENDENCIES image_optim BUNDLED WITH - 2.1.4 + 2.3.9 diff --git a/pkgs/applications/graphics/image_optim/gemset.nix b/pkgs/applications/graphics/image_optim/gemset.nix index 08e7f5c78ef94..b9ea65e552245 100644 --- a/pkgs/applications/graphics/image_optim/gemset.nix +++ b/pkgs/applications/graphics/image_optim/gemset.nix @@ -1,51 +1,63 @@ { exifr = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q2abhiyvgfv23i0izbskjxcqaxiw9bfg6s57qgn4li4yxqpwpfg"; + sha256 = "0mylhwmh6n4xihxr9s3zj0lc286f5maxbqd4dgk3paqnd7afz88s"; type = "gem"; }; - version = "1.3.6"; + version = "1.3.9"; }; fspath = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vjn9sy4hklr2d5wxmj5x1ry31dfq3sjp779wyprb3nbbdmra1sc"; + sha256 = "0xcxikkrjv8ws328nn5ax5pyfjs8pn7djg1hks7qyb3yp6prpb5m"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.2"; }; image_optim = { dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "082w9qcyy9j6m6s2pknfdcik7l2qch4j48axs13m06l4s1hz0dmg"; + sha256 = "1l3n59w1cbvfg2srfa14g3jdqwbkf7l86g4qrgfz3qps7zi0drg7"; type = "gem"; }; - version = "0.26.3"; + version = "0.31.1"; }; image_size = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcn7nc6qix3w4sf7xd557lnsgjniqa7qvz7nnznx70m8qfbc7ig"; + sha256 = "033k72f8n28psm89wv1qwsrnqyzz57ihyivyi442wha6vr9iyjz3"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.2"; }; in_threads = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14hqm59sgqi91ag187zwpgwi58xckjkk58m031ghkp0csl8l9mkx"; + sha256 = "0j9132d4g8prjafgdh4pw948j527kr09m2lvylrcd797il9yd9wi"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; progress = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yrzq4v5sp7cg4nbgqh11k3d1czcllfz98dcdrxrsjxwq5ziiw0p"; + sha256 = "0wymdk40cwrqn32gwg1kw94s5p1n0z3n7ma7x1s62gd4vw3d63in"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; } diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index f21f658ace30a..35c8dbf2f19aa 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -74,6 +74,7 @@ in stdenv.mkDerivation rec { inspired by NIH Image for the Macintosh. It runs on any computer with a Java 1.4 or later virtual machine. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ yuriaisaka ]; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 75bfe5cff93d2..4a6e28c3cf07a 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,7 +5,6 @@ , cairo , cmake , fetchurl -, fetchpatch , gettext , ghostscript , glib @@ -44,20 +43,25 @@ let python3Env = python3.withPackages (ps: with ps; [ + appdirs + beautifulsoup4 + cachecontrol numpy lxml pillow scour pyserial - ]); + requests + pygobject3 + ] ++ inkex.propagatedBuildInputs); in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.1.2"; + version = "1.2"; src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE="; + url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"; + sha256 = "jZsxFCVUlFZk7f7+LWtVkQpQmXZfcXanEQfDTx3N5q0="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -73,20 +77,6 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) - - # Fix build with poppler 22.03 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/4187 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch"; - sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg="; - }) - - # Fix build with poppler 22.04 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/4266 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch"; - sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE="; - }) ]; postPatch = '' diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index d4d00ad9c6ffb..045ac5d665cfe 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -19,11 +19,11 @@ mkDerivation rec { pname = "ipe"; - version = "7.2.23"; + version = "7.2.24"; src = fetchurl { - url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${pname}-${version}-src.tar.gz"; - sha256 = "0yvm3zfba1ljyy518vjnvwpyg7lgnmdwm19v5k0wfgz64aca56x1"; + url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz"; + sha256 = "sha256-/rh58k0dziWRB5B3BEbVCwPkbuLr19KBV7FwWXFkT28="; }; sourceRoot = "${pname}-${version}/src"; diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 1c4609ac55b73..6286e64e3efe8 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hexler.net/products/kodelife"; description = "Real-time GPU shader editor"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 063c5cc1551cb..603c1a44f4f24 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.0.2"; + version = "5.0.8"; kde-channel = "stable"; - sha256 = "sha256-5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8="; + sha256 = "sha256:7R0fpQc+4MQVDh/enhCTgpgOqU0y5YRShrv/ILa/XkU="; }) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index a0819a203e722..d5f778b592ac2 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -3,7 +3,7 @@ , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase +, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages @@ -23,13 +23,13 @@ mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio_1 poppler curl ilmbase + openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp qtmultimedia qtx11extras quazip python3Packages.pyqt5 ] ++ lib.optional stdenv.hostPlatform.isx86 vc; @@ -37,22 +37,31 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; + # Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script. + # Patch the PYTHONPATH so python scripts can import sip successfully. + postPatch = let + pythonPath = python3Packages.makePythonPath (with python3Packages; [ sip setuptools ]); + in '' + substituteInPlace cmake/modules/FindSIP.cmake \ + --replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}' + substituteInPlace cmake/modules/SIPMacros.cmake \ + --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' + ''; + cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ]; - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done + preInstall = '' + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; meta = with lib; { description = "A free and open source painting application"; homepage = "https://krita.org/"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar sifmelcara nek0 ]; platforms = platforms.linux; license = licenses.gpl3Only; }; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 9c16e23ebb597..bb37dc5ef0275 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -2,8 +2,10 @@ , mkDerivation , fetchFromGitHub , fetchurl +, povray , qmake , qttools +, substituteAll , zlib }: @@ -14,26 +16,35 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ let parts = fetchurl { - url = "https://web.archive.org/web/20190715142541/https://www.ldraw.org/library/updates/complete.zip"; + url = "https://web.archive.org/web/20210705153544/https://www.ldraw.org/library/updates/complete.zip"; sha256 = "sha256-PW3XCbFwRaNkx4EgCnl2rXH7QgmpNgjTi17kZ5bladA="; }; in mkDerivation rec { pname = "leocad"; - version = "21.03"; + version = "21.06"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "sha256-69Ocfk5dBXwcRqAZWEP9Xg41o/tAQo76dIOk9oYhCUE="; + sha256 = "1ifbxngkbmg6d8vv08amxbnfvlyjdwzykrjp98lbwvgb0b843ygq"; }; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ zlib ]; + propagatedBuildInputs = [ povray ]; + + patches = [ + (substituteAll { + src = ./povray.patch; + inherit povray; + }) + ]; + qmakeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" "DISABLE_UPDATE_CHECK=1" diff --git a/pkgs/applications/graphics/leocad/povray.patch b/pkgs/applications/graphics/leocad/povray.patch new file mode 100644 index 0000000000000..b1281a55b3459 --- /dev/null +++ b/pkgs/applications/graphics/leocad/povray.patch @@ -0,0 +1,72 @@ +From 6e7dd2c763e2cc79db4cd7173921a4e72ce9b95e Mon Sep 17 00:00:00 2001 +From: Elias Probst <mail@eliasprobst.eu> +Date: Tue, 5 Oct 2021 02:55:18 +0200 +Subject: [PATCH] Don't use configurable POV-ray path. + +Once the POV-ray path is configurable, it'll be written to the LeoCAD +profile, which will break upon the next update of POV-ray which will +have a different Nix store path. + +Signed-off-by: Elias Probst <mail@eliasprobst.eu> +--- + common/lc_application.cpp | 1 - + common/lc_profile.cpp | 2 +- + qt/lc_qpreferencesdialog.cpp | 3 ++- + qt/lc_renderdialog.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/common/lc_application.cpp b/common/lc_application.cpp +index cbdec82e..21974510 100644 +--- a/common/lc_application.cpp ++++ b/common/lc_application.cpp +@@ -1267,7 +1267,6 @@ void lcApplication::ShowPreferencesDialog() + lcSetProfileString(LC_PROFILE_DEFAULT_AUTHOR_NAME, Options.DefaultAuthor); + lcSetProfileString(LC_PROFILE_PARTS_LIBRARY, Options.LibraryPath); + lcSetProfileString(LC_PROFILE_MINIFIG_SETTINGS, Options.MinifigSettingsPath); +- lcSetProfileString(LC_PROFILE_POVRAY_PATH, Options.POVRayPath); + lcSetProfileString(LC_PROFILE_POVRAY_LGEO_PATH, Options.LGEOPath); + lcSetProfileString(LC_PROFILE_LANGUAGE, Options.Language); + lcSetProfileInt(LC_PROFILE_CHECK_UPDATES, Options.CheckForUpdates); +diff --git a/common/lc_profile.cpp b/common/lc_profile.cpp +index 1975b586..911c4fb0 100644 +--- a/common/lc_profile.cpp ++++ b/common/lc_profile.cpp +@@ -132,7 +132,7 @@ static lcProfileEntry gProfileEntries[LC_NUM_PROFILE_KEYS] = + lcProfileEntry("HTML", "ImageWidth", 640), // LC_PROFILE_HTML_IMAGE_WIDTH + lcProfileEntry("HTML", "ImageHeight", 480), // LC_PROFILE_HTML_IMAGE_HEIGHT + +- lcProfileEntry("POVRay", "Path", "/usr/bin/povray"), // LC_PROFILE_POVRAY_PATH ++ lcProfileEntry("POVRay", "Path", "@povray@/bin/povray"), // LC_PROFILE_POVRAY_PATH + lcProfileEntry("POVRay", "LGEOPath", ""), // LC_PROFILE_POVRAY_LGEO_PATH + lcProfileEntry("POVRay", "Width", 1280), // LC_PROFILE_POVRAY_WIDTH + lcProfileEntry("POVRay", "Height", 720), // LC_PROFILE_POVRAY_HEIGHT +diff --git a/qt/lc_qpreferencesdialog.cpp b/qt/lc_qpreferencesdialog.cpp +index 89f86aad..c239763f 100644 +--- a/qt/lc_qpreferencesdialog.cpp ++++ b/qt/lc_qpreferencesdialog.cpp +@@ -55,7 +55,8 @@ lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogO + ui->partsLibrary->setText(mOptions->LibraryPath); + ui->ColorConfigEdit->setText(mOptions->ColorConfigPath); + ui->MinifigSettingsEdit->setText(mOptions->MinifigSettingsPath); +- ui->povrayExecutable->setText(mOptions->POVRayPath); ++ ui->povrayExecutable->hide(); ++ ui->povrayExecutableBrowse->hide(); + ui->lgeoPath->setText(mOptions->LGEOPath); + ui->authorName->setText(mOptions->DefaultAuthor); + ui->mouseSensitivity->setValue(mOptions->Preferences.mMouseSensitivity); +diff --git a/qt/lc_renderdialog.cpp b/qt/lc_renderdialog.cpp +index bd8a9102..96794738 100644 +--- a/qt/lc_renderdialog.cpp ++++ b/qt/lc_renderdialog.cpp +@@ -184,7 +184,7 @@ void lcRenderDialog::on_RenderButton_clicked() + #endif + + #ifdef Q_OS_LINUX +- POVRayPath = lcGetProfileString(LC_PROFILE_POVRAY_PATH); ++ POVRayPath = QDir::cleanPath(QLatin1String("@povray@/bin/povray")); + Arguments.append("+FN"); + Arguments.append("-D"); + #endif +-- +2.33.0 + diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 05a99527e5f71..50b1cb37ffaf2 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Layout, editing, and control software for your laser cutter"; homepage = "https://lightburnsoftware.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/lorien/default.nix b/pkgs/applications/graphics/lorien/default.nix new file mode 100644 index 0000000000000..e3e8daf876622 --- /dev/null +++ b/pkgs/applications/graphics/lorien/default.nix @@ -0,0 +1,124 @@ +{ lib +, stdenv +, fetchFromGitHub + +, copyDesktopItems +, makeDesktopItem + +, godot-export-templates +, godot-headless + +, alsa-lib +, libGL +, libGLU +, libX11 +, libXcursor +, libXext +, libXfixes +, libXi +, libXinerama +, libXrandr +, libXrender +, zlib +, udev # for libudev +}: + +let + preset = + if stdenv.isLinux then "Linux/X11" + else if stdenv.isDarwin then "Mac OSX" + else throw "unsupported platform"; +in +stdenv.mkDerivation rec { + pname = "lorien"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "mbrlabs"; + repo = "Lorien"; + rev = "v${version}"; + sha256 = "sha256-x81Obana2BEGrYSoJHDdCkL6UaULfQGQ94tlrH5+kdY="; + }; + + nativeBuildInputs = [ + copyDesktopItems + godot-headless + ]; + + buildInputs = [ + alsa-lib + libGL + libGLU + libX11 + libXcursor + libXext + libXfixes + libXi + libXinerama + libXrandr + libXrender + zlib + udev + ]; + + desktopItems = [ + (makeDesktopItem { + name = "lorien"; + exec = "lorien"; + icon = "lorien"; + desktopName = "Lorien"; + genericName = "Whiteboard"; + comment = meta.description; + categories = [ "Graphics" "Office" ]; + keywords = [ "whiteboard" ]; + }) + ]; + + buildPhase = '' + runHook preBuild + + # Cannot create file '/homeless-shelter/.config/godot/projects/...' + export HOME=$TMPDIR + + # Link the export-templates to the expected location. The --export commands + # expects the template-file at .../templates/{godot-version}.stable/linux_x11_64_release + mkdir -p $HOME/.local/share/godot + ln -s ${godot-export-templates}/share/godot/templates $HOME/.local/share/godot + + mkdir -p $out/share/lorien + + godot-headless --path lorien --export "${preset}" $out/share/lorien/lorien + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ln -s $out/share/lorien/lorien $out/bin + + # Patch binaries. + interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) + patchelf \ + --set-interpreter $interpreter \ + --set-rpath ${lib.makeLibraryPath buildInputs} \ + $out/share/lorien/lorien + + install -Dm644 images/lorien.png $out/share/pixmaps/lorien.png + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/mbrlabs/Lorien"; + description = "An infinite canvas drawing/note-taking app"; + longDescription = '' + An infinite canvas drawing/note-taking app that is focused on performance, + small savefiles and simplicity + ''; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ hqurve ]; + }; +} diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix new file mode 100644 index 0000000000000..5c6e49ea9a64e --- /dev/null +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -0,0 +1,64 @@ +{ lib +, fetchurl +, gdk-pixbuf +, gobject-introspection +, gtk3 +, mcomix +, python3 +, testers +, wrapGAppsHook + +# Recommended Dependencies: +, lhasa +, mupdf +, p7zip +, unrar +, unrarSupport ? false # unfree software +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mcomix"; + version = "2.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz"; + sha256 = "sha256-7zjQcT5WoHxy+YzCDJ6s2ngOOfO4L9exuqBqacecClg="; + }; + + buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); + + # Tests are broken + doCheck = false; + + # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 + # until https://github.com/NixOS/nixpkgs/pull/102613 + strictDeps = false; + + # prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}" + ) + ''; + + passthru.tests.version = testers.testVersion { + package = mcomix; + }; + + meta = with lib; { + description = "Comic book reader and image viewer"; + longDescription = '' + User-friendly, customizable image viewer, specifically designed to handle + comic books and manga supporting a variety of container formats + (including CBR, CBZ, CB7, CBT, LHA and PDF) + ''; + homepage = "https://sourceforge.net/projects/mcomix/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix deleted file mode 100644 index 30a056738975e..0000000000000 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib -, fetchFromGitHub -, wrapGAppsHook -, installShellFiles -, python3 -, gobject-introspection -, gtk3 -, gdk-pixbuf - -# Recommended Dependencies: -, unrarSupport ? false # unfree software -, unrar -, p7zip -, lhasa -, mupdf -}: - -python3.pkgs.buildPythonApplication rec { - pname = "mcomix3"; - version = "unstable-2021-04-23"; - - # no official release on pypi/github and no build system - src = fetchFromGitHub { - repo = "${pname}"; - owner = "multiSnow"; - rev = "139344e23898c28484328fc29fd0c6659affb12d"; - sha256 = "0q9xgl60ryf7qmy5vgzgfry4rvw5j9rb4d1ilxmpjmvm7dd3fm2k"; - }; - - buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; - nativeBuildInputs = [ wrapGAppsHook installShellFiles ]; - propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); - - format = "other"; - - # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 - # until https://github.com/NixOS/nixpkgs/pull/102613 - strictDeps = false; - - preInstall = '' - libdir=$out/lib/${python3.libPrefix}/site-packages - mkdir -p $out/share/{icons/hicolor,man/man1,applications,metainfo,thumbnailers} - mkdir -p $out/bin $libdir - ''; - - installPhase = '' - runHook preInstall - - substituteInPlace mime/*.desktop \ - --replace "Exec=mcomix" "Exec=mcomix3" \ - --replace "Icon=mcomix" "Icon=${pname}" - ${python3.executable} installer.py --srcdir=mcomix --target=$libdir - mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname} - mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb - mv $libdir/mcomix/mcomix/* $libdir/mcomix - - runHook postInstall - ''; - - postInstall = '' - rmdir $libdir/mcomix/mcomix - mv man/mcomix.1 man/${pname}.1 - installManPage man/* - cp -r mime/icons/* $out/share/icons/hicolor/ - cp mime/*.desktop $out/share/applications/ - cp mime/*.appdata.xml $out/share/metainfo/ - cp mime/*.thumbnailer $out/share/thumbnailers/ - for folder in $out/share/icons/hicolor/*; do - mkdir $folder/{apps,mimetypes} - mv $folder/*.png $folder/mimetypes - cp $libdir/mcomix/images/$(basename $folder)/mcomix.png $folder/apps/${pname}.png - cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png - cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png - done - ''; - - # prevent double wrapping - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}" - ) - ''; - - # real pytests broken upstream - checkPhase = '' - $out/bin/comicthumb --help > /dev/null - $out/bin/${pname} --help > /dev/null - ''; - - meta = with lib; { - description = "Comic book reader and image viewer; python3 fork of mcomix"; - longDescription = '' - User-friendly, customizable image viewer, specifically designed to handle - comic books and manga supporting a variety of container formats - (including CBR, CBZ, CB7, CBT, LHA and PDF) - ''; - homepage = "https://github.com/multiSnow/mcomix3"; - changelog = "https://github.com/multiSnow/mcomix3/blob/gtk3/ChangeLog"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ confus ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 7a5729de5f5ea..13f6c3f5ab30a 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - hash = "sha256-UHJ3Fayf+lS3nRuuhHHLN6mbHfHIPssWkghPMPF5ECg="; + hash = "sha256-zOtHxnXDzsLfaQPS0BhbuoUXglCbRULVJfk1txoS72Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 0280664279511..99e7b042d161e 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , writeText , cmake , doxygen @@ -36,6 +35,8 @@ , vulkan-loader , wayland , wayland-protocols +, wayland-scanner +, libdrm , zlib # Set as 'false' to build monado without service support, i.e. allow VR # applications linking against libopenxr_monado.so to use OpenXR standalone @@ -46,25 +47,16 @@ stdenv.mkDerivation rec { pname = "monado"; - version = "21.0.0"; + version = "unstable-2022-05-28"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "07zxs96i3prjqww1f68496cl2xxqaidx32lpfyy0pn5am4c297zc"; + owner = "monado"; + repo = "monado"; + rev = "011bcbdcff227e25507e5f2d81a83a2bbe478856"; + sha256 = "sha256-8velNKSCZJtKO8ATwXDl1nU8RbxZ8TeyGiUQFOXifuI="; }; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/137245 - # Fix warning after Vulkan 1.2.174 VK_NULL_HANDLE change - (fetchpatch { - url = "https://gitlab.freedesktop.org/monado/monado/-/commit/c47775a95d8e139a2f234063793eb6726f830510.patch"; - sha256 = "093ymvi9ifpk4vyjcwhhci9cnscxwbv5f80xdbppcqa0j92nmkmp"; - }) - ]; - nativeBuildInputs = [ cmake doxygen @@ -75,6 +67,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}" + "-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON" ]; buildInputs = [ @@ -105,7 +98,9 @@ stdenv.mkDerivation rec { vulkan-headers vulkan-loader wayland + wayland-scanner wayland-protocols + libdrm zlib ]; @@ -130,5 +125,6 @@ stdenv.mkDerivation rec { license = licenses.boost; maintainers = with maintainers; [ expipiplus1 prusnak ]; platforms = platforms.linux; + mainProgram = "monado-cli"; }; } diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 2cd3299c6175f..9e516f211069d 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { pygobject3 ])) ]; + patches = [ + # Compiles, but doesn't launch without this, see: + # https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83 + ./fix-launch.diff + ]; enginesPath = lib.makeBinPath ([ tesseract4 @@ -64,7 +69,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl3Plus; platforms = platforms.linux; - # Compiles, but doesn't launch, see: https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83 - broken = true; }; } diff --git a/pkgs/applications/graphics/ocrfeeder/fix-launch.diff b/pkgs/applications/graphics/ocrfeeder/fix-launch.diff new file mode 100644 index 0000000000000..c6f10c2b11019 --- /dev/null +++ b/pkgs/applications/graphics/ocrfeeder/fix-launch.diff @@ -0,0 +1,13 @@ +diff --git i/src/ocrfeeder/studio/studioBuilder.py w/src/ocrfeeder/studio/studioBuilder.py +index 7a2ccdc..7af19d9 100644 +--- i/src/ocrfeeder/studio/studioBuilder.py ++++ w/src/ocrfeeder/studio/studioBuilder.py +@@ -144,7 +144,7 @@ class Studio: + if not self.ocr_engines: + engines = self.configuration_manager.getEnginesInSystem() + if engines: +- add_engines_dialog = widgetPresenter.SystemEnginesDialog(engines) ++ add_engines_dialog = widgetPresenter.SystemEnginesDialog(self.main_window, engines) + response = add_engines_dialog.run() + if response == Gtk.ResponseType.ACCEPT: + for engine in add_engines_dialog.getChosenEngines(): diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix index b99902954572a..3a089febc3df3 100644 --- a/pkgs/applications/graphics/odafileconverter/default.nix +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -46,6 +46,7 @@ in mkDerivation { meta = with lib; { description = "For converting between different versions of .dwg and .dxf"; homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ nagisa ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 52351fab4ce58..dbc5b973fe9c0 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -1,15 +1,16 @@ -{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl }: +{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl, cmake }: stdenv.mkDerivation rec { pname = "libpano13"; - version = "2.9.20"; + version = "2.9.21"; src = fetchurl { url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz"; - sha256 = "12cv4886l1czfjwy7k6ipgf3zjksgwhdjzr2s9fdg33vqcv2hlrv"; + sha256 = "sha256-eeWhRSGZMF4pYUYnIO9ZQRUnecEnxblvw0DSSS5jNZA="; }; buildInputs = [ perl libjpeg libpng libtiff ]; + nativeBuildInputs = [ cmake ]; # one of the tests succeeds on my machine but fails on Hydra (no idea why) #doCheck = true; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 5c5557d6d6016..ffd31bf7325ac 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -99,6 +99,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "GUI prototyping/mockup tool"; homepage = "https://pencil.evolus.vn/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2; # Commercial license is also available maintainers = with maintainers; [ bjornfor prikhi mrVanDalo ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index cc4f4342c6188..1806d0d7b3ba3 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.7.1"; + version = "1.6.10"; src = fetchFromGitHub { owner = "PhotoFlare"; repo = "photoflare"; rev = "v${version}"; - sha256 = "sha256-7b7ICcHuMjOMtyQDkokoHeZrF4G+bOzgRJP4mkns+Zc="; + sha256 = "sha256-lQIzvI6rjcx8pHni9LN15LWyIkMALvyYx54G9WyqpOo="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix new file mode 100644 index 0000000000000..7a730cbda93b6 --- /dev/null +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, qtsvg +, qttools +, exiv2 +, wrapQtAppsHook +, cmake +}: + +stdenv.mkDerivation rec { + pname = "pineapple-pictures"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "BLumia"; + repo = "pineapple-pictures"; + rev = version; + sha256 = "sha256-KTYwe6fS/rUHBbC2B9OdK95mFm3zvgDdGODkg7VQ27M="; + }; + + nativeBuildInputs = [ + cmake + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + qtsvg + exiv2.lib + ]; + + meta = with lib; { + description = "Homebrew lightweight image viewer"; + homepage = "https://github.com/BLumia/pineapple-pictures"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b598c53b89472..438fbaf40cf14 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -20,9 +20,6 @@ buildDotnetModule rec { runtimeDeps = [ gtk3 ]; buildInputs = runtimeDeps; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; - # How-to update deps: # $ nix-build -A pinta.fetch-deps # $ ./result diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/applications/graphics/pixeluvo/default.nix index 0c90b786baca9..f3b40b515183a 100644 --- a/pkgs/applications/graphics/pixeluvo/default.nix +++ b/pkgs/applications/graphics/pixeluvo/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Beautifully Designed Image and Photo Editor for Windows and Linux"; homepage = "http://www.pixeluvo.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 8e864b6409689..f54aef75ac15a 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "pixinsight"; - version = "1.8.9"; + version = "1.8.9-1"; src = requireFile rec { - name = "PI-linux-x64-${version}-20220313-c.tar.xz"; + name = "PI-linux-x64-${version}-20220518-c.tar.xz"; url = "https://pixinsight.com/"; - sha256 = "sha256-LvrTB8fofuysxR3OoZ2fkkOQU62yUAu8ePOczJG2uqU="; + sha256 = "sha256-AVeDJ7YYqCo7KfelUUQurjglNnTwCf0pOzJCV/bQrrw="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution @@ -124,6 +124,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Scientific image processing program for astrophotography"; homepage = "https://pixinsight.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.sheepforce ]; diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix index 96823441b6e16..9e2248f896de7 100644 --- a/pkgs/applications/graphics/qosmic/default.nix +++ b/pkgs/applications/graphics/qosmic/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation +{ stdenv , fetchFromGitHub , fetchpatch , qmake @@ -13,7 +13,7 @@ , lib }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qosmic"; version = "1.6.0"; @@ -42,6 +42,13 @@ mkDerivation rec { }) ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace qosmic.pro \ + --replace "/share" "/Applications/qosmic.app/Contents/Resources" \ + --replace "/qosmic/scripts" "/scripts" \ + --replace "install_icons install_desktop" "" + ''; + nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; buildInputs = [ @@ -55,16 +62,19 @@ mkDerivation rec { qmakeFlags = [ # Use pkg-config to correctly locate library paths - "-config" "link_pkgconfig" + "CONFIG+=link_pkgconfig" ]; + preInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv qosmic.app $out/Applications + ''; + meta = with lib; { description = "A cosmic recursive flame fractal editor"; homepage = "https://github.com/bitsed/qosmic"; license = licenses.gpl3Plus; maintainers = [ maintainers.raboof ]; - # It might be possible to make it work on OSX, - # but this has not been tested. - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 93d40374607e4..ec8efcc27c2a6 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -2,7 +2,7 @@ let myPatchElf = file: with lib; '' patchelf --set-interpreter \ - ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { description = "Brother brscan4 sane backend driver"; homepage = "http://www.brother.com"; platforms = [ "i686-linux" "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ jraygauthier ]; }; diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 219d435a81a0d..59daa9eb09ab8 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -2,7 +2,7 @@ let myPatchElf = file: with lib; '' patchelf --set-interpreter \ - ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; system = stdenv.hostPlatform.system; @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { description = "Brother brscan5 sane backend driver"; homepage = "https://www.brother.com"; platforms = [ "i686-linux" "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ mattchrist ]; }; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index d3c5b1c0b75f2..8c45f3a62ff3e 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { in '' mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ + ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules || \ cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules # the created 49-libsane references /bin/sh substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 8a01f70c6b00f..93e179d867d93 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Brother DSSeries SANE backend driver"; homepage = "http://www.brother.com"; platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ callahad ]; }; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 098d330f004a1..a4eb306823974 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.15"; + version = "0.30.16"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-OlKtYLEC2g31902wMcRdTM8mNRPJVGFu4WZL9PTpvck="; + sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; }; nativeBuildInputs = [ @@ -71,7 +71,9 @@ stdenv.mkDerivation rec { sqlite webkitgtk gst_all_1.gstreamer + gst_all_1.gst-libav gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good libgee libgudev gexiv2 diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 68744831538c4..e0605ad81e43f 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -7,6 +7,7 @@ , at-spi2-core , cairo , dbus +, eigen , freetype , fontconfig , glew @@ -18,6 +19,7 @@ , libpng , libselinux , libsepol +, libspnav , libthai , libxkbcommon , pangomm @@ -29,13 +31,13 @@ stdenv.mkDerivation rec { pname = "solvespace"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE="; + hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA="; fetchSubmodules = true; }; @@ -49,6 +51,7 @@ stdenv.mkDerivation rec { at-spi2-core cairo dbus + eigen freetype fontconfig glew @@ -60,6 +63,7 @@ stdenv.mkDerivation rec { libpng libselinux libsepol + libspnav libthai libxkbcommon pangomm diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 93a600fff8475..6d2b6e4bb7a7e 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { crop, etc), PDF and PNG output. ''; homepage = "http://swingsane.com/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/applications/graphics/symbolic-preview/default.nix b/pkgs/applications/graphics/symbolic-preview/default.nix index de49c9d7cd681..85d7004555f51 100644 --- a/pkgs/applications/graphics/symbolic-preview/default.nix +++ b/pkgs/applications/graphics/symbolic-preview/default.nix @@ -1,25 +1,21 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook -, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc -, gdk-pixbuf, glib, gtk3, libhandy, libxml2 +{ lib, stdenv, fetchurl, wrapGAppsHook4 +, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc +, glib, gtk4, libadwaita, libxml2 }: stdenv.mkDerivation rec { pname = "symbolic-preview"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/91fd27bb70553c8d6c3ad2a35446ff6e/symbolic-preview-${version}.tar.xz"; - sha256 = "1v8l10ppwbjkrq7nvb0wqc3pid6pd8dqpki3jhmjjkmbd7rpdpkq"; + url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/df71a2eee9ea0c90b3d146e7286fec42/symbolic-preview-${version}.tar.xz"; + sha256 = "08g2sbdb1x5z26mi68nmciq6xwv0chvxw6anj1qdfh7npsg0dm4c"; }; nativeBuildInputs = [ - cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook + cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook4 ]; - buildInputs = [ gdk-pixbuf glib gtk3 libhandy libxml2 ]; - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; + buildInputs = [ glib gtk4 libadwaita libxml2 ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/symbolic-preview"; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 57f3560233609..a77a0313223bf 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,122 +1,136 @@ -{ lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config -, imagemagick, intltool, autoreconfHook, which, gnome +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, wrapGAppsHook + +, boost +, cairo +, gettext +, glibmm +, gtk3 +, gtkmm3 +, libjack2 +, libsigcxx +, libxmlxx +, mlt +, pango +, imagemagick +, intltool +, gnome +, harfbuzz +, freetype +, fribidi +, openexr +, fftw }: let - version = "1.0.2"; + version = "1.5.1"; + src = fetchFromGitHub { + owner = "synfig"; + repo = "synfig"; + rev = "v${version}"; + hash = "sha256-9vBYESaSgW/1FWH2uFBvPiYvxLlX0LLNnd4S7ACJcwI="; + }; ETL = stdenv.mkDerivation { - name = "ETL-0.04.19"; - - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; + pname = "ETL"; + inherit version src; - postUnpack = "sourceRoot=\${sourceRoot}/ETL/"; + sourceRoot = "source/ETL"; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + buildInputs = [ + glibmm + ]; }; synfig = stdenv.mkDerivation { pname = "synfig"; - inherit version; - - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; + inherit version src; - postUnpack = "sourceRoot=\${sourceRoot}/synfig-core/"; + sourceRoot = "source/synfig-core"; configureFlags = [ "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" ]; - nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + gettext + intltool + ]; buildInputs = [ - ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango + ETL + boost + cairo + glibmm + mlt + libsigcxx + libxmlxx + pango + imagemagick + harfbuzz + freetype + fribidi + openexr + fftw ]; - - meta.broken = true; }; in stdenv.mkDerivation { pname = "synfigstudio"; - inherit version; + inherit version src; - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; - - postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/"; + sourceRoot = "source/synfig-studio"; postPatch = '' - for i in \ - brushlib/brushlib.hpp \ - gui/canvasview.cpp \ - gui/compview.cpp \ - gui/docks/dock_canvasspecific.cpp \ - gui/docks/dock_children.cpp \ - gui/docks/dock_curves.cpp \ - gui/docks/dock_history.cpp \ - gui/docks/dock_keyframes.cpp \ - gui/docks/dock_layergroups.cpp \ - gui/docks/dock_layers.cpp \ - gui/docks/dock_metadata.cpp \ - gui/docks/dock_params.cpp \ - gui/docks/dock_timetrack.cpp \ - gui/docks/dock_toolbox.cpp \ - gui/docks/dockable.cpp \ - gui/docks/dockdialog.cpp \ - gui/docks/dockmanager.h \ - gui/duck.h \ - gui/duckmatic.cpp \ - gui/duckmatic.h \ - gui/instance.cpp \ - gui/instance.h \ - gui/states/state_stroke.h \ - gui/states/state_zoom.cpp \ - gui/widgets/widget_curves.cpp \ - gui/workarea.cpp \ - gui/workarearenderer/workarearenderer.h \ - synfigapp/action_system.h \ - synfigapp/canvasinterface.h \ - synfigapp/instance.h \ - synfigapp/main.h \ - synfigapp/uimanager.h - do - substituteInPlace src/"$i" --replace '#include <sigc++/object.h>' '#include <sigc++/sigc++.h>' - substituteInPlace src/"$i" --replace '#include <sigc++/hide.h>' '#include <sigc++/adaptors/hide.h>' - substituteInPlace src/"$i" --replace '#include <sigc++/retype.h>' '#include <sigc++/adaptors/retype.h>' - done + patchShebangs images/splash_screen_development.sh ''; - preConfigure = "./bootstrap.sh"; + preConfigure = '' + ./bootstrap.sh + ''; - nativeBuildInputs = [ pkg-config autoreconfHook gettext makeWrapper ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + gettext + wrapGAppsHook + ]; buildInputs = [ - ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool - libjack2 libsigcxx libxmlxx mlt-qt5 - synfig which gnome.adwaita-icon-theme + ETL + synfig + boost + cairo + glibmm + gtk3 + gtkmm3 + imagemagick + intltool + libjack2 + libsigcxx + libxmlxx + mlt + gnome.adwaita-icon-theme + openexr + fftw ]; - postInstall = '' - wrapProgram "$out/bin/synfigstudio" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - enableParallelBuilding = true; + passthru = { + # Expose libraries and cli tools + inherit ETL synfig; + }; + meta = with lib; { description = "A 2D animation program"; homepage = "http://www.synfig.org"; diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 0e5f38ae7918b..16365674706ed 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ viric earvstedt ]; + maintainers = with lib.maintainers; [ viric erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index d1f936fab079f..36c4c694a16a8 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ viric earvstedt ]; + maintainers = with lib.maintainers; [ viric erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/unigine-heaven/default.nix b/pkgs/applications/graphics/unigine-heaven/default.nix index 2ce05a52812ef..1677e4d65eef4 100644 --- a/pkgs/applications/graphics/unigine-heaven/default.nix +++ b/pkgs/applications/graphics/unigine-heaven/default.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/heaven"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix index 25d10d6166783..4b3f3ab547c66 100644 --- a/pkgs/applications/graphics/unigine-sanctuary/default.nix +++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec{ meta = { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/sanctuary"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix index 768089d1a0c4f..b1261bb52f23f 100644 --- a/pkgs/applications/graphics/unigine-superposition/default.nix +++ b/pkgs/applications/graphics/unigine-superposition/default.nix @@ -139,6 +139,7 @@ buildFHSUserEnv { meta = { description = "The Unigine Superposition GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/superposition"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix index 1057c2fa6cad7..f0d5101b4be02 100644 --- a/pkgs/applications/graphics/unigine-tropics/default.nix +++ b/pkgs/applications/graphics/unigine-tropics/default.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation { meta = { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/tropics"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 9b51373178e44..ee1c9e6c15f89 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { meta = { description = "The Unigine Valley GPU benchmarking tool"; homepage = "https://unigine.com/products/benchmarks/valley/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ lib.maintainers.kierdavis ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index eb5033a4a97c4..fb44d36f62a6d 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.18"; + version = "0.0.20"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-Ur1X5FhOa87jbjWBXievBfCHW+qP/8bqLiyKAC8+KU4="; + sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix deleted file mode 100644 index a6320f774fd59..0000000000000 --- a/pkgs/applications/graphics/vimiv/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, gnome - -# Test requirements -, dbus, xvfb-run, xdotool -}: - -python3Packages.buildPythonApplication rec { - pname = "vimiv"; - version = "0.7.3"; - - src = fetchFromGitHub { - owner = "karlch"; - repo = "vimiv"; - rev = "v${version}"; - sha256 = "18dn81n8hcrqhrqfida34qz7a0ar9rz2rrmzsvyp54zc6nyvv1cn"; - }; - - testimages = fetchFromGitHub { - owner = "karlch"; - repo = "vimiv"; - rev = "6f4d1372b27f2065c56eafdb521d230d9bb8f4e2"; - sha256 = "0a3aybzpms0381dz9japhm4c7j5klhmw91prcac6zaww6x34nmxb"; - }; - - postPatch = '' - patchShebangs scripts/install_icons.sh - sed -i -e 's,/usr,,g' -e '/setup\.py/d' Makefile scripts/install_icons.sh - - sed -i \ - -e 's,/etc/vimiv/\(vimivrc\|keys\.conf\),'"$out"'&,g' \ - man/* vimiv/parser.py - - sed -i \ - -e 's!"mogrify"!"${imagemagick}/bin/mogrify"!g' \ - -e '/cmd *=/s!"jhead"!"${jhead}/bin/jhead"!g' \ - vimiv/imageactions.py - ''; - - checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ]; - buildInputs = [ gnome.adwaita-icon-theme librsvg ]; - propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; - - makeWrapperArgs = [ - "--prefix GI_TYPELIB_PATH : \"$GI_TYPELIB_PATH\"" - "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$out/share\"" - "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\"" - ]; - - postCheck = '' - # Some tests assume that the directory only contains one vimiv directory - rm -rf vimiv.egg-info vimiv.desktop - - # Re-use the wrapper args from the main program - makeWrapper "$SHELL" run-tests $makeWrapperArgs - - cp -Rd --no-preserve=mode "$testimages/testimages" vimiv/testimages - HOME="$(mktemp -d)" PATH="$out/bin:$PATH" \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - ./run-tests -c 'python tests/main_test.py && nosetests -vx' - ''; - - postInstall = "make DESTDIR=\"$out\" install"; - - meta = { - homepage = "https://github.com/karlch/vimiv"; - description = "An image viewer with Vim-like keybindings"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 7965f82412539..6cef9384e4c70 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, makeWrapper , dbus , ffmpeg , x264 @@ -11,6 +12,7 @@ , libdrm , pkg-config , pango +, pipewire , cmake , autoconf , libtool @@ -23,13 +25,13 @@ rustPlatform.buildRustPackage rec { pname = "weylus"; - version = "0.11.4"; + version = "unstable-2022-06-07"; src = fetchFromGitHub { owner = "H-M-H"; repo = pname; - rev = "v${version}"; - sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l"; + rev = "b169a6be2bf3e8d105273d92f032cca5438de53a"; + sha256 = "sha256-J9eVFIfmyBviVuT1MYKb5yoacbPqOAT3A8jahWv5qw8="; }; buildInputs = [ @@ -62,22 +64,33 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake nodePackages.typescript + makeWrapper ] ++ lib.optionals stdenv.isLinux [ pkg-config autoconf libtool ]; - cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0"; + cargoSha256 = "sha256-R46RSRdtfqi1PRQ0MaSIIqtj+Pr3yikm6NeMwwu1CSw="; cargoBuildFlags = [ "--features=ffmpeg-system" ]; cargoTestFlags = [ "--features=ffmpeg-system" ]; + postFixup = let + GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + pipewire + ]; + in lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} + ''; + postInstall = '' install -vDm755 weylus.desktop $out/share/applications/weylus.desktop ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Use your tablet as graphic tablet/touch screen on your computer"; homepage = "https://github.com/H-M-H/Weylus"; license = with licenses; [ agpl3Only ]; diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index ca8cebb2ec0c6..be20635c50018 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -54,6 +54,7 @@ mkDerivation rec { meta = with lib; { homepage = "http://www.styluslabs.com/"; description = "Write is a word processor for handwriting"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = lib.licenses.unfree; maintainers = with maintainers; [ oyren ]; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 0385c5db9d86b..b1d96f2d1f42f 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; homepage = "https://www.yworks.com/products/yed"; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index b5fc70494fcd9..cf0dd52ee73c2 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { # Quicker to unpack locally than load Hydra hydraPlatforms = []; maintainers = with lib.maintainers; [raskin]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; platforms = with lib.platforms; unix; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index c390e004c8cce..146ee9b145a72 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -78,8 +78,8 @@ let akregator = callPackage ./akregator.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; - bovo = callPackage ./bovo.nix {}; bomber = callPackage ./bomber.nix {}; + bovo = callPackage ./bovo.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; @@ -120,8 +120,13 @@ let kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive {}; - kdepim-runtime = callPackage ./kdepim-runtime {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; + kdepim-runtime = callPackage ./kdepim-runtime {}; + kdev-php = callPackage ./kdevelop/kdev-php.nix {}; + kdev-python = callPackage ./kdevelop/kdev-python.nix {}; + kdevelop = callPackage ./kdevelop/wrapper.nix {}; + kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix {}; + kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; kdiamond = callPackage ./kdiamond.nix {}; @@ -137,10 +142,10 @@ let kigo = callPackage ./kigo.nix {}; killbots = callPackage ./killbots.nix {}; kimap = callPackage ./kimap.nix {}; - kipi-plugins = callPackage ./kipi-plugins.nix {}; - kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kio-gdrive = callPackage ./kio-gdrive.nix {}; + kipi-plugins = callPackage ./kipi-plugins.nix {}; + kitinerary = callPackage ./kitinerary.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; klettres = callPackage ./klettres.nix {}; @@ -164,25 +169,26 @@ let kollision = callPackage ./kollision.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; + konqueror = callPackage ./konqueror.nix {}; + konquest = callPackage ./konquest.nix {}; konsole = callPackage ./konsole.nix {}; kontact = callPackage ./kontact.nix {}; + konversation = callPackage ./konversation.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; - konquest = callPackage ./konquest.nix {}; - konqueror = callPackage ./konqueror.nix {}; korganizer = callPackage ./korganizer.nix {}; kpat = callPackage ./kpat.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; - ksmtp = callPackage ./ksmtp {}; - ksquares = callPackage ./ksquares.nix {}; - kqtquickcharts = callPackage ./kqtquickcharts.nix {}; kpkpass = callPackage ./kpkpass.nix {}; kpublictransport = callPackage ./kpublictransport.nix {}; - kreversi = callPackage ./kreversi.nix {}; + kqtquickcharts = callPackage ./kqtquickcharts.nix {}; krdc = callPackage ./krdc.nix {}; + kreversi = callPackage ./kreversi.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; kshisen = callPackage ./kshisen.nix {}; + ksmtp = callPackage ./ksmtp {}; kspaceduel = callPackage ./kspaceduel.nix {}; + ksquares = callPackage ./ksquares.nix {}; ksudoku = callPackage ./ksudoku.nix {}; ksystemlog = callPackage ./ksystemlog.nix {}; kteatime = callPackage ./kteatime.nix {}; @@ -215,9 +221,9 @@ let minuet = callPackage ./minuet.nix {}; okular = callPackage ./okular.nix {}; picmi = callPackage ./picmi.nix {}; - pimcommon = callPackage ./pimcommon.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; + pimcommon = callPackage ./pimcommon.nix {}; print-manager = callPackage ./print-manager.nix {}; rocs = callPackage ./rocs.nix {}; skanlite = callPackage ./skanlite.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index d3b94c2a8527a..730989fc59e2b 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.04.1/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/kde/kdevelop/kdev-php.nix index 8308830efccc9..46c4af8c1c078 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/kde/kdevelop/kdev-php.nix @@ -1,13 +1,7 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: +{ mkDerivation, lib, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kdev-php"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-8Qg9rsK4x1LeGgRB0Pn3InSx4tKccjAF7Xjc+Lpxfgw="; - }; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix index 374b4224ca6bd..66335429bdd13 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/kde/kdevelop/kdev-python.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: - -stdenv.mkDerivation rec { +{ mkDerivation, lib, cmake, extra-cmake-modules +, threadweaver, ktexteditor, kdevelop-unwrapped, python39 +}: +let + # FIXME: stick with python 3.9 until MR supporting 3.10 is ready: + # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16 + python = python39; +in +mkDerivation rec { pname = "kdev-python"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-IPm3cblhJi3tmGpPMrjSWa2fe8SLsp6sCl1YU74dkX8="; - }; cmakeFlags = [ "-DPYTHON_EXECUTABLE=${python}/bin/python" diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix index e1478ef6a03c7..f96e8cf6b677e 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix @@ -1,15 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config, extra-cmake-modules, qtbase }: -let +stdenv.mkDerivation rec { pname = "kdevelop-pg-qt"; version = "2.2.1"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index 37ede94fa193d..4e7f576398e5c 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -1,21 +1,18 @@ - -{ mkDerivation, lib, fetchurl, cmake, gettext, pkg-config, extra-cmake-modules +{ mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules , qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons , plasma-framework, krunner, kdevelop-pg-qt, shared-mime-info, libkomparediff2 -, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost +, libksysguard, konsole, llvmPackages_13, makeWrapper, kpurpose, boost +, qtwebengine, cppcheck }: +let + llvmPackages = llvmPackages_13; +in mkDerivation rec { pname = "kdevelop"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-D4a8P+U/dhwePj91RFd6DEFDO+i/8xDPLnKfdvQ2O/Y="; - }; nativeBuildInputs = [ cmake gettext pkg-config extra-cmake-modules makeWrapper @@ -32,6 +29,7 @@ mkDerivation rec { kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose + cppcheck qtwebengine ]; # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b diff --git a/pkgs/applications/editors/kdevelop5/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix index 86d3de9eb39a9..86d3de9eb39a9 100644 --- a/pkgs/applications/editors/kdevelop5/wrapper.nix +++ b/pkgs/applications/kde/kdevelop/wrapper.nix diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index 6f331dcf77c75..eeafc1e5285e6 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -11,6 +11,13 @@ mkDerivation { grantlee kcmutils kconfig kcoreaddons kdbusaddons khtml ki18n kinit kservice xapian ]; + + preFixup = '' + qtWrapperArgs+=( + --prefix MANPATH : /nix/var/nix/profiles/system/sw/share/man + ) + ''; + meta = with lib; { homepage = "https://apps.kde.org/help/"; description = "Help center"; diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 29a3bdc97bb81..d9e8cf889491f 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,9 +1,9 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, - exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, + exiv2, kactivities, kactivities-stats, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio, - khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, - ilmbase, openslp, phonon, qtsvg, samba, solid, gperf + khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, libtirpc, + ilmbase, openslp, phonon, qtsvg, samba, solid, gperf, taglib }: mkDerivation { @@ -14,10 +14,10 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ - exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons + exiv2 kactivities kactivities-stats karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml - kpty syntax-highlighting libmtp libssh openexr openslp - phonon qtsvg samba solid gperf + kpty syntax-highlighting libmtp libssh openexr libtirpc openslp + phonon qtsvg samba solid gperf taglib ]; # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/kde/konversation.nix index 3c80ef09aaf75..4b224827e839e 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/kde/konversation.nix @@ -1,7 +1,5 @@ { mkDerivation , lib -, fetchurl -, fetchpatch , extra-cmake-modules , kdoctools , kbookmarks @@ -17,6 +15,7 @@ , kiconthemes , kidletime , kitemviews +, knewstuff , knotifications , knotifyconfig , kwindowsystem @@ -26,16 +25,11 @@ , solid , sonnet , phonon +, qtmultimedia }: -mkDerivation rec { +mkDerivation { pname = "konversation"; - version = "1.7.7"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc="; - }; buildInputs = [ kbookmarks @@ -52,6 +46,7 @@ mkDerivation rec { kiconthemes kidletime kitemviews + knewstuff knotifications knotifyconfig kwindowsystem @@ -61,6 +56,7 @@ mkDerivation rec { solid sonnet phonon + qtmultimedia ]; nativeBuildInputs = [ @@ -71,7 +67,6 @@ mkDerivation rec { meta = { description = "Integrated IRC client for KDE"; license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh ]; homepage = "https://konversation.kde.org"; }; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 7e5dff590ed33..b3e0ab16926df 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1859 +4,1859 @@ { akonadi = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadi-22.04.1.tar.xz"; - sha256 = "109r46dghfg84kcgq8h69m2pkd7abmq37ykgnpqynfzyrpkcvy6s"; - name = "akonadi-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadi-22.04.3.tar.xz"; + sha256 = "0g277jl2ay00p4yhkadvzjn1k2rkriz90ql2qcp5d4fjgs0220ky"; + name = "akonadi-22.04.3.tar.xz"; }; }; akonadi-calendar = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadi-calendar-22.04.1.tar.xz"; - sha256 = "1jqil45igxbii7warzil9r9lphd0vm23454zc9k0psl4zvwqd71m"; - name = "akonadi-calendar-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadi-calendar-22.04.3.tar.xz"; + sha256 = "0hcc2hpyhpd7219my7hpjcl24gsr9g8d2bwhlc66da96ray0pzg4"; + name = "akonadi-calendar-22.04.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadi-calendar-tools-22.04.1.tar.xz"; - sha256 = "1sn0355mkd8cl58nm6aspjb9jzngp7cxgj3jypyvwriv3fcm3ixj"; - name = "akonadi-calendar-tools-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadi-calendar-tools-22.04.3.tar.xz"; + sha256 = "0x68zfradfw6gxc5ph1s9i9kpj9h5klibn5a5pyfq5p487qnm131"; + name = "akonadi-calendar-tools-22.04.3.tar.xz"; }; }; akonadi-contacts = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadi-contacts-22.04.1.tar.xz"; - sha256 = "03ir95sghhvfxcsaz2v4wp06461xdr85iidgvpp9glfhp45cdwnd"; - name = "akonadi-contacts-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadi-contacts-22.04.3.tar.xz"; + sha256 = "080ba08sxb79il7na97m56k3gpwc8pj4bljca3qgw5kwhswj6gnx"; + name = "akonadi-contacts-22.04.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadi-import-wizard-22.04.1.tar.xz"; - sha256 = "0qgpzz855gfvsq30m3rw935pixpc8b732lsbzjykw6pnl73yji3j"; - name = "akonadi-import-wizard-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadi-import-wizard-22.04.3.tar.xz"; + sha256 = "0cyzkmbfwfs66bm6xvv2wgiyh2bhiykdf9i0g7ys33pabsparw7d"; + name = "akonadi-import-wizard-22.04.3.tar.xz"; }; }; akonadi-mime = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadi-mime-22.04.1.tar.xz"; - sha256 = "03kx6j48rmsz0gy7w1fhs6g0xb8difd753kyv9a2di1ijkqhhn3g"; - name = "akonadi-mime-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadi-mime-22.04.3.tar.xz"; + sha256 = "1qggacdhj5b5vrhwp1srlrhapl13hcc5d1ff5wlsdip87in4jad1"; + name = "akonadi-mime-22.04.3.tar.xz"; }; }; akonadi-notes = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadi-notes-22.04.1.tar.xz"; - sha256 = "119s7vgl8s9ik2fabky6xwq6gvj2xdq2ii0h1j6vx2x98mwwcqsk"; - name = "akonadi-notes-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadi-notes-22.04.3.tar.xz"; + sha256 = "0ps99717hvsq62fh3zagn5xgw5sc99naiiay5ym9wmfjvhr5slml"; + name = "akonadi-notes-22.04.3.tar.xz"; }; }; akonadi-search = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadi-search-22.04.1.tar.xz"; - sha256 = "0arymd5islkmiarxppg3d4fwfrb13fzrj8dpzv7y9llgmngcn7kk"; - name = "akonadi-search-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadi-search-22.04.3.tar.xz"; + sha256 = "0jpirnnpab6ki2gf5vlzklp04rwm05l8phlzajp2apcddb84lqvm"; + name = "akonadi-search-22.04.3.tar.xz"; }; }; akonadiconsole = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akonadiconsole-22.04.1.tar.xz"; - sha256 = "1yji38rzjn3pr9b1gqbx0jq8k6iiqsi6cwpzk0ak9qp02z8h7bx9"; - name = "akonadiconsole-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akonadiconsole-22.04.3.tar.xz"; + sha256 = "18lnxy8sagl5fwf56xlwkqyxkkxwajqjp0dp3yxi95p97zm8w1ip"; + name = "akonadiconsole-22.04.3.tar.xz"; }; }; akregator = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/akregator-22.04.1.tar.xz"; - sha256 = "18anzq4wcimgqizshb6i3cd18ydsls0i88pbgzc92rajqvv8m7z2"; - name = "akregator-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/akregator-22.04.3.tar.xz"; + sha256 = "08n713271i7ifnbrgwrqmxvcpvj45wfqjiidw8zf9rpwxg2m2m9g"; + name = "akregator-22.04.3.tar.xz"; }; }; analitza = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/analitza-22.04.1.tar.xz"; - sha256 = "0a0xzxfqxpriq1ak8qfi2f93f4ilfdp3z4v9ivl468fssmxg2x3j"; - name = "analitza-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/analitza-22.04.3.tar.xz"; + sha256 = "08m9alxzwflhklizwi87z42jm2p188v48b7y81ki5rh9as76r2xc"; + name = "analitza-22.04.3.tar.xz"; }; }; ark = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ark-22.04.1.tar.xz"; - sha256 = "1ikdwr803f55fgymp27zpwwfxzsjf79angzm84ysy2mv3l4cnpkn"; - name = "ark-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ark-22.04.3.tar.xz"; + sha256 = "1wjy90qkkzafwcw8d4v9cyhmc3sgfipc1085hq2ghqhvrgdyzs00"; + name = "ark-22.04.3.tar.xz"; }; }; artikulate = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/artikulate-22.04.1.tar.xz"; - sha256 = "176qjgwwh9xalwddjlfn39hkymjajbabzhgzrrrzjpw30zz6nplc"; - name = "artikulate-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/artikulate-22.04.3.tar.xz"; + sha256 = "0qls3xdv01a65c7l84hrw80gs5vi9mfbqj00lbznnvpgh66s1ar3"; + name = "artikulate-22.04.3.tar.xz"; }; }; audiocd-kio = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/audiocd-kio-22.04.1.tar.xz"; - sha256 = "1mannh6f79q4i6lpyf1dqvc9ra4hdrk7md40m8jj718v834svrql"; - name = "audiocd-kio-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/audiocd-kio-22.04.3.tar.xz"; + sha256 = "0d6pbsh1fbhwwr2c4kf9b17dhzzx2jsmgamawcp4kn7pw9i7i8ql"; + name = "audiocd-kio-22.04.3.tar.xz"; }; }; baloo-widgets = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/baloo-widgets-22.04.1.tar.xz"; - sha256 = "1bkkdqnl3zdwijn05cmnbf77hc1y9zx7h5r24y9197sg2b0241v8"; - name = "baloo-widgets-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/baloo-widgets-22.04.3.tar.xz"; + sha256 = "0084bnrlbdypdwzxi9gfxcywhyjd1z2cmh7p6gv0zhc9f7h6ffnp"; + name = "baloo-widgets-22.04.3.tar.xz"; }; }; blinken = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/blinken-22.04.1.tar.xz"; - sha256 = "162cbivfbxi8792l2m2ipm0g67v2khfgxb481fccgraq3690ib2m"; - name = "blinken-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/blinken-22.04.3.tar.xz"; + sha256 = "0rq4f1s7kb3gfsxs9fnhrgdsrmlw5746bh5720m84mp6nafpvd37"; + name = "blinken-22.04.3.tar.xz"; }; }; bomber = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/bomber-22.04.1.tar.xz"; - sha256 = "04siq2vcicm88p31v3hlqrsyxjbvvbayr03zf5kgn08kr3dr24y9"; - name = "bomber-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/bomber-22.04.3.tar.xz"; + sha256 = "0cxyp5c119r0bkqzx0mnbfdb2i1h0ra0kp30zx0nmvma1rxrrvgf"; + name = "bomber-22.04.3.tar.xz"; }; }; bovo = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/bovo-22.04.1.tar.xz"; - sha256 = "0xbfnhvkfyy0pi1d0df02yx91551hcw5vf8mrm163abd4mjpmzls"; - name = "bovo-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/bovo-22.04.3.tar.xz"; + sha256 = "1yz4x7fmllmp57yxfipqkldgf38haldah81d2qmc5jlahvy3j23p"; + name = "bovo-22.04.3.tar.xz"; }; }; calendarsupport = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/calendarsupport-22.04.1.tar.xz"; - sha256 = "1axfhc09shmmmwgx1n2ilz7k0sakhlx6d9jvxhr2p29s5jsrbcqh"; - name = "calendarsupport-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/calendarsupport-22.04.3.tar.xz"; + sha256 = "05x5ps15hkbv0cm4am859wzf6r5yiyaadidw3617qcim4sh5smqd"; + name = "calendarsupport-22.04.3.tar.xz"; }; }; cantor = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/cantor-22.04.1.tar.xz"; - sha256 = "1lc3nnpg601mx2km62s3jwnyhngv0w4brgrylx4q3v4g2h0czbjc"; - name = "cantor-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/cantor-22.04.3.tar.xz"; + sha256 = "007x06fi9wbw7f0bwry8aj5khynma3zw5gmllwz1lgn3zhpxqih3"; + name = "cantor-22.04.3.tar.xz"; }; }; cervisia = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/cervisia-22.04.1.tar.xz"; - sha256 = "0dr77221ayhb0ihhjgm8rbcsmni8l12hyvp5w0dcd4p58xabnd2w"; - name = "cervisia-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/cervisia-22.04.3.tar.xz"; + sha256 = "16fgqyw3jlz2np9gx8vrpxmrlrw4hc7il4yn7402rqwfl8ln6ihh"; + name = "cervisia-22.04.3.tar.xz"; }; }; dolphin = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/dolphin-22.04.1.tar.xz"; - sha256 = "0ywsjz6jqcwr8i5zafiaxlg7855vyf0cm77936li4ggw3z11mxcw"; - name = "dolphin-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/dolphin-22.04.3.tar.xz"; + sha256 = "07ian9aai9mjygn6bgxanv8h16i83wf69nkl8c9qynwbz4fkwmwf"; + name = "dolphin-22.04.3.tar.xz"; }; }; dolphin-plugins = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/dolphin-plugins-22.04.1.tar.xz"; - sha256 = "1zxh4aqi3mk9wafgslchm0jvcacva405jxf5l8hffkr2llchn8l1"; - name = "dolphin-plugins-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/dolphin-plugins-22.04.3.tar.xz"; + sha256 = "1ii1xrz22caxcgrr9ibzkh7nvw1h9d8xb5a2fadni0makk02qjif"; + name = "dolphin-plugins-22.04.3.tar.xz"; }; }; dragon = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/dragon-22.04.1.tar.xz"; - sha256 = "0nq3m5y6yawb5z036gqmqajvsk52yy5pisblkyjnj1a8i0mlkg9p"; - name = "dragon-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/dragon-22.04.3.tar.xz"; + sha256 = "0284shnqwbh1953ym197qaqgjwrnva77zi55lvvykg5cq42x512s"; + name = "dragon-22.04.3.tar.xz"; }; }; elisa = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/elisa-22.04.1.tar.xz"; - sha256 = "01ay2nz08943iaja8ns3p8gkjbi4hqn632gw30la9kccjgnskgkp"; - name = "elisa-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/elisa-22.04.3.tar.xz"; + sha256 = "1v2h7ayyrv6f6hdkl78x1nrv5x0l6n8dh0xrfm5fnii4f694iik8"; + name = "elisa-22.04.3.tar.xz"; }; }; eventviews = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/eventviews-22.04.1.tar.xz"; - sha256 = "0j3f1y7wnw1y0c6wxbm5cx298afngzppn2rz6vynslz3pb11825d"; - name = "eventviews-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/eventviews-22.04.3.tar.xz"; + sha256 = "1346k5fvjdgxhfjhf0mbc7s559ampxc2vfg0i4wk1a6n6d4jpmcr"; + name = "eventviews-22.04.3.tar.xz"; }; }; falkon = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/falkon-22.04.1.tar.xz"; - sha256 = "09623p10n92fjk5i4kzpjnd5vjxng2m8z7vbz7n0snly8h67i6bl"; - name = "falkon-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/falkon-22.04.3.tar.xz"; + sha256 = "1zv1kbzwhwplmvkvjaj6mwb8xj51snsskavq179w0800bd0a2wcp"; + name = "falkon-22.04.3.tar.xz"; }; }; ffmpegthumbs = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ffmpegthumbs-22.04.1.tar.xz"; - sha256 = "0xbqkly4bpzx0ign1diz2z0gqn05dp6pgzn6z1wfxxp8rpf7nbwc"; - name = "ffmpegthumbs-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ffmpegthumbs-22.04.3.tar.xz"; + sha256 = "1jl7l3n2lfg71kbzwjn5nrm3qlgilhnvs67iil162mnv52gf3c0v"; + name = "ffmpegthumbs-22.04.3.tar.xz"; }; }; filelight = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/filelight-22.04.1.tar.xz"; - sha256 = "06zrfa8r17sf326msnbqgzyazdijxvxd4plbwdkl6iyvybvswfdn"; - name = "filelight-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/filelight-22.04.3.tar.xz"; + sha256 = "1xrgay50r9cq6xqcf51zqpz6dvlmqai78gfn0j05myq67xc4rvh0"; + name = "filelight-22.04.3.tar.xz"; }; }; granatier = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/granatier-22.04.1.tar.xz"; - sha256 = "01czy1a4jiwcj7ngajqb6kf47d1dhxrzjk58l9w1npnl4zgjcbqd"; - name = "granatier-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/granatier-22.04.3.tar.xz"; + sha256 = "1ylywj579j252hj6lz5ghvmiiqf9yb2lncqbypbibdr34irs5if9"; + name = "granatier-22.04.3.tar.xz"; }; }; grantlee-editor = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/grantlee-editor-22.04.1.tar.xz"; - sha256 = "0yis7cd7x4z1hn3q3wwkhqjzlfm6l43fkcj218yayb7pdqxa9q44"; - name = "grantlee-editor-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/grantlee-editor-22.04.3.tar.xz"; + sha256 = "1dzr789mmgs3f0j82vmahg2l0h5j4m1s09ngw6iif4p5l7jk0p8d"; + name = "grantlee-editor-22.04.3.tar.xz"; }; }; grantleetheme = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/grantleetheme-22.04.1.tar.xz"; - sha256 = "0aks9sb4ywk461wqa2yhs0nc0h0i8v30rckx44s0f29v18z50ckm"; - name = "grantleetheme-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/grantleetheme-22.04.3.tar.xz"; + sha256 = "10c6s1g3vp5sdhpiciz1j6rsryld7hcc6lvmxdlsvms2bbcmnj7l"; + name = "grantleetheme-22.04.3.tar.xz"; }; }; gwenview = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/gwenview-22.04.1.tar.xz"; - sha256 = "0jncx7avdfqdv0x0r0s85h1lxxhc0ni14ia37y5vmqn7nxp8z6pr"; - name = "gwenview-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/gwenview-22.04.3.tar.xz"; + sha256 = "01dwayxc06k89n25d4b1vj0r9zfg79svd1g10vcm0c5dy8lkjycc"; + name = "gwenview-22.04.3.tar.xz"; }; }; incidenceeditor = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/incidenceeditor-22.04.1.tar.xz"; - sha256 = "0h33jgrlvdsa4d2p905hl2spg7j265mn79l02rg21258r8r56bc3"; - name = "incidenceeditor-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/incidenceeditor-22.04.3.tar.xz"; + sha256 = "0bm25r3l9d1qhlkxz7pd5hmg6xd0y651q8any4q71bd6a023ps0b"; + name = "incidenceeditor-22.04.3.tar.xz"; }; }; itinerary = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/itinerary-22.04.1.tar.xz"; - sha256 = "09h0m9g7mmy1qap8k00fx3y63lqa641cwpi7dak91jh57crialcy"; - name = "itinerary-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/itinerary-22.04.3.tar.xz"; + sha256 = "1f6s5fs8l5mzf0ryg4z97mww5abdzb8h00mfrypvwk4r9243l0rk"; + name = "itinerary-22.04.3.tar.xz"; }; }; juk = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/juk-22.04.1.tar.xz"; - sha256 = "1c9cigd72qzmaann85i0kfxivkbdqy1lwcrf2mlrb6ycvbzfmbm0"; - name = "juk-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/juk-22.04.3.tar.xz"; + sha256 = "12pnbx17r1103w39gglybdzs8kcpwghy5lc4q9fqk89s1r7l3c7h"; + name = "juk-22.04.3.tar.xz"; }; }; k3b = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/k3b-22.04.1.tar.xz"; - sha256 = "1yslsf736nlkxra8ial067a69mzlfb5zdyakcjg7nmkxbklkg46p"; - name = "k3b-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/k3b-22.04.3.tar.xz"; + sha256 = "1bizk66ad2yq8xszjqvv2ghk069d0l6iczn5rlna1p3zigr43ysl"; + name = "k3b-22.04.3.tar.xz"; }; }; kaccounts-integration = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kaccounts-integration-22.04.1.tar.xz"; - sha256 = "1yj4c4qgxk8r5salfwra8dqi418167zrcs8rnpnzlvrr3gqqvvbj"; - name = "kaccounts-integration-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kaccounts-integration-22.04.3.tar.xz"; + sha256 = "16v12l56wix9sarxyi0qvjrkj6g3hnac6s13x99zj05hhj4rpnqy"; + name = "kaccounts-integration-22.04.3.tar.xz"; }; }; kaccounts-providers = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kaccounts-providers-22.04.1.tar.xz"; - sha256 = "0mphnjgyzdxlp5iig2hyfzvpykqf7bm6vn4ninnj5wcs91jkjlxq"; - name = "kaccounts-providers-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kaccounts-providers-22.04.3.tar.xz"; + sha256 = "1s028j1q9z1x52bjblix9m3fag283s7yqzil3xszf1kkgiycbipj"; + name = "kaccounts-providers-22.04.3.tar.xz"; }; }; kaddressbook = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kaddressbook-22.04.1.tar.xz"; - sha256 = "1n76baf47ran2rdaz6i6b8c411zagqgzz89ap7v7x843vsv6g960"; - name = "kaddressbook-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kaddressbook-22.04.3.tar.xz"; + sha256 = "18f6xjcmqgslrw12dik9immw3mw0krvzi6y6f0ryr2ry1shqvivb"; + name = "kaddressbook-22.04.3.tar.xz"; }; }; kajongg = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kajongg-22.04.1.tar.xz"; - sha256 = "0pbym31l4gyzwi9qvhbwmkyrb7199vfn5mipc9fxkjsczsyp0cqg"; - name = "kajongg-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kajongg-22.04.3.tar.xz"; + sha256 = "15b2l0zsyzrir791w9sdf65kvn6528b8vxdrya3f425nvsxsx7ix"; + name = "kajongg-22.04.3.tar.xz"; }; }; kalarm = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kalarm-22.04.1.tar.xz"; - sha256 = "04cg8ymgwx6ls62q87ma3658xswff3a4kbjbdh05vvipqpkhd0cm"; - name = "kalarm-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kalarm-22.04.3.tar.xz"; + sha256 = "1n5arkqys4yflw3s1mylfqa332s0qggrifp03lqjdlp6cjmqfnav"; + name = "kalarm-22.04.3.tar.xz"; }; }; kalendar = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kalendar-22.04.1.tar.xz"; - sha256 = "1vk1n6in42frx95mgcsz8qhrhbbg2vz0fwxf966xbsdjcrg6whsn"; - name = "kalendar-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kalendar-22.04.3.tar.xz"; + sha256 = "0zgngxym5r6ndibhz04d66r9mlvl8x2hcla6qng8ym0r0x1lirl4"; + name = "kalendar-22.04.3.tar.xz"; }; }; kalgebra = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kalgebra-22.04.1.tar.xz"; - sha256 = "07cyknqhkyr4vsrv7bfl7aqflw079rb1rcqq2lm0k0pp4mi3z5m3"; - name = "kalgebra-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kalgebra-22.04.3.tar.xz"; + sha256 = "054d7kjk1n2z506iwjjp3d93y0zz4xa5rmmapg9zax0acag33lfh"; + name = "kalgebra-22.04.3.tar.xz"; }; }; kalzium = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kalzium-22.04.1.tar.xz"; - sha256 = "1fn8vn0phnaknd8yrzv75zdz3byq0rmdpb8blvp224nnlmf1733f"; - name = "kalzium-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kalzium-22.04.3.tar.xz"; + sha256 = "0h1yk0da6z0y52z1hk5z4x2a22krcgxzg57jc2my2vgbrbhcrh26"; + name = "kalzium-22.04.3.tar.xz"; }; }; kamera = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kamera-22.04.1.tar.xz"; - sha256 = "0c1mb8phip67h9v2crmrv7lnb00ha257l27j6hhq0pi3mpy4jhsg"; - name = "kamera-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kamera-22.04.3.tar.xz"; + sha256 = "09sc80vkyx3rkj1p44djyjq9pnm9fafsbibk5d48glbbd845rhhi"; + name = "kamera-22.04.3.tar.xz"; }; }; kamoso = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kamoso-22.04.1.tar.xz"; - sha256 = "039x5nrrznhlw53v63n550wb9k7x4r5w2d45rc2inw140rj5i32v"; - name = "kamoso-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kamoso-22.04.3.tar.xz"; + sha256 = "0br7dbnm2ypdl55pscp8wr0vwrgprycrxxj206b5r1l9ysx9aqip"; + name = "kamoso-22.04.3.tar.xz"; }; }; kanagram = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kanagram-22.04.1.tar.xz"; - sha256 = "0j0lg5yx8yid1anpvjvgy8p09b1nn8pcvd6w2rlrrxjwpybnx9jc"; - name = "kanagram-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kanagram-22.04.3.tar.xz"; + sha256 = "1bx5ns6a1rz3f433drlhzsphsxqrwnvxl6bx09jhldccx42p3a3y"; + name = "kanagram-22.04.3.tar.xz"; }; }; kapman = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kapman-22.04.1.tar.xz"; - sha256 = "1a6mmzmaxmlkn9d14m06b5wzr9rbciskhb3bfdzjpk9gia6j22kk"; - name = "kapman-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kapman-22.04.3.tar.xz"; + sha256 = "0clh3nyc3kan0hbbzzca3sd09nl2hd36y7f6g5pv2cp6i1m4757y"; + name = "kapman-22.04.3.tar.xz"; }; }; kapptemplate = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kapptemplate-22.04.1.tar.xz"; - sha256 = "16q7pzd47aksbnnfa04cnjf6gbzhzfdmykn9cqwdb37689fs9lmf"; - name = "kapptemplate-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kapptemplate-22.04.3.tar.xz"; + sha256 = "06ignrkd8csri0lzxpx1qhpvk0z79w0ypfql6s40nhlr53i6ra1g"; + name = "kapptemplate-22.04.3.tar.xz"; }; }; kate = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kate-22.04.1.tar.xz"; - sha256 = "0jcqa3c1z54k3sjqhz8f7rq3xygkxcqw9728rppk506zgqyw6vpl"; - name = "kate-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kate-22.04.3.tar.xz"; + sha256 = "0dnlr1cld6lqanqv98bss66w2bi2y78vqb8jx26addn2r1w4ygkf"; + name = "kate-22.04.3.tar.xz"; }; }; katomic = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/katomic-22.04.1.tar.xz"; - sha256 = "1858q8k6pzszrmgjqhp32kkqmax6nbfw04x5h1pjyxhvaxg3xr27"; - name = "katomic-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/katomic-22.04.3.tar.xz"; + sha256 = "0d5vm69zv7596r7wc19ignx3k6hnc1b34swpn8d4klc38frx20w4"; + name = "katomic-22.04.3.tar.xz"; }; }; kbackup = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kbackup-22.04.1.tar.xz"; - sha256 = "1h84alirmrbn90l9zfzs1xj2nf5q5hzvy0rsbsrkhwcsw35q63z2"; - name = "kbackup-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kbackup-22.04.3.tar.xz"; + sha256 = "1v87lxbwbbcd51iw1hj84hr9qkxaiaazy4p3qzs8cjnx0rn244ia"; + name = "kbackup-22.04.3.tar.xz"; }; }; kblackbox = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kblackbox-22.04.1.tar.xz"; - sha256 = "03gdwfwkzyzwh3qj6pjsd90df2knmaf6y6vgpzh92k4y1zq8n421"; - name = "kblackbox-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kblackbox-22.04.3.tar.xz"; + sha256 = "0im7mb93yrbliavil5bcqymcq6a4sjq1pj52ysq8gqqwf7jrw1gx"; + name = "kblackbox-22.04.3.tar.xz"; }; }; kblocks = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kblocks-22.04.1.tar.xz"; - sha256 = "1dglbppjfbdvnmpnk6cf01sp0vclnbxgvw6wnlmdp1vh00qgad3d"; - name = "kblocks-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kblocks-22.04.3.tar.xz"; + sha256 = "18hdzkwv8lscm9xsi0d99pq219y0m9bqdqv3k15g7gz0sryxvyva"; + name = "kblocks-22.04.3.tar.xz"; }; }; kbounce = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kbounce-22.04.1.tar.xz"; - sha256 = "1ci5i5d5dppw7xgma6hyrd5v93n1lc8n2bp36p0za1hak9kxisaa"; - name = "kbounce-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kbounce-22.04.3.tar.xz"; + sha256 = "187f0hz19xj17h5dzj0nw3r9zas3sppiswhgnzma9snl1w0rfzwh"; + name = "kbounce-22.04.3.tar.xz"; }; }; kbreakout = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kbreakout-22.04.1.tar.xz"; - sha256 = "0fmk4nd8c5z8fy2pw88l9fpcv0a59gbcvvgh3v92cmdw0ml65wb0"; - name = "kbreakout-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kbreakout-22.04.3.tar.xz"; + sha256 = "1pvxxl7m46ihjkzaq261xfsynikyrbrr67d4vh5pxfj6pipzrgkp"; + name = "kbreakout-22.04.3.tar.xz"; }; }; kbruch = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kbruch-22.04.1.tar.xz"; - sha256 = "1zx0cwi8s83j9ix0vdnjxhrkw2pa85y6plpwzy12f2fbxkmzvg1h"; - name = "kbruch-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kbruch-22.04.3.tar.xz"; + sha256 = "1r0m9zyxnvnsxv1rys34a8g14ppw5h4nrs9k85wxdbvizp6xnm54"; + name = "kbruch-22.04.3.tar.xz"; }; }; kcachegrind = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kcachegrind-22.04.1.tar.xz"; - sha256 = "0nvqly26w4wma68glfa6bil1jxh6hmd7mjvcr3s6fvzk4ky51was"; - name = "kcachegrind-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kcachegrind-22.04.3.tar.xz"; + sha256 = "12ckn90hqm2c5c58xqkzgcih64jk4kwkgz4q0f5ns1rxv3pidz5n"; + name = "kcachegrind-22.04.3.tar.xz"; }; }; kcalc = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kcalc-22.04.1.tar.xz"; - sha256 = "09nfcmmh5bmjx2bkjw33s0a55lky8shkhrgq1q3fd18igw7xpcgl"; - name = "kcalc-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kcalc-22.04.3.tar.xz"; + sha256 = "1pb0bwmxr9z2qvr7rnnpjg6p87s38ifmr6gi4h37ps9jyhfh74pr"; + name = "kcalc-22.04.3.tar.xz"; }; }; kcalutils = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kcalutils-22.04.1.tar.xz"; - sha256 = "0vgwz3yinrf2wjwj5qfj22fn7hdl0q5lhzd7v4a903gj4cb27ayq"; - name = "kcalutils-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kcalutils-22.04.3.tar.xz"; + sha256 = "1vv2nv4yc2hwi31b9k0jcxmxgbpaalmdc06jhbcq8qbi20pj70kh"; + name = "kcalutils-22.04.3.tar.xz"; }; }; kcharselect = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kcharselect-22.04.1.tar.xz"; - sha256 = "0s4wfq808dsi3bjf4hq419b3ws0hsir79wgw9mbbry0s0c02nlk9"; - name = "kcharselect-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kcharselect-22.04.3.tar.xz"; + sha256 = "0wbg9zpcgblb8x3rx2s6bk7fd3jiy9hlwnb6mypb0nwkrw62z0r6"; + name = "kcharselect-22.04.3.tar.xz"; }; }; kcolorchooser = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kcolorchooser-22.04.1.tar.xz"; - sha256 = "1s9j7r5rxq1zd8aaakxsw2p56rvykhnm80s5rk8krkp4gk58przr"; - name = "kcolorchooser-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kcolorchooser-22.04.3.tar.xz"; + sha256 = "1g1gd99r9h0rrgaqx37vl7h0fjxbr9j68gjqbdz24fa5wvp86z7q"; + name = "kcolorchooser-22.04.3.tar.xz"; }; }; kcron = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kcron-22.04.1.tar.xz"; - sha256 = "15g5k3z840zawhnksyzznw5w8ns3pp9vgdmz7pc2pir15mp763jm"; - name = "kcron-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kcron-22.04.3.tar.xz"; + sha256 = "1z1p1hfql5d94bfz0kqf439i6wyhifyv0vzlni42hns49zgdkxrm"; + name = "kcron-22.04.3.tar.xz"; }; }; kde-dev-scripts = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kde-dev-scripts-22.04.1.tar.xz"; - sha256 = "1s9cjyz2im8s6gpq1w0zqrfgf3cdw697s4z7srw50cg6aagks4x3"; - name = "kde-dev-scripts-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kde-dev-scripts-22.04.3.tar.xz"; + sha256 = "0xqkk700ih8mfwgz0dms706acy1s5xvm1lc3gsmkiml4142cnhjj"; + name = "kde-dev-scripts-22.04.3.tar.xz"; }; }; kde-dev-utils = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kde-dev-utils-22.04.1.tar.xz"; - sha256 = "1bi8i6pnx2yi786y78ad24f1yrb2vjd5ggrgaxislijs9qpdpbnr"; - name = "kde-dev-utils-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kde-dev-utils-22.04.3.tar.xz"; + sha256 = "1j6vqaqdb4c3jqrk0vyg7gqrz8hh0ss4kyrp6vxpa1c169c73d88"; + name = "kde-dev-utils-22.04.3.tar.xz"; }; }; kdebugsettings = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdebugsettings-22.04.1.tar.xz"; - sha256 = "14b0p0n14bivfr5nfjsyamx8jk2sbw283s04hrrxmv93b14068r7"; - name = "kdebugsettings-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdebugsettings-22.04.3.tar.xz"; + sha256 = "1q0yf2dv2rmb5mpmxc2s5ixw4xjrp4f604j8chf9rxk3xraia5md"; + name = "kdebugsettings-22.04.3.tar.xz"; }; }; kdeconnect-kde = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdeconnect-kde-22.04.1.tar.xz"; - sha256 = "0ym5n311iabrwal8w3yiq76g656rp1gz0yq9fdz61fl0pd4bmnbd"; - name = "kdeconnect-kde-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdeconnect-kde-22.04.3.tar.xz"; + sha256 = "015gxglclds2vmjr4bv51yfv840bafzgrl71cnwgnwwy8rrh9x4x"; + name = "kdeconnect-kde-22.04.3.tar.xz"; }; }; kdeedu-data = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdeedu-data-22.04.1.tar.xz"; - sha256 = "1lgcn4z4k2djzls35w33y5h7yjw2cs1028bxh0avlprh5ihi8cn2"; - name = "kdeedu-data-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdeedu-data-22.04.3.tar.xz"; + sha256 = "1r5kbyxb0c85zsdl6wvl8y8z0wdlhc6qjzvlnkzljzhp6bz6611j"; + name = "kdeedu-data-22.04.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdegraphics-mobipocket-22.04.1.tar.xz"; - sha256 = "0p8zsks0fcrzmcnwdzb7gcswq7vkv67vy1x1mi4v0y6lcgx1xqz7"; - name = "kdegraphics-mobipocket-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdegraphics-mobipocket-22.04.3.tar.xz"; + sha256 = "12yrwa22c4qxsf10fv76fzaaj5xlv5lmrwcqvf6qhgr6f9qsw7sj"; + name = "kdegraphics-mobipocket-22.04.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdegraphics-thumbnailers-22.04.1.tar.xz"; - sha256 = "1y8rkjr5azyffj8bb06jrm46j87n93xzvn2fcyarrmww01dsw1hp"; - name = "kdegraphics-thumbnailers-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdegraphics-thumbnailers-22.04.3.tar.xz"; + sha256 = "0dlwr8hahifr4akxq5dr05s921a2nzw08jwsrnc63gbqd6lr5f1z"; + name = "kdegraphics-thumbnailers-22.04.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdenetwork-filesharing-22.04.1.tar.xz"; - sha256 = "1h5zh0yvar3lylxm1iri3w7c7qzmdf18ak258jfphc23c9q6w32j"; - name = "kdenetwork-filesharing-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdenetwork-filesharing-22.04.3.tar.xz"; + sha256 = "1815gp8rgas5m2ysq94rz3q35dmz2igaz7a82hhs728db9biw7w5"; + name = "kdenetwork-filesharing-22.04.3.tar.xz"; }; }; kdenlive = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdenlive-22.04.1.tar.xz"; - sha256 = "0kiajmkmf2254464s8rv8d61igwrd2xmrj1dxwzrps4fy50r11xf"; - name = "kdenlive-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdenlive-22.04.3.tar.xz"; + sha256 = "142p6hy51bqphf2zlgf9y5w5lfz7fs4r12zl5xaq37isxpwjzrky"; + name = "kdenlive-22.04.3.tar.xz"; }; }; kdepim-addons = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdepim-addons-22.04.1.tar.xz"; - sha256 = "0r5gy56n1nrsm1wvf8687g6ng5m3q9wnl8nkfqaa4a4kk16h0i5f"; - name = "kdepim-addons-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdepim-addons-22.04.3.tar.xz"; + sha256 = "1l8v7n7m61jk8hzqp4q9xrii1jd6ajqcpgwralw20sq3w15swcvq"; + name = "kdepim-addons-22.04.3.tar.xz"; }; }; kdepim-runtime = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdepim-runtime-22.04.1.tar.xz"; - sha256 = "0gwhzdlzal2j61hak5axv68n7chhnlf8n9dqnnfili6ffps63yxm"; - name = "kdepim-runtime-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdepim-runtime-22.04.3.tar.xz"; + sha256 = "1lhkcfdjnxlm8amfczw4pi41grlq951pd67cj1z51whs6b84an27"; + name = "kdepim-runtime-22.04.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdesdk-kioslaves-22.04.1.tar.xz"; - sha256 = "19ay298fbjmn5xcrmpjabch7ljfmn03qkacifv337yx5idv1116q"; - name = "kdesdk-kioslaves-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdesdk-kioslaves-22.04.3.tar.xz"; + sha256 = "07z565i3hydfnnd1xlq6k7lhpw4s10pslxqmibd94frzbp3n1yqk"; + name = "kdesdk-kioslaves-22.04.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdesdk-thumbnailers-22.04.1.tar.xz"; - sha256 = "0f7d9m13gx552f1ficw1r7ndlal39iicklrc8g8cqh2gvkbydgni"; - name = "kdesdk-thumbnailers-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdesdk-thumbnailers-22.04.3.tar.xz"; + sha256 = "00vqanpln8z9vdfrd9j0xzpqxcwlfcaisqq83vx8p6njjfhj7nns"; + name = "kdesdk-thumbnailers-22.04.3.tar.xz"; }; }; kdev-php = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdev-php-22.04.1.tar.xz"; - sha256 = "1cxvzybiqxa5kgbv2jb42jq7div5q4jyl3kiar5mdnnc590x4h2y"; - name = "kdev-php-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdev-php-22.04.3.tar.xz"; + sha256 = "05f94y7qcalm84q7pxdcidhbgsk7d2ajik6snb08lrfkmqp7q9hs"; + name = "kdev-php-22.04.3.tar.xz"; }; }; kdev-python = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdev-python-22.04.1.tar.xz"; - sha256 = "01570g5284llqbmnlrsbrpm6zbkkp5rip49gng4nn7pi4nab9nyr"; - name = "kdev-python-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdev-python-22.04.3.tar.xz"; + sha256 = "1d58dzdrh61xa4w04h6nirfxczf5vg2q5cwb68l66sfc5n9sqqx0"; + name = "kdev-python-22.04.3.tar.xz"; }; }; kdevelop = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdevelop-22.04.1.tar.xz"; - sha256 = "1n6dcs1z88d7aaski7ffjvjpfzqssr9zjrlzlcf84k285l6zbwr2"; - name = "kdevelop-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdevelop-22.04.3.tar.xz"; + sha256 = "03dwllxy96sy20kdsc3sll0n6bhh6gdmpjl821flsxv0jb5naplv"; + name = "kdevelop-22.04.3.tar.xz"; }; }; kdf = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdf-22.04.1.tar.xz"; - sha256 = "03vr48yhb08fw5f34yn8yjnygflz6993ihq9pfcp6jg916fpwkbp"; - name = "kdf-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdf-22.04.3.tar.xz"; + sha256 = "1m0dwk3inqzk9kjjzgsaam15lnpbhzjfmwrzv8sazfk44scnr2v1"; + name = "kdf-22.04.3.tar.xz"; }; }; kdialog = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdialog-22.04.1.tar.xz"; - sha256 = "0qqpvrkbinnxz26a4msak4wa26b4r52yjyz2h5l3q1gw7j2kp4wm"; - name = "kdialog-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdialog-22.04.3.tar.xz"; + sha256 = "0czzdz9wjhgxkzphh8l1nj1dpq1mcyngzb2fqmph3ykzn449gzf0"; + name = "kdialog-22.04.3.tar.xz"; }; }; kdiamond = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kdiamond-22.04.1.tar.xz"; - sha256 = "19pj1lfcz7bgq6cxkn165l7b8lr5vwjp4sd724krm6l51jxzmd0x"; - name = "kdiamond-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kdiamond-22.04.3.tar.xz"; + sha256 = "1ca1hxzzvpwm3ms9m0xd7x4r011n7bjlsc4l333q0xjy5vwlrz3s"; + name = "kdiamond-22.04.3.tar.xz"; }; }; keditbookmarks = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/keditbookmarks-22.04.1.tar.xz"; - sha256 = "0bix84hy02i90bpmrxjl5gd433jb2yawlbdcchgwb73py14pcay2"; - name = "keditbookmarks-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/keditbookmarks-22.04.3.tar.xz"; + sha256 = "0bykkazjac801iikyvy6x4sd93awywxbm3jmzlyiffkg0ssccqp7"; + name = "keditbookmarks-22.04.3.tar.xz"; }; }; kfind = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kfind-22.04.1.tar.xz"; - sha256 = "1mrrjrnlapvajw3hysqzd1kb1qvjwbwbc4mggawpwpq4cbpap4mc"; - name = "kfind-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kfind-22.04.3.tar.xz"; + sha256 = "0zkyrg39m76r0s0ibqnfddplxcnydmxy0bic6g3s0vz9f1r4gqbn"; + name = "kfind-22.04.3.tar.xz"; }; }; kfloppy = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kfloppy-22.04.1.tar.xz"; - sha256 = "1yc90238v9f5czryjzfx9znjkl5r5smwr3gdx0cgp9sw225gl01q"; - name = "kfloppy-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kfloppy-22.04.3.tar.xz"; + sha256 = "1afin4hvg2p0pnc5jzckyj67x17j9kqk523lb2v20qxdiwp5f8xr"; + name = "kfloppy-22.04.3.tar.xz"; }; }; kfourinline = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kfourinline-22.04.1.tar.xz"; - sha256 = "0964iv2fa96s659crs56yqjcdkbckl7zw5h25x0r9gfycjkddhl2"; - name = "kfourinline-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kfourinline-22.04.3.tar.xz"; + sha256 = "163aii9bala14bhc9j503xk86jcnmnn327fmx3c68ryp0s89rx97"; + name = "kfourinline-22.04.3.tar.xz"; }; }; kgeography = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kgeography-22.04.1.tar.xz"; - sha256 = "0l6az2fkbgrlg7i8h81f6jhj4vlw92x6jgkywxm93msbaz4ah1fw"; - name = "kgeography-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kgeography-22.04.3.tar.xz"; + sha256 = "02a4xz4xh11gl1fhq5dbh7d5i2hvm8kxm9r4kmrjv5hryv9n732s"; + name = "kgeography-22.04.3.tar.xz"; }; }; kget = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kget-22.04.1.tar.xz"; - sha256 = "1v8vv32ncwnw4wn51rvk8n5kixdc2kjw9ds08ajv5x6iz06cvqrd"; - name = "kget-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kget-22.04.3.tar.xz"; + sha256 = "0rqznsyphnq0zi65wvrl9mwqm9268wgihkr104i87pp5kfiah5yp"; + name = "kget-22.04.3.tar.xz"; }; }; kgoldrunner = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kgoldrunner-22.04.1.tar.xz"; - sha256 = "0hs7p3allyw16lncr7fwavgggacdlgp893i1wx0mqzgg9yp4p1zm"; - name = "kgoldrunner-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kgoldrunner-22.04.3.tar.xz"; + sha256 = "1ga0djplhgqbfrvq0m7ymd30lsi7kc23chaqmc0vy3g61y9274da"; + name = "kgoldrunner-22.04.3.tar.xz"; }; }; kgpg = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kgpg-22.04.1.tar.xz"; - sha256 = "0dgc33h7mmbmgk29jmrrsykngzkirk53j6xxwrz8mfwbadvmvgy5"; - name = "kgpg-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kgpg-22.04.3.tar.xz"; + sha256 = "196xgbvc68jzacal4wwxgdrwxyiyr49hq0h2dwpzq5yhpfh3fcrw"; + name = "kgpg-22.04.3.tar.xz"; }; }; khangman = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/khangman-22.04.1.tar.xz"; - sha256 = "09mx12hf24rhwk0q2kni1gx5hg90nkjh556c0v6zqjmx3whlc1p6"; - name = "khangman-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/khangman-22.04.3.tar.xz"; + sha256 = "00xanpzkd7r41bn5pp44jnyvwvdygsx7j6l454pp32m8a2d9iala"; + name = "khangman-22.04.3.tar.xz"; }; }; khelpcenter = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/khelpcenter-22.04.1.tar.xz"; - sha256 = "0wjjcrmncig6ymrk2an5n12ygy652zg7lxwvi2wi6zrdjk2kazf8"; - name = "khelpcenter-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/khelpcenter-22.04.3.tar.xz"; + sha256 = "0ga270imh1ssifj0w3434z9hgrmn0dqrschygywy1z2hcpyx991d"; + name = "khelpcenter-22.04.3.tar.xz"; }; }; kidentitymanagement = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kidentitymanagement-22.04.1.tar.xz"; - sha256 = "0f07r0x8i0k8fkzik49y80wr3laxq96gcmr287n4265f7pj02skl"; - name = "kidentitymanagement-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kidentitymanagement-22.04.3.tar.xz"; + sha256 = "0z1ixwlrdm7dzfxszphf2wma0gjprr0143c46li79g5gzvcrid8w"; + name = "kidentitymanagement-22.04.3.tar.xz"; }; }; kig = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kig-22.04.1.tar.xz"; - sha256 = "1qz287cfvk7wvx5jp61jcwnmwmjm8y3h6k2hyjpspqr3k1n84345"; - name = "kig-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kig-22.04.3.tar.xz"; + sha256 = "0a8cyn6lx6gm23mmsxp12i4wlj55a9naqscxxpfwrya9k30k33b1"; + name = "kig-22.04.3.tar.xz"; }; }; kigo = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kigo-22.04.1.tar.xz"; - sha256 = "094q9q9c728zva64dxl522s2q7lzdybrw055w5mryj66mdb9b43j"; - name = "kigo-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kigo-22.04.3.tar.xz"; + sha256 = "0wav6pmljbki2ipgzp82gb2j861b2bj1c2x4ydqn106aqcm0ci71"; + name = "kigo-22.04.3.tar.xz"; }; }; killbots = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/killbots-22.04.1.tar.xz"; - sha256 = "0kymimgwa5amcc93r6nrfiv6psjb0k96a8b2vr3jbc6vrm9aimjy"; - name = "killbots-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/killbots-22.04.3.tar.xz"; + sha256 = "07ak86a4v0v8b0nny8n246j3lab5zr8sq0ra9k48cdy53xmq909j"; + name = "killbots-22.04.3.tar.xz"; }; }; kimagemapeditor = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kimagemapeditor-22.04.1.tar.xz"; - sha256 = "1lzqgav4gfq0cay162rjypikh4dx1jjj44ds9br2rfm0wp6x6zds"; - name = "kimagemapeditor-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kimagemapeditor-22.04.3.tar.xz"; + sha256 = "0w8ihv4mz9dqkpmk8n6qm569j6ihsgqhqc9f2kagnqarsqkvqz7a"; + name = "kimagemapeditor-22.04.3.tar.xz"; }; }; kimap = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kimap-22.04.1.tar.xz"; - sha256 = "0r945v0365vmyapcaqb6wabxdyflp33hh441cx26acwj11dpwgvl"; - name = "kimap-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kimap-22.04.3.tar.xz"; + sha256 = "1k5h7jmzxg8wq58iqk0f1gx5r45pr2895vl7y5ihyav9w0qfqcn0"; + name = "kimap-22.04.3.tar.xz"; }; }; kio-extras = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kio-extras-22.04.1.tar.xz"; - sha256 = "057qbz1cmmi1mgj38r4dsh49af4dqnihzs5r7w6hwx3dw03m2ix4"; - name = "kio-extras-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kio-extras-22.04.3.tar.xz"; + sha256 = "0v5p7zc0wmv4k48wb1j8z3gym23fn5wrf9qk5g3504m2kgym64jb"; + name = "kio-extras-22.04.3.tar.xz"; }; }; kio-gdrive = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kio-gdrive-22.04.1.tar.xz"; - sha256 = "12qb6m2n0nfx62z0xc1p66si140j6yih3lp80n9b43yf9c1hn5h6"; - name = "kio-gdrive-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kio-gdrive-22.04.3.tar.xz"; + sha256 = "0h9sc2dw7qzr2xc82hkqvfahdjg6h2lgirznqdbylazjvywm66k2"; + name = "kio-gdrive-22.04.3.tar.xz"; }; }; kipi-plugins = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kipi-plugins-22.04.1.tar.xz"; - sha256 = "0587pc2nmcxig4nfqyc6yvc1rxaqqa3kgnbdah53177mb4zj1lk8"; - name = "kipi-plugins-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kipi-plugins-22.04.3.tar.xz"; + sha256 = "1picx4hfb7ckcnmcg14ksv6kdsaww34x00m40v1b1fgg126hfkya"; + name = "kipi-plugins-22.04.3.tar.xz"; }; }; kirigami-gallery = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kirigami-gallery-22.04.1.tar.xz"; - sha256 = "1yjj18vcik38gzqka2kia4yrk8ay9l2d7lh3wspp97v3r49dpl7y"; - name = "kirigami-gallery-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kirigami-gallery-22.04.3.tar.xz"; + sha256 = "131z7hhyd52yf3qx0ld7p01ksbpn6b0jcjz9zfhpykn31n5gjvmh"; + name = "kirigami-gallery-22.04.3.tar.xz"; }; }; kiriki = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kiriki-22.04.1.tar.xz"; - sha256 = "0mwdmb14ljr2vvpz05frzd3qpwp16zckivi5qb7awf488vj7iknz"; - name = "kiriki-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kiriki-22.04.3.tar.xz"; + sha256 = "1ijl4hjck4wvxplcjzqw9ahadnbvd8hk61qn04kbyz6mrp67xgrn"; + name = "kiriki-22.04.3.tar.xz"; }; }; kiten = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kiten-22.04.1.tar.xz"; - sha256 = "14zq296qmjfssa0f3gmq2hsadlglp95l1wrrm0v14j19rd1sfzlr"; - name = "kiten-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kiten-22.04.3.tar.xz"; + sha256 = "1ayf2nz1vrcvvq25wcpg4749icp99749fpwwqhrksmqcy9zn4473"; + name = "kiten-22.04.3.tar.xz"; }; }; kitinerary = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kitinerary-22.04.1.tar.xz"; - sha256 = "0ykbjp3bqhlhjj3r04zgh0pza6mh4qadhxk8gsxdndqvpv4p8sih"; - name = "kitinerary-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kitinerary-22.04.3.tar.xz"; + sha256 = "1jxkd9x90z96qvcsnacj8c2gff2679fjmpc3aa6ci11mcc79gilz"; + name = "kitinerary-22.04.3.tar.xz"; }; }; kjumpingcube = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kjumpingcube-22.04.1.tar.xz"; - sha256 = "1fgz21wy3nwqhsplpg65j54rlwdpmp6nhdh9g04zsgy3micsghag"; - name = "kjumpingcube-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kjumpingcube-22.04.3.tar.xz"; + sha256 = "0m9ajl9lq52yn498g0kvsbwa0xmihlqli7zw644c282ni934bwhn"; + name = "kjumpingcube-22.04.3.tar.xz"; }; }; kldap = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kldap-22.04.1.tar.xz"; - sha256 = "1p06v089mid7y1qapdwai781jvypl2a3q8007j0rfpk9nbb93lhb"; - name = "kldap-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kldap-22.04.3.tar.xz"; + sha256 = "024xgjffz5n8zz6js06i78pf8s3nd5sbmvhzz7bm3qc05xqxyp75"; + name = "kldap-22.04.3.tar.xz"; }; }; kleopatra = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kleopatra-22.04.1.tar.xz"; - sha256 = "08xfxbm9rlv36bf9zzj61ds052hg5l1q4m1fs9mcwvwcnwsn63nk"; - name = "kleopatra-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kleopatra-22.04.3.tar.xz"; + sha256 = "1dp421hniyknggirpqqdb7pmsrbidz9qshmd3qnsqvcr9pz301d5"; + name = "kleopatra-22.04.3.tar.xz"; }; }; klettres = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/klettres-22.04.1.tar.xz"; - sha256 = "1clyjlrzjxw534ks6y496l1xr4iz1qxmmlgr5dyaqw8r5n45x687"; - name = "klettres-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/klettres-22.04.3.tar.xz"; + sha256 = "1j96d76x744mr916jcfacrqj7vsks2xnbnf7rzpsfipm75klhgyp"; + name = "klettres-22.04.3.tar.xz"; }; }; klickety = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/klickety-22.04.1.tar.xz"; - sha256 = "1ssnrqyvm9w3jn53pshy8gd06q30760wgzk9svhk485j90g6jw9c"; - name = "klickety-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/klickety-22.04.3.tar.xz"; + sha256 = "1nflz48lnr5ww837vzfkz4wp7qr9zyg06fmv2wbx88h1d86k5i6x"; + name = "klickety-22.04.3.tar.xz"; }; }; klines = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/klines-22.04.1.tar.xz"; - sha256 = "1k3a9vr92xb7m5gqdgz9kg0vnyxq4br1zyxy7d5wgqf28qgh41vf"; - name = "klines-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/klines-22.04.3.tar.xz"; + sha256 = "15z5gcncyr1i7xipnsvr2lvdi9wdqm8if3ylimksxhgr5dkvz9vz"; + name = "klines-22.04.3.tar.xz"; }; }; kmag = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmag-22.04.1.tar.xz"; - sha256 = "0siiwgrfvzqhm23887j560w6l9i0j43i569kfknyqkiz5p0l28zz"; - name = "kmag-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmag-22.04.3.tar.xz"; + sha256 = "08jwv2wnb67vjgz5pv1nn6rwl9ldj8dfd74l6va9vz4x5pk7d859"; + name = "kmag-22.04.3.tar.xz"; }; }; kmahjongg = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmahjongg-22.04.1.tar.xz"; - sha256 = "0kcdpyh7iabg672y0yd84lb14h0mn4p3cq2w9zi0l71gqm1zs22a"; - name = "kmahjongg-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmahjongg-22.04.3.tar.xz"; + sha256 = "0lvia7ghnp8wx2xndzipv8grdsdn3i96xlsy6wspna1k884x8ylw"; + name = "kmahjongg-22.04.3.tar.xz"; }; }; kmail = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmail-22.04.1.tar.xz"; - sha256 = "1s4kbv8y7jhwg6b2qd8kj22xiwdgyllxnljmmna1964kqakl6h54"; - name = "kmail-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmail-22.04.3.tar.xz"; + sha256 = "0x2d8w8hlb62h9q9qkh3cwyg7pwwl7px1rf89vyfp9arfbs030dq"; + name = "kmail-22.04.3.tar.xz"; }; }; kmail-account-wizard = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmail-account-wizard-22.04.1.tar.xz"; - sha256 = "119gp8dv84nfnd2lvxgw3qsrfrycmgbqq2xm0hlz8zp2jmikw9fk"; - name = "kmail-account-wizard-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmail-account-wizard-22.04.3.tar.xz"; + sha256 = "1lqi0x7rdr5zib1xmrvmbx5jvxr14if1jj6as4b4gvd5z4gx8xav"; + name = "kmail-account-wizard-22.04.3.tar.xz"; }; }; kmailtransport = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmailtransport-22.04.1.tar.xz"; - sha256 = "1lmd4lvj66ib0f1bkaanvcdq84f8hcyxx2hgrqdyha5d1mpw47cg"; - name = "kmailtransport-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmailtransport-22.04.3.tar.xz"; + sha256 = "0fcgwln40d9h3r4m58mp4m79k425hianjz0ambqckdzp0aspkhzp"; + name = "kmailtransport-22.04.3.tar.xz"; }; }; kmbox = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmbox-22.04.1.tar.xz"; - sha256 = "1496mzbcxzdlwyy207b0ql2il934hcqigb2vybxqc6lap4irzf4i"; - name = "kmbox-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmbox-22.04.3.tar.xz"; + sha256 = "0d3i36zkn3apcjqkbsq633mgrk382xgx8knfg6fkyyc8i55p3dig"; + name = "kmbox-22.04.3.tar.xz"; }; }; kmime = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmime-22.04.1.tar.xz"; - sha256 = "01favp535b9cjjwyqcaqbprcljamn2pzwl8mf5m59xq4s9h4myd7"; - name = "kmime-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmime-22.04.3.tar.xz"; + sha256 = "1k9lvq3a728015laj7rklg136hgg256l4snarnc5cw97ijqdm5ng"; + name = "kmime-22.04.3.tar.xz"; }; }; kmines = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmines-22.04.1.tar.xz"; - sha256 = "1rcx9yxml0lgaa8bls836j010bgqbqd6pj08ncjqw42m67fzll24"; - name = "kmines-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmines-22.04.3.tar.xz"; + sha256 = "1w6bqlzhbm3vc09jyxfg8vgn0a2nknfz1shbsfamc36jsy2sr758"; + name = "kmines-22.04.3.tar.xz"; }; }; kmix = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmix-22.04.1.tar.xz"; - sha256 = "1flf3adk1bm9c6hi4xqana8r1jslgdffy4rri4r5s0lrr3w7kdsw"; - name = "kmix-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmix-22.04.3.tar.xz"; + sha256 = "0zc96l9mnn763pw54ki715sw3wm4z6rjdz2zzsjc6l5iwcqzwqq8"; + name = "kmix-22.04.3.tar.xz"; }; }; kmousetool = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmousetool-22.04.1.tar.xz"; - sha256 = "0hlggni1mwn1bf9xx8l643nxwzw7pjh4y9cra7adph30nqfyr4cv"; - name = "kmousetool-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmousetool-22.04.3.tar.xz"; + sha256 = "13pvdhhf3fdkaiyjp0ijqm5qdffabyw7qq2051l1nqv6i7w6lgwx"; + name = "kmousetool-22.04.3.tar.xz"; }; }; kmouth = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmouth-22.04.1.tar.xz"; - sha256 = "01j19l02ffijjggi8h1lrncc9177iqgdh62y14dlka83j47f1wh3"; - name = "kmouth-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmouth-22.04.3.tar.xz"; + sha256 = "0lzaw7qqvpqzfz4nb2lk8l06c4yxacfg5982yk33g5q0j7r19bpy"; + name = "kmouth-22.04.3.tar.xz"; }; }; kmplot = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kmplot-22.04.1.tar.xz"; - sha256 = "0fvsygp3sf1mvhws8mb3q3vdf4ljmvvjj9a36rl7904zan14klq8"; - name = "kmplot-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kmplot-22.04.3.tar.xz"; + sha256 = "0k8n3jjj30hzcp3kmi1ygi36bv3zkgnwrv5xbxf40k62x3v32rdq"; + name = "kmplot-22.04.3.tar.xz"; }; }; knavalbattle = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/knavalbattle-22.04.1.tar.xz"; - sha256 = "1araf2f216hjy212ilabz4z4axa2j93j2jvvlq5y5psn4zmrz23v"; - name = "knavalbattle-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/knavalbattle-22.04.3.tar.xz"; + sha256 = "0i7hf58b3gylld6d7q2aq5w6dksa32z5y1dcaj8nm1lpgcndmj0s"; + name = "knavalbattle-22.04.3.tar.xz"; }; }; knetwalk = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/knetwalk-22.04.1.tar.xz"; - sha256 = "0psayrbk56zl54vbwhzzzpg4h9rigyw48rxl0si7z7sjwill3xq2"; - name = "knetwalk-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/knetwalk-22.04.3.tar.xz"; + sha256 = "0w1bpx04yn7xsyf4h8ymw887ir9ifbwxynqllh8xn4chwd21ipgp"; + name = "knetwalk-22.04.3.tar.xz"; }; }; knights = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/knights-22.04.1.tar.xz"; - sha256 = "018f8y7zhdqn77qkkwqgf5w5m0y1c9i5w7xs08q2hcglpa6pb5jj"; - name = "knights-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/knights-22.04.3.tar.xz"; + sha256 = "1hi19f7z64wz9izpnvfwn78kd9xkaisfyw2ydpchrsnwcdppvwfc"; + name = "knights-22.04.3.tar.xz"; }; }; knotes = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/knotes-22.04.1.tar.xz"; - sha256 = "1h1afis9d33mzz023b61b6fxy399bdxrvnbmjvb2ncgs7c3nvd21"; - name = "knotes-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/knotes-22.04.3.tar.xz"; + sha256 = "1bbrcr2s5am7gq3im5s9kk63nrsgz0kfkm3qzhasafnz06zhf1vf"; + name = "knotes-22.04.3.tar.xz"; }; }; kolf = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kolf-22.04.1.tar.xz"; - sha256 = "15jhd2giakbp7zy3jwz0rqmr11cv7y5n6hbvxdx17xf6rgr20qxf"; - name = "kolf-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kolf-22.04.3.tar.xz"; + sha256 = "0mmmj9rxrbpf9clj49zgflrlic8qafzw2r2by5knhsn15mq59bd3"; + name = "kolf-22.04.3.tar.xz"; }; }; kollision = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kollision-22.04.1.tar.xz"; - sha256 = "1g7z7n2ihfnqr10pbba2rfwm826vrir7k6lxvizma4fa65f9dg9c"; - name = "kollision-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kollision-22.04.3.tar.xz"; + sha256 = "0ra83qmvzd4n6d7df2i8bh81y70lxa48i115x9h9ik52b2a48mxf"; + name = "kollision-22.04.3.tar.xz"; }; }; kolourpaint = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kolourpaint-22.04.1.tar.xz"; - sha256 = "1sxgfyvxfjwfn5rjxcgifmdlxin77f5kizwpyn1jan8awk3rcl2d"; - name = "kolourpaint-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kolourpaint-22.04.3.tar.xz"; + sha256 = "0zbmqs09nnfpf2ayb0kg993d5srkkvidfjrijgadn9kjip9z1ifh"; + name = "kolourpaint-22.04.3.tar.xz"; }; }; kompare = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kompare-22.04.1.tar.xz"; - sha256 = "0kjkmj5xnvkg22i9h5bqy3r68xbxy57mpp0fynaakl3dj89pxz0m"; - name = "kompare-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kompare-22.04.3.tar.xz"; + sha256 = "14kd9v8srz5m3ayr32vfmq9b1biggfzzs45nm3n1ddhgqmlg4z0a"; + name = "kompare-22.04.3.tar.xz"; }; }; konqueror = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/konqueror-22.04.1.tar.xz"; - sha256 = "1vs7x40pf8290bqcxyd0p086nds9z3bczk4rjsadifrymgmf4i17"; - name = "konqueror-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/konqueror-22.04.3.tar.xz"; + sha256 = "1bixiqdkm4qfgv1xi8aibd8gn48y6z3dyz5kqk1bbmg2bkhs0jm6"; + name = "konqueror-22.04.3.tar.xz"; }; }; konquest = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/konquest-22.04.1.tar.xz"; - sha256 = "0rajwi6yjxzs4g7q8bc07b4sn71p0989cz9fx4k6rs3zwhfdf0dr"; - name = "konquest-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/konquest-22.04.3.tar.xz"; + sha256 = "1kylv730plii7grzccaclg5lkmgwhdgh2ya7h7lpnb8zaapy3kbr"; + name = "konquest-22.04.3.tar.xz"; }; }; konsole = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/konsole-22.04.1.tar.xz"; - sha256 = "1qr2d32j0dz1ssd8ym8llxwsdzjmn6x1z5hcbkn6895ym649h14d"; - name = "konsole-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/konsole-22.04.3.tar.xz"; + sha256 = "19yrhjjbwq7kaip05ig8raqnh87k5dg57jck2zrsdrhq2f4nb3ql"; + name = "konsole-22.04.3.tar.xz"; }; }; kontact = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kontact-22.04.1.tar.xz"; - sha256 = "19krnikn5374gjp82k7g3vvv1ylakqari2rnsbp1l7vdrymj28wn"; - name = "kontact-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kontact-22.04.3.tar.xz"; + sha256 = "1izv4whvl26ncbsf948kxr5kql5sfdajl4nk7xcp27kwclpfgvkq"; + name = "kontact-22.04.3.tar.xz"; }; }; kontactinterface = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kontactinterface-22.04.1.tar.xz"; - sha256 = "0sya33b0xg9392jb8p5gdw0cd3iivgfq2jvzbvpr3iiq9cgbj2m3"; - name = "kontactinterface-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kontactinterface-22.04.3.tar.xz"; + sha256 = "0npaxlrvgpg2p8wdaqs03k2gyppbid81k64q6cawin6wrn6zzc9m"; + name = "kontactinterface-22.04.3.tar.xz"; }; }; kontrast = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kontrast-22.04.1.tar.xz"; - sha256 = "0paharkjyz51mgajan6bspkc8bpywjkgdkszdi909vxyzgszcznz"; - name = "kontrast-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kontrast-22.04.3.tar.xz"; + sha256 = "0q1fgqzzzf5jmj0vhvmskj2ypjy4kr9qjg9dq1inwdmh367lx7sc"; + name = "kontrast-22.04.3.tar.xz"; }; }; konversation = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/konversation-22.04.1.tar.xz"; - sha256 = "1gzy1v2vdc100sr1anp3762nn3hj4km5hrjnxnkcc30z2p7g7cyi"; - name = "konversation-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/konversation-22.04.3.tar.xz"; + sha256 = "08b4vnm66hbbnvkkh1p0a82pd2aj4zy5a8indfv3fzczsfpx6gp0"; + name = "konversation-22.04.3.tar.xz"; }; }; kopeninghours = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kopeninghours-22.04.1.tar.xz"; - sha256 = "0w9j1y7h8p6hqvrf9k0rp0hbajjlbipnwj4rc9p204khganbp1nd"; - name = "kopeninghours-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kopeninghours-22.04.3.tar.xz"; + sha256 = "1h44x335gmaq940d6i9pgpgviixykp5fbv7pw06ahaiq7pylznkz"; + name = "kopeninghours-22.04.3.tar.xz"; }; }; kopete = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kopete-22.04.1.tar.xz"; - sha256 = "1rhykqns68p650s64vd1x655cvfa0jgvban3v2vpa2qh2pl7w1mk"; - name = "kopete-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kopete-22.04.3.tar.xz"; + sha256 = "0fc9m2xgsjmsypqllqb3cp1y2m28dqh48r1qg2xgkfyqa70dnvp9"; + name = "kopete-22.04.3.tar.xz"; }; }; korganizer = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/korganizer-22.04.1.tar.xz"; - sha256 = "0d2mshb8gj5akr4jxf85rk759i3dmkg15c3daj7jfpgr7ybyck2r"; - name = "korganizer-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/korganizer-22.04.3.tar.xz"; + sha256 = "0ypscdr0la4pdxz491mryjmg535d0g7c4r62y0l7an5g1ribrjq9"; + name = "korganizer-22.04.3.tar.xz"; }; }; kosmindoormap = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kosmindoormap-22.04.1.tar.xz"; - sha256 = "0kmla7f8ld0398prqcqanv2pf38lg4c1gkz1qiak93ay2h9nww11"; - name = "kosmindoormap-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kosmindoormap-22.04.3.tar.xz"; + sha256 = "0xahj5zwpjlnx1makn2d27sxkl04zry1zi2gjqp9dma2kh43pd1s"; + name = "kosmindoormap-22.04.3.tar.xz"; }; }; kpat = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kpat-22.04.1.tar.xz"; - sha256 = "1wd125nxgmflzxrsasbsi3k99wwws1nrwvimqgsy2rw40fm3i6ga"; - name = "kpat-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kpat-22.04.3.tar.xz"; + sha256 = "13blzclcl51ypp2szayyjg3lsn2hqpqvisqb0hlizy49ca7f6lz3"; + name = "kpat-22.04.3.tar.xz"; }; }; kpimtextedit = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kpimtextedit-22.04.1.tar.xz"; - sha256 = "1ixzz4wlmx8sh4bkxaxacllcn3pymr75vwgks00rw1jiqgydxkpn"; - name = "kpimtextedit-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kpimtextedit-22.04.3.tar.xz"; + sha256 = "1gb0n8nrx673ya3mgkjs6khjlz7472a932lgpy5pwir48mc57g1d"; + name = "kpimtextedit-22.04.3.tar.xz"; }; }; kpkpass = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kpkpass-22.04.1.tar.xz"; - sha256 = "07a1k6gfl0x7p57n0g0199g2zaz097arbwhkjx1y7xsi775asp2y"; - name = "kpkpass-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kpkpass-22.04.3.tar.xz"; + sha256 = "05jka6yi3d75hrx6yjrbqs75y5c9d999vns054zvv48hnmyjbsq3"; + name = "kpkpass-22.04.3.tar.xz"; }; }; kpmcore = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kpmcore-22.04.1.tar.xz"; - sha256 = "1y34gh1983ihf2hcs9x35xq805wd0cx1w2dgnbb41l2v2b647l3h"; - name = "kpmcore-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kpmcore-22.04.3.tar.xz"; + sha256 = "04qslli4vnbnl329zynbinlwaigxr9xpswra5n0v710p92as0qif"; + name = "kpmcore-22.04.3.tar.xz"; }; }; kpublictransport = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kpublictransport-22.04.1.tar.xz"; - sha256 = "0zssk77hxzprpgdzcw5r00kk3yccpmjcqx0hvix4q2ghj422z1cg"; - name = "kpublictransport-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kpublictransport-22.04.3.tar.xz"; + sha256 = "05s8mpqn74vz1daim3qdyfg8n7b7n8f18hzcybiim4zxcy2k71rz"; + name = "kpublictransport-22.04.3.tar.xz"; }; }; kqtquickcharts = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kqtquickcharts-22.04.1.tar.xz"; - sha256 = "0b1cwsa16bfwlv8x3zwmvhkk5zahrhqpr94vpv5fvai47apihng8"; - name = "kqtquickcharts-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kqtquickcharts-22.04.3.tar.xz"; + sha256 = "0bm7rdysvlfnfnvy87ii3kxl238q83vw0ia58zsnwjmkxmlgf6mp"; + name = "kqtquickcharts-22.04.3.tar.xz"; }; }; krdc = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/krdc-22.04.1.tar.xz"; - sha256 = "0ccg5a5rk9cb0q844y2adyrxj2z0zc63jp9zcdi14f7lp4rka8zz"; - name = "krdc-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/krdc-22.04.3.tar.xz"; + sha256 = "0bs8q3na924lnmra5608jwnn0dqczvh0f72nn43673ib3m1mddlr"; + name = "krdc-22.04.3.tar.xz"; }; }; kreversi = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kreversi-22.04.1.tar.xz"; - sha256 = "0kwy7wdrfndmxg4nrqy51j102z33xzh1768ai6jcbgz2vjv6qhln"; - name = "kreversi-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kreversi-22.04.3.tar.xz"; + sha256 = "0gyj0a6hj6jps5z97wdw0nwp0mvnib6v062bcy4dp3c14lhl9r4p"; + name = "kreversi-22.04.3.tar.xz"; }; }; krfb = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/krfb-22.04.1.tar.xz"; - sha256 = "00843wncngb4x6l44li6yzaq4qzlfyrzyxvkk6njm5pzmgki4yvp"; - name = "krfb-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/krfb-22.04.3.tar.xz"; + sha256 = "09h05al7ivf9pzf2p6mnja1124746fawmr3vdk6rggjjw0p0wgn1"; + name = "krfb-22.04.3.tar.xz"; }; }; kross-interpreters = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kross-interpreters-22.04.1.tar.xz"; - sha256 = "1sh8f0m8hh06i3wspjybhqhn1dhpxag2mass38p7gm3ipkp7q88n"; - name = "kross-interpreters-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kross-interpreters-22.04.3.tar.xz"; + sha256 = "1yw6642q5fnql6p9dajjv2130xl9ck2fh8gnqfq0dr8jb1v29nym"; + name = "kross-interpreters-22.04.3.tar.xz"; }; }; kruler = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kruler-22.04.1.tar.xz"; - sha256 = "0vp1290wmy8rji34wdzzpshrgpzpiz3hvjgd0cynqg3skjn8r17p"; - name = "kruler-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kruler-22.04.3.tar.xz"; + sha256 = "0yswzy67wcmay10sg00fzlkc8k9s7vdqidf8lh9h46x81z88bia3"; + name = "kruler-22.04.3.tar.xz"; }; }; kshisen = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kshisen-22.04.1.tar.xz"; - sha256 = "0hiwkz2fm4ywm404prphl797j5dn95di6bcnnrb8l8zy6i2gwkvp"; - name = "kshisen-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kshisen-22.04.3.tar.xz"; + sha256 = "004qr0kmw0c6ahif1mf2f88a849ws3kap7p2ksvljmyyl38x2sbs"; + name = "kshisen-22.04.3.tar.xz"; }; }; ksirk = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ksirk-22.04.1.tar.xz"; - sha256 = "14zb64kz7jk46hqc388g4zv7a3m2bd131sp8pabjmn83ysrpppz7"; - name = "ksirk-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ksirk-22.04.3.tar.xz"; + sha256 = "0c1ls3i2jqcrmdy3zhb25ml9lhdy4gjdcvv4j5z8x5wig265qbwx"; + name = "ksirk-22.04.3.tar.xz"; }; }; ksmtp = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ksmtp-22.04.1.tar.xz"; - sha256 = "0n7lg7zavy43z73my5569hb1fv4xrsibizpzd9yp631iahn6jigl"; - name = "ksmtp-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ksmtp-22.04.3.tar.xz"; + sha256 = "1l0w7yxmmvkj2wbv49yf73b2ca7k0yxrishkdqgm3q5crahg8l4z"; + name = "ksmtp-22.04.3.tar.xz"; }; }; ksnakeduel = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ksnakeduel-22.04.1.tar.xz"; - sha256 = "1sz70hdyfbzl5syq9f2vn2wdqdl4058xxk83vmj2a8niva49nr9m"; - name = "ksnakeduel-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ksnakeduel-22.04.3.tar.xz"; + sha256 = "0hi812hsjnyp1ds3wwv2wr58az6m2zsq97nywsncc0d3b5cxzsza"; + name = "ksnakeduel-22.04.3.tar.xz"; }; }; kspaceduel = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kspaceduel-22.04.1.tar.xz"; - sha256 = "1k5fl88w1wcsq2sbh36bkikjh272fc9z89v45xnv40hjd00wwxac"; - name = "kspaceduel-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kspaceduel-22.04.3.tar.xz"; + sha256 = "1yb7y1f5rcw4jacpf9vpzbragm2ywwb3mkjhq67x7x99q6r9iz55"; + name = "kspaceduel-22.04.3.tar.xz"; }; }; ksquares = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ksquares-22.04.1.tar.xz"; - sha256 = "1xlzbl9iqkhbh91v7qkrgk0ha8xi96j680bzyia9yjhxq8bkn0ii"; - name = "ksquares-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ksquares-22.04.3.tar.xz"; + sha256 = "05cz0d83570awnh0faam3y5fxzafzkxaj3wijka1vcbigxk350c5"; + name = "ksquares-22.04.3.tar.xz"; }; }; ksudoku = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ksudoku-22.04.1.tar.xz"; - sha256 = "03nasma38xiwvbapyxs2wkgk7vv83jk57zg103rgkkr78ybabmgf"; - name = "ksudoku-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ksudoku-22.04.3.tar.xz"; + sha256 = "116dgc9hh6fq6x0w4rd4kjd2qy93hq6bmxwk5jmm21lqwrszr6hw"; + name = "ksudoku-22.04.3.tar.xz"; }; }; ksystemlog = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ksystemlog-22.04.1.tar.xz"; - sha256 = "0dpb4acglqzy2cwfi32sc48r0p6vl8j7g9g6pc8r6iq25pja2qfp"; - name = "ksystemlog-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ksystemlog-22.04.3.tar.xz"; + sha256 = "0x9j3m0kndbaxldsk2rh8zawz0nqqdpn1xf36m4zzymm3b034glv"; + name = "ksystemlog-22.04.3.tar.xz"; }; }; kteatime = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kteatime-22.04.1.tar.xz"; - sha256 = "0nv5i2arnwzpmd2zm5ra7n87y3ygmadzzpdlr5ylpznaqfypbgym"; - name = "kteatime-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kteatime-22.04.3.tar.xz"; + sha256 = "0h289x2jbfn6jm14b8pqxqiwr4wqdpkk5yf1cx65nh7nzc3lg6pc"; + name = "kteatime-22.04.3.tar.xz"; }; }; ktimer = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktimer-22.04.1.tar.xz"; - sha256 = "1ragzrdzzg9nw6nnxgpw9cm982lk71j1lbcb5b19dfb3jpwwirrw"; - name = "ktimer-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktimer-22.04.3.tar.xz"; + sha256 = "1mvgyfwwcm6ylg9bj4jw6cbjgx6yczxzv78n2c624aa0fmy7l5dz"; + name = "ktimer-22.04.3.tar.xz"; }; }; ktnef = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktnef-22.04.1.tar.xz"; - sha256 = "1rpni8jhbwghzzv4nw646xmz7g3vw7k1y7bnv9kmripn1sag8f49"; - name = "ktnef-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktnef-22.04.3.tar.xz"; + sha256 = "0nvvaakjhciqdn0v1697d559p0py5v41iyd0ix2z8sqgw7lb7nkh"; + name = "ktnef-22.04.3.tar.xz"; }; }; ktorrent = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktorrent-22.04.1.tar.xz"; - sha256 = "1cnq13dgz8fxiw65mlhzbimmb1p25rdcawldffr2b4gxv2gxcngk"; - name = "ktorrent-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktorrent-22.04.3.tar.xz"; + sha256 = "1h95hf4ki2xi2c9bzdg18p6d1757gzqknf6gn1ls6lwqy6p0pr4h"; + name = "ktorrent-22.04.3.tar.xz"; }; }; ktouch = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktouch-22.04.1.tar.xz"; - sha256 = "0rz379xc0v3nvwilisvdfqlf84xgy48mhslkgp164mmp670r5ksj"; - name = "ktouch-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktouch-22.04.3.tar.xz"; + sha256 = "01kzn5nvsqc1p81v0qx2h67v0kiyygjsciyi4x60fkkxgzabsrxi"; + name = "ktouch-22.04.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-accounts-kcm-22.04.1.tar.xz"; - sha256 = "15mc8wc4lywn0gi6wbc9h0k38fs38jr8v771r3zpc2r9bpa0qfsl"; - name = "ktp-accounts-kcm-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-accounts-kcm-22.04.3.tar.xz"; + sha256 = "1lrmpsqnsg7zr7s8p0hv9lnm60rrckkd4z028aisgmwy9s3zlc50"; + name = "ktp-accounts-kcm-22.04.3.tar.xz"; }; }; ktp-approver = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-approver-22.04.1.tar.xz"; - sha256 = "11xrr83s1n0a97bkgyr8gy3f6abggndk1rdj7d4qs399jfzqs7j5"; - name = "ktp-approver-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-approver-22.04.3.tar.xz"; + sha256 = "0cyk447dlwrmn8diahlmqhr4c1y62ilm4x2nk606wdh8n840rqnp"; + name = "ktp-approver-22.04.3.tar.xz"; }; }; ktp-auth-handler = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-auth-handler-22.04.1.tar.xz"; - sha256 = "1fp2wj3nrnjn8mzyhqdqg8r7gdy7ksm245qagynynb1a2hdd1vpb"; - name = "ktp-auth-handler-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-auth-handler-22.04.3.tar.xz"; + sha256 = "1hnjz4lzhav4w2wlc097pciy725xbagvx58dwnp9j6c9a0g03bmb"; + name = "ktp-auth-handler-22.04.3.tar.xz"; }; }; ktp-call-ui = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-call-ui-22.04.1.tar.xz"; - sha256 = "0jmbn52pz83d5n11hqawh64s2204izbb6w1aya4zdlsa4l2zyizb"; - name = "ktp-call-ui-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-call-ui-22.04.3.tar.xz"; + sha256 = "1kggh9jsi5s9dqs4jyzd31ka4g0fdlfxag9dj7pgl305pnx15mgk"; + name = "ktp-call-ui-22.04.3.tar.xz"; }; }; ktp-common-internals = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-common-internals-22.04.1.tar.xz"; - sha256 = "0vmy6sdxhi0d1g4iql2xx2zc259gwi155hh3s6f6nnfdvm4971a3"; - name = "ktp-common-internals-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-common-internals-22.04.3.tar.xz"; + sha256 = "06ndj8n9c23hi0k0lrii7jam8ilxmjr89vcamixc0smfxrnrxmsp"; + name = "ktp-common-internals-22.04.3.tar.xz"; }; }; ktp-contact-list = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-contact-list-22.04.1.tar.xz"; - sha256 = "1pczacindx828c7g6dkvq90nqadgg32jn4my335sl6ykr735a4pw"; - name = "ktp-contact-list-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-contact-list-22.04.3.tar.xz"; + sha256 = "00qph13c801sk8rcmsx44dw72a6rdkgjq2h22nkrramcw8j8sap6"; + name = "ktp-contact-list-22.04.3.tar.xz"; }; }; ktp-contact-runner = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-contact-runner-22.04.1.tar.xz"; - sha256 = "1hcy2dm8d08bp5lqxa96am6af3i33vialyc7hzdmp6alv062fqgs"; - name = "ktp-contact-runner-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-contact-runner-22.04.3.tar.xz"; + sha256 = "0wwwdd36j26jd9w7hw66kcn41bp9xyivh8dbsfab06lzms3zgbd8"; + name = "ktp-contact-runner-22.04.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-desktop-applets-22.04.1.tar.xz"; - sha256 = "19hdfs1pa04d0inqh5id6ysnzsbi3n24jlr6y2qn2lzqfm3kgxl6"; - name = "ktp-desktop-applets-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-desktop-applets-22.04.3.tar.xz"; + sha256 = "03k27jxg2cdzw5xdypwhl11pqj1qz69cvzg9lwnryf0ybb3i29dj"; + name = "ktp-desktop-applets-22.04.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-filetransfer-handler-22.04.1.tar.xz"; - sha256 = "1698ic2y43w8bm2j6r9mms4z3zgyz5wdghyhnw1syh8g0nks6b9a"; - name = "ktp-filetransfer-handler-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-filetransfer-handler-22.04.3.tar.xz"; + sha256 = "0m5831r3wpphjlsnxqdyjx6ll8yk4lyf4qxyqpbsqb7d0z0dd6a7"; + name = "ktp-filetransfer-handler-22.04.3.tar.xz"; }; }; ktp-kded-module = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-kded-module-22.04.1.tar.xz"; - sha256 = "1df6wiyxb4qa6d8nj8hkn7z6f9g2nn0bwi9gywfqq23n1imrnin7"; - name = "ktp-kded-module-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-kded-module-22.04.3.tar.xz"; + sha256 = "09mainmyiphf9j139b4v0fx422azimwpjk7v5yc9sxq78lnq10ig"; + name = "ktp-kded-module-22.04.3.tar.xz"; }; }; ktp-send-file = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-send-file-22.04.1.tar.xz"; - sha256 = "0swf599kf769ad721r0lmf74g0mp68h0lxjcvy71wfnjkfgn16rl"; - name = "ktp-send-file-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-send-file-22.04.3.tar.xz"; + sha256 = "1ak50infh64q7acb7lfdgccfbpalx59svsnc31ar5v1yhdykmkni"; + name = "ktp-send-file-22.04.3.tar.xz"; }; }; ktp-text-ui = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktp-text-ui-22.04.1.tar.xz"; - sha256 = "0ldgiq0amr715hivv9573gxdi6p530zjfvq1nmyn4nr3lv3k036f"; - name = "ktp-text-ui-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktp-text-ui-22.04.3.tar.xz"; + sha256 = "0p5bjsv6cksv8h7c9rajlpjp5mx3x4n5lj9ha93fl2q0s2i7cqr7"; + name = "ktp-text-ui-22.04.3.tar.xz"; }; }; ktuberling = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/ktuberling-22.04.1.tar.xz"; - sha256 = "1b1ra5qxf4yba4z9hsjq1r30vfg0kgpxjmj5cpzvm0jdy5vas8j5"; - name = "ktuberling-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/ktuberling-22.04.3.tar.xz"; + sha256 = "19kyk7r7lkzwcvhhn1jjgrcdkq8gfmzgyrvvcbm4qkx7jd27v1ia"; + name = "ktuberling-22.04.3.tar.xz"; }; }; kturtle = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kturtle-22.04.1.tar.xz"; - sha256 = "1gs3q23ylxpbk65ml9xpgz7dyz9r2gbwl2jda9i2vqir4n6w1ihm"; - name = "kturtle-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kturtle-22.04.3.tar.xz"; + sha256 = "09a928zizpsnjgcdaz4737whbdqn79ajdczscqvi2m624hb626hv"; + name = "kturtle-22.04.3.tar.xz"; }; }; kubrick = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kubrick-22.04.1.tar.xz"; - sha256 = "13p33kmrdknzjbkpg90wjccgy7ckpk23gfghvn55q13hvvvr492w"; - name = "kubrick-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kubrick-22.04.3.tar.xz"; + sha256 = "09hxrigckvpxw1ipzlhq5fb5hpzrb5h65b55m6di3nj6ys2x50v9"; + name = "kubrick-22.04.3.tar.xz"; }; }; kwalletmanager = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kwalletmanager-22.04.1.tar.xz"; - sha256 = "0nhfyz9fyjsjjbj4fgyqqq2rvafm8klbjnlf0sqy5fdd5ldii7i8"; - name = "kwalletmanager-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kwalletmanager-22.04.3.tar.xz"; + sha256 = "0f1777dyzjsnh2xspnak236fg9wrxp061psdzc6n5p7c7v69h50b"; + name = "kwalletmanager-22.04.3.tar.xz"; }; }; kwave = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kwave-22.04.1.tar.xz"; - sha256 = "10m847fqk3b8yhs4vji477qc9gh62rz9n72b23ib4y8xpddvkxzz"; - name = "kwave-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kwave-22.04.3.tar.xz"; + sha256 = "0j6ck44lkfcnaa0rymv2aqvdcy0zbybbklm1s6mvbgdpfsh0rhkm"; + name = "kwave-22.04.3.tar.xz"; }; }; kwordquiz = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/kwordquiz-22.04.1.tar.xz"; - sha256 = "0mw8pkwr52bfzwbv8rny6s5yfqf7rz55ql0v7i319vi71pk9m8bz"; - name = "kwordquiz-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/kwordquiz-22.04.3.tar.xz"; + sha256 = "1v2vwii0l51rimcnspq0aykczpndkf410pk9f3n4xnsd4cl2g5ah"; + name = "kwordquiz-22.04.3.tar.xz"; }; }; libgravatar = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libgravatar-22.04.1.tar.xz"; - sha256 = "0fy52hm3xkh7kvask339gfxsm2fiv5d2va4wlhgqhnjq972b7fyn"; - name = "libgravatar-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libgravatar-22.04.3.tar.xz"; + sha256 = "1zik4y1micgqyz2y6cj5w5sjccm69d49svl72bdjcj5n3r6xl9iq"; + name = "libgravatar-22.04.3.tar.xz"; }; }; libkcddb = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkcddb-22.04.1.tar.xz"; - sha256 = "000bqff7gdy5bhs7jkyf08j975f9wqxv9x4qgs5gnqz4wxrqllqh"; - name = "libkcddb-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkcddb-22.04.3.tar.xz"; + sha256 = "1js5r8hxqabnygmavfjvjbfy5c7978bmwm2rqlgsfyn17fkmf2y8"; + name = "libkcddb-22.04.3.tar.xz"; }; }; libkcompactdisc = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkcompactdisc-22.04.1.tar.xz"; - sha256 = "06s56iqmr0rhpp325p98mz7b0bn7siq91y11v6pvvxwp42mfm6w6"; - name = "libkcompactdisc-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkcompactdisc-22.04.3.tar.xz"; + sha256 = "0fv9dbx74xs42iiw67bvjpxga0d126q2nfs8n4hiv3z2xda9n4ic"; + name = "libkcompactdisc-22.04.3.tar.xz"; }; }; libkdcraw = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkdcraw-22.04.1.tar.xz"; - sha256 = "19d82bmz8mfp6sajjih5712z4951pp0hsnsw1s46xs0r4lwjv532"; - name = "libkdcraw-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkdcraw-22.04.3.tar.xz"; + sha256 = "1694g9v5wvylkcxp15xca380zg231zvxv5q3wxy72p3vd96ff15x"; + name = "libkdcraw-22.04.3.tar.xz"; }; }; libkdegames = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkdegames-22.04.1.tar.xz"; - sha256 = "1q6r1y13lzxyfgy1bphrqq6vpn43vssa077inccl1b4hqm9lgs8c"; - name = "libkdegames-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkdegames-22.04.3.tar.xz"; + sha256 = "0igq87anam9x2mclb0lkvwhrxk62y1f4xl14a4dhd97mqsc5pbzn"; + name = "libkdegames-22.04.3.tar.xz"; }; }; libkdepim = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkdepim-22.04.1.tar.xz"; - sha256 = "0x21yw42fsvib28fabilxinm7sl0vrwhw12yzra66mrl7ysvwfwn"; - name = "libkdepim-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkdepim-22.04.3.tar.xz"; + sha256 = "1r6hbj3rgma1q1fxmi982widvnq1dajslhwmd21aknnnryspfx7s"; + name = "libkdepim-22.04.3.tar.xz"; }; }; libkeduvocdocument = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkeduvocdocument-22.04.1.tar.xz"; - sha256 = "05w76d7js2068wmyjahailw1bmjn6zrr9d49hixn2ic0fih4amai"; - name = "libkeduvocdocument-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkeduvocdocument-22.04.3.tar.xz"; + sha256 = "0cv0gphcmj68f5gn3ffxsvrfc4zng1kxksdqhjbi334kbjabb902"; + name = "libkeduvocdocument-22.04.3.tar.xz"; }; }; libkexiv2 = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkexiv2-22.04.1.tar.xz"; - sha256 = "1nnmbq3xcl7blflw9ibaqwkk405rf1rfjh8zxvli8yhz76rkhvrp"; - name = "libkexiv2-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkexiv2-22.04.3.tar.xz"; + sha256 = "0p43z69yh5jk8m1hn3xynjpgzxpkc89h0dafj5964qx4xp4vxl19"; + name = "libkexiv2-22.04.3.tar.xz"; }; }; libkgapi = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkgapi-22.04.1.tar.xz"; - sha256 = "17qa3c2zbsiyj6lqw56flhv0dfnwcd8ak7hisyrksalv50x5zq4l"; - name = "libkgapi-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkgapi-22.04.3.tar.xz"; + sha256 = "0m47wqr2m147csypzm38i29msm1mcnn6mx3l0nwfhwsmycf6lsr7"; + name = "libkgapi-22.04.3.tar.xz"; }; }; libkipi = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkipi-22.04.1.tar.xz"; - sha256 = "1zcskhg1p8ldrf4r0miqnyvyw9yr4x894lp4hkahvlarxm7vf5gg"; - name = "libkipi-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkipi-22.04.3.tar.xz"; + sha256 = "0x87d0b7v9x48zaaprsi7j2sprbypjscxy708r5xyq3b0cai527h"; + name = "libkipi-22.04.3.tar.xz"; }; }; libkleo = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkleo-22.04.1.tar.xz"; - sha256 = "01qqzvna4vpldflq9ah2dj8hl3wmzh6x4hw4ah3vii2rmf5hbmln"; - name = "libkleo-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkleo-22.04.3.tar.xz"; + sha256 = "0nk6bi2z4s0rf0qim00xcmvxyzwax4bjn1f4f6iyw5qdfkc6yvnp"; + name = "libkleo-22.04.3.tar.xz"; }; }; libkmahjongg = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkmahjongg-22.04.1.tar.xz"; - sha256 = "0aw79n93f4vc2fg0mrb55cz1584hwf7li4fyvs4c4wpxcpbfk3ff"; - name = "libkmahjongg-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkmahjongg-22.04.3.tar.xz"; + sha256 = "1y123bygi4iil8qglv2fx81qnlqpjpx3s4fmq8sffkilcz875nw8"; + name = "libkmahjongg-22.04.3.tar.xz"; }; }; libkomparediff2 = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libkomparediff2-22.04.1.tar.xz"; - sha256 = "0gz31j51vqgs13gyk2xrr20h852vnk9cy381sgnnk9m22lqxn174"; - name = "libkomparediff2-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libkomparediff2-22.04.3.tar.xz"; + sha256 = "1vaxbx7c6r7skh3452blxyrngfcsdyjmmvcg6j2wcsn04m01mw8k"; + name = "libkomparediff2-22.04.3.tar.xz"; }; }; libksane = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libksane-22.04.1.tar.xz"; - sha256 = "103448xv5y6q552g4g6016nmrgr2b0b6g0mg4d5hy2ibd0kmsxdv"; - name = "libksane-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libksane-22.04.3.tar.xz"; + sha256 = "0h3761h2b4lm3kg9if4yq3fsagq2v67asp7jvhsv487fqybvjm33"; + name = "libksane-22.04.3.tar.xz"; }; }; libksieve = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libksieve-22.04.1.tar.xz"; - sha256 = "06ypiw5xmpxjyr5blwnwv5whm15fsafadzld8mn7qqxfzhibpzrx"; - name = "libksieve-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libksieve-22.04.3.tar.xz"; + sha256 = "0s5c49vgsqmbpyk1bhwjb04v6v6vb9xlcms8dvc6f3gyjdchk5lc"; + name = "libksieve-22.04.3.tar.xz"; }; }; libktorrent = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/libktorrent-22.04.1.tar.xz"; - sha256 = "1jnxwyvil5mjlj7rvy31nbdg39fziclb014ilsy2f0g1r7nldpap"; - name = "libktorrent-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/libktorrent-22.04.3.tar.xz"; + sha256 = "098ac7b5wa7v6svqv4rx1w44j18pr22qgr236fj94r2kpl2nq79q"; + name = "libktorrent-22.04.3.tar.xz"; }; }; lokalize = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/lokalize-22.04.1.tar.xz"; - sha256 = "0m4z9qas74x5j7wc1gr0rfzn10mzf1jdf3ffqybrxgli22w8c9my"; - name = "lokalize-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/lokalize-22.04.3.tar.xz"; + sha256 = "1yx1rc21m66jnqbfbrpw7bdvppjbgk9hc97a62j3qm5qpphnd0rx"; + name = "lokalize-22.04.3.tar.xz"; }; }; lskat = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/lskat-22.04.1.tar.xz"; - sha256 = "0gyd8bzdnc5c0dpswmrigm81ajqgbvkvfs97nrdw08hvk5ba3a79"; - name = "lskat-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/lskat-22.04.3.tar.xz"; + sha256 = "07pkrgn9pgwwcc903iqmdp49i26ijkkb795jbwyhdg3nqgck9ar9"; + name = "lskat-22.04.3.tar.xz"; }; }; mailcommon = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/mailcommon-22.04.1.tar.xz"; - sha256 = "0xfsjl6p629r0gpvcrnxgdx1hfcqk9q1zzwjs4zw1waggpf39has"; - name = "mailcommon-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/mailcommon-22.04.3.tar.xz"; + sha256 = "0vir2p7akihfzb86iwspz3k6j3psc6xxyak4x738dw3lhn22nfzb"; + name = "mailcommon-22.04.3.tar.xz"; }; }; mailimporter = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/mailimporter-22.04.1.tar.xz"; - sha256 = "17gklgbi9fppc1k96nlmam8qdw8rzpc47b1vd9y1zrxsbp47fv46"; - name = "mailimporter-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/mailimporter-22.04.3.tar.xz"; + sha256 = "0hb4ba8vr7wrw8mcrc7hicl8f9r6ihsbwkxxr1qkzk0310yjmcbf"; + name = "mailimporter-22.04.3.tar.xz"; }; }; marble = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/marble-22.04.1.tar.xz"; - sha256 = "0mxqp7q4l0zic3aszfwijyk06pj9b2q3cj7bj3lqghvncd4196rm"; - name = "marble-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/marble-22.04.3.tar.xz"; + sha256 = "0wgppsds6dfysz4ha4dp7w86krlw4klvykpnfwiqy6r32zrlx3a3"; + name = "marble-22.04.3.tar.xz"; }; }; markdownpart = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/markdownpart-22.04.1.tar.xz"; - sha256 = "1ihg3n4ndyipsfac5gfhf7pljr4x3v2zbalvc9369q39xmzvz8c5"; - name = "markdownpart-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/markdownpart-22.04.3.tar.xz"; + sha256 = "192jrwcvmm7h97cd3jlf5y82ydsrb9r02qs8ir0bijx613qa22yn"; + name = "markdownpart-22.04.3.tar.xz"; }; }; mbox-importer = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/mbox-importer-22.04.1.tar.xz"; - sha256 = "14jl5gwz7rwsac4gzyv1larr1llwwhdrbg6pvapqgwwpmxnmdjzi"; - name = "mbox-importer-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/mbox-importer-22.04.3.tar.xz"; + sha256 = "1h2kg8qkcv9y61w9ibls6wjfv6rjd6bckvahid43n8432m2g4fja"; + name = "mbox-importer-22.04.3.tar.xz"; }; }; messagelib = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/messagelib-22.04.1.tar.xz"; - sha256 = "0inz5pygvfngd9brd40mk2zvh106m294mj2h52aq0ydnhxf9w0m8"; - name = "messagelib-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/messagelib-22.04.3.tar.xz"; + sha256 = "06vsba8r9sh94y59hmkh8nbg8xhib83sv80qnfw4g9fv5gfjppjh"; + name = "messagelib-22.04.3.tar.xz"; }; }; minuet = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/minuet-22.04.1.tar.xz"; - sha256 = "0af3fir0njcczqf9wgfb0kygj9nnjf7z18sr39nzd45mm0qmmgk2"; - name = "minuet-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/minuet-22.04.3.tar.xz"; + sha256 = "07aammhxiaq8kjg52iiy3qhpc4p6h4kxfz26sln3az94byvhzp27"; + name = "minuet-22.04.3.tar.xz"; }; }; okular = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/okular-22.04.1.tar.xz"; - sha256 = "0gqnfzh0k03q6mnb5ixa1shk6sx9qzgcj1l443lji1w2y8nhpqnf"; - name = "okular-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/okular-22.04.3.tar.xz"; + sha256 = "03jpwgrhjgyx14g1h3lxhnyib88ck0qkqcxh4fpc398xwdr3amkw"; + name = "okular-22.04.3.tar.xz"; }; }; palapeli = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/palapeli-22.04.1.tar.xz"; - sha256 = "1a8d0qg04a8h53nxxn8016gpamb6a8vycjhhf7586aglx51nj4ds"; - name = "palapeli-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/palapeli-22.04.3.tar.xz"; + sha256 = "0bwi5y5mrf6h1vhyhs5sxwx8hdv0hkknpscpg5q54f6hw6cwf4qv"; + name = "palapeli-22.04.3.tar.xz"; }; }; parley = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/parley-22.04.1.tar.xz"; - sha256 = "0xvml3svb68gpxrd80a3hqh65d0wavvksdx1wd5mxm8bkdqifb2j"; - name = "parley-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/parley-22.04.3.tar.xz"; + sha256 = "1ks8p5px8ii5v1invxz24vqb0b0qyvznfwg0fr6i2rbrp1jkpdxs"; + name = "parley-22.04.3.tar.xz"; }; }; partitionmanager = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/partitionmanager-22.04.1.tar.xz"; - sha256 = "08nplvyzbbclqgkm03c7r6gyvmgj6931ml539ifngmfxjfhxj82n"; - name = "partitionmanager-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/partitionmanager-22.04.3.tar.xz"; + sha256 = "1s442rnh5l4r85ka82145z2m8kmfzjf8li4jw0ra34qf5x065pn2"; + name = "partitionmanager-22.04.3.tar.xz"; }; }; picmi = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/picmi-22.04.1.tar.xz"; - sha256 = "13ipw692n72m3sbcpviyh85f993zvw2d6yqbdk96c5wwfksrhqww"; - name = "picmi-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/picmi-22.04.3.tar.xz"; + sha256 = "0nn00sila4zn4r28dh84jvqqrrs31sh9vwd76nalm7y14xrxwn46"; + name = "picmi-22.04.3.tar.xz"; }; }; pim-data-exporter = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/pim-data-exporter-22.04.1.tar.xz"; - sha256 = "15kbvbq7gyxkjrhkafkz1dc3zyblsys3hg6641x0hmyy3zmyigbi"; - name = "pim-data-exporter-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/pim-data-exporter-22.04.3.tar.xz"; + sha256 = "1ffs89dzl83ims6b5fn1ff1gcd773q2d73dza8bbhayyh75gi01n"; + name = "pim-data-exporter-22.04.3.tar.xz"; }; }; pim-sieve-editor = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/pim-sieve-editor-22.04.1.tar.xz"; - sha256 = "02kr6530x6x7y7ngiz98ca4rvfsbcnci9093if71kaybhs2l267k"; - name = "pim-sieve-editor-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/pim-sieve-editor-22.04.3.tar.xz"; + sha256 = "0smxv88jzwwnn8q0hgwcac8nxssh3637cv66j8yq6ijih0gxra1m"; + name = "pim-sieve-editor-22.04.3.tar.xz"; }; }; pimcommon = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/pimcommon-22.04.1.tar.xz"; - sha256 = "01l1nj7jjq7kx7db63a8nn1jcl2hpn3in6cklz89w2ilwkcwv51a"; - name = "pimcommon-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/pimcommon-22.04.3.tar.xz"; + sha256 = "1xns3qc5n5fig898bsj3kzda6484n0r406km43gicnly1m7jpar9"; + name = "pimcommon-22.04.3.tar.xz"; }; }; poxml = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/poxml-22.04.1.tar.xz"; - sha256 = "0aiw90l716ii6sj82r68li7a0sq28nvy2j5phvdiqwisqcmrhhqn"; - name = "poxml-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/poxml-22.04.3.tar.xz"; + sha256 = "1nrp0i3a39pw4pzcanpmjyks3pl1lyfj3zq61ii8xx402xw1ip2w"; + name = "poxml-22.04.3.tar.xz"; }; }; print-manager = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/print-manager-22.04.1.tar.xz"; - sha256 = "0ydqf9p0zzsw2l2l49w3di7ihl441h54ifxidww0y1s2why0d77l"; - name = "print-manager-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/print-manager-22.04.3.tar.xz"; + sha256 = "07knxvqf3q2pb057k7k0pniyfkqh280wx4qfkj60iv69s1a54cr4"; + name = "print-manager-22.04.3.tar.xz"; }; }; rocs = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/rocs-22.04.1.tar.xz"; - sha256 = "0jldr3kisfk309ykfnp6fqqny0bg4vfy0c85c593c014v099nnzc"; - name = "rocs-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/rocs-22.04.3.tar.xz"; + sha256 = "1rvv8n86p7gq8a0npyv6dk2101bzkwhdbpkrw1f3xgfrxbsfqyw3"; + name = "rocs-22.04.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/signon-kwallet-extension-22.04.1.tar.xz"; - sha256 = "13nh3ggy6wlh18z1ag2hxrcf7gg3bscz1518ajbhcvriz4yc3v1c"; - name = "signon-kwallet-extension-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/signon-kwallet-extension-22.04.3.tar.xz"; + sha256 = "0vms9ykj39x7zmdjasv6mn0gxf7v11jws6ma7zhir3akvkw8i451"; + name = "signon-kwallet-extension-22.04.3.tar.xz"; }; }; skanlite = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/skanlite-22.04.1.tar.xz"; - sha256 = "1j0ky1b5pf8v8vqym8nrjpjb7z0gssj3nkbvfs0mz725a04gxxv9"; - name = "skanlite-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/skanlite-22.04.3.tar.xz"; + sha256 = "1v1jk40pxzsnhqv2vk770xrab9gay7z9bybfvn1kvjlpjzvbmz3n"; + name = "skanlite-22.04.3.tar.xz"; }; }; skanpage = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/skanpage-22.04.1.tar.xz"; - sha256 = "1w3w3h58arjmkfp63rgzzgzyl44wkv53dqsp43ny1yk8zyfw6cih"; - name = "skanpage-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/skanpage-22.04.3.tar.xz"; + sha256 = "11qn1iymncv83cj93q6z4y617az2p9gbwjlgzgz53j3r2m6hp56k"; + name = "skanpage-22.04.3.tar.xz"; }; }; spectacle = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/spectacle-22.04.1.tar.xz"; - sha256 = "111q8jg925spgmij52vq17pdiw1wsxrw654ns2yj6vcnf2mwjnrk"; - name = "spectacle-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/spectacle-22.04.3.tar.xz"; + sha256 = "17bbpcd5haa66cdp17yvykqrwjai7v4n6hj13qrycvn2pj2pifwn"; + name = "spectacle-22.04.3.tar.xz"; }; }; step = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/step-22.04.1.tar.xz"; - sha256 = "03dwp4xg84a3q79gmqlqb5idaybl3k5na5d47668zfv8hw5kwz1m"; - name = "step-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/step-22.04.3.tar.xz"; + sha256 = "1agv3c6ixgmg8yd48ss6s6kpi8x5aqqrsl5ml74kgqcbmxar32cg"; + name = "step-22.04.3.tar.xz"; }; }; svgpart = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/svgpart-22.04.1.tar.xz"; - sha256 = "1738p2k9j9lckav86fqm57i6aszwdhin7nja7dx1g637w0a96nsy"; - name = "svgpart-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/svgpart-22.04.3.tar.xz"; + sha256 = "166m7dqhyhqd5znh14fk39yynj6q7w9vikngrvf110ilmvrr6lvq"; + name = "svgpart-22.04.3.tar.xz"; }; }; sweeper = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/sweeper-22.04.1.tar.xz"; - sha256 = "10719rj6pwjq6k8n60x4vg08rvy4pwnf9g2p6warp4mzkwhdn4fh"; - name = "sweeper-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/sweeper-22.04.3.tar.xz"; + sha256 = "0kda4a5d9a11am2y6f91bx8v3nb8mw9qh671nskvgkx46x1pww21"; + name = "sweeper-22.04.3.tar.xz"; }; }; umbrello = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/umbrello-22.04.1.tar.xz"; - sha256 = "01jk3w17prvqljrn3lfk1j3ifaf59wp917527idnk3yhl6k6abdz"; - name = "umbrello-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/umbrello-22.04.3.tar.xz"; + sha256 = "0hr2pb1w9amphk857yyz5inkfyfchdi0kdwfyhndsg0lv02i581w"; + name = "umbrello-22.04.3.tar.xz"; }; }; yakuake = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/yakuake-22.04.1.tar.xz"; - sha256 = "1c61cpp8dai5bb3mcdry12iibz1mni3bhnwnsdb2v9kaf0vrhf2k"; - name = "yakuake-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/yakuake-22.04.3.tar.xz"; + sha256 = "0h5c8j65m6gylvwrj4sag4rlx92brbfllyrwpi7kwfjbwf7a5j1k"; + name = "yakuake-22.04.3.tar.xz"; }; }; zanshin = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/zanshin-22.04.1.tar.xz"; - sha256 = "0frza7k4fmwkpdaxinnza021wqri1llhpasdphbwx539sxpbwlv8"; - name = "zanshin-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/zanshin-22.04.3.tar.xz"; + sha256 = "1nadwmcvixhcbjq2q8rvmyxyzvv4cds3d2kkkjhgz374b4308f5y"; + name = "zanshin-22.04.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "22.04.1"; + version = "22.04.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.1/src/zeroconf-ioslave-22.04.1.tar.xz"; - sha256 = "1bswkxjw0djp60k6wp0jyfz27pvzcvgdkp4219lzf5kxyj6ln1dk"; - name = "zeroconf-ioslave-22.04.1.tar.xz"; + url = "${mirror}/stable/release-service/22.04.3/src/zeroconf-ioslave-22.04.3.tar.xz"; + sha256 = "0jbrdbphxn77dg2a4wzsm7q24455j4d1xhd4rj5iwhq4ywiig9i1"; + name = "zeroconf-ioslave-22.04.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index d9d21f30f3479..871f07440e832 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -23,6 +23,8 @@ , libxcb , libxkbcommon , libxshmfence +, libGL +, libappindicator-gtk3 , mesa , nspr , nss @@ -42,11 +44,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.8.0-11.BETA"; + version = "8.8.0-165.BETA"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-HU+nIz3aKXXdBWEBMSRlbi8yZ+JEsE33o6nfbWRgpBo="; + sha256 = "sha256-ZpKAkuIMeHEFdz/od/sKDh8VXoWOZYO8GjvMiho3D4A="; }; nativeBuildInputs = [ makeWrapper ]; @@ -78,6 +80,8 @@ in stdenv.mkDerivation rec { libxcb libxkbcommon libxshmfence + libGL + libappindicator-gtk3 mesa nspr nss @@ -125,6 +129,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform password manager"; homepage = "https://1password.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 72b542e24fe43..0bae8412b2477 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -23,6 +23,8 @@ , libxcb , libxkbcommon , libxshmfence +, libappindicator-gtk3 +, libGL , mesa , nspr , nss @@ -42,11 +44,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.7.0"; + version = "8.7.3"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-Ubn1KEjK8H8d8+4QNEpEOuclWyD8ujUbO5CpzWr+kSg="; + sha256 = "sha256-1JMSUKbeqcyz5SJLrPD9kaqSlPI0pZVMXFjRuMIvwqo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -78,6 +80,8 @@ in stdenv.mkDerivation rec { libxcb libxkbcommon libxshmfence + libGL + libappindicator-gtk3 mesa nspr nss @@ -127,6 +131,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform password manager"; homepage = "https://1password.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 080d7b0c9fb07..0d18b3dd37a3e 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.2.0"; + version = "2.5.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-fKW2qSQkkC4GcnHcLLszX1pcqK67SaofVX017/cIkD0=" "zip"; - i686-linux = fetch "linux_386" "sha256-TmQ3nWG12DTpAJaxbK+hnJak0RrFhhw6rJWfV7q8wb4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-66kFScxPmy4WgK9p1W6qBoAeYJwungHgGkTurjEJy+4=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-DD1j093SjnaPtkQ4XuU1zkRi6XPXtwnBxiqC6wZbV+w=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip"; + i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; @@ -48,6 +48,7 @@ stdenv.mkDerivation { ''; postInstall = '' + HOME=$TMPDIR installShellCompletion --cmd ${mainProgram} \ --bash <($out/bin/${mainProgram} completion bash) \ --fish <($out/bin/${mainProgram} completion fish) \ @@ -67,6 +68,7 @@ stdenv.mkDerivation { homepage = "https://developer.1password.com/docs/cli/"; downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; maintainers = with maintainers; [ joelburget marsam ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; inherit mainProgram platforms; }; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 951faaac4ded4..e54f6c8cbc127 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -12,17 +12,16 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.2.5.7"; + version = "5.2.7.7"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-NXRHLE9Y7j10l8mAUY68+556wcxRXLfdKeCI+b4Xs7I="; + sha256 = "sha256-2yx6YjMsJixtaiWse65p5VeZoiSumdIjaPIlfq9Mdmw="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; - dotnet-sdk = dotnetCorePackages.sdk_6_0; nugetDeps = if stdenvNoCC.isAarch64 then ./deps-aarch64-linux.nix else ./deps-x86_64-linux.nix; @@ -42,7 +41,7 @@ buildDotnetModule rec { ''; passthru = { - updateScript = ./updater.sh; + updateScript = ./update.sh; ui = callPackage ./web-ui { }; }; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index 461b98e5c45b7..983e03c8f3da3 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -1,7 +1,7 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; }) + (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) @@ -55,12 +55,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.2"; sha256 = "094yy2hfwvnlzap919zmnbfc915v86gd1zb9hfcbfvzbly11rd7s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.5"; sha256 = "1lmi0jl63377gbrjicfh06jcvgxc3q6x4k7545cby38fbkwnbgic"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.5"; sha256 = "0mjv5w9gia3bb2qg7ahh6j1mgb3fwlr3famxssdy8vq8qgfd1h4h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.5"; sha256 = "0br5ms806jsgc2jghcjb6lm2h1ifq8wa3cgxp5ginrhzzj3p145i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.5"; sha256 = "0ns6ibghr8silf6pxd8ibwyflyrpjy3z8yqh4w2sr8yrhmv32d3j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.5"; sha256 = "15fbzv7yywhzfmkkrqi9xxwi0h6fy9miz5ihl8j4hd0psqc8wil3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.5"; sha256 = "1wl227mbbda039dznl2lvd65kh3k978qa88pa2ayqjx3vb6394q9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "1fv3xvqc98l3ma4s8f2g4fklifbj1i24fngcvlhfm4j6s295xjj1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "1z50gqg0jimk98yd0zr2vxn087h3h1qn08fdcqbaxfgpcw30yi87"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "1qp64z6m7sr5ln3sa5b39vj73yd52zs7asqlsws3a9jpisns6vds"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; }) (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"; }) @@ -77,17 +77,17 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.5"; sha256 = "0bxrmv89018gsmhggxmyfyb1xmdn2p9mz1n8gg9lrf448d0ahqax"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.5"; sha256 = "0jgz59npwawkivlzw27zwn7qf5y58i3vd9981j0lfwz6qhcknb8r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.5"; sha256 = "10q7irxzzph0ijv0j9xax6sy3ahlkply5p49b8dk2718x3bmaj0p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.5"; sha256 = "1bx0bbzwnbp7r7dcxcq5222zbhmgirs75lcm6azqw5f5qxrvv5x8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.5"; sha256 = "19lfp3lbvsvc51q46jwy5l39skx5rfiyhk6f6djdc3g5l55kb871"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.5"; sha256 = "1l67hb5gzmd1b26rficg9jb6bkjgh0zi262bynia2dqpph2x07sx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.5"; sha256 = "0x1jhv7h17kwxigrwlcs13kf4xlfy0977hdajj96kl6vbcd7256d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.5"; sha256 = "0hzsvhk5hzk0iav7cc2i8dgyx02a5jks2g0jljychw18ck9s2ilg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.5"; sha256 = "1xd89kws1bpdml4wfcjbwy4ydxdzvki0dbsw1v58b3l6ih4mz6ry"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.5"; sha256 = "0xyvhhksdxjdwn1bfkhvxrgyd92p01r9mdjsand05dmba4q7gxqq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.5"; sha256 = "1ihlnzp7zclc76d1ig3dc71l0gm7z5lqqwppjj06aa4yhrsa2baj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.6"; sha256 = "0kygwac98rxq89g83lyzn21kslvgdkcqfd1dnba2ssw7q056fbgy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.6"; sha256 = "0hvawclkpp6srhbdl0b1ma2xsvf6yy8k8s1fp4by249qzpy26w7l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.6"; sha256 = "1wwwjldbqy6l8x9dlw0512zqac9jplsmnn0rrrwzrlb0p5amz0a4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.6"; sha256 = "12b6ya9q5wszfq6yp38lpan8zws95gbp1vs9pydk3v82gai336r3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "088ggz1ac5z4ir707xmxiw4dlcaacfgmyvvlgwvsxhnv3fngf8b6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "117rz4gm7ihns5jlc2x05h7kdcgrl0ic4v67dzfbbr9kpra1bmcw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "04i4d7zhw7cqhfl84p93hpib8lhvkhmprip1li64sq5zrs36dxpx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0l15md6rzr2dvwvnk8xj1qz1dcjcbmp0aglnflrj8av60g5r1kwd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; }) (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.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) @@ -110,9 +110,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; }) + (fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; }) (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"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix index fe91bb8026f97..fc69de3a10806 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix @@ -1,7 +1,7 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; }) + (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) @@ -55,12 +55,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.2"; sha256 = "094yy2hfwvnlzap919zmnbfc915v86gd1zb9hfcbfvzbly11rd7s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.5"; sha256 = "1lmi0jl63377gbrjicfh06jcvgxc3q6x4k7545cby38fbkwnbgic"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.5"; sha256 = "0mjv5w9gia3bb2qg7ahh6j1mgb3fwlr3famxssdy8vq8qgfd1h4h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.5"; sha256 = "0br5ms806jsgc2jghcjb6lm2h1ifq8wa3cgxp5ginrhzzj3p145i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.5"; sha256 = "0ns6ibghr8silf6pxd8ibwyflyrpjy3z8yqh4w2sr8yrhmv32d3j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.5"; sha256 = "15fbzv7yywhzfmkkrqi9xxwi0h6fy9miz5ihl8j4hd0psqc8wil3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.5"; sha256 = "1wl227mbbda039dznl2lvd65kh3k978qa88pa2ayqjx3vb6394q9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "1fv3xvqc98l3ma4s8f2g4fklifbj1i24fngcvlhfm4j6s295xjj1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "1z50gqg0jimk98yd0zr2vxn087h3h1qn08fdcqbaxfgpcw30yi87"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "1qp64z6m7sr5ln3sa5b39vj73yd52zs7asqlsws3a9jpisns6vds"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; }) (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"; }) @@ -77,17 +77,17 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.5"; sha256 = "0bxrmv89018gsmhggxmyfyb1xmdn2p9mz1n8gg9lrf448d0ahqax"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.5"; sha256 = "0q9wswwnwdi2y9ca2h072anb2m8mjs01hqg6p9kyxlsgfmvcaxmw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.5"; sha256 = "10q7irxzzph0ijv0j9xax6sy3ahlkply5p49b8dk2718x3bmaj0p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.5"; sha256 = "1bx0bbzwnbp7r7dcxcq5222zbhmgirs75lcm6azqw5f5qxrvv5x8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.5"; sha256 = "19lfp3lbvsvc51q46jwy5l39skx5rfiyhk6f6djdc3g5l55kb871"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.5"; sha256 = "1l67hb5gzmd1b26rficg9jb6bkjgh0zi262bynia2dqpph2x07sx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.5"; sha256 = "0x1jhv7h17kwxigrwlcs13kf4xlfy0977hdajj96kl6vbcd7256d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.5"; sha256 = "0hzsvhk5hzk0iav7cc2i8dgyx02a5jks2g0jljychw18ck9s2ilg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.5"; sha256 = "1xd89kws1bpdml4wfcjbwy4ydxdzvki0dbsw1v58b3l6ih4mz6ry"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.5"; sha256 = "0xyvhhksdxjdwn1bfkhvxrgyd92p01r9mdjsand05dmba4q7gxqq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.5"; sha256 = "1ihlnzp7zclc76d1ig3dc71l0gm7z5lqqwppjj06aa4yhrsa2baj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.6"; sha256 = "0kygwac98rxq89g83lyzn21kslvgdkcqfd1dnba2ssw7q056fbgy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.6"; sha256 = "0hlxq0k60ras0wj7d7q94dxd8nzjcry0kixxs6z1hyrbm4q0y3ls"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.6"; sha256 = "1wwwjldbqy6l8x9dlw0512zqac9jplsmnn0rrrwzrlb0p5amz0a4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.6"; sha256 = "12b6ya9q5wszfq6yp38lpan8zws95gbp1vs9pydk3v82gai336r3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "088ggz1ac5z4ir707xmxiw4dlcaacfgmyvvlgwvsxhnv3fngf8b6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "117rz4gm7ihns5jlc2x05h7kdcgrl0ic4v67dzfbbr9kpra1bmcw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "04i4d7zhw7cqhfl84p93hpib8lhvkhmprip1li64sq5zrs36dxpx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0l15md6rzr2dvwvnk8xj1qz1dcjcbmp0aglnflrj8av60g5r1kwd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; }) (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.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) @@ -110,9 +110,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; }) + (fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; }) (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"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/updater.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 3c361d7023946..4ff04432040b6 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/updater.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts nuget-to-nix -set -exo pipefail +set -euox pipefail cd "$(dirname "${BASH_SOURCE[0]}")" deps_file="$(realpath ./deps)" @@ -15,15 +15,21 @@ if [[ "$new_version" == "$old_version" ]]; then fi fi +asf_path=$(pwd) cd ../../../.. nixpkgs_path=$(pwd) -if [[ "$1" != "--deps-only" ]]; then +if [[ "${1:-}" != "--deps-only" ]]; then update-source-version ArchiSteamFarm "$new_version" fi store_src="$(nix-build -A ArchiSteamFarm.src --no-out-link)" platforms="$(nix-instantiate --strict --eval --json -A ArchiSteamFarm.meta.platforms | jq -r .[])" src="$(mktemp -d /tmp/ArchiSteamFarm-src.XXX)" + +trap ' + rm -r "$src" +' EXIT + cp -rT "$store_src" "$src" chmod -R +w "$src" @@ -36,15 +42,12 @@ for i in $platforms; do nix-shell -I nixpkgs="$nixpkgs_path" -p dotnet-sdk_6 --argstr system $i --run " mkdir ./nuget_pkgs-$i for project in ArchiSteamFarm/ArchiSteamFarm.csproj ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj; do - dotnet restore $project --packages ./nuget_pkgs-$i + dotnet restore \$project --packages ./nuget_pkgs-$i done; nuget-to-nix ./nuget_pkgs-$i > $deps_file-$i.nix" \ || echo "Did you set up binformat for $i?"; - done; -trap ' - popd - rm -r "$src" -' EXIT +cd "$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 b055f176a60ef..260035bf11e81 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,30 +11,30 @@ 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 = "bb59242af6f17a54449e6f87e9df397da1a19525"; - sha256 = "0d9x0fcjxghmjqnfxj22x2hnx3k6jfsayb2ws7ayn3azcczfsccp"; + rev = "99278781c3716064dc25e3608a344900ebb05165"; + sha256 = "0nly16g39cv4lhnm40w5ci6bdwypk0gp8n70l914907hy0nvz4vg"; }; in - nodePackages.package.override { - inherit src; +nodePackages.package.override { + inherit src; - # upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time) - version = ArchiSteamFarm.version; + # upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time) + version = ArchiSteamFarm.version; - nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ]; + nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ]; - postInstall = '' - patchShebangs node_modules/ - npm run build - ln -s $out/lib/node_modules/asf-ui/dist $out/lib/dist - ''; + postInstall = '' + patchShebangs node_modules/ + npm run build + cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist + rm -rf $out/lib/node_modules/ + ''; - meta = with lib; { - description = "The official web interface for ASF"; - license = licenses.apsl20; - homepage = "https://github.com/JustArchiNET/ASF-ui"; - platforms = ArchiSteamFarm.meta.platforms; - maintainers = with maintainers; [ lom ]; - }; - } + meta = with lib; { + description = "The official web interface for ASF"; + license = licenses.apsl20; + homepage = "https://github.com/JustArchiNET/ASF-ui"; + inherit (ArchiSteamFarm.meta) maintainers platforms; + }; +} diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index b9bacf6aef1a2..5de9d220ab743 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -31,31 +31,31 @@ let sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; }; }; - "@babel/core-7.17.10" = { + "@babel/core-7.18.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.17.10"; + version = "7.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.17.10.tgz"; - sha512 = "liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz"; + sha512 = "MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ=="; }; }; - "@babel/eslint-parser-7.17.0" = { + "@babel/eslint-parser-7.18.2" = { name = "_at_babel_slash_eslint-parser"; packageName = "@babel/eslint-parser"; - version = "7.17.0"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz"; - sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA=="; + url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz"; + sha512 = "oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A=="; }; }; - "@babel/generator-7.17.10" = { + "@babel/generator-7.18.2" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz"; - sha512 = "46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz"; + sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -76,31 +76,31 @@ let sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; - "@babel/helper-compilation-targets-7.17.10" = { + "@babel/helper-compilation-targets-7.18.2" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz"; - sha512 = "gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"; + sha512 = "s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.17.9" = { + "@babel/helper-create-class-features-plugin-7.18.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.9"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz"; - sha512 = "kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz"; + sha512 = "Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.17.0" = { + "@babel/helper-create-regexp-features-plugin-7.17.12" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.17.0"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz"; - sha512 = "awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz"; + sha512 = "b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw=="; }; }; "@babel/helper-define-polyfill-provider-0.3.0" = { @@ -112,13 +112,13 @@ let sha512 = "7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg=="; }; }; - "@babel/helper-environment-visitor-7.16.7" = { + "@babel/helper-environment-visitor-7.18.2" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.16.7"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; - sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz"; + sha512 = "14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="; }; }; "@babel/helper-explode-assignable-expression-7.16.7" = { @@ -166,13 +166,13 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.17.7" = { + "@babel/helper-module-transforms-7.18.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.17.7"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz"; - sha512 = "VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"; + sha512 = "kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA=="; }; }; "@babel/helper-optimise-call-expression-7.16.7" = { @@ -184,13 +184,13 @@ let sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; }; }; - "@babel/helper-plugin-utils-7.16.7" = { + "@babel/helper-plugin-utils-7.17.12" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; - sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"; + sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; }; }; "@babel/helper-remap-async-to-generator-7.16.8" = { @@ -211,13 +211,13 @@ let sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; }; }; - "@babel/helper-simple-access-7.17.7" = { + "@babel/helper-simple-access-7.18.2" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.17.7"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz"; - sha512 = "txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"; + sha512 = "7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { @@ -265,13 +265,13 @@ let sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.17.9" = { + "@babel/helpers-7.18.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.17.9"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz"; - sha512 = "cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz"; + sha512 = "j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg=="; }; }; "@babel/highlight-7.16.7" = { @@ -283,58 +283,58 @@ let sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw=="; }; }; - "@babel/parser-7.17.10" = { + "@babel/parser-7.18.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.17.10"; + version = "7.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.10.tgz"; - sha512 = "n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz"; + sha512 = "YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz"; - sha512 = "anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz"; + sha512 = "xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz"; - sha512 = "di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz"; + sha512 = "/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.8" = { + "@babel/plugin-proposal-async-generator-functions-7.17.12" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.8"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz"; - sha512 = "71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz"; + sha512 = "RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.16.7" = { + "@babel/plugin-proposal-class-properties-7.17.12" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz"; - sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz"; + sha512 = "U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw=="; }; }; - "@babel/plugin-proposal-class-static-block-7.17.6" = { + "@babel/plugin-proposal-class-static-block-7.18.0" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.17.6"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz"; - sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz"; + sha512 = "t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -346,40 +346,40 @@ let sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.16.7" = { + "@babel/plugin-proposal-export-namespace-from-7.17.12" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz"; - sha512 = "ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz"; + sha512 = "j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ=="; }; }; - "@babel/plugin-proposal-json-strings-7.16.7" = { + "@babel/plugin-proposal-json-strings-7.17.12" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz"; - sha512 = "lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz"; + sha512 = "rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.16.7" = { + "@babel/plugin-proposal-logical-assignment-operators-7.17.12" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz"; - sha512 = "K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz"; + sha512 = "EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz"; - sha512 = "aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz"; + sha512 = "ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag=="; }; }; "@babel/plugin-proposal-numeric-separator-7.16.7" = { @@ -391,13 +391,13 @@ let sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.17.3" = { + "@babel/plugin-proposal-object-rest-spread-7.18.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.17.3"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz"; - sha512 = "yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"; + sha512 = "nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { @@ -409,40 +409,40 @@ let sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.16.7" = { + "@babel/plugin-proposal-optional-chaining-7.17.12" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz"; - sha512 = "eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz"; + sha512 = "7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.16.11" = { + "@babel/plugin-proposal-private-methods-7.17.12" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.16.11"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz"; - sha512 = "F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz"; + sha512 = "SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.16.7" = { + "@babel/plugin-proposal-private-property-in-object-7.17.12" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; - sha512 = "rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz"; + sha512 = "/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.16.7" = { + "@babel/plugin-proposal-unicode-property-regex-7.17.12" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz"; - sha512 = "QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz"; + sha512 = "Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -490,6 +490,15 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; + "@babel/plugin-syntax-import-assertions-7.17.12" = { + name = "_at_babel_slash_plugin-syntax-import-assertions"; + packageName = "@babel/plugin-syntax-import-assertions"; + version = "7.17.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz"; + sha512 = "n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw=="; + }; + }; "@babel/plugin-syntax-json-strings-7.8.3" = { name = "_at_babel_slash_plugin-syntax-json-strings"; packageName = "@babel/plugin-syntax-json-strings"; @@ -571,22 +580,22 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.16.7" = { + "@babel/plugin-transform-arrow-functions-7.17.12" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz"; - sha512 = "9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz"; + sha512 = "PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA=="; }; }; - "@babel/plugin-transform-async-to-generator-7.16.8" = { + "@babel/plugin-transform-async-to-generator-7.17.12" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.16.8"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz"; - sha512 = "MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz"; + sha512 = "J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.16.7" = { @@ -598,40 +607,40 @@ let sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; }; }; - "@babel/plugin-transform-block-scoping-7.16.7" = { + "@babel/plugin-transform-block-scoping-7.17.12" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz"; - sha512 = "ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz"; + sha512 = "jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ=="; }; }; - "@babel/plugin-transform-classes-7.16.7" = { + "@babel/plugin-transform-classes-7.17.12" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz"; - sha512 = "WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz"; + sha512 = "cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw=="; }; }; - "@babel/plugin-transform-computed-properties-7.16.7" = { + "@babel/plugin-transform-computed-properties-7.17.12" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz"; - sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz"; + sha512 = "a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ=="; }; }; - "@babel/plugin-transform-destructuring-7.17.7" = { + "@babel/plugin-transform-destructuring-7.18.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.17.7"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz"; - sha512 = "XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"; + sha512 = "Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw=="; }; }; "@babel/plugin-transform-dotall-regex-7.16.7" = { @@ -643,13 +652,13 @@ let sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.16.7" = { + "@babel/plugin-transform-duplicate-keys-7.17.12" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz"; - sha512 = "03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz"; + sha512 = "EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw=="; }; }; "@babel/plugin-transform-exponentiation-operator-7.16.7" = { @@ -661,13 +670,13 @@ let sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; }; }; - "@babel/plugin-transform-for-of-7.16.7" = { + "@babel/plugin-transform-for-of-7.18.1" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.16.7"; + version = "7.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz"; - sha512 = "/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz"; + sha512 = "+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg=="; }; }; "@babel/plugin-transform-function-name-7.16.7" = { @@ -679,13 +688,13 @@ let sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; }; }; - "@babel/plugin-transform-literals-7.16.7" = { + "@babel/plugin-transform-literals-7.17.12" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz"; - sha512 = "6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz"; + sha512 = "8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ=="; }; }; "@babel/plugin-transform-member-expression-literals-7.16.7" = { @@ -697,58 +706,58 @@ let sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; }; }; - "@babel/plugin-transform-modules-amd-7.16.7" = { + "@babel/plugin-transform-modules-amd-7.18.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.16.7"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz"; - sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz"; + sha512 = "h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.17.9" = { + "@babel/plugin-transform-modules-commonjs-7.18.2" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.17.9"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz"; - sha512 = "2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz"; + sha512 = "f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.17.8" = { + "@babel/plugin-transform-modules-systemjs-7.18.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.17.8"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz"; - sha512 = "39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.0.tgz"; + sha512 = "vwKpxdHnlM5tIrRt/eA0bzfbi7gUBLN08vLu38np1nZevlPySRe6yvuATJB5F/WPJ+ur4OXwpVYq9+BsxqAQuQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.16.7" = { + "@babel/plugin-transform-modules-umd-7.18.0" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.16.7"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz"; - sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz"; + sha512 = "d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.17.10" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.17.12" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.17.10"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz"; - sha512 = "v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz"; + sha512 = "vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA=="; }; }; - "@babel/plugin-transform-new-target-7.16.7" = { + "@babel/plugin-transform-new-target-7.17.12" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz"; - sha512 = "xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz"; + sha512 = "CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w=="; }; }; "@babel/plugin-transform-object-super-7.16.7" = { @@ -760,13 +769,13 @@ let sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; }; }; - "@babel/plugin-transform-parameters-7.16.7" = { + "@babel/plugin-transform-parameters-7.17.12" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz"; - sha512 = "AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"; + sha512 = "6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA=="; }; }; "@babel/plugin-transform-property-literals-7.16.7" = { @@ -778,22 +787,22 @@ let sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.17.9" = { + "@babel/plugin-transform-regenerator-7.18.0" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.17.9"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz"; - sha512 = "Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz"; + sha512 = "C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw=="; }; }; - "@babel/plugin-transform-reserved-words-7.16.7" = { + "@babel/plugin-transform-reserved-words-7.17.12" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz"; - sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz"; + sha512 = "1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA=="; }; }; "@babel/plugin-transform-shorthand-properties-7.16.7" = { @@ -805,13 +814,13 @@ let sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; }; }; - "@babel/plugin-transform-spread-7.16.7" = { + "@babel/plugin-transform-spread-7.17.12" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz"; - sha512 = "+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz"; + sha512 = "9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg=="; }; }; "@babel/plugin-transform-sticky-regex-7.16.7" = { @@ -823,22 +832,22 @@ let sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; }; }; - "@babel/plugin-transform-template-literals-7.16.7" = { + "@babel/plugin-transform-template-literals-7.18.2" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.16.7"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz"; - sha512 = "VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz"; + sha512 = "/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.16.7" = { + "@babel/plugin-transform-typeof-symbol-7.17.12" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz"; - sha512 = "p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz"; + sha512 = "Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw=="; }; }; "@babel/plugin-transform-unicode-escapes-7.16.7" = { @@ -859,13 +868,13 @@ let sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; }; }; - "@babel/preset-env-7.17.10" = { + "@babel/preset-env-7.18.2" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.17.10.tgz"; - sha512 = "YNgyBHZQpeoBSRBg0xixsZzfT58Ze1iZrajvv0lJc70qDDGuGfonEnMGfWeSY0mQ3JTuCWFbMkzFRVafOyJx4g=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz"; + sha512 = "PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -895,22 +904,22 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.17.10" = { + "@babel/traverse-7.18.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.17.10"; + version = "7.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz"; - sha512 = "VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz"; + sha512 = "aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA=="; }; }; - "@babel/types-7.17.10" = { + "@babel/types-7.18.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.17.10"; + version = "7.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz"; - sha512 = "9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz"; + sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -922,13 +931,13 @@ let sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@eslint/eslintrc-1.2.3" = { + "@eslint/eslintrc-1.3.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.2.3"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz"; - sha512 = "uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; + sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; }; }; "@fortawesome/fontawesome-common-types-0.3.0" = { @@ -976,13 +985,13 @@ let sha512 = "0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg=="; }; }; - "@fortawesome/vue-fontawesome-2.0.6" = { + "@fortawesome/vue-fontawesome-2.0.7" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.6.tgz"; - sha512 = "V3vT3flY15AKbUS31aZOP12awQI3aAzkr2B1KnqcHLmwrmy51DW3pwyBczKdypV8QxBZ8U68Hl2XxK2nudTxpg=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.7.tgz"; + sha512 = "D1a5FJQeiCFG5a29Re5uNAUAI8SdkCPZlvf0EyfEy9XBVB7tEsL/tfXO6ToXoEOE8CAzJCwuM/PXSCHusXT5/Q=="; }; }; "@humanwhocodes/config-array-0.9.2" = { @@ -1003,13 +1012,13 @@ let sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; - "@jridgewell/gen-mapping-0.1.1" = { + "@jridgewell/gen-mapping-0.3.1" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.1.1"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; - sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; + sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; }; }; "@jridgewell/resolve-uri-3.0.5" = { @@ -1021,13 +1030,13 @@ let sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; }; }; - "@jridgewell/set-array-1.1.0" = { + "@jridgewell/set-array-1.1.1" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.0.tgz"; - sha512 = "SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"; + sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; }; }; "@jridgewell/sourcemap-codec-1.4.11" = { @@ -1039,13 +1048,13 @@ let sha512 = "Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="; }; }; - "@jridgewell/trace-mapping-0.3.4" = { + "@jridgewell/trace-mapping-0.3.13" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.4"; + version = "0.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz"; - sha512 = "vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; + sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; }; }; "@leichtgewicht/ip-codec-2.0.3" = { @@ -1453,31 +1462,31 @@ let sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; }; }; - "@webpack-cli/configtest-1.1.1" = { + "@webpack-cli/configtest-1.2.0" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz"; - sha512 = "1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz"; + sha512 = "4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg=="; }; }; - "@webpack-cli/info-1.4.1" = { + "@webpack-cli/info-1.5.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz"; - sha512 = "PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz"; + sha512 = "e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ=="; }; }; - "@webpack-cli/serve-1.6.1" = { + "@webpack-cli/serve-1.7.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz"; - sha512 = "gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz"; + sha512 = "oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -1507,15 +1516,6 @@ let sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; - "acorn-7.4.1" = { - name = "acorn"; - packageName = "acorn"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - }; "acorn-8.7.1" = { name = "acorn"; packageName = "acorn"; @@ -1597,15 +1597,6 @@ let sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; }; }; - "ajv-8.9.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; - sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; - }; - }; "ajv-formats-2.1.1" = { name = "ajv-formats"; packageName = "ajv-formats"; @@ -1723,15 +1714,6 @@ let sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; }; - "array-union-3.0.1" = { - name = "array-union"; - packageName = "array-union"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz"; - sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="; - }; - }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -2254,13 +2236,13 @@ let sha512 = "i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw=="; }; }; - "copy-webpack-plugin-10.2.4" = { + "copy-webpack-plugin-11.0.0" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "10.2.4"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz"; - sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz"; + sha512 = "fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ=="; }; }; "core-js-compat-3.22.3" = { @@ -2353,15 +2335,6 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; "debug-4.3.3" = { name = "debug"; packageName = "debug"; @@ -2704,13 +2677,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.15.0" = { + "eslint-8.17.0" = { name = "eslint"; packageName = "eslint"; - version = "8.15.0"; + version = "8.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz"; - sha512 = "GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz"; + sha512 = "gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2749,13 +2722,13 @@ let sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; }; }; - "eslint-plugin-vue-7.20.0" = { + "eslint-plugin-vue-9.1.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.20.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz"; - sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.1.1.tgz"; + sha512 = "W9n5PB1X2jzC7CK6riG0oAcxjmKrjTF6+keL1rni8n57DZeilx/Fulz+IRJK3lYseLNAygN0I62L7DvioW40Tw=="; }; }; "eslint-scope-5.1.1" = { @@ -2776,15 +2749,6 @@ let sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; }; }; - "eslint-utils-2.1.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; - }; - }; "eslint-utils-3.0.0" = { name = "eslint-utils"; packageName = "eslint-utils"; @@ -2794,15 +2758,6 @@ let sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; }; }; - "eslint-visitor-keys-1.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; - }; - }; "eslint-visitor-keys-2.1.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -2821,24 +2776,6 @@ let sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; }; - "espree-6.2.1" = { - name = "espree"; - packageName = "espree"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"; - sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; - }; - }; - "espree-9.3.1" = { - name = "espree"; - packageName = "espree"; - version = "9.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz"; - sha512 = "bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ=="; - }; - }; "espree-9.3.2" = { name = "espree"; packageName = "espree"; @@ -3271,31 +3208,22 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.12.0" = { - name = "globals"; - packageName = "globals"; - version = "13.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"; - sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; - }; - }; - "globals-13.13.0" = { + "globals-13.15.0" = { name = "globals"; packageName = "globals"; - version = "13.13.0"; + version = "13.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz"; - sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; + url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; + sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; }; }; - "globby-12.2.0" = { + "globby-13.1.1" = { name = "globby"; packageName = "globby"; - version = "12.2.0"; + version = "13.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz"; - sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; + url = "https://registry.npmjs.org/globby/-/globby-13.1.1.tgz"; + sha512 = "XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q=="; }; }; "globby-6.1.0" = { @@ -3532,13 +3460,13 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; - "humanize-duration-3.27.1" = { + "humanize-duration-3.27.2" = { name = "humanize-duration"; packageName = "humanize-duration"; - version = "3.27.1"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz"; - sha512 = "jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA=="; + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.2.tgz"; + sha512 = "A15OmA3FLFRnehvF4ZMocsxTZYvHq4ze7L+AgR1DeHw0xC9vMd4euInY83uqGU9/XXKNnVIEeKc1R8G8nKqtzg=="; }; }; "iconv-lite-0.4.24" = { @@ -3604,15 +3532,6 @@ let sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; - "indexes-of-1.0.1" = { - name = "indexes-of"; - packageName = "indexes-of"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; - sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -4954,22 +4873,13 @@ let sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; }; }; - "postcss-selector-parser-6.0.2" = { + "postcss-selector-parser-6.0.10" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.2"; + version = "6.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; - }; - }; - "postcss-selector-parser-6.0.6" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; - sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"; + sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; }; }; "postcss-value-parser-4.2.0" = { @@ -5341,22 +5251,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.51.0" = { + "sass-1.52.3" = { name = "sass"; packageName = "sass"; - version = "1.51.0"; + version = "1.52.3"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.51.0.tgz"; - sha512 = "haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz"; + sha512 = "LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA=="; }; }; - "sass-loader-12.6.0" = { + "sass-loader-13.0.0" = { name = "sass-loader"; packageName = "sass-loader"; - version = "12.6.0"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz"; - sha512 = "oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA=="; + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.0.tgz"; + sha512 = "IHCFecI+rbPvXE2zO/mqdVFe8MU7ElGrwga9hh2H65Ru4iaBJAMRteum1c4Gsxi9Cq1FOtTEDd6+/AEYuQDM4Q=="; }; }; "schema-utils-2.7.1" = { @@ -5431,13 +5341,13 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.3.5" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.5"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; "send-0.17.2" = { @@ -5926,15 +5836,6 @@ let sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; }; }; - "uniq-1.0.1" = { - name = "uniq"; - packageName = "uniq"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; - }; - }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -6034,22 +5935,22 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; - "vue-eslint-parser-7.11.0" = { + "vue-eslint-parser-8.3.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.11.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz"; - sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz"; + sha512 = "dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g=="; }; }; - "vue-eslint-parser-8.3.0" = { + "vue-eslint-parser-9.0.2" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "8.3.0"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz"; - sha512 = "dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.0.2.tgz"; + sha512 = "uCPQwTGjOtAYrwnU+76pYxalhjsh7iFBsHwBqDHiOPTxtICDaraO4Szw54WFTNZTAEsgHHzqFOu1mmnBOBRzDA=="; }; }; "vue-hot-reload-api-2.3.4" = { @@ -6097,13 +5998,13 @@ let sha512 = "z5M7lJs0QluJnaoMFTIeGx6dIkYxOwHThlZDeQnWZBizKblb99GSejPnK37ZbNE/rVwDcYcHY+Io+AxdpY952w=="; }; }; - "vue-router-3.5.3" = { + "vue-router-3.5.4" = { name = "vue-router"; packageName = "vue-router"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz"; - sha512 = "FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="; + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.5.4.tgz"; + sha512 = "x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ=="; }; }; "vue-snotify-3.2.1" = { @@ -6169,13 +6070,13 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "webpack-5.72.1" = { + "webpack-5.73.0" = { name = "webpack"; packageName = "webpack"; - version = "5.72.1"; + version = "5.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz"; - sha512 = "dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz"; + sha512 = "svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA=="; }; }; "webpack-bundle-analyzer-4.5.0" = { @@ -6187,13 +6088,13 @@ let sha512 = "GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ=="; }; }; - "webpack-cli-4.9.2" = { + "webpack-cli-4.10.0" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.9.2"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz"; - sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"; + sha512 = "NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w=="; }; }; "webpack-dev-middleware-5.3.1" = { @@ -6205,13 +6106,13 @@ let sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg=="; }; }; - "webpack-dev-server-4.9.0" = { + "webpack-dev-server-4.9.2" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.9.0"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz"; - sha512 = "+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz"; + sha512 = "H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q=="; }; }; "webpack-merge-5.8.0" = { @@ -6322,6 +6223,15 @@ let sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA=="; }; }; + "xml-name-validator-4.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; + sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; + }; + }; "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; @@ -6350,7 +6260,7 @@ let sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.10" - (sources."@babel/core-7.17.10" // { + (sources."@babel/core-7.18.5" // { dependencies = [ sources."debug-4.3.4" sources."json5-2.2.1" @@ -6358,22 +6268,22 @@ let sources."semver-6.3.0" ]; }) - (sources."@babel/eslint-parser-7.17.0" // { + (sources."@babel/eslint-parser-7.18.2" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.17.10" + sources."@babel/generator-7.18.2" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.17.10" // { + (sources."@babel/helper-compilation-targets-7.18.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.9" - sources."@babel/helper-create-regexp-features-plugin-7.17.0" + sources."@babel/helper-create-class-features-plugin-7.18.0" + sources."@babel/helper-create-regexp-features-plugin-7.17.12" (sources."@babel/helper-define-polyfill-provider-0.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -6381,48 +6291,49 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-environment-visitor-7.18.2" sources."@babel/helper-explode-assignable-expression-7.16.7" sources."@babel/helper-function-name-7.17.9" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.17.7" + sources."@babel/helper-module-transforms-7.18.0" sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-plugin-utils-7.17.12" sources."@babel/helper-remap-async-to-generator-7.16.8" sources."@babel/helper-replace-supers-7.16.7" - sources."@babel/helper-simple-access-7.17.7" + sources."@babel/helper-simple-access-7.18.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.17.9" + sources."@babel/helpers-7.18.2" sources."@babel/highlight-7.16.7" - sources."@babel/parser-7.17.10" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" - sources."@babel/plugin-proposal-async-generator-functions-7.16.8" - sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.17.6" + sources."@babel/parser-7.18.5" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" + sources."@babel/plugin-proposal-async-generator-functions-7.17.12" + sources."@babel/plugin-proposal-class-properties-7.17.12" + sources."@babel/plugin-proposal-class-static-block-7.18.0" sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-namespace-from-7.16.7" - sources."@babel/plugin-proposal-json-strings-7.16.7" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.17.12" + sources."@babel/plugin-proposal-json-strings-7.17.12" + sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.17.3" + sources."@babel/plugin-proposal-object-rest-spread-7.18.0" sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.16.7" - sources."@babel/plugin-proposal-private-methods-7.16.11" - sources."@babel/plugin-proposal-private-property-in-object-7.16.7" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.17.12" + sources."@babel/plugin-proposal-private-methods-7.17.12" + sources."@babel/plugin-proposal-private-property-in-object-7.17.12" + sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" 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.17.12" 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" @@ -6432,39 +6343,39 @@ let sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.16.7" - sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-arrow-functions-7.17.12" + sources."@babel/plugin-transform-async-to-generator-7.17.12" sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.16.7" - sources."@babel/plugin-transform-classes-7.16.7" - sources."@babel/plugin-transform-computed-properties-7.16.7" - sources."@babel/plugin-transform-destructuring-7.17.7" + sources."@babel/plugin-transform-block-scoping-7.17.12" + sources."@babel/plugin-transform-classes-7.17.12" + sources."@babel/plugin-transform-computed-properties-7.17.12" + sources."@babel/plugin-transform-destructuring-7.18.0" sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.17.12" sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-for-of-7.18.1" sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-literals-7.17.12" sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.17.9" - sources."@babel/plugin-transform-modules-systemjs-7.17.8" - sources."@babel/plugin-transform-modules-umd-7.16.7" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.10" - sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.18.0" + sources."@babel/plugin-transform-modules-commonjs-7.18.2" + sources."@babel/plugin-transform-modules-systemjs-7.18.0" + sources."@babel/plugin-transform-modules-umd-7.18.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" + sources."@babel/plugin-transform-new-target-7.17.12" sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-parameters-7.17.12" sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-regenerator-7.17.9" - sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-regenerator-7.18.0" + sources."@babel/plugin-transform-reserved-words-7.17.12" sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-spread-7.17.12" sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.16.7" - sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-template-literals-7.18.2" + sources."@babel/plugin-transform-typeof-symbol-7.17.12" sources."@babel/plugin-transform-unicode-escapes-7.16.7" sources."@babel/plugin-transform-unicode-regex-7.16.7" - (sources."@babel/preset-env-7.17.10" // { + (sources."@babel/preset-env-7.18.2" // { dependencies = [ sources."semver-6.3.0" ]; @@ -6472,20 +6383,18 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.17.10" // { + (sources."@babel/traverse-7.18.5" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.17.10" + sources."@babel/types-7.18.4" sources."@discoveryjs/json-ext-0.5.5" - (sources."@eslint/eslintrc-1.2.3" // { + (sources."@eslint/eslintrc-1.3.0" // { dependencies = [ sources."debug-4.3.3" - sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.2" - sources."globals-13.12.0" + sources."globals-13.15.0" sources."ms-2.1.2" ]; }) @@ -6501,7 +6410,7 @@ let sources."@fortawesome/fontawesome-common-types-6.1.1" ]; }) - sources."@fortawesome/vue-fontawesome-2.0.6" + sources."@fortawesome/vue-fontawesome-2.0.7" (sources."@humanwhocodes/config-array-0.9.2" // { dependencies = [ sources."debug-4.3.3" @@ -6509,11 +6418,11 @@ let ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@jridgewell/gen-mapping-0.1.1" + sources."@jridgewell/gen-mapping-0.3.1" sources."@jridgewell/resolve-uri-3.0.5" - sources."@jridgewell/set-array-1.1.0" + sources."@jridgewell/set-array-1.1.1" sources."@jridgewell/sourcemap-codec-1.4.11" - sources."@jridgewell/trace-mapping-0.3.4" + sources."@jridgewell/trace-mapping-0.3.13" sources."@leichtgewicht/ip-codec-2.0.3" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" @@ -6565,9 +6474,9 @@ let sources."@webassemblyjs/wasm-opt-1.11.1" sources."@webassemblyjs/wasm-parser-1.11.1" sources."@webassemblyjs/wast-printer-1.11.1" - sources."@webpack-cli/configtest-1.1.1" - sources."@webpack-cli/info-1.4.1" - sources."@webpack-cli/serve-1.6.1" + sources."@webpack-cli/configtest-1.2.0" + sources."@webpack-cli/info-1.5.0" + sources."@webpack-cli/serve-1.7.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" @@ -6681,16 +6590,14 @@ let sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-to-clipboard-3.3.1" - (sources."copy-webpack-plugin-10.2.4" // { + (sources."copy-webpack-plugin-11.0.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."ajv-keywords-5.1.0" - sources."array-union-3.0.1" sources."glob-parent-6.0.2" - sources."globby-12.2.0" + sources."globby-13.1.1" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" - sources."slash-4.0.0" ]; }) (sources."core-js-compat-3.22.3" // { @@ -6759,7 +6666,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.15.0" // { + (sources."eslint-8.17.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6768,16 +6675,9 @@ let sources."debug-4.3.4" sources."escape-string-regexp-4.0.0" sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.2" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" - sources."globals-13.13.0" + sources."globals-13.15.0" sources."has-flag-4.0.0" sources."ms-2.1.2" sources."supports-color-7.2.0" @@ -6805,22 +6705,23 @@ let sources."doctrine-2.1.0" ]; }) - (sources."eslint-plugin-vue-7.20.0" // { + (sources."eslint-plugin-vue-9.1.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.4" + sources."eslint-scope-7.1.1" + sources."estraverse-5.3.0" sources."ms-2.1.2" - sources."semver-6.3.0" - sources."vue-eslint-parser-7.11.0" + sources."vue-eslint-parser-9.0.2" ]; }) sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - (sources."espree-6.2.1" // { + (sources."eslint-utils-3.0.0" // { dependencies = [ - sources."acorn-7.4.1" + sources."eslint-visitor-keys-2.1.0" ]; }) + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.3.2" (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" @@ -6951,7 +6852,7 @@ let sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.4" sources."human-signals-2.1.0" - sources."humanize-duration-3.27.1" + sources."humanize-duration-3.27.2" sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" sources."ignore-5.2.0" @@ -6973,7 +6874,6 @@ let ]; }) sources."imurmurhash-0.1.4" - sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" (sources."internal-slot-1.0.3" // { @@ -7146,13 +7046,9 @@ let sources."postcss-8.4.12" sources."postcss-modules-extract-imports-3.0.0" sources."postcss-modules-local-by-default-4.0.0" - (sources."postcss-modules-scope-3.0.0" // { - dependencies = [ - sources."postcss-selector-parser-6.0.6" - ]; - }) + sources."postcss-modules-scope-3.0.0" sources."postcss-modules-values-4.0.0" - sources."postcss-selector-parser-6.0.2" + sources."postcss-selector-parser-6.0.10" sources."postcss-value-parser-4.2.0" sources."prelude-ls-1.2.1" sources."prettier-1.19.1" @@ -7202,12 +7098,12 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.51.0" - sources."sass-loader-12.6.0" + sources."sass-1.52.3" + sources."sass-loader-13.0.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-2.0.1" - (sources."semver-7.3.5" // { + (sources."semver-7.3.7" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -7239,6 +7135,7 @@ let }) sources."signal-exit-3.0.3" sources."sirv-1.0.17" + sources."slash-4.0.0" sources."sockjs-0.3.24" sources."source-map-js-1.0.2" (sources."spdy-4.0.2" // { @@ -7300,7 +7197,6 @@ let sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" sources."unicode-property-aliases-ecmascript-2.0.0" - sources."uniq-1.0.1" sources."unpipe-1.0.0" sources."uri-js-4.2.2" (sources."url-loader-4.1.1" // { @@ -7325,8 +7221,6 @@ let dependencies = [ sources."debug-4.3.3" sources."eslint-scope-7.1.1" - sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.1" sources."estraverse-5.3.0" sources."ms-2.1.2" ]; @@ -7336,7 +7230,7 @@ let sources."vue-meta-2.4.0" sources."vue-multiselect-2.1.6" sources."vue-resize-1.0.1" - sources."vue-router-3.5.3" + sources."vue-router-3.5.4" sources."vue-snotify-3.2.1" sources."vue-style-loader-4.1.3" sources."vue-template-compiler-2.6.14" @@ -7344,7 +7238,7 @@ let sources."vuex-3.6.2" sources."watchpack-2.3.1" sources."wbuf-1.7.3" - sources."webpack-5.72.1" + sources."webpack-5.73.0" (sources."webpack-bundle-analyzer-4.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -7357,7 +7251,7 @@ let sources."ws-7.5.5" ]; }) - (sources."webpack-cli-4.9.2" // { + (sources."webpack-cli-4.10.0" // { dependencies = [ sources."commander-7.2.0" ]; @@ -7370,7 +7264,7 @@ let sources."schema-utils-4.0.0" ]; }) - (sources."webpack-dev-server-4.9.0" // { + (sources."webpack-dev-server-4.9.2" // { dependencies = [ sources."ajv-8.11.0" sources."ajv-keywords-5.1.0" @@ -7394,6 +7288,7 @@ let sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-8.4.2" + sources."xml-name-validator-4.0.0" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh index dfe394c785861..90f8baf8e1b6e 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh @@ -1,17 +1,19 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix gnused jq curl +#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl +set -eoux pipefail +pushd ../../../.. version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r) -ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=${version} | jq -r .sha) - -pushd $(dirname "$0") +popd +pushd "$(dirname "$0")" +ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha) -curl https://raw.githubusercontent.com/JustArchiNET/ASF-ui/${ui}/package-lock.json -o package-lock.json -curl https://raw.githubusercontent.com/JustArchiNET/ASF-ui/${ui}/package.json -o package.json +curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json +curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package.json" -o package.json # update-source-version doesn't work for some reason sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix -sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz)\";/" default.nix +sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix node2nix \ --nodejs-14 \ diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix index d185096aa7974..4932379ef02d5 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/applications/misc/HentaiAtHome/default.nix @@ -1,24 +1,43 @@ -{ buildGraalvmNativeImage, fetchzip, graalvm17-ce, lib }: - -buildGraalvmNativeImage rec { +{ buildPackages +, buildPlatform +, fetchzip +, javaOpts ? "-XX:+UseZGC" +, jdk +, jre_headless +, lib +, makeWrapper +, stdenvNoCC +, +}: +stdenvNoCC.mkDerivation rec { pname = "HentaiAtHome"; version = "1.6.1"; + src = fetchzip { - url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}.zip"; + url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; hash = - "sha512-nGGCuVovj4NJGrihKKYXnh0Ic9YD36o7r6wv9zSivZn22zm8lBYVXP85LnOw2z9DiJARivOctQGl48YFD7vxOQ=="; + "sha512-j+B0kx6fjUibI3MjVJ5PVTq9xxtSOTTY/XizAJKjeNkpExJF9DIV4VCwf+sfLlg+7W4UBosnyb8hZNNoidRBKA=="; stripRoot = false; }; - jar = "${src}/HentaiAtHome.jar"; - dontUnpack = true; + nativeBuildInputs = [ jdk makeWrapper ]; + + LANG = "en_US.UTF-8"; + LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc") + "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + + buildPhase = '' + make all + ''; + + installPhase = '' + mkdir -p $out/share/java + cp build/HentaiAtHome.jar $out/share/java - graalvmDrv = graalvm17-ce; - extraNativeImageBuildArgs = [ - "--enable-url-protocols=http,https" - "--install-exit-handlers" - "--no-fallback" - ]; + mkdir -p $out/bin + makeWrapper ${jre_headless}/bin/java $out/bin/HentaiAtHome \ + --add-flags "${javaOpts} -jar $out/share/java/HentaiAtHome.jar" + ''; doInstallCheck = true; installCheckPhase = '' @@ -27,6 +46,8 @@ buildGraalvmNativeImage rec { popd ''; + strictDeps = true; + meta = with lib; { homepage = "https://ehwiki.org/wiki/Hentai@Home"; description = diff --git a/pkgs/applications/misc/activate-linux/default.nix b/pkgs/applications/misc/activate-linux/default.nix new file mode 100644 index 0000000000000..b48236dd96811 --- /dev/null +++ b/pkgs/applications/misc/activate-linux/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, lib +, pkg-config +, xorg +, cairo +}: + +stdenv.mkDerivation rec { + pname = "activate-linux"; + version = "unstable-2022-05-22"; + + src = fetchFromGitHub { + owner = "MrGlockenspiel"; + repo = pname; + rev = "18a6dc9771c568c557569ef680386d5d67f25e96"; + sha256 = "wYoCyWZqu/jgqAuNYdNr2bjpz4pFRTnAF7qF4BRs9GE="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + xorg.libX11 + xorg.libXext + xorg.libXfixes + xorg.libXinerama + cairo + ]; + + + meta = with lib; { + description = "The \"Activate Windows\" watermark ported to Linux"; + homepage = "https://github.com/MrGlockenspiel/activate-linux"; + license = licenses.gpl3; + maintainers = with maintainers; [ alexnortung ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 2bce30365f08c..1a164f578a016 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; knownVulnerabilities = [ "Numerous unresolved vulnerabilities" diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 07cbee42694d9..6e28c58798e79 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.25.4"; + version = "0.26.1"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM="; + sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index b70cf4407501c..2d0990bab4347 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -6,10 +6,21 @@ let python = python3.override { packageOverrides = self: super: { django = super.django_3.overridePythonAttrs (old: rec { - version = "3.1.7"; + version = "3.1.14"; src = old.src.override { inherit version; - sha256 = "sha256-Ms55Lum2oMu+w0ASPiKayfdl3/jCpK6SR6FLK6OjZac="; + sha256 = "72a4a5a136a214c39cf016ccdd6b69e2aa08c7479c66d93f3a9b5e4bb9d8a347"; + }; + meta = old.meta // { + knownVulnerabilities = [ + "CVE-2021-45115" + "CVE-2021-45116" + "CVE-2021-45452" + "CVE-2022-23833" + "CVE-2022-22818" + "CVE-2022-28347" + "CVE-2022-28346" + ]; }; }); }; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 6f55e5dd17c9d..e903b77779d93 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.22.5"; + version = "1.22.7"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-EuHg8JrI6ZoyTXqD3v4cfk4/NovAj4fF2NY1V2ZF64c="; + sha256 = "sha256-A6nWH/WqFxTEIfOQcTRluAX0ORMNiyxfC/XLC8fmbdI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index d7cf8f34b832d..d41685821cd7c 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -25,20 +25,20 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.1.1"; + version = "4.1.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - hash = "sha256-wl7wyj0vVDkOB7XKQFOEFzCmffTsrUsaM83fWgZ6tG0="; + hash = "sha256-fv7Np3haRCJABlJocKuu+1jevHYrdo+VyiQBpRmHs2g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-3SzemDjLsZUXPPtSlDMBQXQf5P3Sz8caJL73mHRv1js="; + hash = "sha256-8GddlDM1lU365GXdrKNhO331/y1p3Om5uZfVLy8TBGI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 1dfe075fa8408..ca243f4437071 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -1,79 +1,21 @@ -{ alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, autoPatchelfHook -, cairo -, cups -, dbus -, electron_9 -, expat +{ autoPatchelfHook +, electron , fetchurl -, gdk-pixbuf -, glib -, gtk3 , lib -, libappindicator-gtk3 -, libdbusmenu-gtk3 -, libuuid , makeWrapper -, nspr -, nss -, pango , squashfsTools , stdenv -, systemd -, xorg }: -let - # Currently only works with electron 9 - electron = electron_9; -in - 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.1.0"; - rev = "9"; - - buildInputs = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libappindicator-gtk3 - libdbusmenu-gtk3 - libuuid - nspr - nss - pango - stdenv.cc.cc - systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - ]; + version = "2.2.0"; + rev = "10"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "sha256-RxjxOYrbneVctyTJTMvoN/UdREohaZWb1kTdEeI6mUU="; + sha256 = "sha256-sB9/fVV/qp+DfjxpvzIUHsLkeEu35i2rEv1/JYMytG8="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; @@ -95,25 +37,16 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/lib/ - - cp -r ./* $out/ - rm -R ./* + mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps - # The snap package has the `ffmpeg.so` file which is copied over with other .so files - mv $out/*.so $out/lib/ + # Copy only what is needed + cp -r resources* $out/ + cp -r locales* $out/ + cp meta/gui/authy.desktop $out/share/applications/ + cp meta/gui/icon.png $out/share/pixmaps/authy.png # Replace icon name in Desktop file - sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/meta/gui/authy.desktop" - - # Move the desktop file, icon, binary to their appropriate locations - mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps - cp $out/meta/gui/authy.desktop $out/share/applications/ - cp $out/meta/gui/icon.png $out/share/pixmaps/authy.png - cp $out/${pname} $out/bin/${pname} - - # Cleanup - rm -r $out/{data-dir,gnome-platform,meta,scripts,usr,*.sh,*.so} + sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/share/applications/authy.desktop" runHook postInstall ''; @@ -126,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.authy.com"; description = "Twilio Authy two factor authentication desktop application"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ iammrinal0 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 56ee5fa528010..20c36b745893c 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "avrdudess"; - version = "2.13"; + version = "2.14"; src = fetchurl { - url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.13/AVRDUDESS-2.13-portable.zip"; - sha256 = "0fpvc19fb14ppqfb2yg821szmhyanxcp5chfldf8yh51f64zihv9"; + url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.14/AVRDUDESS-2.14-portable.zip"; + sha256 = "sha256-x3xcsJLBJVO8XdV4OUveZ4KLqN5z/z0FsNLbGHSNoHs="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index aa7150bb6b0b5..0261f983ac79d 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -166,6 +166,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ xavierzwirtz ]; description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index c998309bdd337..f7e0597e0705e 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.3.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-bBa3eKBT43G/Q8gYluW2gH5qcmp/SsrF06onyGlg+UI="; + sha256 = "sha256-gZMGbw7Ij1IVQSWOqG/91YrbWTG3I3l6Yp11QbVCfyY="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index f55b6ef791435..f5b027a9b2de3 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,5 @@ -{ lib, mkDerivation +{ lib +, stdenv , fetchFromGitHub , cmake , docbook_xml_dtd_45 @@ -14,15 +15,15 @@ , sword }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bibletime"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "bibletime"; - repo = "bibletime"; - rev = "v${version}"; - hash = "sha256-8X5LkquALFnG0yRayZYjeymHDcOzINBv0MXeVBsOnfI="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-4O8F5/EyoJFJBEWOAs9lzN3TKuu/CEdKfPaOF8gNqps="; }; nativeBuildInputs = [ @@ -55,10 +56,10 @@ mkDerivation rec { ]; meta = with lib; { - description = "A powerful cross platform Bible study tool"; homepage = "http://www.bibletime.info/"; - platforms = platforms.linux; + description = "A powerful cross platform Bible study tool"; license = licenses.gpl2Plus; - maintainers = [ maintainers.piotr ]; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index 330235b80d73c..f3e58b7787188 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -22,11 +22,11 @@ buildPythonApplication rec { pname = "bikeshed"; - version = "3.4.3"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vJW4yNbKCZraJ5vx8FheNsBl+zObGoLFgAVqoU0p9QQ="; + sha256 = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; }; # Relax requirements from "==" to ">=" @@ -72,6 +72,6 @@ buildPythonApplication rec { ''; homepage = "https://tabatkins.github.io/bikeshed/"; license = licenses.cc0; - maintainers = [ maintainers.kvark ]; + maintainers = []; }; } diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index d5d6f6b5358ea..15e3c51e9ad4c 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "binance"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ="; + sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Binance Cryptoexchange Official Desktop Client"; homepage = "https://www.binance.com/en/desktop-download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix new file mode 100644 index 0000000000000..ccb748fe3a627 --- /dev/null +++ b/pkgs/applications/misc/binocle/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, makeWrapper +, xorg +, vulkan-loader +}: + +rustPlatform.buildRustPackage rec { + pname = "binocle"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "0b0hf2aq34kxxj0la0yar5sp44k6mqcbyailp6j6q0mksf1l74bc"; + }; + + cargoSha256 = "sha256-CZWAHWZYaL54Rl6Jrp8B6w6HK+2fIKQle2x4mGHv2/o="; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/binocle \ + --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with xorg; [ libX11 libXcursor libXi libXrandr ] ++ [ vulkan-loader ])} + ''; + + meta = with lib; { + description = "Graphical tool to visualize binary data"; + homepage = "https://github.com/sharkdp/binocle"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/misc/blender/darwin.patch b/pkgs/applications/misc/blender/darwin.patch index 72db79245941a..d5156bfad3d90 100644 --- a/pkgs/applications/misc/blender/darwin.patch +++ b/pkgs/applications/misc/blender/darwin.patch @@ -1,7 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1832,7 +1832,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) + ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) + if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) + if(APPLE) +- if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0) ++ if(FALSE) + # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) + # with Xcode-11 (the Clang of which doesn't support the flag). + message(WARNING diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake -@@ -77,7 +77,6 @@ else() +@@ -60,7 +60,6 @@ else() message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") endif() if(NOT EXISTS "${LIBDIR}/") @@ -9,7 +21,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake endif() # Prefer lib directory paths -@@ -114,10 +113,6 @@ if(WITH_CODEC_SNDFILE) +@@ -98,10 +97,6 @@ if(WITH_CODEC_SNDFILE) find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) list(APPEND LIBSNDFILE_LIBRARIES @@ -20,17 +32,26 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake ) print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") -@@ -134,7 +129,7 @@ if(WITH_PYTHON) - # normally cached but not since we include them with blender +@@ -118,7 +113,7 @@ if(WITH_PYTHON) + # Normally cached but not since we include them with blender. set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}") - set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.a) + set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.dylib) set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") - # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled else() -@@ -175,9 +170,7 @@ endif() - if(WITH_CODEC_FFMPEG) + # Module must be compiled against Python framework. +@@ -147,7 +142,7 @@ endif() + + # FreeType compiled with Brotli compression for woff2. + find_package(Freetype REQUIRED) +-list(APPEND FREETYPE_LIBRARIES ++message(TRACE APPEND FREETYPE_LIBRARIES + ${LIBDIR}/brotli/lib/libbrotlicommon-static.a + ${LIBDIR}/brotli/lib/libbrotlidec-static.a) + +@@ -159,9 +154,7 @@ if(WITH_CODEC_FFMPEG) + set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg) set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil - mp3lame ogg opus swresample swscale @@ -40,7 +61,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake find_package(FFmpeg) endif() -@@ -275,7 +268,6 @@ if(WITH_BOOST) +@@ -270,7 +263,6 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) @@ -48,12 +69,12 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake endif() if(WITH_PUGIXML) -@@ -476,7 +468,7 @@ else() - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic") - endif() +@@ -399,7 +391,7 @@ endif() --if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) -+if(FALSE) - # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv - string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024") - endif() + # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. + if(WITH_OPENMP) +- if(CMAKE_C_COMPILER_ID MATCHES "Clang") ++ if(FALSE) + # Use OpenMP from our precompiled libraries. + message(STATUS "Using ${LIBDIR}/openmp for OpenMP") + set(OPENMP_CUSTOM ON) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2e3ff53550a96..83e25a37e5d33 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1d0476bzcz86lwdnyjn7hyzkmhfiqh47ls5h09jlbm7v7k9x69hw"; + hash = "sha256-k78LL1urcQWxnF1lSoSi3CH3Ylhzo2Bk2Yvq5zbTYEo="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -76,9 +76,7 @@ stdenv.mkDerivation rec { : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ - '${python}' \ - --replace '${"$"}{LIBDIR}/openmp' \ - '${llvmPackages.openmp}' + '${python}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ --replace '${"$"}{LIBDIR}/python' \ '${python}' \ diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index bff4e724f61e0..bf11f3e7f42bf 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,13 +20,13 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.5.14-trento-1"; + version = "2022.5.28-trento-3"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "sha256-w5nSMJnt4WO1KOJvdjM1TYSOvPnogERgQWp1JVr3TZY="; + sha256 = "sha256-KIDLRqDLFTsVAczRpTchnUtKJfVHqbYzf8MhIR5UdYY="; }; postPatch = '' @@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://usebottles.com/"; downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; - maintainers = with maintainers; [ bloomvdomino psydvl shamilton ]; + maintainers = with maintainers; [ psydvl shamilton ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 753be1eb88cff..d25998cb17b17 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -16,7 +16,6 @@ , hunspell , hyphen , unrarSupport ? false -, chmlib , python3Packages , libusb1 , libmtp @@ -66,7 +65,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ - chmlib fontconfig hunspell hyphen @@ -102,6 +100,7 @@ mkDerivation rec { msgpack netifaces pillow + pychm pyqt-builder pyqt5 python diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 0440e806c0c14..4d189d1c37a4e 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cbatticon"; - version = "1.6.12"; + version = "1.6.13"; src = fetchFromGitHub { owner = "valr"; repo = pname; rev = version; - sha256 = "sha256-FGCT3gP+KL71Am4cd+f71iY8EwDPRZJ4+FDgQqjZK1M="; + sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c="; }; nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 067ad872f6404..23bf35a30b399 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.46"; + version = "0.99.47"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-yX9USGiiCwtBcg055D8xBHoiCafQWtQFqf5i5bsi13U="; + sha256 = "sha256-qKBf/7DBIpK1o/xlDlWeVXkSSV5a3y9hoWsAzeTIsf4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index f97d44d1ea835..8c455a725cc1e 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -2,7 +2,7 @@ let pname = "chrysalis"; - version = "0.8.6"; + version = "0.9.4"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; @@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec { inherit name; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "17wv475w4m4fg6ky9wf7ygxm98nmsmydks14vh3an85xv0fhj8h9"; + sha256 = "sha256-DAJGS1vKOOLMRgMczAiEfrT9awRNjz9r/MEr4ZFc3Bo="; }; }; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index fb89d2a7e373d..84095c4165417 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,22 +1,20 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, mkDerivation, fetchurl, qtbase, qmake }: -let version = "0.6.4"; in -stdenv.mkDerivation { +mkDerivation rec { pname = "confclerk"; - inherit version; + version = "0.7.1"; src = fetchurl { url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; + sha256 = "0l5i4d6lymh0k6gzihs41x4i8v1dz0mrwpga096af0vchpvlcarg"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ qmake ]; - nativeBuildInputs = [ qmake4Hook ]; - - installPhase = '' + postInstall = '' mkdir -p $out/bin - cp src/bin/confclerk $out/bin + mv $out/confclerk $out/bin/ ''; meta = { diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index e1cbaf320eaec..a1a63992349ec 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, cmake, pkg-config, lib, +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, lib, qttools, fribidi, libunibreak }: mkDerivation rec { @@ -17,6 +17,7 @@ mkDerivation rec { buildInputs = [ qttools fribidi libunibreak ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://github.com/buggins/coolreader"; description = "Cross platform open source e-book reader"; license = licenses.gpl2Plus; # see https://github.com/buggins/coolreader/issues/80 diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 763b8bd34d118..d672df00d79f2 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3Only; - maintainers = with maintainers; [ willtim artturin ]; + 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/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 9d64a31dded92..388d166c58147 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-pYinePs7WFVfRMNYTY+Is8B+cv5w6IF7Ce+9v/mLRYg="; + sha256 = "sha256-9oRNyspFmvIG63aJ8qyaVmi1GW1eW+Rg0+z8la3LuKA="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 42355054ee881..48d1d4a4f99fc 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -3,42 +3,38 @@ , fetchFromGitHub , qtbase , qmake +, qttools , wrapQtAppsHook -, copyDesktopItems -, makeDesktopItem }: stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.1.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-cIA6W82XEeW0k9WNygZ/KVFZE31QThpkV4OazVEvmtw="; + sha256 = "sha256-jwYmgA2JtWpEbuuFPwGdKKaSZ2uAs3t7CCCeu6eD9nI="; fetchSubmodules = true; }; + postPatch = '' + substituteInPlace cubiomes-viewer.pro \ + --replace '$$[QT_INSTALL_BINS]/lupdate' lupdate \ + --replace '$$[QT_INSTALL_BINS]/lrelease' lrelease + ''; + buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake + qttools wrapQtAppsHook - copyDesktopItems ]; - desktopItems = [ (makeDesktopItem { - name = pname; - desktopName = "Cubiomes Viewer"; - exec = pname; - icon = pname; - categories = [ "Game" ]; - comment = meta.description; - }) ]; - preBuild = '' # QMAKE_PRE_LINK is not executed (I dont know why) make -C ./cubiomes libcubiomes CFLAGS="-DSTRUCT_CONFIG_OVERRIDE=1" all @@ -50,13 +46,15 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp cubiomes-viewer $out/bin - mkdir -p $out/share/pixmaps - cp rc/icons/map.png $out/share/pixmaps/cubiomes-viewer.png + mkdir -p $out/share/{pixmaps,applications} + cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png + cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications runHook postInstall ''; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "A graphical Minecraft seed finder and map viewer"; longDescription = '' diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix deleted file mode 100644 index d330a8a5ae28b..0000000000000 --- a/pkgs/applications/misc/cura/stable.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "cura"; - version = "15.06.03"; - - src = fetchFromGitHub { - owner = "daid"; - repo = "Cura"; - rev = version; - sha256 = "sha256-o1cAi4Wi19WOijlRB9iYwNEpSNnmywUj5Bth8rRhqFA="; - }; - - desktopItem = makeDesktopItem { - name = "Cura"; - exec = "cura"; - icon = "cura"; - comment = "Cura"; - desktopName = "Cura"; - genericName = "3D printing host software"; - categories = [ "GNOME" "GTK" "Utility" ]; - }; - - python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ]; - - pythonPath = python_deps; - - propagatedBuildInputs = python_deps; - - buildInputs = [ curaengine python27Packages.wrapPython ]; - - configurePhase = ""; - buildPhase = ""; - - patches = [ ./numpy-cast.patch ]; - - installPhase = '' - # Install Python code. - site_packages=$out/lib/python2.7/site-packages - mkdir -p $site_packages - cp -r Cura $site_packages/ - - # Install resources. - resources=$out/share/cura - mkdir -p $resources - cp -r resources/* $resources/ - sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py - - # Install executable. - mkdir -p $out/bin - cp Cura/cura.py $out/bin/cura - chmod +x $out/bin/cura - sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura - wrapPythonPrograms - - # Make it find CuraEngine. - echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py - - # Install desktop item. - mkdir -p "$out"/share/applications - cp "$desktopItem"/share/applications/* "$out"/share/applications/ - mkdir -p "$out"/share/icons - ln -s "$resources/images/c.png" "$out"/share/icons/cura.png - ''; - - meta = with lib; { - description = "3D printing host software"; - homepage = "https://github.com/daid/Cura"; - license = licenses.agpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 439067187c2d2..c36d98a1b6e52 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.0.2"; # When updating also update mvnSha256 + version = "22.1.1"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-3tIxHw4734ggIUDjZO2EGIMbyPNP3yvy9QgnMLw+/fc="; + sha256 = "sha256-+MFULieuwfvuAP0HjJ+C0hb/uqhHtnP/nOoIfWwjtoI="; }; - mvnSha256 = "os3eb+In8XreHwdZMacXafIVgOAeSSfCIkO5pwaO6MI="; + mvnSha256 = "pSZL+GDSXSm+sLymlSlq2ZIRdYJY1B3PCmCpjtosdGY="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ @@ -127,6 +127,10 @@ PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access, Teradata, Firebird, Derby, etc. ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # dependencies from maven + ]; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ jojosch mkg20001 ]; diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 20d47e204f7cc..560afe32b8a19 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.87"; + version = "0.88"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-7O2AY7tWYiOIy4ImFBxWu6S+ljc3VmqS/j4KyEzVVIA="; + sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY="; }; postPatch = '' diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 0eb432bc734d2..370f41b1b831b 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { homepage = "http://www.qtrac.eu/diffpdfc.html"; description = "Tool for diffing pdf files visually or textually"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ tstrobel ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix new file mode 100644 index 0000000000000..fb1646dbbcca5 --- /dev/null +++ b/pkgs/applications/misc/diffuse/default.nix @@ -0,0 +1,68 @@ +{ lib, gitUpdater +, fetchFromGitHub +, meson +, ninja +, gettext +, wrapGAppsHook +, gobject-introspection +, pango +, gdk-pixbuf +, python3 +, atk +}: + +python3.pkgs.buildPythonApplication rec { + pname = "diffuse"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "MightyCreak"; + repo = "diffuse"; + rev = "v${version}"; + sha256 = "0nd1fyl40wyc98jclcxv8zlnm744lrr51fahh5h9v4ksk184h4z8"; + }; + + format = "other"; + + nativeBuildInputs = [ + wrapGAppsHook + meson + ninja + gettext + gobject-introspection + ]; + + buildInputs = [ + gobject-introspection + pango + gdk-pixbuf + atk + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pycairo + pygobject3 + ]; + + mesonFlags = [ + "-Db_ndebug=true" + ]; + + # to avoid running gtk-update-icon-cache, update-desktop-database and glib-compile-schemas + DESTDIR = "/"; + + passthru = { + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/MightyCreak/diffuse"; + description = "Graphical tool for merging and comparing text files"; + license = licenses.gpl2; + maintainers = with maintainers; [ k3a ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 6b8f92ddb1c2e..8e4a98af13816 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; description = "dmenu for wayland-compositors"; homepage = "https://github.com/nyyManni/dmenu-wayland"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 6afd9ee624208..24bfaf785e1f8 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-aMla5mzQpN9CNDc4QSxjcKR+Ufej+8WLBYxCntApcKU="; + sha256 = "sha256-fRPhu+kpwLPvdzIpXSjXFzQTfv4xewOMv/1ZqLJw3dk="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 6bc2908098325..60a26b7088240 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -1,4 +1,4 @@ -{lib, python3Packages, gettext, qt5, fetchFromGitHub}: +{ stdenv, lib, python3Packages, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; @@ -57,6 +57,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "GUI tool to find duplicate files in a system"; homepage = "https://github.com/arsenetar/dupeguru"; license = licenses.bsd3; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 7fe091cf77326..a6545db64cad0 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.2.7"; + version = "4.2.10"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; - rev = version; - sha256 = "sha256-m8a3x5fPSrnrCH30MToT3aKtX35nFUbeerR7ubWgOOI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-m13wJlNBG3BxOdKUyd3qmIhFBM7263FzMKr5lfD1tys="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index f82ce53d97465..77a8adc692571 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -31,6 +31,7 @@ EOF meta = with lib; { homepage = "https://github.com/ebzzry/emem"; description = "A trivial Markdown to HTML converter"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 42d16c3eaf815..1c590451a9b86 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -46,12 +46,15 @@ in python.pkgs.buildPythonApplication rec { }; propagatedBuildInputs = with python.pkgs; [ + appdirs etebase etesync flask flask-wtf + msgpack (python.pkgs.toPythonModule (radicale3.override { python3 = python; })) - ]; + requests + ] ++ requests.optional-dependencies.socks; doCheck = false; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index c4b0df2cc0d51..0e4a0f5be00e3 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "evtest"; - version = "1.34"; + version = "1.35"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxml2 ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://anongit.freedesktop.org/${pname}"; rev = "refs/tags/${pname}-${version}"; - sha256 = "sha256-0UGcoGkNF/19aSTWNEFAmZP7seL/yObXsOLlZLiyG2Q="; + sha256 = "sha256-xF2dwjTmTOyZ/kmASYWqKfnvqCjw0OmdNKrNMrjNl5g="; }; meta = with lib; { diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 05918b6af39ca..f7637534de048 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time - maintainers = with maintainers; [ volth hypersw ]; + maintainers = with maintainers; [ hypersw ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 21b92f3823ec1..ad1660173159c 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -22,24 +22,26 @@ let domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd-device-themes"; - rev = "v0.0.20210909"; - sha256 = "1d041wnq39sa0sl08xya4yp3n7j6aw560i38chl10vgpmwk9mmhr"; + rev = "v0.0.20220523"; + sha256 = "sha256-RyUZj+tpJSYhyoK+E98CTIoHwXwBdB1YHVnO5821exo="; }; in stdenv.mkDerivation rec { pname = "feedbackd"; # Not an actual upstream project release, # only a Debian package release that is tagged in the upstream repo - version = "0.0.0+git20211018"; + version = "0.0.0+git20220520"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + # remove if cross-compiling gobject-introspection works + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd"; rev = "v${version}"; - hash = "sha256-jqKRHcxISK54xq/tQm6zV+J+U71eKh04OVTNHDDy65E="; + hash = "sha256-4ftPC6LnX0kKFYVyH85yCH43B3YjuaZM5rzr8TGgZvc="; }; nativeBuildInputs = [ @@ -61,7 +63,13 @@ stdenv.mkDerivation rec { libgudev ]; - mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" ]; + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dman=true" + # TODO(mindavi): introspection broken due to https://github.com/NixOS/nixpkgs/issues/72868 + # can be removed if cross-compiling gobject-introspection works. + "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" + ]; checkInputs = [ dbus diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 1f67c40561f50..8488e301f4869 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.27"; + version = "6.4.30"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-nmT55x95jPH+Ini4Ti9YgLgGUnwMAgaSXAhszReRE9w="; + sha256 = "sha256-NYJMIKodjZfj8WEf70m59/aDlvfLxNOoB/7SeunqRFo="; }; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index dca8e12569192..4e8e4ff613068 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/foxitreader/default.nix b/pkgs/applications/misc/foxitreader/default.nix index b206d14323b1c..c6ed7bc1ad3ff 100644 --- a/pkgs/applications/misc/foxitreader/default.nix +++ b/pkgs/applications/misc/foxitreader/default.nix @@ -73,6 +73,7 @@ mkDerivation rec { meta = with lib; { description = "A viewer for PDF documents"; homepage = "https://www.foxitsoftware.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ p-h rhoriguchi ]; diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 287a2fca3637c..a96cbb5661063 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , autoreconfHook, intltool , gtk, pkg-config, flex }: @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; }; + patches = [ + # Pul patch pending upstream inclusion for -fno-common toolchain support: + # https://github.com/galculator/galculator/pull/45 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch"; + sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67"; + }) + ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ gtk flex ]; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 0d563da0eddf8..a21bf78596b51 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,20 +2,24 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.21.2"; + version = "1.22.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xn+Y8WOIH6zkExO3ZNya3ZBwh90oSjSk00xfO0c23To="; + sha256 = "sha256-6nveSEpi5fdlf6ooUXFrX1WaVDOQi6mvgDGAGgwi1zc="; }; propagatedBuildInputs = [ requests yt-dlp ]; checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ # requires network access "--ignore=test/test_results.py" "--ignore=test/test_downloader.py" + + # incompatible with pytestCheckHook + "--ignore=test/test_ytdl.py" ]; meta = with lib; { diff --git a/pkgs/applications/misc/gmnitohtml/default.nix b/pkgs/applications/misc/gmnitohtml/default.nix index a4b6f9403c64c..dc64b1142b492 100644 --- a/pkgs/applications/misc/gmnitohtml/default.nix +++ b/pkgs/applications/misc/gmnitohtml/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gmnitohtml"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromSourcehut { owner = "~adnano"; repo = pname; rev = version; - hash = "sha256-XcHJbqmfSkW6lt2xRlrf9AJfwLOZqdgsL1v0aK2bQwo="; + hash = "sha256-nKNSLVBBdZI5mkbEUkMv0CIOQIyH3OX+SEFf5O47DFY="; }; vendorSha256 = "sha256-Cx8x8AISRVTA4Ufd73vOVky97LX23NkizHDingr/zVk="; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 5f03b8ea7e76e..953aad85ae863 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; + # Workaround build failure on -fno-common toolchains: + # ld: gmtp-preferences.o:src/main.h:72: multiple definition of + # `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here + # TODO: can be removed when 1.4.0 is released. + NIX_CFLAGS_COMPILE = "-fcommon"; + preFixup = '' gappsWrapperArgs+=(--add-flags "--datapath $out/share"); ''; diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index f3e32f195fc04..8b06988a20b21 100644 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, gitUpdater , appstream-glib , desktop-file-utils , fwupd @@ -19,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gnome-firmware"; - version = "42.1"; + version = "42.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = version; - sha256 = "9QZ98EElENWsME/jXoj9YJl2e+ipyLm0g4grQUwmnuE="; + sha256 = "L0R2lXU69I6NI7Srq5s+8N9261Ic8B7FVaaXNjz2Ll0="; }; nativeBuildInputs = [ @@ -53,6 +54,11 @@ stdenv.mkDerivation rec { "-Dconsolekit=false" ]; + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = "(alpha|beta|rc).*"; + }; + meta = with lib; { homepage = "https://gitlab.gnome.org/World/gnome-firmware"; description = "Tool for installing firmware on devices"; diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index f937b12302668..6052cf70facb7 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "6.4"; + version = "6.5"; 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-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU="; + sha256 = "sha256-Hy2W7cvvzVcKtd/KzTn81awoolnfM3ST0Nm70YBLTYY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 49c723efe989d..6a88aa6acb03e 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -13,13 +13,15 @@ GEM gemojione (4.3.3) json github-markup (4.0.1) - gollum (5.2.3) + gollum (5.3.0) gemojione (~> 4.1) gollum-lib (~> 5.1) + i18n (~> 1.8) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1.0) - mustache-sinatra (~> 1.0) + mustache-sinatra (>= 1.0.1, < 2) octicons (~> 12.0) + rdoc (~> 6) rss (~> 0.2.9) sass (~> 3.5) sinatra (~> 2.0) @@ -30,7 +32,7 @@ GEM uglifier (~> 4.2) useragent (~> 0.16.2) webrick (~> 1.7) - gollum-lib (5.1.3) + gollum-lib (5.2) gemojione (~> 4.1) github-markup (~> 4.0) gollum-rugged_adapter (~> 1.0) @@ -43,6 +45,8 @@ GEM mime-types (~> 1.15) rugged (~> 1.1.0) htmlentities (4.3.4) + i18n (1.10.0) + concurrent-ruby (~> 1.0) json (2.6.2) kramdown (2.4.0) rexml @@ -66,15 +70,19 @@ GEM nokogiri (>= 1.6.3.1) org-ruby (0.9.12) rubypants (~> 0.2) + psych (4.0.4) + stringio racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-protection (2.2.0) rack rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) + rdoc (6.4.0) + psych (>= 4.0.0) rexml (3.2.5) - rouge (3.28.0) + rouge (3.29.0) rss (0.2.9) rexml ruby2_keywords (0.0.5) @@ -101,6 +109,7 @@ GEM rack (> 1, < 3) sprockets-helpers (1.4.0) sprockets (>= 2.2) + stringio (3.0.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) @@ -111,7 +120,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) + unf_ext (0.0.8.2) useragent (0.16.10) webrick (1.7.0) wikicloth (0.8.3) @@ -133,4 +142,4 @@ DEPENDENCIES wikicloth BUNDLED WITH - 2.2.33 + 2.3.9 diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index fba88415874c9..3817782a6f649 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -101,15 +101,15 @@ version = "4.0.1"; }; gollum = { - dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent" "webrick"]; + dependencies = ["gemojione" "gollum-lib" "i18n" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rdoc" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zdpl8rj6r2psigcjavwi57ljriyakh0ydfai9c3q85jzc005bax"; + sha256 = "1xz7d3xfc536njk0fg4inmzzy350c5bjp237vghrcky8azc6xl7k"; type = "gem"; }; - version = "5.2.3"; + version = "5.3.0"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -117,10 +117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1samwcxjr1z0sy8a87xvp0z4qx0fc2irzx568s6q1yxcba9nqqv2"; + sha256 = "1acxi4zjdmxlj7hzv9fjqilqngcwjvzhk3khnykdfvnb0l6l4xbs"; type = "gem"; }; - version = "5.1.3"; + version = "5.2"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -143,6 +143,17 @@ }; version = "4.3.4"; }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + type = "gem"; + }; + version = "1.10.0"; + }; json = { groups = ["default"]; platforms = []; @@ -281,6 +292,17 @@ }; version = "0.9.12"; }; + psych = { + dependencies = ["stringio"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2lz03mkn43rf2a2xiy8vqgir1dvds0a0fpx7m7my6a21ygryw2"; + type = "gem"; + }; + version = "4.0.4"; + }; racc = { groups = ["default"]; platforms = []; @@ -296,10 +318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.3.1"; }; rack-protection = { dependencies = ["rack"]; @@ -333,6 +355,17 @@ }; version = "0.10.1"; }; + rdoc = { + dependencies = ["psych"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxzcvxvrmb1ngxz0bgz1va4q9c4w8m6gc8lmdhi6gnvaaf98gsy"; + type = "gem"; + }; + version = "6.4.0"; + }; RedCloth = { groups = ["default"]; platforms = []; @@ -358,10 +391,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; + sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r"; type = "gem"; }; - version = "3.28.0"; + version = "3.29.0"; }; rss = { dependencies = ["rexml"]; @@ -470,6 +503,16 @@ }; version = "1.4.0"; }; + stringio = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jns0x5lbafyqyx7pgzfs6i4ykc7p6zg7gxa6hd82w40n6z9rdvi"; + type = "gem"; + }; + version = "3.0.2"; + }; therubyrhino = { dependencies = ["therubyrhino_jar"]; groups = ["default"]; @@ -539,10 +582,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; useragent = { groups = ["default"]; diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix index 9b335b1aedae4..8c68f8672c3b5 100644 --- a/pkgs/applications/misc/gometer/default.nix +++ b/pkgs/applications/misc/gometer/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analytic-Tracking tool for GoLance"; homepage = "https://golance.com/download-gometer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; }; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 950cb236ecbfa..dd6964318e77d 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -115,6 +115,7 @@ mkDerivation rec { meta = with lib; { description = "A world sphere viewer"; homepage = "https://www.google.com/earth/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ friedelino shamilton ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.nix b/pkgs/applications/misc/gpsbabel/debian-patches.nix new file mode 100644 index 0000000000000..34dd2db31c572 --- /dev/null +++ b/pkgs/applications/misc/gpsbabel/debian-patches.nix @@ -0,0 +1,26 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "https://sources.debian.org/data/main/g/gpsbabel/1.8.0+ds-4/debian/patches"; +in +[ + { + url = "${prefix}/gpsbabelfe_disable_version_check"; + sha256 = "1kk1iq4mbmldl1jjvd4bphr0165rgn2gpqdyyd1vq8v8wjx942sb"; + } + { + url = "${prefix}/gpsbabelfe_opt-in-for-usage-data-reporting"; + sha256 = "0dr3jyn8sxx9vw3w11gir6jvshlda0ldmhlq4aq313xn6d1j8qv2"; + } + { + url = "${prefix}/gpsbabelfe_do-not-check-for-newer-version"; + sha256 = "0kmmxcq1k9p84v9cjagda1cqcc9p7p48i104l3z6clc17zixwgai"; + } + { + url = "${prefix}/htmldoc-location"; + sha256 = "0nk3gz3l0q68d7blzfkbkvr630xy8y7vlxalnzlbdigqcx7lk54f"; + } + { + url = "${prefix}/Disable-donation-nagging"; + sha256 = "11j2ffa0hn5cy8xw98jndkf735ar39sf6rl28bn91pxd38xyaz5b"; + } +] diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.txt b/pkgs/applications/misc/gpsbabel/debian-patches.txt new file mode 100644 index 0000000000000..012c28a37df2f --- /dev/null +++ b/pkgs/applications/misc/gpsbabel/debian-patches.txt @@ -0,0 +1,6 @@ +gpsbabel/1.8.0+ds-4 +gpsbabelfe_disable_version_check +gpsbabelfe_opt-in-for-usage-data-reporting +gpsbabelfe_do-not-check-for-newer-version +htmldoc-location +Disable-donation-nagging diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 85c7fbae789f5..b09e7ef725efb 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,61 +1,102 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, qtbase, zlib, IOKit, which, expat }: +{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, which +, qtbase, qmake, qttools, qttranslations, wrapQtAppsHook +, libusb1, shapelib, zlib +, withGUI ? false, qtserialport +, withMapPreview ? (!stdenv.isDarwin), qtwebengine +, withDoc ? false, docbook_xml_dtd_45, docbook_xsl, expat, fop, libxml2, libxslt, perl +}: stdenv.mkDerivation rec { pname = "gpsbabel"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "gpsbabel"; repo = "gpsbabel"; rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy"; + sha256 = "sha256-0w8LsO+HwqZF8SQmwd8bCKma9PCM0hAzXhzWR4DgAHs="; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip"; - sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr"; - }) - ]; - - buildInputs = [ libusb1 qtbase zlib ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; - - checkInputs = [ expat.dev which ]; # Avoid ./testo.d/kml.test: line 74: which: command not found. Skipping KML validation phase. + patches = map fetchurl (import ./debian-patches.nix); - /* FIXME: Building the documentation, with "make doc", requires this: - - [ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ] + postPatch = '' + patchShebangs testo + '' + lib.optionalString withGUI '' + # See https://github.com/NixOS/nixpkgs/issues/86054 + substituteInPlace gui/mainwindow.cc \ + --replace 'QLibraryInfo::location(QLibraryInfo::TranslationsPath)' \ + 'QLatin1String("${qttranslations}/translations")' + '' + lib.optionalString withDoc '' + substituteInPlace gbversion.h.qmake.in \ + --replace /usr/share/doc $doc/share/doc + + substituteInPlace testo.d/serialization.test \ + --replace /usr/share/doc $doc/share/doc + + substituteInPlace xmldoc/gpsbabel_man.xml \ + --replace /usr/share/doc $doc/share/doc + ''; + + outputs = [ "out" ] ++ lib.optional withDoc "doc"; + + nativeBuildInputs = [ pkg-config qmake ] + ++ lib.optionals withGUI [ qttools wrapQtAppsHook ] + ++ lib.optionals withDoc [ docbook_xml_dtd_45 docbook_xsl expat fop libxml2 libxslt perl ]; + + buildInputs = [ libusb1 shapelib zlib ] + ++ lib.optional withGUI qtserialport + ++ lib.optional (withGUI && withMapPreview) qtwebengine; + + checkInputs = [ libxml2 which ]; + + preConfigure = lib.optionalString withGUI '' + lrelease gui/*.ts gui/coretool/*.ts + ''; + + qmakeFlags = [ + "WITH_LIBUSB=pkgconfig" + "WITH_SHAPELIB=pkgconfig" + "WITH_ZLIB=pkgconfig" + ] ++ lib.optionals (withGUI && !withMapPreview) [ + "CONFIG+=disable-mappreview" + ]; - But FOP isn't packaged yet. */ + makeFlags = lib.optional withGUI "gui" + ++ lib.optionals withDoc [ "gpsbabel.pdf" "gpsbabel.html" "gpsbabel.org" ]; - configureFlags = [ "--with-zlib=system" ] - # Floating point behavior on i686 causes test failures. Preventing - # extended precision fixes this problem. - ++ lib.optionals stdenv.isi686 [ - "CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store" - ]; + # Floating point behavior on i686 causes nmea.test failures. Preventing + # extended precision fixes this problem. + NIX_CFLAGS_COMPILE = lib.optional stdenv.isi686 "-ffloat-store"; - enableParallelBuilding = true; + doCheck = true; dontWrapQtApps = true; - doCheck = true; - preCheck = '' - patchShebangs testo - substituteInPlace testo \ - --replace "-x /usr/bin/hexdump" "" - - rm -v testo.d/alantrl.test - '' - # The raymarine and gtm tests fail on i686 despite -ffloat-store. - + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" - # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572. - + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test testo.d/classic-2.test" - # The arc-project test fails on aarch64. - + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test"; + installPhase = '' + install -Dm755 gpsbabel -t $out/bin + '' + lib.optionalString withGUI (if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv gui/GPSBabelFE.app $out/Applications + install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/Applications/GPSBabelFE.app/Contents/Resources/translations + ln -s $out/bin/gpsbabel $out/Applications/GPSBabelFE.app/Contents/MacOS + '' else '' + install -Dm755 gui/objects/gpsbabelfe -t $out/bin + install -Dm644 gui/gpsbabel.desktop -t $out/share/application + install -Dm644 gui/images/appicon.png $out/share/icons/hicolor/512x512/apps/gpsbabel.png + install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/share/gpsbabel/translations + '') + lib.optionalString withDoc '' + install -Dm655 gpsbabel.{html,pdf} -t $doc/share/doc/gpsbabel + cp -r html $doc/share/doc/gpsbabel + ''; + + postFixup = lib.optionalString withGUI (if stdenv.isDarwin then '' + wrapQtApp "$out/Applications/GPSBabelFE.app/Contents/MacOS/GPSBabelFE" + '' else '' + wrapQtApp "$out/bin/gpsbabelfe" + ''); meta = with lib; { + broken = stdenv.isDarwin; description = "Convert, upload and download data from GPS and Map programs"; longDescription = '' GPSBabel converts waypoints, tracks, and routes between popular @@ -75,8 +116,9 @@ stdenv.mkDerivation rec { process data that may (or may not be) placed on a map, such as waypoints, tracks, and routes. ''; - homepage = "http://www.gpsbabel.org/"; + homepage = "https://www.gpsbabel.org/"; license = licenses.gpl2Plus; - platforms = platforms.all; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; }; } diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix deleted file mode 100644 index 8501b7c0875b9..0000000000000 --- a/pkgs/applications/misc/gpsbabel/gui.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: - -mkDerivation { - pname = "gpsbabel-gui"; - - inherit (gpsbabel) src version; - - sourceRoot = "source/gui"; - - nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtwebkit ]; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace mainwindow.cc \ - --replace "QApplication::applicationDirPath() + \"/" "\"" \ - --replace "QApplication::applicationDirPath() + '/' + " "" \ - --replace "translator.load(full_filename)" "translator.load(filename)" \ - --replace "gpsbabelfe_%1.qm" "$out/share/gpsbabel/translations/gpsbabelfe_%1.qm" \ - --replace "gpsbabel_%1.qm" "$out/share/gpsbabel/translations/gpsbabel_%1.qm" \ - --replace "qt_%1.qm" "${qttranslations}/translations/qt_%1.qm" - substituteInPlace formatload.cc \ - --replace "QApplication::applicationDirPath() + \"/" "\"" - substituteInPlace gpsbabel.desktop \ - --replace "gpsbabelfe-bin" "gpsbabelfe" - ''; - - preConfigure = '' - lrelease *.ts coretool/*.ts - ''; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ gpsbabel ]}" - ]; - - postInstall = '' - install -Dm755 objects/gpsbabelfe -t $out/bin - install -Dm644 gpsbabel.desktop -t $out/share/applications - install -Dm644 images/appicon.png $out/share/icons/hicolor/512x512/apps/gpsbabel.png - install -Dm644 *.qm coretool/*.qm -t $out/share/gpsbabel/translations - ''; - - meta = with lib; { - description = "Qt-based GUI for gpsbabel"; - homepage = "http://www.gpsbabel.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 48708bc057c7c..da5c8574ad056 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Application for viewing, editing and converting GPS coordinate data"; homepage = "https://activityworkshop.net/software/gpsprune/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; maintainers = with maintainers; [ rycee ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index b4e8e7151c150..7ce85dc6f7678 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qttools, qttranslations, qtlocation, wrapQtAppsHook, substituteAll }: +{ lib, stdenv, fetchFromGitHub, qmake, qttools, qttranslations, qtlocation, qtpbfimageplugin, wrapQtAppsHook, substituteAll }: stdenv.mkDerivation rec { pname = "gpxsee"; - version = "10.5"; + version = "11.1"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-TvOdyzWvGSdl8aSA+pAOpPVpQzK9POmqtClqdXAMsws="; + sha256 = "sha256-0n1XPrJ+gssIP/7k9CI8AWXs9ddKOg3Lo3DfrXGUl84="; }; patches = (substituteAll { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { inherit qttranslations; }); - buildInputs = [ qtlocation ]; + buildInputs = [ qtlocation qtpbfimageplugin ]; nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index c93d31f66305b..9170af04e61c4 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -16,7 +16,13 @@ let }; }); # Use click 7 - click = self.callPackage ../../../development/python2-modules/click/default.nix { }; + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); }; }; in diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix new file mode 100644 index 0000000000000..f3b721bc49597 --- /dev/null +++ b/pkgs/applications/misc/hollywood/default.nix @@ -0,0 +1,94 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, lib +, coreutils +, apg +, atop +, bmon +, cmatrix +, pygments +, moreutils +, util-linux +, jp2a +, man +, mplayer +, openssh +, tree +, mlocate +, findutils +, ccze +, ncurses +, python3 +, wget +, libcaca +, newsboat +, rsstail +, w3m +, ticker +, tmux +}: + +stdenv.mkDerivation { + pname = "hollywood"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "dustinkirkland"; + repo = "hollywood"; + rev = "35275a68c37bbc39d8b2b0e4664a0c2f5451e5f6"; + sha256 = "sha256-faIm1uXERvIDZ6SK6uarVkWGNJskAroHgq5Cg7nUZc4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ ./nixos-paths.patch ]; + postPatch = '' + rm lib/hollywood/speedometer + rm bin/wallstreet + rm -r lib/wallstreet + ''; + + dontBuild = true; + + installPhase = + let pathDeps = [ + tmux + coreutils + ncurses + jp2a + mlocate + apg + atop + bmon + cmatrix + pygments + moreutils + util-linux + jp2a + man + mplayer + openssh + tree + findutils + ccze + ]; + in '' + runHook preInstall + + mkdir -p $out + cp -r bin $out/bin + cp -r lib $out/lib + cp -r share $out/share + wrapProgram $out/bin/hollywood --prefix PATH : ${lib.makeBinPath pathDeps} + + runHook postInstall + ''; + + meta = { + description = "Fill your console with Hollywood melodrama technobabble"; + homepage = "https://a.hollywood.computer/"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/pkgs/applications/misc/hollywood/nixos-paths.patch b/pkgs/applications/misc/hollywood/nixos-paths.patch new file mode 100644 index 0000000000000..d280a6b003c1e --- /dev/null +++ b/pkgs/applications/misc/hollywood/nixos-paths.patch @@ -0,0 +1,67 @@ +diff --git a/bin/hollywood b/bin/hollywood +index 6f1ee68..09bc4ea 100755 +--- a/bin/hollywood ++++ b/bin/hollywood +@@ -74,7 +74,7 @@ if [ -z "$TMUX" ]; then + else + tmux_launcher=tmux + fi +- $tmux_launcher new-session -d -s $PKG "/bin/bash" ++ $tmux_launcher new-session -d -s $PKG "/usr/bin/env bash" + $tmux_launcher send-keys -t $PKG "$0 $1" + $tmux_launcher send-keys -t $PKG Enter + exec $tmux_launcher attach-session -t $PKG +diff --git a/lib/hollywood/code b/lib/hollywood/code +index 532ce73..3448447 100755 +--- a/lib/hollywood/code ++++ b/lib/hollywood/code +@@ -19,7 +19,7 @@ command -v view >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*.java" "/usr/*.c" "/usr/*.cpp" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*.java" "/run/current-system/sw/*.java" "/usr/*.c" "/run/current-system/sw/*.c" "/usr/*.cpp" "/run/current-system/sw/*.cpp" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/hexdump b/lib/hollywood/hexdump +index f2fb0bd..db059f5 100755 +--- a/lib/hollywood/hexdump ++++ b/lib/hollywood/hexdump +@@ -19,8 +19,8 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- for f in $(ls /usr/bin/ | sort -R); do +- head -c 4096 "/usr/bin/$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" ++ for f in $(find /usr/bin/ /run/current-system/sw/bin/ | sort -R); do ++ head -c 4096 "$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" + sleep 0.7 + done + done +diff --git a/lib/hollywood/jp2a b/lib/hollywood/jp2a +index e87b950..6541f80 100755 +--- a/lib/hollywood/jp2a ++++ b/lib/hollywood/jp2a +@@ -19,7 +19,7 @@ command -v jp2a >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*jpg" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*jpg" "/run/current-system/sw/*jpg" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/man b/lib/hollywood/man +index 2d42513..f4d8bbb 100755 +--- a/lib/hollywood/man ++++ b/lib/hollywood/man +@@ -19,7 +19,7 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(ls /usr/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) ++ FILES=$(ls /usr/share/man/man1/ /run/current-system/sw/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) + for f in $FILES; do + man "$f" | ccze -A + sleep 0.2 diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 44169f6a539e2..390f756beb101 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Time tracking software"; homepage = "https://hubstaff.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus srghma ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 3911cc6ab3c27..070727b772a47 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hugo"; @@ -33,6 +33,7 @@ buildGoModule rec { ''; meta = with lib; { + broken = stdenv.isDarwin && stdenv.isx86_64; description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index ae049699121ed..1a079ab8274c3 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GPU-accelerated procedural modeler and slicer for 3D printing"; homepage = "https://icesl.loria.fr/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ mgttlinger ]; diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix index 1e20a0d6faf04..619a821a32c69 100644 --- a/pkgs/applications/misc/ideamaker/default.nix +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.raise3d.com/ideamaker/"; description = "Raise3D's 3D slicer software"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 120affb988c01..ecad4bd9821b0 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Supermicro IPMI configuration tool"; homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index a25806533ef86..fbc436c882cfc 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; maintainers = with maintainers; [ vlaci ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/join-desktop/default.nix b/pkgs/applications/misc/join-desktop/default.nix index 0b09911ddb24b..369aae0386336 100644 --- a/pkgs/applications/misc/join-desktop/default.nix +++ b/pkgs/applications/misc/join-desktop/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/joaomgcd/JoinDesktop/"; description = "Desktop app for Join"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license license = licenses.free; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index ecb553dbd660b..47a0fcbebde47 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.7.15"; + version = "2.8.8"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-PtfDH2W8wolqa10BoI9hazcj+1bszlnpt+D+sbzSRts="; - x86_64-darwin = "sha256-CPD/2x5FxHL9CsYz9EZJX5SYiFGz7/fjntOlDMKHYEA="; + x86_64-linux = "0ivljlw6kdpg94q9syi11zmk54w06m8j3zicx9nppqg720fw4zv3"; + x86_64-darwin = "0gpr3zi6z98pkg8hsvcmpck754cph53kmgl3bhp3zmmmfj0kxjhs"; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9a7ed898e51f4..fa3b360b1cb24 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18427"; + version = "18513"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-SsoeKfpWi41sd77LfaQW0OcHnyf8iLolKWF74dhalpY="; + sha256 = "sha256-rKBDKPq6hn4VGlzW4ad/gBU4eCVRF9JgRLrDaTKjCbI="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-cz3OT03StvJy9XYBiPxx+nz36O0cg+XrL/uc52/G/1c="; + sha256 = "sha256-M8ZV3FXZJHqaegPKQnjQkMYMWt2BUiKzM8Tit4NqtU4="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-AyfUFE0y8d8FtgfhxSscQGE1IVNwYYNymH6jTnrUBTs="; + sha256 = "sha256-cguvKl9yvthNWcLD6YDLKiialJmutJTa9egMdfKHRpU="; }; }; in @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { description = "An extensible editor for OpenStreetMap"; homepage = "https://josm.openstreetmap.de/"; changelog = "https://josm.openstreetmap.de/wiki/Changelog"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; maintainers = with maintainers; [ rycee sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index e6cadec469bc5..64044693203e7 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.13.55213"; + version = "0.14.58899"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-u5DmpKvmgTqwtXLFMdz0dhtPc/2rzEX492OKxyFBqzY="; + sha256 = "sha256-V4aShSMifXQl+qnCspm+P4q99Fn3N+us/sLzzTVV7mg="; stripRoot = false; }; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.jottacloud.com/"; downloadPage = "https://repo.jotta.us/archives/linux/"; maintainers = with maintainers; [ evenbrenden ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 28100135d83d2..6b62d45b8c047 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://csl.name/jp2a/"; description = "A small utility that converts JPG images to ASCII"; license = licenses.gpl2Only; diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix index ccdaa0ff21bb1..f68a584fe83f3 100644 --- a/pkgs/applications/misc/jquake/default.nix +++ b/pkgs/applications/misc/jquake/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { downloadPage = "https://jquake.net/?down"; changelog = "https://jquake.net/?docu"; maintainers = with maintainers; [ nessdoor ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/junction/default.nix b/pkgs/applications/misc/junction/default.nix new file mode 100644 index 0000000000000..34002c547162e --- /dev/null +++ b/pkgs/applications/misc/junction/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gobject-introspection +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, gjs +, gtk4 +, libadwaita +, libportal-gtk4 +}: + +stdenv.mkDerivation rec { + pname = "junction"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "sonnyp"; + repo = "junction"; + rev = "v${version}"; + sha256 = "sha256-jS4SHh1BB8jk/4EP070X44C4n3GjyCz8ozgK8v5lbqc="; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gjs + gtk4 + libadwaita + libportal-gtk4 + ]; + + postInstall = '' + # autoPatchShebangs does not like "/usr/bin/env -S gjs" + substituteInPlace $out/bin/re.sonny.Junction --replace "/usr/bin/env -S gjs" "/usr/bin/gjs" + ''; + + meta = with lib; { + description = "Choose the application to open files and links"; + homepage = "https://apps.gnome.org/en/app/re.sonny.Junction/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hqurve ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 8ee8337bea2a9..05d1c98e56ac8 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "Analytics and time-series database"; homepage = "http://www.kx.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "i686-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 3daebeaabc977..fdac7cede1702 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -87,6 +87,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ]; + dontWrapGApps = true; + postFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + buildInputs = [ curl botan2 diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index 2863dd103d8d4..2274aa00cb440 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.numinit ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index c20a5bbf6b29b..2b8002d4eb678 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, pkgs, python3, fetchpatch, glibcLocales }: +{ lib, stdenv, pkgs, python3, fetchpatch, glibcLocales, installShellFiles }: with python3.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.10.4"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f"; + sha256 = "sha256-Tu+3rDAqJthgbbOSgXWHpO2UwnoVvy6iEWFKRk/PDHY="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ with python3.pkgs; buildPythonApplication rec { pkginfo freezegun ]; - nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed ]; + nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed installShellFiles ]; checkInputs = [ glibcLocales pytestCheckHook @@ -34,8 +34,11 @@ with python3.pkgs; buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; postInstall = '' - # zsh completion - install -D misc/__khal $out/share/zsh/site-functions/__khal + # shell completions + installShellCompletion --cmd khal \ + --bash <(_KHAL_COMPLETE=bash_source $out/bin/khal) \ + --fish <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \ + --zsh <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \ @@ -48,15 +51,8 @@ with python3.pkgs; buildPythonApplication rec { doCheck = !stdenv.isAarch64; - disabledTests = [ - # This test is failing due to https://github.com/pimutils/khal/issues/1065 - "test_print_ics_command" - - # Mocking breaks in this testcase - "test_import_from_stdin" - ]; - meta = with lib; { + broken = stdenv.isDarwin; homepage = "http://lostpackets.de/khal/"; description = "CLI calendar application"; license = licenses.mit; diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix index 2eb329dd51119..93e65e5fbfe33 100644 --- a/pkgs/applications/misc/kiln/default.nix +++ b/pkgs/applications/misc/kiln/default.nix @@ -1,29 +1,28 @@ -{ lib, buildGoModule, fetchFromSourcehut, scdoc }: +{ lib, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }: buildGoModule rec { pname = "kiln"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromSourcehut { owner = "~adnano"; repo = pname; rev = version; - hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA="; + hash = "sha256-PI80td/GV92Msdtive+f+H6FWo7wdaPmPCpwrX3iLlo="; }; - nativeBuildInputs = [ scdoc ]; + nativeBuildInputs = [ scdoc installShellFiles ]; vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; - installPhase = '' - runHook preInstall - make PREFIX=$out install - runHook postInstall + postInstall = '' + scdoc < docs/kiln.1.scd > docs/kiln.1 + installManPage docs/kiln.1 ''; meta = with lib; { description = "A simple static site generator for Gemini"; - homepage = "https://git.sr.ht/~adnano/kiln"; + homepage = "https://kiln.adnano.co/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; }; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index f3406d4159b8f..e64feb4165555 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "kiwix"; - version = "2.0.5"; + version = "2.2.1"; src = fetchFromGitHub { owner = pname; repo = "${pname}-desktop"; rev = version; - sha256 = "12v43bcg4g8fcp02y2srsfdvcb7dpl4pxb9z7a235006s0kfv8yn"; + sha256 = "sha256-ks2d/guMp5pb2tiwGxNp3htQVm65MsYvZ/6tNjGXNr8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index dcde5c390a473..9d365cd328c8b 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "kiwix-lib"; - version = "9.4.1"; + version = "10.1.1"; src = fetchFromGitHub { owner = "kiwix"; repo = pname; rev = version; - sha256 = "034nk6l623v78clrs2d0k1vg69sbzrd8c0q79qiqmlkinck1nkxw"; + sha256 = "sha256-ECvdraN1J5XJQLeZDngxO5I7frwZ8+W8tFpbB7o8UeM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 0a082cce32749..b428690b7a403 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2022.03.1"; + version = "2022.05.1"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-ZoqITWPR60G4xY9InrtIY9rCWUk0PidGFZokHLWl5ps="; + sha256 = "sha256-Uz8fzF/SdKNRywoIb8B/iHRuXDwRyw7wH7bL9vRzPfY="; }; sourceRoot = "."; @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/koreader/koreader"; description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = intersectLists platforms.x86_64 platforms.linux; license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix deleted file mode 100644 index 585dfe3e04f17..0000000000000 --- a/pkgs/applications/misc/krusader/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - mkDerivation, fetchurl, lib, - extra-cmake-modules, kdoctools, wrapGAppsHook, - karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem -}: - -mkDerivation rec { - pname = "krusader"; - version = "2.7.2"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "02b1jz5a7cjr13v6c7fczrhs1xmg1krnva5fxk8x2bf4nd1rm8s1"; - }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - - propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ]; - - meta = with lib; { - description = "Norton/Total Commander clone for KDE"; - homepage = "http://www.krusader.org"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ sander turion ]; - }; -} diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index e5cb6f5816e32..7325c85dbd4c6 100644 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , extra-cmake-modules , kactivities @@ -10,28 +9,15 @@ mkDerivation rec { pname = "KSmoothDock"; - version = "6.2"; + version = "6.3"; src = fetchFromGitHub { owner = "dangvd"; repo = "ksmoothdock"; rev = "v${version}"; - sha256 = "182x47cymgnp5xisa0xx93hmd5wrfigy8zccrr23p4r9hp8xbnam"; + sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk="; }; - patches = [ - # Fixed hard coded installation path to use CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_PREFIX instead - (fetchpatch { - url = "https://github.com/dangvd/ksmoothdock/commit/00799bef8a1c1fe61ef9274866267d9fe9194041.patch"; - sha256 = "1nmb7gf1ggzicxz8k4fd67xhwjy404myqzjpgjym66wqxm0arni4"; - }) - # Pull request to fix build on Qt 5.15 https://github.com/dangvd/ksmoothdock/pull/123 - (fetchpatch { - url = "https://github.com/dangvd/ksmoothdock/commit/259527aacadb0fd9110d4425b9bf41a15bedce72.patch"; - sha256 = "12nj58v9qqrynarn3gpywih3w27mr4n51z1b8mh0rfbnd2kib8dc"; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kactivities qtbase ]; diff --git a/pkgs/applications/misc/liberasurecode/default.nix b/pkgs/applications/misc/liberasurecode/default.nix index 0546ec017decd..289423c61220e 100644 --- a/pkgs/applications/misc/liberasurecode/default.nix +++ b/pkgs/applications/misc/liberasurecode/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "liberasurecode"; - version = "1.6.2"; + version = "1.6.3"; outputs = [ "out" "dev" "doc" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "openstack"; repo = pname; rev = version; - sha256 = "sha256-qV7DL/7zrwrYOaPj6iHnChGA6KHFwYKjeaMnrGrTPrQ="; + sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU="; }; postPatch = '' diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index d0b02caff04c6..e4e51d78fcab5 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.9"; + version = "0.7.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-ubhGDx5T1AAJjU6Ka1Pqy5kL8HPa097QhhK5Sp3HWEo="; + sha256 = "sha256-3YCO0pQT5vUkscQEE4+XrfEkQJro8DpQ5xDLglfqJjI="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/logseq/update.sh b/pkgs/applications/misc/logseq/update.sh index 9f83eefad1911..eb81dc68e4ebf 100755 --- a/pkgs/applications/misc/logseq/update.sh +++ b/pkgs/applications/misc/logseq/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts -version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)" +version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq 'map(select(.prerelease == false)) | .[0].tag_name' --raw-output)" update-source-version logseq "$version" diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index 8f984db7df522..42f3a271b9694 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mako"; - version = "1.6"; + version = "1.7.1"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RcPwZ5NeO9vxwPWfgj5x3wVdCYGKumnYT3ngHEAWfW0="; + sha256 = "sha256-/+XYf8FiH4lk7f7/pMt43hm13mRK+UqvaNOpf1TI6m4="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index 08c2c7afc45f1..75e7f64227bba 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -6,10 +6,10 @@ with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "1.14.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "dd36278d60cdcaaf31f7f9bbc50e90e770f3feb65cf4b3eff287215ee85f018d"; + sha256 = "sha256-SVKZDLH8IfdND0/BFj/lrqp7BNanpzkjuTxlSMGjuiY="; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 68453252ba539..de131b7ce63f0 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/applications/misc/masterpdfeditor4/default.nix index b4b9a4d624469..befb11a0a48b3 100644 --- a/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Master PDF Editor - version 4, without watermark"; homepage = "https://code-industry.net/free-pdf-editor/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index afdfc6c905e04..2d5b6ee8f2ae6 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.0c"; + version = "1.5.1"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE="; + sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 98622ae404ce5..7f51f7d102eb6 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.6.5.0"; + version = "4.6.7.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "sha256-2gsJmMnt0+4vknd2HgOtCYCjVWT7eD0WBimmtsFEhvY="; + sha256 = "sha256-vJSXvSTYEhxuG3KUQ+lBcppC8M70UnYlBLPHhYJSNOE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 637c4add65d64..08f91765de0ed 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.2"; + version = "2.2.3"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-V3qcQQwc2ykVTVgUJuNnVQ9iSPD0tv4C2hSILLxuE70="; + hash = "sha256-ykJd1ZjAqT8OtJsZiSjbDdkN5fFlQcWtTO88x3zAfU8="; }; nativeBuildInputs = [ @@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Python GTK application to view and clean metadata in files, using mat2"; homepage = "https://gitlab.com/rmnvgr/metadata-cleaner"; + changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ gpl3Plus cc-by-sa-40 ]; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix new file mode 100644 index 0000000000000..86b4bc66d2969 --- /dev/null +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, gettext +, python3 +}: + +stdenv.mkDerivation { + pname = "metamorphose2"; + version = "0.10.0beta"; + + # exif-py vendored via submodule + src = fetchFromGitHub { + owner = "timinaust"; + repo = "metamorphose2"; + rev = "ba0666dd02e4f3f58c1dadc309e7ec1cc13fe851"; + sha256 = "0w9l1vyyswdhdwrmi71g23qyslvhg1xym4ksifd42vwf9dxy55qp"; + fetchSubmodules = true; + }; + + postPatch = '' + rm -rf ./src/mutagen + substituteInPlace messages/Makefile \ + --replace "\$(shell which msgfmt)" "${gettext}/bin/msgfmt" + ''; + + postInstall = '' + rm $out/bin/metamorphose2 + makeWrapper ${python3.interpreter} $out/bin/metamorphose2 \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ + --add-flags "-O $out/share/metamorphose2/metamorphose2.py -w=3" + ''; + + buildInput = [ gettext python3 ]; + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_1 pillow six ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "a graphical mass renaming program for files and folders"; + homepage = "https://github.com/timinaust/metamorphose2"; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 89a64457fd57e..aa69148bd9644 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4902"; + version = "4904"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-djqa6loaFUYfAhgmF6Lm+4M4Xgzyiw1bXqK4XWqT/tY="; + sha256 = "sha256-43gJkpk19Ef3vUbRNt3VDstxCLJl6smsAjtcrovGjEE="; }; patches = [ @@ -76,6 +76,10 @@ stdenv.mkDerivation rec { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; homepage = "https://www.mkgmap.org.uk/"; downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 9956b61c9cfe0..13158d7f72576 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 = "651"; + version = "652"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; rev = version; - sha256 = "sha256-j6U+Wvxef151NEwkpuv4VdMac/cOT9YZUgkt+YPGCuk="; + sha256 = "sha256-yCdVOT8if3AImD4Q63gKfMep7WZsrCgV+IXfP4ZL3Qw="; }; patches = [ @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { description = "Utility for splitting OpenStreetMap maps into tiles"; homepage = "https://www.mkgmap.org.uk/"; downloadPage = "https://www.mkgmap.org.uk/download/splitter.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 7097f584f54a5..f714b026a8359 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.53.7"; + version = "0.55.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1hVvpfrfL/+DIeiPW5iVBEnoc8dy8vVWim4JjhsBlzM="; + sha256 = "sha256-up78503+YqUB2fR9B6W6plYksTJzTj5pkmFJ5eL/mLY="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/moz-phab/default.nix b/pkgs/applications/misc/moz-phab/default.nix index 886e06a382bd5..cef60f72e3b40 100644 --- a/pkgs/applications/misc/moz-phab/default.nix +++ b/pkgs/applications/misc/moz-phab/default.nix @@ -5,6 +5,7 @@ # build inputs , distro , glean-sdk +, pip , python-hglib , sentry-sdk , setuptools @@ -30,6 +31,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ distro glean-sdk + pip python-hglib sentry-sdk setuptools @@ -51,7 +53,7 @@ buildPythonApplication rec { ''; homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html"; license = licenses.mpl20; - maintainers = [ maintainers.kvark ]; + maintainers = []; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix deleted file mode 100644 index 657ac9645deb9..0000000000000 --- a/pkgs/applications/misc/mqtt-bench/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: - -buildGoPackage rec { - pname = "mqtt-bench"; - version = "0.3.0"; - rev = "v${version}"; - - goPackagePath = "github.com/takanorig/mqtt-bench"; - - src = fetchFromGitHub { - inherit rev; - owner = "takanorig"; - repo = "mqtt-bench"; - sha256 = "03b9ak2j303iwq6abd7j10f2cs2ianwnbflwmyx9g96i7zd74f5m"; - }; - - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/takanorig/mqtt-bench/pull/13.patch"; - name = "mqtt-paho-changes.patch"; - sha256 = "17c8ajrp5dmbsasj6njxrlhy0x08b65fignzm3yccqbhb4ijcvha"; - }) - ]; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "Mosquitto benchmark tool"; - homepage = "https://github.com/takanorig/mqtt-bench"; - maintainers = with maintainers; [ disassembler ]; - }; -} diff --git a/pkgs/applications/misc/mqtt-bench/deps.nix b/pkgs/applications/misc/mqtt-bench/deps.nix deleted file mode 100644 index d93d3c4681458..0000000000000 --- a/pkgs/applications/misc/mqtt-bench/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/eclipse/paho.mqtt.golang"; - fetch = { - type = "git"; - url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "65f43bda5f7edbbf6b7533d3a5a13b2c67cf3545"; - sha256 = "1ad136xf78br599ya43j45f8dycjip1k0hkplayy1slg8ckwrhdr"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "8351a756f30f1297fe94bbf4b767ec589c6ea6d0"; - sha256 = "0b6m579i3wrx1m69mqkdng5gjfssprxx0pg45kzrdi68sh0zr5d1"; - }; - } -] diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 9ba9f360402bf..27f3e53d3e20d 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -183,7 +183,7 @@ in stdenv.mkDerivation rec { homepage = "http://wb.mysql.com/"; license = licenses.gpl2; - maintainers = [ maintainers.kkallio ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 62c1834d26ad7..198d170bd89ca 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Morphological analysis of Russian text"; homepage = "https://yandex.ru/dev/mystem/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 8daf50f82e70a..8e7acbe8223dc 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 = "0.14.6"; + version = "0.14.15"; 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 "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc="; + sha256 = if stdenv.isDarwin then "10c5255nbgqiigcwq6kmhzcgafq91k25wnxj3jxabzc0hs7pn4m5" else "sha256-bSLt4EnlCtxZeKIahr618qMuK9ogUhxn+NKO2GPkjOQ="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ae82d4023247d..822f2c13cbeae 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -311,8 +311,8 @@ in src = fetchFromGitHub { owner = "jneilliii"; repo = "OctoPrint-STLViewer"; - rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + rev = "refs/tags/${version}"; + sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y="; }; meta = with lib; { diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 224b5921baa8f..62d14957a4237 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin; description = "A framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 0a46393bd220d..24fd239997862 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { translation leveraging into updated projects. ''; homepage = "http://www.omegat.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ t184256 ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 1e726f81bfb14..17553c6121ead 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -4,7 +4,6 @@ , cmake , curl , dbus -, epoxy , fetchFromGitHub , flac , gtk3 @@ -13,6 +12,7 @@ , libarchive , libdatrie , libelf +, libepoxy , libexif , libogg , libopus @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { at-spi2-core curl dbus - epoxy flac gtk3 jasper @@ -62,6 +61,7 @@ stdenv.mkDerivation rec { libarchive libdatrie libelf + libepoxy libexif libogg libopus diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index d220d5fa2fa1c..e0a7b89424440 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,16 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.14"; + version = "2.3.15"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; - # 2.3.14 release tag points to the commit before the one that updates the - # version number. - # rev = "release/${version}"; - rev = "1e09791a1e2fe2a0ca9835019d634a4c6a4fa3bf"; - sha256 = "0mhzp1j6nmqvkjxg8lv8xa637m1lavdsak30mdlq0g25dhwg6k92"; + rev = "release/${version}"; + sha256 = "sha256-F3zykJhKuIpLQSTjn7mcdjEmgRAlwCZpkTaKQR9ve3g="; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 63923188db7ba..639ad2175b414 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.0"; + version = "42.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "LCUXmrQbJgsY8f+Jm+uv5olDi0nf/SEd78l2olCT9zo="; + sha256 = "+ty6C/6uHmZyJmJk529j/lq/jw77NL4Ri1qXP7by9yQ="; }; patches = [ diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index fa4b5457e4f75..c44fc41a5c650 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -8,7 +8,6 @@ , which , python3 , rsync -, makeWrapper , qtbase , qtsvg , libGLU @@ -20,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.04.27-2"; + version = "2022.06.18-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0="; + sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; fetchSubmodules = true; }; @@ -45,7 +44,6 @@ mkDerivation rec { which python3 rsync - makeWrapper ]; # Most dependencies are vendored @@ -64,23 +62,14 @@ mkDerivation rec { bash ./configure.sh ''; - # Tell the program that the read-only and the read-write data locations - # are different, and create the read-write one. - # https://github.com/organicmaps/organicmaps/issues/2387 - postInstall = '' - wrapProgram $out/bin/OMaps \ - --add-flags "-resources_path $out/share/organicmaps/data" \ - --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ - --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' - ''; - meta = with lib; { + # darwin: "invalid application of 'sizeof' to a function type" + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; license = licenses.asl20; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; mainProgram = "OMaps"; - broken = stdenv.isDarwin; # "invalid application of 'sizeof' to a function type" }; } diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 9d432556b9e58..b5de0b059a8e1 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-lJJZ0ZsPTPEaYyzi8chAPo1OlZQ6p9QVqwtSOyJD7W4="; + sha256 = "sha256-cpBMzYLcU93GXYkBhUdoRovjQ2hd1+pAt6d9aAOaZT8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index b894195cfa603..5e0f5fc9e0114 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "12n1a9j61r4spx0zi2kk85nslv11j1s510asxqvj92ggqhr2s3sq"; + sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc="; }; - cargoSha256 = "12zachbg78ajx1n1mqp53rd00dzcss5cqhsq0119lalzc8b5zkrn"; + cargoSha256 = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 745796098e8cc..e4626ef3c947c 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -42,6 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/torakiki/pdfsam"; description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.agpl3; platforms = platforms.all; maintainers = with maintainers; [ _1000101 ]; diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index 8c034d6636b32..047d9e4190fcb 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -88,6 +88,10 @@ buildFHSUserEnv { homepage = "https://www.qoppa.com/${pname}/"; description = "An easy to use, full-featured PDF editing software"; longDescription = longDescription; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; mainProgram = pname; diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index e27519da2cd7a..1dc1f1e557cae 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -12,7 +12,7 @@ in pdfstudio = callPackage ./common.nix rec { pname = program; year = "2021"; - version = "${year}.1.3"; + version = "${year}.2.0"; desktopName = "PDF Studio"; longDescription = '' PDF Studio is an easy to use, full-featured PDF editing software. This is the standard/pro edition, which requires a license. For the free PDF Studio Viewer see the package pdfstudioviewer. @@ -22,21 +22,21 @@ in ]; src = fetchurl { url = makeurl { inherit pname year version; }; - sha256 = "sha256-2az8/slWeLY7l7dCwyTaT18KFfvsO71vJFDZEvbDHGM="; + sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU="; }; }; pdfstudioviewer = callPackage ./common.nix rec { pname = program; year = "2021"; - version = "${year}.1.3"; + version = "${year}.2.0"; desktopName = "PDF Studio Viewer"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { url = makeurl { inherit pname year version; }; - sha256 = "sha256-kd+rQruBL0fudmc30agRO/XV97l/6unqU0GK25yhOzI="; + sha256 = "sha256-RjVfl3wRK4bqNwSZr2R0CNx4urHTL0QLmKdogEnySWU="; }; }; }.${program} diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 58d45d19bee58..669f25e1509eb 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -142,6 +142,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "GUI for managing Windows programs under linux"; homepage = "https://www.playonlinux.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.pasqui23 ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 5a8055b081562..6bd4ee6b3c181 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -2,35 +2,14 @@ qtbase, mkDerivationWith }: { - stable = with python27Packages; buildPythonPackage rec { - pname = "plover"; - version = "3.1.1"; - - meta = with lib; { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; - }; - - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "plover"; - rev = "v${version}"; - sha256 = "sha256-LIhTwHMphg+xTR9NKvjAZ6p0mmqPNcZd9C4cgnenmYQ="; - }; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest mock ]; - propagatedBuildInputs = [ - six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python - ]; - }; + stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 dev = with python3Packages; mkDerivationWith buildPythonPackage rec { pname = "plover"; version = "4.0.0.dev10"; meta = with lib; { + broken = stdenv.isDarwin; description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 8fcd9e1a04fe9..1c286d611e6be 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -122,6 +122,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.noneucat ]; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix new file mode 100644 index 0000000000000..f27902a8aac76 --- /dev/null +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -0,0 +1,108 @@ +{ lib +, fetchFromGitHub +, bash +, cairo +, glib +, qt5 +, hicolor-icon-theme +, gdk-pixbuf +, imagemagick +, desktop-file-utils +, ninja +, meson +, sassc +, ibus +, usbutils +, libxcb +, python3Packages +, gobject-introspection +, gtk3 +, wrapGAppsHook +, libappindicator-gtk3 +}: + +python3Packages.buildPythonApplication rec { + name = "polychromatic"; + version = "0.7.3"; + + format = "other"; + + src = fetchFromGitHub { + owner = "polychromatic"; + repo = "polychromatic"; + rev = "v${version}"; + sha256 = "sha256-H++kQ3Fxw56avEsSE1ctu5p0s50s0eQ+jL5zXS3AA94="; + }; + + postPatch = '' + patchShebangs scripts + + substituteInPlace scripts/build-styles.sh \ + --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ + --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' + + substituteInPlace pylib/common.py --replace "/usr/share/polychromatic" "$out/share/polychromatic" + ''; + + preConfigure = '' + scripts/build-styles.sh + ''; + + buildInputs = [ + cairo + hicolor-icon-theme + ]; + + pythonPath = with python3Packages; [ + openrazer + pyqt5 + pyqtwebengine + ]; + + propagatedBuildInputs = with python3Packages; [ + libxcb + colour + colorama + setproctitle + openrazer + openrazer-daemon + requests + ibus + usbutils + pyqt5 + libappindicator-gtk3 + ]; + + nativeBuildInputs = with python3Packages; [ + pyqt5 + desktop-file-utils + qt5.wrapQtAppsHook + wrapGAppsHook + ninja + meson + sassc + ]; + + propagatedNativeBuildInputs = [ + gobject-introspection + gtk3 + gdk-pixbuf + imagemagick + ]; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; + + meta = with lib; { + homepage = "https://polychromatic.app/"; + description = "Graphical front-end and tray applet for configuring Razer peripherals on GNU/Linux."; + longDescription = '' + Polychromatic is a frontend for OpenRazer that enables Razer devices + to control lighting effects and more on GNU/Linux. + ''; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index d2b8663d24531..3fe8c64f20be5 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { description = "A simple, configurable utility to show your web activity as playing status on Discord"; homepage = "https://premid.app"; downloadPage = "https://premid.app/downloads"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; [ natto1784 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d89364280795d..9f08000de51c3 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python3 +, python39 }: let - python3' = python3.override { + python3' = python39.override { packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; @@ -19,7 +19,7 @@ let }); flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { version = "2.7.0"; - src = python3.pkgs.fetchPypi { + src = self.fetchPypi { pname = "Flask-Migrate"; inherit version; sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; @@ -65,30 +65,42 @@ let sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; }; }); - # Required by flask-babel itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { - version = "2.0.1"; + version = "1.1.0"; + src = old.src.override { + inherit version; + sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + }; + }); + flask = super.flask.overridePythonAttrs (old: rec { + version = "1.1.4"; src = old.src.override { inherit version; - sha256 = "sha256-nnJNaPwikCoUNTUfhMP7hiPzA//8xWaky5Ut+MVyz/A="; + sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; }; }); - flask = self.callPackage ../../../development/python2-modules/flask { }; sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = false; }; }); + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); }; }; in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-c5pWbBaOFQd7z3BvtYgrnZBiknLBDCE6So76Q68AptA="; + sha256 = "sha256-bjMw69nKecv87nwsLfb4+h677WjZlkVcIpVe53AI9WU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 8f7e371a8e562..679b77157cd05 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,7 +1,53 @@ -{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook -, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme -, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch +{ stdenv +, lib +, binutils +, fetchFromGitHub +, cmake +, copyDesktopItems +, makeDesktopItem +, pkg-config +, wrapGAppsHook +, boost +, cereal +, cgal_5 +, curl +, dbus +, eigen +, expat +, glew +, glib +, gmp +, gtest +, gtk3 +, hicolor-icon-theme +, ilmbase +, libpng +, mpfr +, nlopt +, openvdb +, pcre +, qhull +, systemd +, tbb +, wxGTK31-gtk3 +, xorg +, fetchpatch +, wxGTK31-gtk3-override ? null }: +let + wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec { + pname = "wxwidgets-prusa3d-patched"; + version = "3.1.4"; + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "wxWidgets"; + rev = "489f6118256853cf5b299d595868641938566cdb"; + hash = "sha256-xGL5I2+bPjmZGSTYe1L7VAmvLHbwd934o/cxg9baEvQ="; + fetchSubmodules = true; + }; + }); + wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override; +in stdenv.mkDerivation rec { pname = "prusa-slicer"; version = "2.4.2"; @@ -14,6 +60,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + binutils boost cereal cgal_5 @@ -34,7 +81,7 @@ stdenv.mkDerivation rec { pcre systemd tbb - wxGTK31-gtk3 + wxGTK31-gtk3-override' xorg.libX11 ] ++ checkInputs; @@ -44,6 +91,16 @@ stdenv.mkDerivation rec { url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; }) + # Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238 + # Can be removed with the next version update + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch"; + sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8="; + }) + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch"; + sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20="; + }) ]; doCheck = true; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 41ba786227087..742fa6f8e20e2 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: +{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }: let appname = "SuperSlicer"; pname = "super-slicer"; @@ -54,7 +54,7 @@ let passthru = allVersions; }; - - allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions; + prusa-slicer' = prusa-slicer.override { wxGTK31-gtk3-override = wxGTK31-gtk3; }; + allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions; in allVersions.stable diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 8c4fa2efb2278..bd27fbb342f32 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 +{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2 , qtsvg, qttools, qtquick1, qtcharts , qmake @@ -75,6 +75,7 @@ EOF ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Cross-platform open source Redis DB management tool"; homepage = "https://redisdesktop.com/"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 5734adc1b7d29..7f5bf8862d543 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.1"; + version = "7.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kpKA3vrQo45Y6Qy6mcjJxJY3dpXV0ckNIfKdDVS5qhM="; + sha256 = "sha256-R/sQwVt+YHENkG9U2R205+YADovB8P58eMrUD/WnPic="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 69f0b26b9ec41..273b2d6046ed8 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -53,6 +53,7 @@ in mkDerivation rec { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; maintainers = with maintainers; [ cstrahan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index 3d7720d25968e..0074a923f4179 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -5,25 +5,23 @@ , river , wayland , pkg-config -, scdoc }: stdenv.mkDerivation rec { pname = "rivercarro"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromSourcehut { owner = "~novakane"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "07md837ki0yln464w8vgwyl3yjrvkz1p8alxlmwqfn4w45nqhw77"; + sha256 = "sha256-eATbbwIt5ytEVLPodyq9vFF9Rs5S1xShpvNYQnfwdV4="; }; nativeBuildInputs = [ pkg-config river - scdoc wayland zig ]; @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dcpu=baseline -Dman-pages --prefix $out install + zig build -Drelease-safe -Dcpu=baseline --prefix $out install runHook postInstall ''; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 8c644e5f3cc4d..ae32aac267e17 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, curl +, curlWithGnuTls , zlib , glib , xorg @@ -14,10 +14,6 @@ , makeWrapper }: -let - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; -in - stdenv.mkDerivation rec { pname = "robo3t"; version = "1.4.3"; @@ -95,6 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://robomongo.org/"; description = "Query GUI for mongodb. Formerly called Robomongo"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ eperuffo ]; }; diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 6a631d5a95087..a02d486ca9e57 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "rofi-rbw"; - version = "0.5.0"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; - rev = version; - hash = "sha256-1RDwb8lKls6+X/XtARbi4F7sK4nT03Iy3Wb9N1LEa5o="; + rev = "refs/tags/${version}"; + hash = "sha256-YDL0pMl3BX59kzjuykn0lQHu2RMvPhsBrlSiqdcZAXs="; }; propagatedBuildInputs = [ configargparse ]; diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index 177476900aa9b..22a1b9e74b78b 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "seatd"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "seatd"; rev = version; - sha256 = "1k0wz68aqr9xgpyrfrsmrjn5b634qmm7fwv2d73w112hjmgvjxk5"; + sha256 = "sha256-m8xoL90GI822FTgCXuVr3EejLAMUStkPKVoV7w8ayIE="; }; outputs = [ "bin" "out" "dev" "man" ]; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index e26a40667da9c..23684142a09b4 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -48,6 +48,7 @@ description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; homepage = "https://github.com/SideQuestVR/SideQuest"; downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ joepie91 rvolosatovs ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 928a71b69047c..bc48ce3e2afcc 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , python3 , ffmpeg }: @@ -35,6 +36,10 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); + disabledTests = lib.optionals stdenv.isDarwin [ + "test_nonmedia_files" + ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index e3384ff6dd7f5..28aaf9dd72c81 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.3.0"; + version = "3.4.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-dcfzCac4dT2X1hgTSh30G7h2XtvVj1jMUmrUzqZ11y8="; + sha256 = "sha256-YlTawz09i7k5QxaybKSo4IhECs6UdDSNV+ylIJgKPt4="; }; - cargoSha256 = "sha256-CQofC9Y0y8XASLpjk9B6mMlSQqiXnoGZ8kJh16txiPA="; + cargoSha256 = "sha256-L4eIGxQTM+sZWXWZDGtSwsCT54CWLbyPQ9b+Jf6s94U="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix index eb0af95d58d59..f183fbed3d2e4 100644 --- a/pkgs/applications/misc/signumone-ks/default.nix +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digital signature tool for Costa Rican electronic invoicing"; homepage = "https://signum.one/download.html"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index f723ba27beb8d..35f153393518c 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -27,6 +27,7 @@ let description = "The simplest way to keep notes"; homepage = "https://github.com/Automattic/simplenote-electron"; license = licenses.gpl2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ kiwi ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 0f331ef6e2ce4..2ec034e882e18 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,12 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: +{ lib +, fetchFromGitHub +, gobject-introspection +, gtk3 +, gtksourceview3 +, webkitgtk +, wrapGAppsHook +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -8,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; + hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -20,9 +28,16 @@ python3Packages.buildPythonApplication rec { # any Pokemon, and clicking Stats and Moves tab. webkitgtk ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ + cairosvg natsort + ndspy packaging pycairo pygal @@ -36,6 +51,7 @@ python3Packages.buildPythonApplication rec { skytemple-files skytemple-icons skytemple-ssb-debugger + tilequant ]; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index b5bcbabf8674b..6a9c8843c09a3 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Snapmaker Luban is an easy-to-use 3-in-1 software tailor-made for Snapmaker machines"; homepage = "https://github.com/Snapmaker/Luban"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.simonkampe ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 85f4ffec5f16b..90aab7987b389 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line client for the Snowflake database"; homepage = "https://www.snowflake.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ andehen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 07d7d605d809f..4e540accce23d 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.9.4"; + version = "2.10.2"; src = fetchFromGitHub { - owner = "khanhas"; + owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dHkbjmb9qlMO+pYUmdnoztkrMqPW6GfceAUxgnRmlDA="; + sha256 = "sha256-chaCz4+RXPUP/MZymxA0h1ATuWYRgru3JMELiWPEBcE="; }; vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng="; @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Command-line tool to customize Spotify client"; - homepage = "https://github.com/khanhas/spicetify-cli/"; + homepage = "https://github.com/spicetify/spicetify-cli/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 974ebb78c2f11..21ca26012ddb5 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; license = licenses.bsdOriginal; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix new file mode 100644 index 0000000000000..9039854f74e37 --- /dev/null +++ b/pkgs/applications/misc/sticky/default.nix @@ -0,0 +1,83 @@ +{ lib +, python3 +, fetchFromGitHub +, wrapGAppsHook +, cinnamon +, glib +, gspell +, gtk3 +, gobject-introspection +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sticky"; + version = "1.8"; + format = "other"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + hash = "sha256-VSD/QsG7G9hji5m6NSEkCoVM+XK3t4KmCqbocTbZwE4="; + }; + + postPatch = '' + sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py + ''; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + glib + gobject-introspection + cinnamon.xapps + gspell + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + xapp + ]; + + postBuild = '' + glib-compile-schemas usr/share/glib-2.0/schemas + ''; + + # hook for gobject-introspection doesn't like strictDeps + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + # no tests + doCheck = false; + + dontWrapGApps = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv usr/lib $out + mv usr/share $out + patchShebangs $out/lib/sticky + mv $out/lib/sticky/sticky.py $out/bin/sticky + sed -i -e "1aimport sys;sys.path.append('$out/lib/sticky')" $out/bin/sticky + + runHook postInstall + ''; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "A sticky notes app for the linux desktop"; + homepage = "https://github.com/linuxmint/sticky"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ linsui ]; + }; +} diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/applications/misc/stw/default.nix new file mode 100644 index 0000000000000..e7c11fd4b9a5c --- /dev/null +++ b/pkgs/applications/misc/stw/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, fontconfig +, libXft +, libXrender +}: + +stdenv.mkDerivation rec { + pname = "stw"; + version = "unstable-2022-02-04"; + + src = fetchFromGitHub { + owner = "sineemore"; + repo = pname; + rev = "c034e04ac912c157f9faa35cb769ba93d92486a0"; + sha256 = "sha256-YohHF1O0lm6QWJv/wkS4RVJvWaOjcYSZNls6tt4hbqo=="; + }; + + buildInputs = [ libX11 fontconfig libXft libXrender ]; + + makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A simple text widget for X resembling the watch(1) command"; + license = licenses.mit; + maintainers = with maintainers; [ somasis ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index fdae9753edbc4..b67122965234a 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sway-launcher-desktop"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Biont"; repo = "sway-launcher-desktop"; rev = "v${version}"; - sha256 = "0i19igj30jyszqb63ibq0b0zxzvjw3z1zikn9pbk44ig1c0v61aa"; + sha256 = "HCGUFXrj6b9Pb6b5y9yupBumFLQyH1QVMrfoBM4HbMg="; }; postPatch = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.mrhedgehog ]; + maintainers = [ maintainers.thehedgeh0g ]; mainProgram = "${pname}"; }; } diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix new file mode 100644 index 0000000000000..546b365b3684e --- /dev/null +++ b/pkgs/applications/misc/swaynag-battery/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "swaynag-battery"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "m00qek"; + repo = "swaynag-battery"; + rev = "v${version}"; + hash = "sha256-7f9+4Fzw5B5ATuud4MJC3iyuNRTx6kwJ7/KsusGtQM8="; + }; + + vendorSha256 = "h9Zj3zmQ0Xpili5Pl6CXh1L0bb2uL1//B79I4/ron08="; + + meta = with lib; { + homepage = "https://github.com/m00qek/swaynag-battery"; + description = "Shows a message when your battery is discharging "; + maintainers = with maintainers; [ asbachb ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/applications/misc/swaysettings/default.nix new file mode 100644 index 0000000000000..ae0e76bed54c9 --- /dev/null +++ b/pkgs/applications/misc/swaysettings/default.nix @@ -0,0 +1,78 @@ +{ lib +, fetchFromGitHub +, accountsservice +, appstream-glib +, dbus +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gsettings-desktop-schemas +, gtk3 +, json-glib +, libgee +, libhandy +, libxml2 +, meson +, ninja +, pantheon +, pkg-config +, python3 +, stdenv +, vala +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "swaysettings"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ErikReider"; + repo = "SwaySettings"; + rev = "v${version}"; + hash = "sha256-2bbB+37t6chbdnOSpIolAsy7aD9i1UizWqkcF8Frfsk="; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + accountsservice + dbus + glib + gobject-introspection + gsettings-desktop-schemas + gtk3 + json-glib + libgee + libhandy + libxml2 + pantheon.granite + ]; + + postPatch = '' + patchShebangs /build/source/build-aux/meson/postinstall.py + ''; + + meta = with lib; { + description = "A GUI for configuring your sway desktop"; + longDescription = '' + Sway settings enables easy configuration of a sway desktop environment + such as selection of application or icon themes. + ''; + homepage = "https://github.com/ErikReider/SwaySettings"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.aacebedo ]; + }; +} diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index dc4569c6fca3e..e81edefdfa625 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -7,6 +7,8 @@ , extra-cmake-modules , cpp-utilities , qtutilities +, qtforkawesome +, boost , cmake , kio , plasma-framework @@ -19,17 +21,23 @@ }: mkDerivation rec { - version = "1.1.3"; + version = "1.1.20"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-ovit2XSkxSjcbpqQUv8IzMqfsfItbtXLbx0/Vy0+J0Y="; + sha256 = "sha256-T0ddAROwVSh+IKGZZNDMC7YB2IfQZal2pAQ5ArirtjI="; }; - buildInputs = [ qtbase cpp-utilities qtutilities ] + buildInputs = [ + qtbase + cpp-utilities + qtutilities + boost + qtforkawesome + ] ++ lib.optionals webviewSupport [ qtwebengine ] ++ lib.optionals jsSupport [ qtdeclarative ] ++ lib.optionals kioPluginSupport [ kio ] diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index b28b4da7dbefc..0b0163b054d7d 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { programmatically extract tables from PDFs. ''; homepage = "https://tabula.technology/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = [ maintainers.jakewaksbaum ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index b396c578c903f..d2978ec7bd321 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { Microsoft Excel spreadsheet using a simple, easy-to-use interface. ''; homepage = "https://tabula.technology/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index 66708aa8135d8..b6d115c8feb9e 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/noctuid/tdrop"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ wedens ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 42f4d36eea5d5..c9d845574ff0b 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mastodon/Misskey Client for PC"; homepage = "https://thedesk.top"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index d2b92fa250b3f..17e5d458b89bd 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "themechanger"; - version = "0.10.2"; + version = "0.11.0"; format = "other"; src = fetchFromGitHub { owner = "ALEX11BR"; repo = "ThemeChanger"; rev = "v${version}"; - sha256 = "00z1npm3lpvf0wc9z2v58pc4nxxh8x9m158kxf1k0qlz536jrzqr"; + sha256 = "sha256-umRkGPeNDZOmx6pjWLU9rRdHX6QFuHY/dsuQ8oI2YLI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 37aafb7827ef3..76ea8fb7fc0ef 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { description = "Learn and train typing with the ten-finger system"; homepage = "https://gitlab.com/tipp10/tipp10"; license = licenses.gpl2Only; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 9aeb726e5c2ce..e92636bad20f8 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { + broken = stdenv.isDarwin || stdenv.isAarch64; description = "Build vector tilesets from large collections of GeoJSON features"; homepage = "https://github.com/mapbox/tippecanoe"; license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; platforms = with platforms; linux ++ darwin; - broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro b/pkgs/applications/misc/toggldesktop/TogglDesktop.pro deleted file mode 100644 index e86156313d1f0..0000000000000 --- a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro +++ /dev/null @@ -1,19 +0,0 @@ -QT += core network widgets - -DEFINES += APP_ENVIRONMENT=\\\"production\\\" -DEFINES += APP_VERSION=\\\"@version@\\\" - -TARGET = toggldesktop -TEMPLATE = app - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -RESOURCES += *.qrc - -target.path = $$PREFIX - -INSTALLS += target - -CONFIG += link_pkgconfig -PKGCONFIG += bugsnag-qt qxtglobalshortcut qt-oauth-lib toggl x11 xscrnsaver diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix deleted file mode 100644 index 910f92a849e22..0000000000000 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config -, cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco -, qtbase, qtwebengine, qtx11extras, sqlite }: - -let - name = "toggldesktop-${version}"; - version = "7.4.231"; - - src = fetchFromGitHub { - owner = "toggl"; - repo = "toggldesktop"; - rev = "v${version}"; - sha256 = "sha256-YaeeUlwz42i1ik5nUKSIy0IBrvu1moi95dBK2lKfGAY="; - }; - - bugsnag-qt = mkDerivation rec { - pname = "bugsnag-qt"; - version = "20180522.005732"; - - src = fetchFromGitHub { - owner = "alpakido"; - repo = "bugsnag-qt"; - rev = version; - sha256 = "sha256-2L7pxdQOniwrp1Kgq3Q8BFbjb2yGtGoKUiQC+B6tRgs="; - }; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase ]; - }; - - qxtglobalshortcut = mkDerivation rec { - pname = "qxtglobalshortcut"; - version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; - - src = fetchFromGitHub { - owner = "hluk"; - repo = "qxtglobalshortcut"; - rev = version; - sha256 = "sha256-gb94rqK8j1mbD4YSXdOaxCdczZJFC6MU+iBsdf07wcc="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qtx11extras ]; - }; - - qt-oauth-lib = mkDerivation rec { - pname = "qt-oauth-lib"; - version = "20190125.190943"; - - src = fetchFromGitHub { - owner = "alpakido"; - repo = "qt-oauth-lib"; - rev = version; - sha256 = "sha256-MjtNAN4F9JJFxM8MYpCv8tPe26RHtbXdq+lY49p+rn4="; - }; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtwebengine ]; - }; - - poco-pc = writeText "poco.pc" '' - Name: Poco - Description: ${poco.meta.description} - Version: ${poco.version} - Libs: -L${poco}/lib -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation - Cflags: -I${poco}/include/Poco - ''; - - poco-pc-wrapped = runCommand "poco-pc-wrapped" {} '' - mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc - ''; - - libtoggl = mkDerivation { - name = "libtoggl-${version}"; - inherit src version; - - sourceRoot = "source/src"; - - nativeBuildInputs = [ qmake pkg-config ]; - buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ]; - - postPatch = '' - cat ${./libtoggl.pro} > libtoggl.pro - rm get_focused_window_{mac,windows}.cc - ''; - }; - - toggldesktop = mkDerivation { - name = "${name}-unwrapped"; - inherit src version; - - sourceRoot = "source/src/ui/linux/TogglDesktop"; - - postPatch = '' - substituteAll ${./TogglDesktop.pro} TogglDesktop.pro - substituteInPlace toggl.cpp \ - --replace ./../../../toggl_api.h toggl_api.h - ''; - - postInstall = '' - ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem - ''; - - nativeBuildInputs = [ qmake pkg-config ]; - - buildInputs = [ - bugsnag-qt - libtoggl - qxtglobalshortcut - qtbase - qtwebengine - qt-oauth-lib - qtx11extras - libX11 - libXScrnSaver - ]; - }; - - toggldesktop-icons = mkDerivation { - name = "${name}-icons"; - inherit (toggldesktop) src sourceRoot; - - installPhase = '' - for f in icons/*; do - mkdir -p $out/share/icons/hicolor/$(basename $f)/apps - mv $f/toggldesktop.png $_ - done - ''; - }; - - toggldesktop-wrapped = runCommand "toggldesktop-wrapped" {} '' - mkdir -p $out/bin && ln -s ${toggldesktop}/toggldesktop $_ - ''; - - desktopItem = makeDesktopItem rec { - categories = [ "Utility" ]; - desktopName = "Toggl"; - genericName = desktopName; - name = "toggldesktop"; - exec = "${toggldesktop-wrapped}/bin/toggldesktop"; - icon = "toggldesktop"; - }; -in - -buildEnv { - inherit name; - paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; - - meta = with lib; { - broken = true; # libtoggl is broken - description = "Client for Toggl time tracking service"; - homepage = "https://github.com/toggl/toggldesktop"; - license = licenses.bsd3; - maintainers = with maintainers; [ yana ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/toggldesktop/libtoggl.pro b/pkgs/applications/misc/toggldesktop/libtoggl.pro deleted file mode 100644 index c8303440fe675..0000000000000 --- a/pkgs/applications/misc/toggldesktop/libtoggl.pro +++ /dev/null @@ -1,20 +0,0 @@ -TARGET = toggl -TEMPLATE = lib - -SOURCES += *.cc -HEADERS += *.h - -headers.files = $$HEADERS -headers.path = $$PREFIX/include -target.path = $$PREFIX/lib - -INSTALLS += headers target - -CONFIG += create_prl create_pc link_pkgconfig -PKGCONFIG += jsoncpp openssl lua poco sqlite3 x11 - -QMAKE_PKGCONFIG_NAME = $$TARGET -QMAKE_PKGCONFIG_PREFIX = $$PREFIX -QMAKE_PKGCONFIG_LIBDIR = $$target.path -QMAKE_PKGCONFIG_INCDIR = $$headers.path -QMAKE_PKGCONFIG_DESTDIR = pkgconfig diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/applications/misc/toipe/default.nix index ca842ff6db00e..1b41f9ae53e92 100644 --- a/pkgs/applications/misc/toipe/default.nix +++ b/pkgs/applications/misc/toipe/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "toipe"; - version = "0.4.0"; + version = "0.4.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-lAvFCvNm55SjRmrhIkMBiM0nSlAG+jUEKLlLaGs1RkY="; + sha256 = "sha256-aunejitHVNIB/zIDgX3mlA1FzG7wIxlDCFdUvtuzQnc="; }; - cargoSha256 = "sha256-WmWH/x69H17uHQEB0+GRUtApJnSEkoeFLLweP8NoBrk="; + cargoSha256 = "sha256-Nabc2lPpsUCcWEJzL6U84UoIJ5PCtYKVyLRhjhiqhpE="; meta = with lib; { description = "Trusty terminal typing tester"; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index c11ad8d1e981b..48b1b2d57e05e 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nix-update-script , fetchpatch -, vala +, vala_0_54 , meson , ninja , pkg-config @@ -44,6 +44,12 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/tootle/0002-Use-reason_phrase-instead-of-get_phrase.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5"; sha256 = "sha256-rm5NFLeAL2ilXpioywgCR9ppoq+MD0MLyVaBmdzVkqU="; }) + # Application: make app_entries private + # https://github.com/bleakgrey/tootle/pull/346 + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/tootle/0003-make-app-entries-private.patch?id=c973e68e3cba855f1601ef010afa9a14578b9499"; + sha256 = "sha256-zwU0nxf/haBZl4tOYDmMzwug+HC6lLDT8/12Wt62+S4="; + }) ]; nativeBuildInputs = [ @@ -51,7 +57,11 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with Vala 0.56.1: + # ../src/Widgets/Status.vala:8.43-8.56: error: construct + # properties not supported for specified property type + # public API.NotificationType? kind { get; construct set; } + vala_0_54 wrapGAppsHook ]; @@ -68,11 +78,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Fix build with vala 0.56 - # https://github.com/bleakgrey/tootle/pull/346 - substituteInPlace src/Application.vala \ - --replace "public const GLib.ActionEntry[] app_entries" "private const GLib.ActionEntry[] app_entries" - chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 4523168314aef..48ff9675a78d4 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://projects.sirrix.com/trac/tpmmanager"; description = "Tool for managing the TPM"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ tstrobel ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index 7db743559a4e5..26508c6d49bf6 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with lib; { + broken = stdenv.isDarwin; description = "An md5sum-alike program that works with Tiger/THEX hashes"; longDescription = '' tthsum generates or checks TTH checksums (root of the THEX hash diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix index 887a979219db2..690dd9d64ad69 100644 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Electronic TV Program Guide"; homepage = "https://www.tvbrowser.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 34cc97023989e..0b1bed6785755 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Online freelancing platform desktop application for time tracking"; homepage = "https://www.upwork.com/ab/downloads/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zakkor wolfangaukang ]; diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/applications/misc/usb-reset/default.nix index db05eda0d41d9..7b4d67eb065f1 100644 --- a/pkgs/applications/misc/usb-reset/default.nix +++ b/pkgs/applications/misc/usb-reset/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Perform a bus reset on a USB device using its vendor and product ID"; homepage = "https://github.com/ralight/usb-reset"; changelog = "https://github.com/ralight/usb-reset/blob/master/ChangeLog.txt"; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 99657d60bd703..e73c6e7b5dc3a 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -14,7 +14,7 @@ , pyshp , fonttools , pyyaml -, pdfminer +, pdfminer-six , vobject , tabulate , wcwidth @@ -55,7 +55,7 @@ buildPythonApplication rec { pyyaml #namestand #datapackage - pdfminer + pdfminer-six #tabula vobject tabulate diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 5994df7c559a1..db9313b6be614 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "Visual Understanding Environment - mind mapping software"; maintainers = with lib.maintainers; [ raskin ]; platforms = with lib.platforms; linux; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.free; # Apache License fork, actually }; } diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 9b8a7f0a348ad..3972d7a17230c 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -1,28 +1,51 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, electron , nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.4"; + version = "4.6.0"; - src = fetchurl { - url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr"; - }; + src = let + downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; + in + if stdenv.system == "x86_64-linux" then + fetchurl { + url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; + sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8"; + } + else if stdenv.system == "aarch64-linux" then + fetchurl { + url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; + sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974"; + } + else + throw "Whalebird is not supported for ${stdenv.system}"; nativeBuildInputs = [ - dpkg autoPatchelfHook makeWrapper + copyDesktopItems nodePackages.asar ]; buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; - dontConfigure = true; + desktopItems = [ + (makeDesktopItem { + desktopName = "Whalebird"; + comment = meta.description; + categories = [ "Network" ]; + exec = "whalebird"; + icon = "whalebird"; + name = "whalebird"; + }) + ]; unpackPhase = '' - dpkg-deb -x ${src} ./ + mkdir -p opt + tar -xf ${src} -C opt + # remove the version/target suffix from the untar'd directory + mv opt/Whalebird-* opt/Whalebird ''; buildPhase = '' @@ -31,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 "jo,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" + --replace "Do,\"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 @@ -41,12 +64,17 @@ stdenv.mkDerivation rec { runHook preInstall mkdir $out - mv usr/share opt $out + mv opt $out + + # install icons + for icon in $out/opt/Whalebird/resources/build/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/whalebird.png" + done - substituteInPlace $out/share/applications/whalebird.desktop \ - --replace '/opt/Whalebird' $out/bin makeWrapper ${electron}/bin/electron $out/bin/whalebird \ - --add-flags $out/opt/Whalebird/resources/app.asar + --add-flags $out/opt/Whalebird/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postInstall ''; @@ -54,8 +82,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux"; homepage = "https://whalebird.social"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ wolfangaukang colinsane ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index d8af28093b9e9..25cbac7d229ba 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; license = licenses.gpl3Only; - maintainers = with maintainers; [ elyhaka ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 6b63fde222f8f..d092a910912a3 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A program to help prevent Repetitive Strain Injury"; longDescription = '' Workrave is a program that assists in the recovery and prevention of diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index e29d58039a04a..0ba8c5a97ad9d 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -38,6 +38,7 @@ buildGoModule rec { changelog = "https://github.com/wtfutil/wtf/raw/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ kalbasit ]; + mainProgram = "wtfutil"; platforms = platforms.linux ++ platforms.darwin; broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 2a6bab5ebda77..7b94af3b52a11 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config +{ stdenv, mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config , libtool, openssl, qtbase, qttools, sphinx }: mkDerivation rec { @@ -22,6 +22,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin; description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; homepage = "https://hohnstaedt.de/xca/"; license = licenses.bsd3; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 00ae2df100e37..357fa7f59648a 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,20 +1,32 @@ -{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib +, fetchFromGitHub +, atk +, gdk-pixbuf +, gobject-introspection +, pango +, python3Packages +, txt2tags +, wrapGAppsHook +, gitUpdater +}: python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "gapan"; repo = pname; rev = version; - sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif"; + sha256 = "Q38m8YrvkkTCY2dByvPj+Ee1DMSUbWvwSDI0kW182bU="; }; format = "other"; strictDeps = false; + dontWrapGApps = true; + nativeBuildInputs = [ gobject-introspection txt2tags @@ -22,26 +34,30 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - glib + atk + gdk-pixbuf + pango ]; pythonPath = with python3Packages; [ - pyxdg pygobject3 + pyxdg ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - installFlags = [ - "DESTDIR=" - ]; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru.updateScript = gitUpdater {inherit pname version; }; meta = with lib; { description = "Command line tool that generates XDG menus for several window managers"; homepage = "https://github.com/gapan/xdgmenumaker"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch platforms = with platforms; filter (x: !(elem x darwin)) unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 70543b5fa186c..539a0f7d1a1d8 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qt4 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation rec { pname = "xkblayout-state"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo="; }; - buildInputs = [ qt4 ]; + buildInputs = [ libX11 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index bcc4fca33b130..17134dcd3892b 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -85,6 +85,10 @@ stdenv.mkDerivation rec { and save to Evernote. ''; homepage = "https://www.xmind.net/"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 91c8c69fe9308..3dbf4467a3a8e 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,16 +1,11 @@ { stdenv, stdenvGcc6, lib , fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl -, opencl-headers, ocl-icd, hwloc, cudatoolkit +, opencl-headers, ocl-icd, hwloc , devDonationLevel ? "0.0" -, cudaSupport ? false , openclSupport ? true }: -let - stdenv' = if cudaSupport then stdenvGcc6 else stdenv; -in - -stdenv'.mkDerivation rec { +stdenv.mkDerivation rec { pname = "xmr-stak"; version = "2.10.8"; @@ -23,12 +18,11 @@ stdenv'.mkDerivation rec { NIX_CFLAGS_COMPILE = "-O3"; - cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF" + cmakeFlags = [ "-DCUDA_ENABLE=OFF" ] ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; nativeBuildInputs = [ cmake ]; buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ] - ++ lib.optional cudaSupport cudatoolkit ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; postPatch = '' diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index b771bd7e62120..578449192fdf2 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 2c69a3960f708..1d80a8837e05b 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, xmrig }: +{ stdenv, fetchFromGitHub, lib, xmrig }: xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; @@ -12,6 +12,7 @@ xmrig.overrideAttrs (oldAttrs: rec { }; meta = with lib; { + broken = stdenv.isDarwin; description = "A fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 578c08b207eda..d24345389cab1 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,23 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.17.6"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz"; + sha256 = "sha256-rvqx0s56VozG8M0m3uZsHuugx0BXucSFqLbq0L1KhAM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE="; + cargoSha256 = "sha256-CyHkjXZVISkQJEQx5vNBGBf6zZrVv/cLWIYeOq9Ac5k="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; - homepage = "https://github.com/sayanarijit/xplr"; + homepage = "https://xplr.dev"; license = licenses.mit; - maintainers = with maintainers; [ sayanarijit suryasr007 ]; + maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g ]; }; } diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix index 49370870f692a..9440c23681007 100644 --- a/pkgs/applications/misc/ydict/default.nix +++ b/pkgs/applications/misc/ydict/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ydict"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "ydict"; rev = "v${version}"; - sha256 = "sha256-zhjsXZsRk0UNijjqjGjZh4TiPxAM5p+ic3JMx2wrPeY="; + sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M="; }; - vendorSha256 = "sha256-O6czDfKD18rGVMIZv6II09oQu1w0ijQRuZRGt2gj9Cs="; + vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index bd9e5a87bf9bb..cfee5cb43e3f5 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -8,11 +8,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.6"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-f01WLxp8fe7y2EwTUhpPqcRuWBs/9lMaAAOdybmHB5M="; + sha256 = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix index b83f93b3b68c5..ab5ae744d2715 100644 --- a/pkgs/applications/networking/3proxy/default.nix +++ b/pkgs/applications/networking/3proxy/default.nix @@ -1,29 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, nixosTests }: +{ lib, stdenv, fetchFromGitHub, nixosTests }: stdenv.mkDerivation rec { pname = "3proxy"; version = "0.9.4"; src = fetchFromGitHub { - owner = "z3APA3A"; + owner = "3proxy"; repo = pname; rev = version; sha256 = "sha256-4bLlQ/ULvpjs6fr19yBBln5mRRc+yj+zVLiTs1e/Ypc="; }; + # They use 'install -s', that calls the native strip instead of the cross. + # Don't strip binary on install, we strip it on fixup phase anyway. + postPatch = '' + substituteInPlace Makefile.Linux \ + --replace "(INSTALL_BIN) -s" "(INSTALL_BIN)" \ + --replace "/usr" "" + ''; + makeFlags = [ "-f Makefile.Linux" - "INSTALL=${coreutils}/bin/install" + "INSTALL=install" "DESTDIR=${placeholder "out"}" + "CC:=$(CC)" ]; + postInstall = '' + rm -fr $out/var + ''; + passthru.tests = { smoke-test = nixosTests._3proxy; }; meta = with lib; { description = "Tiny free proxy server"; - homepage = "https://github.com/z3APA3A/3proxy"; + homepage = "https://github.com/3proxy/3proxy"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ misuzu ]; diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix index 5f78b244ca412..62dbae082d9a1 100644 --- a/pkgs/applications/networking/aether/default.nix +++ b/pkgs/applications/networking/aether/default.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { description = "Peer-to-peer ephemeral public communities"; homepage = "https://getaether.net/"; downloadPage = "https://getaether.net/download/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; maintainers = with maintainers; [ maxhille ]; # other platforms could be supported by building from source diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 8b20c1aac6b0c..4a9c0da726fa2 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Eclipse-based LDAP browser and directory client"; homepage = "https://directory.apache.org/studio/"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.asl20; # Upstream supports macOS and Windows too. platforms = platforms.linux; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 7e4c5cfac888d..cac64ba7f63f1 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -87,11 +87,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.5.4"; + version = "5.5.5"; src = fetchurl { url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-7qfgUYD7uPb+ZEierREVfnHoGz0/b/J+hcsX/duDFWU="; + sha256 = "sha256-eXcGHd3TGNFqjFQ+wSg4+1hF/6DJTPOs0ldjegFktGo="; }; # just patch interpreter @@ -151,6 +151,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Appgate SDP (Software Defined Perimeter) desktop client"; homepage = "https://www.appgate.com/support/software-defined-perimeter-support"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ ymatsiuk ]; diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 2f2a708455e17..0f25fd0a8ec98 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE="; + sha256 = "sha256-jOOakRuiNbdCGmbaQFuHcLsHhV26jaQY+1GgDj9ocs0="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI="; + vendorSha256 = "sha256-fsMBL9qyhIrV6eAsqpSaNniibMdYRVBnl2KCzStvMGQ="; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix index 31f33be38670e..6fab38f973603 100644 --- a/pkgs/applications/networking/breitbandmessung/default.nix +++ b/pkgs/applications/networking/breitbandmessung/default.nix @@ -1,32 +1,12 @@ { lib , stdenv -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, autoPatchelfHook -, cairo -, cups -, dbus -, dpkg -, expat , fetchurl -, gdk-pixbuf -, glib -, gtk3 -, libdrm -, libxkbcommon +, dpkg +, electron_16 , makeWrapper -, mesa , nixosTests -, nspr -, nss -, pango -, pciutils -, systemd +, nodePackages , undmg -, writeShellScriptBin -, xorg }: let @@ -34,19 +14,6 @@ let version = "3.1.0"; - # At first start, the program checks for supported operating systems by calling `lsb_release -a` - # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy. - fake-lsb-release = writeShellScriptBin "lsb_release" '' - echo "Distributor ID: Debian" - echo "Description: Debian GNU/Linux 10 (buster)" - echo "Release: 10" - echo "Codename: buster" - ''; - - binPath = lib.makeBinPath [ - fake-lsb-release - ]; - systemArgs = rec { x86_64-linux = rec { src = fetchurl { @@ -54,68 +21,41 @@ let sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w="; }; - dontUnpack = true; - nativeBuildInputs = [ - autoPatchelfHook dpkg makeWrapper + nodePackages.asar ]; - buildInputs = runtimeDependencies; - - runtimeDependencies = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libdrm - libxkbcommon - mesa - nspr - nss - pango - pciutils - systemd - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb - xorg.libxshmfence - ]; + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - dpkg-deb -x $src $out mkdir -p $out/bin - - chmod -R g-w $out - - addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung - autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung - - makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \ - --prefix PATH : ${binPath} - - mv $out/usr/share $out/share - rmdir $out/usr + mv usr/share $out/share + mkdir -p $out/share/breitbandmessung/resources + + asar e opt/Breitbandmessung/resources/app.asar $out/share/breitbandmessung/resources + + # At first start, the program checks for supported operating systems by using the `bizzby-lsb-release` + # module and only runs when it finds Debian/Ubuntu. So we present us as Debian and make it happy. + cat <<EOF > $out/share/breitbandmessung/resources/node_modules/bizzby-lsb-release/lib/lsb-release.js + module.exports = function release() { + return { + distributorID: "Debian", + description: "Debian GNU/Linux 10 (buster)", + release: "10", + codename: "buster" + } + } + EOF + + makeWrapper ${electron_16}/bin/electron $out/bin/breitbandmessung \ + --add-flags $out/share/breitbandmessung/resources/build/electron.js # Fix the desktop link substituteInPlace $out/share/applications/breitbandmessung.desktop \ --replace /opt/Breitbandmessung $out/bin ''; - - dontAutoPatchelf = true; - dontPatchELF = true; }; x86_64-darwin = { @@ -147,6 +87,7 @@ stdenv.mkDerivation ({ description = "Broadband internet speed test app from the german Bundesnetzagentur"; homepage = "https://www.breitbandmessung.de"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ b4dm4n ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index 20b685a162fef..d049ed4e3893a 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -1,25 +1,57 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "brig"; version = "0.4.1"; - rev = "v${version}"; - - goPackagePath = "github.com/sahib/brig"; - subPackages = ["."]; src = fetchFromGitHub { owner = "sahib"; repo = "brig"; - inherit rev; + rev = "v${version}"; sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600"; }; + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ] ++ (with lib; + mapAttrsToList (n: v: "-X github.com/sahib/brig/version.${n}=${v}") + (with versions; { + Major = major version; + Minor = minor version; + Patch = patch version; + ReleaseType = ""; + BuildTime = "1970-01-01T00:00:00+0000"; + GitRev = src.rev; + })); + + postInstall = '' + installShellCompletion --cmd brig \ + --bash $src/autocomplete/bash_autocomplete \ + --zsh $src/autocomplete/zsh_autocomplete + ''; + + # There are no tests for the brig executable. + doCheck = false; + meta = with lib; { - description = "File synchronization on top of ipfs with git like interface and FUSE filesystem"; - homepage = "https://github.com/sahib/brig"; + description = "File synchronization on top of IPFS with a git-like interface and a FUSE filesystem"; + longDescription = '' + brig is a distributed and secure file synchronization tool with a version + control system. It is based on IPFS, written in Go and will feel familiar + to git users. Think of it as a swiss army knife for file synchronization + or as a peer to peer alternative to Dropbox. + ''; + homepage = "https://brig.readthedocs.io"; + changelog = "https://github.com/sahib/brig/releases/tag/${src.rev}"; license = licenses.agpl3; - platforms = platforms.unix; maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 54b8a1d315694..a89d2bb36e877 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "asuka"; - version = "0.8.3"; + version = "0.8.5"; src = fetchFromSourcehut { owner = "~julienxx"; repo = pname; rev = version; - sha256 = "sha256-l3SgIyApASllHVhAc2yoUYc2x7QtCdzBrMYaXCp65m8="; + sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M="; }; - cargoSha256 = "sha256-twECZM1KcWeQptLhlKlIz16r3Q/xMb0e+lBG+EX79mU="; + cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 2983ced459f84..f17bdcd8f9fde 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.38.115"; + version = "1.40.113"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-YQpFsB3VVzsOa7PoZ+TLv10Dzm9z819cmyw7atnG/Cs="; + sha256 = "sha256-+lJjLfxEOf82uvcVaRbWYQ93KEzWGVrzXvI9Rt1U9Bc="; }; dontConfigure = true; @@ -200,6 +200,7 @@ stdenv.mkDerivation rec { chew up your bandwidth, and invade your privacy. Brave lets you contribute to your favorite creators automatically. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; [ uskudnik rht jefflabonte nasirhm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index d764f74b614cb..035be9585ddd7 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -16,6 +16,6 @@ buildGoPackage rec { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; homepage = "https://blog.filippo.io/captive-browser"; license = licenses.mit; - maintainers = with maintainers; [ volth ma27 ]; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 71b4593c40d47..5a0a7f0d215bd 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "castor"; - version = "0.8.18"; + version = "0.9.0"; src = fetchFromSourcehut { owner = "~julienxx"; repo = pname; rev = version; - sha256 = "sha256-sv6hiSTVFe3jxNuaM6Jyn7UeqFqUNmRvYtWfkJTJ4tA="; + sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0="; }; - cargoSha256 = "sha256-/IHxvTW9VYZmgjmDh0zJFDQqfw/H5CXVwEuLKq6Hnys="; + cargoSha256 = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 993f95a6bfffb..1cfc90dd4f145 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,13 +160,9 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ optionals (versionRange "102" "103") [ - # https://dawn-review.googlesource.com/c/dawn/+/88582 - # Wrap get_gitHash in try-catch to prevent failures in tarball builds. - ./patches/m102-fix-dawn_version_generator-failure.patch ]; - postPatch = optionalString (chromiumVersionAtLeast "102") '' + postPatch = '' # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361: substituteInPlace BUILD.gn \ --replace '"//infra/orchestrator:orchestrator_all",' "" @@ -174,7 +170,6 @@ let substituteInPlace build/config/compiler/BUILD.gn \ --replace '"-Xclang",' "" \ --replace '"-no-opaque-pointers",' "" - '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then @@ -194,7 +189,7 @@ let --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi chmod -x third_party/webgpu-cts/src/tools/run_deno - ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"} + chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch b/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch deleted file mode 100644 index e9391541e435c..0000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001 -From: Loko Kung <lokokung@google.com> -Date: Tue, 3 May 2022 00:28:53 +0000 -Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball - builds. - -Bug: chromium:1321370 -Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d -Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582 -Commit-Queue: Loko Kung <lokokung@google.com> -Reviewed-by: Austin Eng <enga@chromium.org> -Kokoro: Kokoro <noreply+kokoro@google.com> -(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e) ---- - third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py -index 1907e88da..3c1927bee 100644 ---- a/third_party/dawn/generator/dawn_version_generator.py -+++ b/third_party/dawn/generator/dawn_version_generator.py -@@ -23,11 +23,14 @@ def get_git(): - - - def get_gitHash(dawnDir): -- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'], -- stdout=subprocess.PIPE, -- cwd=dawnDir) -- if result.returncode == 0: -- return result.stdout.decode('utf-8').strip() -+ try: -+ result = subprocess.run([get_git(), "rev-parse", "HEAD"], -+ stdout=subprocess.PIPE, -+ cwd=dawnDir) -+ if result.returncode == 0: -+ return result.stdout.decode("utf-8").strip() -+ except Exception: -+ return "" - # No hash was available (possibly) because the directory was not a git checkout. Dawn should - # explicitly handle its absenece and disable features relying on the hash, i.e. caching. - return '' --- -2.36.0 diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5edbf50bbe39f..0fa6054c0661b 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": "101.0.4951.64", - "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", - "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", + "version": "103.0.5060.114", + "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", + "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", "deps": { "gn": { - "version": "2022-03-14", + "version": "2022-05-11", "url": "https://gn.googlesource.com/gn", - "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", - "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" + "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", + "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" } }, "chromedriver": { - "version": "101.0.4951.41", - "sha256_linux": "0zsh6cm7h1m0k5mx1cd29knxjxaadjjcbp7m5fr2mx9c21a1nlcr", - "sha256_darwin": "09py50436y81lw2vk44256dmzsg8dqj14fd0g0gs1cc3ps6q4awl", - "sha256_darwin_aarch64": "0krjijd0zgwg8d44miz43xrjdlvfiymbrrz5r1hzpx64555ch12y" + "version": "103.0.5060.53", + "sha256_linux": "1gpxfrqf2wm2c76701rnw0h5ppmaqzf5ygcrasj1mmwjsfk49v5d", + "sha256_darwin": "03ibi0ybr3mmk02mmn6dp7ygjn7c9wwvahbhm2syh0fhxyyxmf0p", + "sha256_darwin_aarch64": "13bb2ai32b1q4lvyhcgp5315zzxwbi6609xxb67h7h3i3rb2yhcd" } }, "beta": { - "version": "102.0.5005.61", - "sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs", - "sha256bin64": "1cwfpjh060sm56bkgmpmmck0y3vrndrv6cbn8y3p26p3j06f2i3h", + "version": "104.0.5112.29", + "sha256": "1cjqr1d2cgiwq7vlb26ilyw2r79wgyd7dkxaipmjiqyyrl4bfm6y", + "sha256bin64": "1vbhm3pm1jgifmg6dc4aqi7xf12dx37spifjs3flq4v2lixg5r6f", "deps": { "gn": { - "version": "2022-04-14", + "version": "2022-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", - "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" + "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", + "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" } } }, "dev": { - "version": "103.0.5060.13", - "sha256": "1y7nadfmw4yxc2za7ln3h7xywlzdiscmsa8kjar17gmqz6ic69id", - "sha256bin64": "0crs07sjqhgpr22vxa7c52ai8xvxp6c4cs82kaqzc5cgg97076gq", + "version": "105.0.5148.2", + "sha256": "0qnkpda0chsxgfby5g38xmpkilyz2v12mrwlayfsp2iqhc7d07vz", + "sha256bin64": "045czwsra17iclgyzsnbbjr55lrmhzf97c2k0wwjrmd59cx4b1sa", "deps": { "gn": { - "version": "2022-05-11", + "version": "2022-06-22", "url": "https://gn.googlesource.com/gn", - "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", - "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" + "rev": "29accf5ac2eadfc53e687081583b7bc1592a8839", + "sha256": "0z9gaw8p88yhb7fi844pvylsbgjy3ni7bnca1yx37928fjw3ppln" } } }, "ungoogled-chromium": { - "version": "101.0.4951.64", - "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", - "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", + "version": "103.0.5060.114", + "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", + "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", "deps": { "gn": { - "version": "2022-03-14", + "version": "2022-05-11", "url": "https://gn.googlesource.com/gn", - "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", - "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" + "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", + "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" }, "ungoogled-patches": { - "rev": "101.0.4951.64-1", - "sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3" + "rev": "103.0.5060.114-1", + "sha256": "11i7d480q21vcd9p14rc7rb408xwlg2nkj88dq0sfj2rz60lzy0a" } } } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 8af0c1bc8e67d..72a1601d18724 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { buildInputs = with lib; [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ]; + # Workaround build failure on -fno-common toolchains: + # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; + # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + configureFlags = [ "--enable-ssl" ]; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 84f46f1b60d89..1daa5d351a8c8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null , enablePython ? false, python ? null -, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null +, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null # re-add javascript support when upstream supports modern spidermonkey }: diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index a779e99c254a5..76dcafa8442ea 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 = "101.0b9"; + version = "102.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ach/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ach/firefox-102.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "3b6976610aecdcea2e4067875cd99948f3b90a19ba5c9cdc28a6468baedd9a91"; + sha256 = "f6a62b8149ed7bd0d5f544857caa895421515aba3c18fa2cd706ce79932a1b45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/af/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/af/firefox-102.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "3e0fcee8180c294477cd331080bc47a09619b6ac326f1da2f404469d71aab65b"; + sha256 = "8f6004b6dca8bbe0bc3fdd58b2e8196213911618287cefd0489edecfd7979930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/an/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/an/firefox-102.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "25d1afb8220d1b75dbc582590a05731396cbc09272f4bf4526a4ddee8df5ccc1"; + sha256 = "fce57419cd95a2e3c395070bf37b224983cf20a04c90721374ed1a76e5c0770e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ar/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ar/firefox-102.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "c7889add14aa4bba4f8c6ef9ead2041abc09f0141dc1ce01643f740d13537b3d"; + sha256 = "412496ab20fb82702db69299759a955726d45dfd430e13705b60335c095be1ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ast/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ast/firefox-102.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1f96dba635dfc3db01409320352aa0b81c6c3fbb8e6a697fa1403e72b87547f1"; + sha256 = "757d92e5220400919fc0f658ea9cd319498b752a10a6a8e1b1ceeff8db3057ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/az/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/az/firefox-102.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0e46fbd9c55f13757cb3b98c10bf52385ab47a20f2913cc95717592ee0c284c8"; + sha256 = "9e05bb2ee38e11e50af90975a6d0ee191ed040d5bf4e27c447a9bb80385915ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/be/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/be/firefox-102.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "905a7f1f7a395defc7d4cfe0991ae70c1541d4fa6237af983f5b0090d67add2f"; + sha256 = "86e6df9cdaab54b8dc9bb0def3a3dbb724168798fa5df44a34fac5cda4cc294c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/bg/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/bg/firefox-102.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "cfd4fa55ca17f629f1d643a33bd3c265eb2630e1a80af4d73a3277f8b208d949"; + sha256 = "07de1169bfb798b74032fe40da2239e165066f0f9ddd15ce5ef818103498cb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/bn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/bn/firefox-102.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "b96a410a998c29ac62b2b0c5ad63b7021c718e3eed849cbc694a746fa2788637"; + sha256 = "c5913cbb695e2b1c51ee298117fc1a26ad044ea84389b12cf32345ae8e2d6a7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/br/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/br/firefox-102.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f52535396b2d872f70f80b66747d4884b4cd69e5f2475a85c13170773a08d5ec"; + sha256 = "072b458f42f7c0d42a0672a0d77d7db9e9c6423ce8efb3ad3ed008637acd849c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/bs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/bs/firefox-102.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "8538ca13db07a08cdef23263dc4312cce72152e7b2c51e28a1c690bdae60a99e"; + sha256 = "862274ebaa9d718c1132d168e29105c804ee457d1fc860d3eb57157c70a54c13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ca-valencia/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ca-valencia/firefox-102.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "37bc2096537d42963393f6405906b7ff4c1c185a52c5c6c73561f3d64da96489"; + sha256 = "2ebd10e91fd537794e5139c0a70a2117f6b6288dd452ed34e28260cd708d68cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ca/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ca/firefox-102.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "59712cd3ef6184598cbe8c9b82c6b4a881dcf9d44bef7d1a057889f8592fc889"; + sha256 = "1abc9f7856aa1112cedbd34852620315be7b00d5a4057a930cb9e82d7b8caec2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/cak/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/cak/firefox-102.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "2e6a523a9860ede12c6cac9b8a03886e886f198d732dda8eae01082d088953c3"; + sha256 = "e7ff230c42648b2df77613e51ca0bc9d9bc02ce3b0256c0b7c6f7eb4fbaac031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/cs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/cs/firefox-102.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "dd3269c941177d144f408553378edcd7c24f0dac14396e5fb826bd524ccfc569"; + sha256 = "92f1876d0214796bf074f453b16c728b1e96abbc91e25bc8fc1269204e9f8068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/cy/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/cy/firefox-102.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "37b7e0a28c1cdd93866088cf5aaa68786ef64531857f6498186ca9423e8efbaf"; + sha256 = "5a0bbad296543c64d7f5d44a7b65447f8f502855769cb35ba39afa501cadb438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/da/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/da/firefox-102.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e14ad5cfc9a150279b41c94be7b7217c246de861f5694a7dc9b9033e8cccd0f9"; + sha256 = "466ade4b3d5efabadb562320e1eb9a4b74add0a9b2b9388413abb0aa9e1c8fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/de/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/de/firefox-102.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2d4b294c3a09da9f948ce81a157139ff8da7b628b70c083a18230fa8ca71516b"; + sha256 = "294b403166693f2612d3a6a30d540f88acec826a4c1c8ef0c05231bc6dcdf079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/dsb/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/dsb/firefox-102.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "21cc6912fa90883c8d82eba67cc2ea5125833e2c61f57a9d7275571ac767ccdc"; + sha256 = "457bf545b320ea85643db20754fbda4a01c4bb06078af3849561b724cbb30aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/el/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/el/firefox-102.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0b1350c98686fa689cc9f164fc3392f711305eb76210da4f9c481e53c096b439"; + sha256 = "91c0ae42071fa97a8cfa69d898b7da202e62e28dfdb224d190645409688d59d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/en-CA/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/en-CA/firefox-102.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "70f61a52894c08bb6d62a34fd67c69e737c505fb24aa59caacd0bb94d8505c73"; + sha256 = "24b113b1f90dd271c389909287230034edeab7109aae3b33dd1bcb3f31a8de92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/en-GB/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/en-GB/firefox-102.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "864dcc9ca375bdaaf98f25223b8f6fa24ba20d08cc4b83f07d57ac1dceffd7d1"; + sha256 = "6a74d7384f80eac4fd9e8502b6de230ff2a9147b8df5594fd8cbdfbad0527869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/en-US/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/en-US/firefox-102.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a222ae9a1799e81f99a6d394c83feb5a90ecb64f551a80cbcb4b512260f4f73e"; + sha256 = "05c2ba22559d7d35b93196ad93bd3268cb85946c10a57824eaf2abe298e3e650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/eo/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/eo/firefox-102.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "472fdb8de55303b14fa55c39503d0874fcc5a51976703abdd88a139fda6fcddb"; + sha256 = "e0b2dca237a4a5512f919927c9b62cab48a62a4aed8a3485124ba81f007f048b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/es-AR/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/es-AR/firefox-102.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f099234d94a654923a0a0dd365bf7ff8f4d878cccf5f1cd8e592c72aeb528247"; + sha256 = "994709b21742292cd6f3d8f34881578b43b7f57661134fbee88f8a12ba68adbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/es-CL/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/es-CL/firefox-102.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "316a667ac49ce5664b6055ef4bd2dd9581ce2517e2fad7351e56d14d942c7c42"; + sha256 = "f074e4ca16f37e5f9654fb91107b3396c4cfe52a707a691e4bc17a1e31e994d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/es-ES/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/es-ES/firefox-102.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "728adea6eba648e2bb12af6062d0ff24b53b77095bc329e9d191b8e77e9c2c1f"; + sha256 = "7619f6e2a6966b23a5da0d202fa01ba299db426b9254d42a22f9a40f6565ff6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/es-MX/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/es-MX/firefox-102.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e9b004f11f5efabd7c940d37b69376fbb5eee11798cf89a26054f63fa44d064b"; + sha256 = "913d768d2d7c983da0aaaef3cc774fb17acf726878de65a97c10cfbb71648e94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/et/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/et/firefox-102.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ea67ddbf2865bea034a985e6c8cba14f4414597a4140525c2f27645a2a9231c9"; + sha256 = "e4c654a9bb423e2aee965ae4c78ebd4527282ce5f6732f461975b46323e43d2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/eu/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/eu/firefox-102.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "25dabe2c47e85b0fba1356a24c67934c533129a2295a429b0d45a5245b86e130"; + sha256 = "335be9e6ddd3a026282b3efd4e9d94f96009794b818506dd1ae934c0a71b13a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/fa/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/fa/firefox-102.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8fd9f27662de06b3611820e2bcfad63a1334abedf1960f9870612c664cc56aca"; + sha256 = "1f9ee2e5d6662023fe1e5e36b4663289e040b0cb736bafe4d0993574b0105628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ff/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ff/firefox-102.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f30f7380e53cf2ee014b2c8256cd8959510a07f7a0b57ec4dbfcdf0fc2d1b77b"; + sha256 = "0dfa9858f637af48365d49979af1d61f2b83c29e93af1ab09f7b0bbee47f6d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/fi/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/fi/firefox-102.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f1a47149f5b104bfc457d7cee285e3886f85742bf52660d11075e94a43b2b8a0"; + sha256 = "3bd60c1d82ccdcee32c5a8281039628b0da80b55520a26661e3e663b0ee6ae5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/fr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/fr/firefox-102.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2ff37caa3fa38da1eade172c4b445e3a1364cf95ab6fdb91730dcab78c16068c"; + sha256 = "91a40ffb51816c74859e99458ad7673e7432f586039effd1087cb6ea549b8833"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/fy-NL/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/fy-NL/firefox-102.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "deea3a15a2ced0bdccc80a0f83a70befd73011d59f00ce833482f6f909e49799"; + sha256 = "b0e4db755b8d145318cf017498d91ce7c7b6c10a9ddaff8b89b9214d93099a20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ga-IE/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ga-IE/firefox-102.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f90208d5995fec5ca2f4de183727b1d1650312e9db4aff10fab21b9ce952bab5"; + sha256 = "1b827951034f7a9b3a8abf6fd8d8cf0bc6cc05747f0bf34d334b06f823d5a2fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/gd/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/gd/firefox-102.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "aa0cf6d529f93400c79f70c8f088938b5ec06a4f50bbcc644354a5d55a7c4d82"; + sha256 = "4f3c924610b71a449a9a06412bec34f5cc24e301ffa67d4ed2b8ca793bdec98f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/gl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/gl/firefox-102.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7572b5870ca24e8f5c5f22966368e72f5bf2209d4bbfe6ffb552b9d38357c32b"; + sha256 = "1f3c5eb9235bf52762d36f65a22a3db1eba899e9cb33855c8dab7c62dca12298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/gn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/gn/firefox-102.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "f8c8682adc0e2f6292a85ecb2a93b9435038a39b38a10a70e363b5319c0e027c"; + sha256 = "1c19bf45cdb749b6c642e92ad9cfc50025043183804cc144fb2b41110e0d8c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/gu-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/gu-IN/firefox-102.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "c782a8f038c19459272322075a996a4635868b87f7e5f5b71f1ef2426bff2f55"; + sha256 = "3180bf019cc52bcf07774969180576cd3df61864dc37bab67ec6ca2927e2f33b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/he/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/he/firefox-102.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c85c83456a0476ae472ad583211a2c21595ba9cc868de6b2f0fd0e638e38e0f4"; + sha256 = "18afc8e49fbb495a88939aa3e39a1405d7cf5924555b5e87c05bd591b0687910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/hi-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hi-IN/firefox-102.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "343cc02d860bb59549f2113e637d8d35bc5514fbc8a9d5c167b68af9f18be218"; + sha256 = "e0625561c65fa65fdc9dec3679cad9ca0d9339a5c566ff1b33d0dcc2724eb1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/hr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hr/firefox-102.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "185c43871cb203bf25975099be162a73e07984873fe36ffce2acc8067f13eb77"; + sha256 = "d733426ddc6e8adad2ac6b0e49c328cba3116164c33ee3bde9d2058164365097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/hsb/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hsb/firefox-102.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3c161e86e08571ae7f3c6049cbd447cba55a81b2c9f8e02cf3993521cca2f865"; + sha256 = "95fe6f146eb82b214e0ae9eb000508dd56ed829854cd6960d7a06782bd3c9f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/hu/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hu/firefox-102.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b254b389f2234858a5991c920c782abc3de42bef9b55f26f672653afd55e77b7"; + sha256 = "dc9b58f809395ce0c9140cd67179bfe844b4ad16c8700ca20cfc9cda4bc82a87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/hy-AM/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hy-AM/firefox-102.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f6a3d683b0b40f75ade047b3097c6ff7a82d32b7528776187c816f02c209693c"; + sha256 = "091a28c4179c5ff321d91249b8fc9ebd9cd791b78577805aba592a6bc34ababd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ia/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ia/firefox-102.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "ca8913e3e1ef29fab4f55d8acca63a3dc4126df89297eba26244b130a9172ed4"; + sha256 = "af6d2e552f581d33b2a9ac847235fa05bc8d31e5b0adfc5b9b2f388c18a943cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/id/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/id/firefox-102.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "87eaa28653f77b8239df3c1b911431fc290e4ec8e604dbc5b0e4a40b0944ec4c"; + sha256 = "7e8bc203cc0de401ca57da1697ff19f1385f1493f05bd0b09bcd1575364b0525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/is/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/is/firefox-102.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0bd3a38a5a9659d0565b829c7491ea8e369eb9fb01bc7c0b991a70a67221663b"; + sha256 = "327c418e89dc0f7a465252186622df20eb32f1f626a643195f5d18c80d985c04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/it/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/it/firefox-102.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "901eb6195e9dba8ba44aea36358d7927b55c6356e21c705a1c6ad3f59a95818c"; + sha256 = "ccb3930cb1daea27adfdcd5060badd6224fade2b336865a66104e95ec7362428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ja/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ja/firefox-102.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1546b415c858ce0ce896154ac9b678dbfaacee18c5bfed3f6ac659f991acb25c"; + sha256 = "e48d5977a1c1e2c251c4a93c749187e5061800f5c2c2834834ab401d68b8daca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ka/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ka/firefox-102.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f3b1f72309cd3839de8c15c57004822ad6f42c239a6f9df986746ef94c8a9c7f"; + sha256 = "dddaf01eee264975209a3f25e4b2d72b7f9a10c41db9ef331043b37c91cf7d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/kab/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/kab/firefox-102.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "43fc789b365928ec9f7bd8c2a5ae0b45b832d562a54147641051061bf2b2ce3b"; + sha256 = "0cb3a0723a0ebe3c90682a2356b994c8c7986a44fa159df7b2a61163fe84f598"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/kk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/kk/firefox-102.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1b3f8ecc8789f013cbd49524b27d4517f8fb2ec00816160123b22db289d64725"; + sha256 = "8ffb34d138f675cb1d4521accd7cb74f7d3aec5f18977fa101e97e9412b0bf06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/km/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/km/firefox-102.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "1a19b71b66ffd534d39860c959ed2c6f3aa96ca2a956dfa01cc1ed2b3a59435f"; + sha256 = "3b1d3d06d8712a8e308b5cebcc92574bed651f284d6e55b52ec96ecc1c1bb4d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/kn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/kn/firefox-102.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d1fb6768e2fabb7dfb6c747484492673d5b651e4da60dba98ee351cc9195cf40"; + sha256 = "6b6eb8d59ba445fb76b310241f05a927cb6e0cf03e018532b61ed5d3a295f1d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ko/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ko/firefox-102.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "dcd8e6b915509b12007e773cfdd23bd2c0cca78a6f83df7db6516bc6653bb1a6"; + sha256 = "cd486e51854aaa070ef2e98c0f97cc83f9336b33cb082cebb5634c9809429dd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/lij/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/lij/firefox-102.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "6c5adb927ea168706ec60b51d2f0876c85ddcf176c3d30a66c7de426e1a21b34"; + sha256 = "42f09292edd9df0337142ce49e3c52352dbeb4fc3c44b7e9dafb38cad5d40bfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/lt/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/lt/firefox-102.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "03404c37d32c8ff3862a50b7faa2eebd1943b89049cf2a3a00063de997a72431"; + sha256 = "f559821d7c372ecff40cf79b36ddd74629a9ad5404f1e39f07fd586618914419"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/lv/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/lv/firefox-102.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "cc7c783e1b96d3b031d0c11217f494231f12e4b818dba5566ebca7dee1a22d72"; + sha256 = "86fbfb43010472f8cca75b64f24493682dbd3a1837131c90ac784ec4400a185c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/mk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/mk/firefox-102.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "51148c255b1bb434423021152770b004bc5df110946ae97cf1353fa3e067957d"; + sha256 = "021576bb2b687e76dc4df1b3b739dc6fb47be1d80fbc28e4cf98e0bd8df537fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/mr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/mr/firefox-102.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "0a8d169ce3275d174c4a93d40ed6b297c5b9556a673da54a0b26b1aaece85fb3"; + sha256 = "7d75029e32f227aabc5580c036a29190b1b7ff1accc945d6c6269225dcf55812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ms/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ms/firefox-102.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c8297bf48a736289b45128949e0c6d6470f635bf7f3667021bbe2d5c69b16c4a"; + sha256 = "3d7eb53c775315e84025e5163b8b1386b9353f2f3371b13d253aa73c7fbe6acd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/my/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/my/firefox-102.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9f6007d047ac53edb7ad896605918204b2c560fe25b5cfa38900b9909e02c1de"; + sha256 = "7bfa3b314c618fcf299ce4907bb54758cc696d50ed2675cb88b0bdeb908627db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/nb-NO/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/nb-NO/firefox-102.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "31b3293b2dfbba19e48a5dc02a8cb71ec7bdb616c0a23d775143b9601ba03b08"; + sha256 = "781e3c9be1f4c3c23f6084d6e8c88d6e6ad569d3eb40433499a4aba7661a425a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ne-NP/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ne-NP/firefox-102.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "790fba7bc871c59bf462011e123a555d278c41ea131c568df4cfd08d8533c037"; + sha256 = "3504c5dea5f6a6ad82fd5075efd63d4ff195839a733917200c782eb113d3a695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/nl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/nl/firefox-102.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "9cbf14615f35b0943648b6004c42ecaf1562e036d3b2f47b832a02ae4a485203"; + sha256 = "5967441d70b936e00a7bf2e89cbbf40d967a28d2eb6affc4c101888b4801e7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/nn-NO/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/nn-NO/firefox-102.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "acd608b3305833014a53c51ace00859fd112fc54eca525fb98fff17f7f34d3ab"; + sha256 = "03f3b86f89d560f71db7429ad9506e10eab9284c16877f0076295e1d01d17ac3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/oc/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/oc/firefox-102.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "dbf3610aa0413b7679ec5440551339684a9cd6b14cb3f04dcb3d64759351072b"; + sha256 = "0512991bbf04f9b23b6d7ebf1dcd6eb121550d616e7fe36d2f20cbdfb9703130"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/pa-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/pa-IN/firefox-102.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "e40eba4bac0d2fb46f61834e77152807812685973a6a9f1ba657b94bab774469"; + sha256 = "1eccf86a9c5cc2d2471c0d92a09ed982e5507a918d36b26eda3862fa7c44b1f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/pl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/pl/firefox-102.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cb6e0e2fe62a2d719ca40ad3a9238eea8671015bf6b96098c5955a679dc21718"; + sha256 = "fe1f71e8281b0b9f27b378926c97b03105167035f727e82512bc8ae22ce00ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/pt-BR/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/pt-BR/firefox-102.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d6802045cd943260b4d270d1e7032d41ecca261d338b6e5eebacf66ba28d6322"; + sha256 = "058b62559effbc6267a027d298fd876d16fab1483bfd13ab846748c7d835dcc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/pt-PT/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/pt-PT/firefox-102.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "63bc9d7b3c0bd4c42416f1f17fa0a19f9e0077a5138acd48031173bcd562ebca"; + sha256 = "f0e6ea6817b630e7217b5cb01818e2e1c8f90f21cb4d44e53c2df47e9005d255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/rm/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/rm/firefox-102.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "78073c1cbaad746f47e499d6c09242a526e68603715fc1e55ce5df4c3c43664e"; + sha256 = "7fcfc37ec448bd4bedd57c2c80c0ccf93eba18c98d148c2a064735c37f596b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ro/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ro/firefox-102.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c0f50f7dc3748f991ff37b6573594b1f3eb304a8a2617261534d596aaf9fa5d2"; + sha256 = "16ada7990282d86567e959afcecc4af834e87b0529908c9438cde9c5423f0ab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ru/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ru/firefox-102.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "66c7933d2beccf62a31ad7ac70b30d7cd4f2d0ddd74fb2a891c552ebf7d01639"; + sha256 = "f8fba469012ca813959d1e18ada6ce5f08ac2149860dff94a6ea3955b43b187e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/sco/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sco/firefox-102.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "99aab380a45efd711f3e5d0a8202bc0aa9b0c924344e39f9e8d09e9fc9076896"; + sha256 = "f1b44b4ad4bdc9c7477e1217f82f38519c69d03197f3c2b4a7745bfd6e21166e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/si/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/si/firefox-102.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "7b64b790d4e33bcd671d3a7b54a1a27fee776f84a2e6db85f499e37a743ba3eb"; + sha256 = "b2674ca44f703c0c87cca9338448010c12e5ee6815fa13bdc7d75b86c78ef50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/sk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sk/firefox-102.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5f1a19fbcd96057b47b8954680b5951ca929b9da940b6c61d632c53b03987c8d"; + sha256 = "1b3c1ed920596bdd9c4563e590a002304ce03b16f83795dcc0e64943029af7a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/sl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sl/firefox-102.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c25a3cd8f931671674387a92c7f066df519193aead18f42acfff4bb3e34dce4c"; + sha256 = "a5d90ae445633614a85be7154b5633b030fced435886efb24abae7d7da273ab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/son/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/son/firefox-102.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7aa9c489b7b685a02b1156cbf659f673a6fbe9771b66faa89924e6b3d46880c7"; + sha256 = "94ab6ebd8a40883050043d0976ef67e27432b4797c699a7b8305169e545276e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/sq/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sq/firefox-102.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8ee95b2aece9bb308550b2523a45735b8d241ff99436baa1a0859b3f8e30c2bc"; + sha256 = "2616ea691b488f9c7eef6397beb074ad90bc15c32f4789a60d6a2a776cd3a6de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/sr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sr/firefox-102.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "793ddbe11e0cca9cd4b8c049c093664ea8c551b100aa195e986a7644b308b91d"; + sha256 = "b09e7265ff516d462da24e059e4420e4b40c96b9d705449fd5474bdacd8f3da6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/sv-SE/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sv-SE/firefox-102.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "f9b650f593dc6830d40c7aac92db1e7d78f5675cef1048331ac431a5c4109113"; + sha256 = "bb47fc71084f21fb59bfbd5f35c86a5b31cdb961345b8cc9885014cd1168686d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/szl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/szl/firefox-102.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "6f63629e32e82e2d7c64ef7882c27b2452561d6b6f78345751dfd3a3e7c669b0"; + sha256 = "264a6f0d1a9e1c5f8862f1632a1ef6aaca9ac7c4e1c58e3704e1fc8f2b920caa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ta/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ta/firefox-102.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "0c4b1886161fd3c6adee625edaa615dd06ba8b9c868aecfe00d530b08a74b637"; + sha256 = "d53616088845bcb779301c265452d75d37081785286c2b923ab149ce7ffc36eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/te/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/te/firefox-102.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "0cd91eeb24cf2ef76bfeb27b12d449158817254a27372f0e55ebcee4d854aa72"; + sha256 = "b9fe7b1f0f7fce1823b71a06043292c160b44bd9d1ea45e7a5a4aee680a02d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/th/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/th/firefox-102.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "65d5c828ed89099d90917b27510871fce6ac82f6ab7e8cc127847cda0746a0f3"; + sha256 = "778c01294759cee55da38a0e94e6bcdc29d61b20064d6c58d4202686ce92ed14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/tl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/tl/firefox-102.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7ca34250aef8cbc80f3e18e623232210a39b7c0b6a2bc14aa16301b4838f19e3"; + sha256 = "da70af424c392a72a15f6084cf3f9fc467f70cadd51b8e2b23a67c840490a163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/tr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/tr/firefox-102.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "754fb7a838bf93962167e647bf7df93e7a5c0b89306356b2803d0273f1b96a5c"; + sha256 = "32c99fd1ea5648cae849e16792875ee6610f80c3a3e16cf8c9fc872ad4ca2568"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/trs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/trs/firefox-102.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "9a2a6303cb55a53e91636090feb419242f4ab9451f40a8b9be4c86a13489a30d"; + sha256 = "dd33de848adbb8d19cd1135ec172b4ebd8e14919f1ad710164b10815f254d3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/uk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/uk/firefox-102.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5ac5d442b54fc53a6ecbfa9cd58c39afb54b679d3191f7610461d1f5879b9c43"; + sha256 = "20d3f58d75ca72c7bab2537a49777b5054444673320c5fc226665129077d68d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/ur/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ur/firefox-102.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "48f2cb5fa1cc6c2e1c8976a4471d21dbf98a3afeaa3a2f9b076a8a8cd4a95173"; + sha256 = "97441900226e7496f8be02f6845a795d7a219971ba91b0bd2e01ac740a41b143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/uz/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/uz/firefox-102.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "def78f252455fc9ae075759dc7f078df3300bea26bc729ba66689cb3c93b9b86"; + sha256 = "79b3704259a848b01e2d09e3ec6691162ddb9c938e950c5fd88cba3b0ebbe165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/vi/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/vi/firefox-102.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "2a32efcd688ac5484687a1bd4c9f15e4c3dc28dd923bf094c38081a1c4a794b3"; + sha256 = "df0767cb2a81e66e8e74db143d7f2b783dc87b7cca5245a5dbd8bfb3da168913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/xh/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/xh/firefox-102.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1fd1a8bdfa554fdf9e9aeb4b9d99f84acddc90aabe5ba516adc6fa497f55db01"; + sha256 = "c9b1525d1c74c8f22066ce92ed3020a311acb13daf481bc1b063ccb24d5d04f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/zh-CN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/zh-CN/firefox-102.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "af70a09341b9b9766d41dabfaa560f1b7db2964c1eb06aaa89cd89bc2a412134"; + sha256 = "d0fe983910d03407eb1b66ce22b98a916c3f8f37a66903ea9852a45219444ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-x86_64/zh-TW/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/zh-TW/firefox-102.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8e3c08489faada8281afe0dd48381843a987779bdb3e95749268fc30a195a2c2"; + sha256 = "251a6746ed303b4aedc70c06609ebd5677abcbb7bc78f6124b86cb7d601827f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ach/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ach/firefox-102.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "2341d71374b8859eb3c75494dc56a200e9fe521de6d2ecfdbd5752a2dd51a3b7"; + sha256 = "1db3027a0ff4f97a9f3b89e74c0cd064a6e286650107e3c679637e5a3d8bcf9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/af/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/af/firefox-102.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "fa1874c00747fea84026057937a40c0254219c0be767e7704bc5c6809174717c"; + sha256 = "9b30388af217863bfdfe515fbdc4e8f75fd10d42df0f1e792718e2866277d3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/an/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/an/firefox-102.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "aec0241d98ca3c9a7b01bbd78b747af64b1b6bcda83728f4a15931b2ee9d6577"; + sha256 = "6039792ade1504227eeaab031419a21f059fb8e86c29a92210c92afbae228b0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ar/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ar/firefox-102.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9d739a0595c6c114c0d20a9d74c0b0b19ddba77b78d34abaae340fbdbf1a7c17"; + sha256 = "96fd651782739e9d6b0801637546d0c081bc3180f1c893594364992d88e8d351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ast/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ast/firefox-102.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "10ff7239d7c574386a33a0be0145e5cbf0db893a7e46a4a0e04e09fe08961dee"; + sha256 = "a781ac01567448a3f333d71ccc925db988f894d8324e186ed9b45a51a846ba8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/az/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/az/firefox-102.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "323a1808075d2f9cd51a8d8f6be06211f1093c8d1ec63c4515bc2c03904e7923"; + sha256 = "64b5ff9a72fca91631a0de0197945fc29b6a0816b24ec803b896ace5908439a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/be/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/be/firefox-102.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ad6796736e7a07d0892b30a2dbb537a3329d3e968929261dfb814a4786ab95c2"; + sha256 = "0d6fbb02a1b3c08c4856e1768fc3244903822b641164f2e56f19cd8fd062c258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/bg/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/bg/firefox-102.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "18ffe90d491bfbfa98128c3ba0067d6770d444e349e268293acb30eb26597c0c"; + sha256 = "4da9b4d4333a68d166ee93e26aedddf2f07e7cd8bcfd6456515b453693264ae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/bn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/bn/firefox-102.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "555a9503aaab6cb7c6aca368063937f3076179d7b72e55cdde92ff68a6bf3125"; + sha256 = "3bd664b4778e2ec305ea20e4d5c35b5251dfc874ae3387c00af1f7746835c406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/br/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/br/firefox-102.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "e5b65fc5624c89c4e9210da90b1c7a89e76b7592c6bb0a726507e0edd4febb1d"; + sha256 = "5b344af3df5c8826f89c7ce0b1884bab6110d39c4436ed1b309cc61266d4a6c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/bs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/bs/firefox-102.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "4ee1dbccc10336aafa9218b5768904b823ec951690539df0316b3c85a014302b"; + sha256 = "ab071cc62f7e27b1a0c10ba2871dd0cc7049ab17e03a1cd3344ab49c9f523bfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ca-valencia/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ca-valencia/firefox-102.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "6a842b5ff4537ca51c96dde356da8000d0cf44f832889ef14c51da55b4d8dc14"; + sha256 = "b716bfee87a44a33724391da559c923398dfd27c6198f9ee8b5ce1ce02722802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ca/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ca/firefox-102.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5382dfc6913e69c6778534b19f59e2846bbf21facd92129238f51f01e162830c"; + sha256 = "41ebb594e850fd0001367a35e17b8d3cfa9a6fa4946d092f218b577d2632a1eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/cak/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/cak/firefox-102.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2758f30ed49f1a936d4f7bbb6dd7c5dd579515e7476535946f32dc9c0c82a054"; + sha256 = "84b169887334029d52599b3cd3295b342d156ee300f7b2a6c9f25db23ac54d6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/cs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/cs/firefox-102.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bfa22b10ad0ab4bffb01172e2bf04c35a0e90ad960a30d48ab42270aa15d1a90"; + sha256 = "07feeb58f2ffe2fc85996e9c161dd93b98897688a0b0418d5a3f28440d572c85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/cy/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/cy/firefox-102.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a89bfcae1941d7dc5a032ca2aefe378f40cda73c8e8d41461f707fa07feb71ff"; + sha256 = "15ec7072d94f5f1a37e97ff8db6cde0354157ddb7ebd9a717f7445904dd69e2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/da/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/da/firefox-102.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d77554be4873cece00669d97195440d648022b9f278bfa1732cf8626ea0b4e5b"; + sha256 = "c3c7f7003650f89de1a1c0dd52c0b69a926591073bd1d308611a2bcfce204101"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/de/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/de/firefox-102.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "cf62aacf9e57fa0392391ebae982a31e90dfec65fdab21f52f38ccb00e5ade17"; + sha256 = "041f366f76d58e7175e64716fe7b458bd93a9e9bcad8645d241e081871146dcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/dsb/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/dsb/firefox-102.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "59a9522f26b26aed47d2bd6fbcd5fe3e9c9b1089571bfd2a0e07811e0998eba8"; + sha256 = "99ce4792744e32660c379b4ddaed8b8df28b62525a735144707fbafe5bf019ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/el/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/el/firefox-102.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "054d5eae5b1374c8298afc24f34082f7125d467cb5158f9d1b83c7a1fba51ca0"; + sha256 = "c7a866979dfcb5a67cb7ed1bf991e37f3269fea6e61f46f9fbabf6e6528d1b94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/en-CA/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/en-CA/firefox-102.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "5517dd83c75e1ed94c776c26d86c0f1d96834e722f734bdc6849b367a4437327"; + sha256 = "06a69fe2d4ceb9137c1fb998b9d227493dbc28503d5122bce87b30d75799b5e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/en-GB/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/en-GB/firefox-102.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "43418924b152c85efa7b870e743b7e0e3604bad290c146d2b021e4f932c6e798"; + sha256 = "cb532e0e1378002018062dd843986de1dc053ee25d06d1d403565143a940c75a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/en-US/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/en-US/firefox-102.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "65a2906b98807e0a5fa7baf4e4d1c4f6f91e9f869d1d713ec120e30b3ce92df3"; + sha256 = "e0d50401fb8d7c77fcfb68d331b821960aca8d7f07f459a51f563e942242da59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/eo/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/eo/firefox-102.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c879fc9e45a8ce6334c57fea38a1878e200c5725c1bdce4e6de454508c28a9a6"; + sha256 = "04109864aab5ea2232bc10cee64662d3dd0b2ea2ea92fbafc883862dcee76e59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/es-AR/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/es-AR/firefox-102.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b1882a26a9eca96c0b78c9afd214afb3c20d5b1f232065bb73aadf949d533982"; + sha256 = "0da754812b2d4c92634b2c384b6c78f5380de7257f7627c8c76866cfaca0c7d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/es-CL/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/es-CL/firefox-102.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "085608b8ab5443c627ebda0d8df7ff37b512a6aa317f9ddb791c5526232db12c"; + sha256 = "c7479a639501d6a81bfb1e40f1484abb1409c51e38476d2831152216ff9227fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/es-ES/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/es-ES/firefox-102.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "fc754e339dc0341e8a4c014dff510721559869fc2c8aa3d8c0e54232a10669af"; + sha256 = "73443686ac2d94b13dc1b2fdd05cd96859e96fb6b38a7cfdda492c1907515538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/es-MX/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/es-MX/firefox-102.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "28a2a3fa7867205adb118b83241d1c2dcad7be7639ecc488fa87035e6420ccf4"; + sha256 = "3020e0bd33e2abf4f0fce26da38f242963bee96d86c36501b2364dbd84ef4d79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/et/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/et/firefox-102.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c5a1d9d3eeb4275694617a86138016c0512601b3a2be076089844129283964c9"; + sha256 = "e1f217785f1a9405d58d508eec2c7a612453b53813a98876d6196fdedc1ce3d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/eu/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/eu/firefox-102.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3a7bd404dc71dd70d6133022283aefac934e87f2a4f5edbd365af4420b347bc8"; + sha256 = "c7de81417b64e86af18fd299b94b6867595b6c3f46408157174ed5322714598e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/fa/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/fa/firefox-102.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "adaef725b8a555556292a01cc79945a8b1981c57a6663c18261c161e2961232b"; + sha256 = "1ea5df0a4b1fd236f4f0c0172675e592382de040097a04eaaf0ea453766567f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ff/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ff/firefox-102.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9d66e8567195df41dd25ae552f3800faeee9acb38be8f745402b3530cd2a6d21"; + sha256 = "2128882e8be4a953e126665d253e4b0274b1e03652fd7cd77985633f0f7cbc5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/fi/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/fi/firefox-102.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d64e78e535bdcf02102a9608fe6ac9d55963cfa682cb13832f4d8bf0df28b4c1"; + sha256 = "24b768c57724729e6b4ecb10c7726c36ef639164127cf376292be1783753d484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/fr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/fr/firefox-102.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1fbf1d49cbcd8f2e3f883f82d6f755da654f7f97b571d84140f8433c39325900"; + sha256 = "c8a6252244b64f69942877cf7e5b3526ba5ce4c103a6c322b55e9d40037466a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/fy-NL/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/fy-NL/firefox-102.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c5ff61b1e1a085cabff4f6a4a8b7f39f151f0bb78dcddd8a673b50c8986cb82f"; + sha256 = "6f84d63e032821cfaf578a212e030089bf67e90be80b16796e0f1031ac3fc566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ga-IE/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ga-IE/firefox-102.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "268d2467317b9b626bdf275ad97d066882a229f866b52fcf5a19d17fb0e747e4"; + sha256 = "fec3e01ca2e76dd9b12c2c22829a8b93bcfc7735c86ba190c674f5865b626d65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/gd/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/gd/firefox-102.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "982c2d1cfeb71792eb3a46e2382f967df373ddb5abda16fb0c6137fd337fdf57"; + sha256 = "c2bd3adcc77b91f0cbf5abd38a55c45a5aab5a26aacbef0f09e1996a98628c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/gl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/gl/firefox-102.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "f622030a837dc78ced46adabde1b5af2ab5925fa208b9f1fa5bd44844410b85e"; + sha256 = "e715815b246ce479417d70913fc2da97f4926bd9156666ad854fc1fbb8c95eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/gn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/gn/firefox-102.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "bc151f4b0632614bc42fa0b3be28e0750fcb8b593805c5c2b3471fefc92c424d"; + sha256 = "1ff47e0900f8cad068f7fc5fcea60a6434b8a2d7cadf0185f918ac9abfc8fcfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/gu-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/gu-IN/firefox-102.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "fbbf415fee3292a26ebec8ca2998a3c5dee78794082af0c37c2a89911286f9ce"; + sha256 = "25257bb9b09c5d027afe6e93882df02c6f599a2f1acdbc030b1fe1879f01c64b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/he/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/he/firefox-102.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f0d6666370769f995049b9374a7ccb3411c278ffbc0852414b523d7a6d76d327"; + sha256 = "94a7beb1a8a8869e4b14f1384cc04b46bb430ab74ca37f40097c80b150523a9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/hi-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hi-IN/firefox-102.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fc6f9e8d51f081ee80e1f0d23cdc6588e524501fa848e31155d3fbc203404370"; + sha256 = "d35191506fd802eef87d3869805735845c28c4f8ba733f52ce7cd4d140f5fd25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/hr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hr/firefox-102.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "998dab22f5f8bd1ead669a9f4b023d78017ab42a155e31f0cc303ab9ab575739"; + sha256 = "06f180b0d86561c6bb7a7f9d678b93899b9ae804d09ebeb26c9359831411762f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/hsb/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hsb/firefox-102.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "0ecb7490da9b5585214864988ee435165e1edc20ddbe9da0a8d2e92b573188e8"; + sha256 = "fa3ed226e5d4e27362610db29b4413a489e0bb7b8f7a89d9cbe964208102c6b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/hu/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hu/firefox-102.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "06583503232b0b7b73f028410f741b3566d2d184100c3479bd03fb409da4c132"; + sha256 = "447790e0d2690fc7ad3d53bd766c39d9a3c8278bccb84260f9c1ddbe7ae927ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/hy-AM/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hy-AM/firefox-102.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "3c9b2ad5dfd3c61b868449f901ff58944a619a119e37f0d987c7fcd66f3b2514"; + sha256 = "2d0f5ed9ad68a64aab70ad01977dd1df0cb2e24e30df04e1bcd4f182f473acc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ia/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ia/firefox-102.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "cc0be3022aa6ee824b3ee6cdf5a9517bc9205aa237e3559f0c933789aec0dfe7"; + sha256 = "f4bf4b85cea6aa58a91fc5d9037f9ec5d2a751bd8dd933de4a392c0ef35f2800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/id/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/id/firefox-102.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "aac16ad0d7e1972d087bad5bcc2669e2a293e5599ef49501452a9757b59bb931"; + sha256 = "4090c7d35be06e5293e8c35610e4cb691f4f86c61f92975524f88ee4ec801156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/is/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/is/firefox-102.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "98c58a4b6a1f78ae875c88bc56043341c8c2e6c55c504111e7dc69b180d75c59"; + sha256 = "cb2fbc27dd4f09ab81a2835bb4acc7da4b40fc5eb60e5125c6b03cf871c096ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/it/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/it/firefox-102.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a18c972f87d00838d845d26afd98f1552d997e35a2f21caf5baa123e8b378be5"; + sha256 = "53de3aeff13e8d55d5924d9393b1051f03889c1974849a82b445c9fe9596336e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ja/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ja/firefox-102.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8bde7abe3175f378605cdbbe642b9f22c0da6a8b527297c44017e50a154eacd2"; + sha256 = "b5201b5993681717e33e2fcf4354b546616e84a3fb6db6fba04cebbfcfa7bf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ka/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ka/firefox-102.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "0c48bb947c061665973f9174a6654ab7c84947c00d0e1dcba30a55355c9d802f"; + sha256 = "12da40b40ba63f7b0747e52b336df59f4a9d408b1a492280e98c667f69240efd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/kab/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/kab/firefox-102.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e0a1bfab26d0e5a85643196e611fc0d36292b8921480eed197a0ec81f3fb781f"; + sha256 = "b3f48792ed72a61b84e27003e8d662914feb6e2270e0c1b3c5d2ad9ea4127f44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/kk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/kk/firefox-102.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3ab50e337956a85f3eed1efbfa1aceb352c01af35b9b6eab8e9802a7e968a27a"; + sha256 = "bdd6d181f6f758e5b9bb0e121ea952538954346e9628c579fd520de574eb863f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/km/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/km/firefox-102.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b3fe2a4ac6efb397d40914c99eafb21cbcb7f5c0eb01865a1584eac2a701683e"; + sha256 = "d50f19153543fa39a50aebda529e900a0c4cf21ce7eae4493080ed82b50b879b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/kn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/kn/firefox-102.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "82851a784b06360af3703076a4bafe0332920db5d30a3e77e511aab16dee4304"; + sha256 = "f8ec8484acbb3160bb45c9690e411d48a84c7d02a61f20a3c8a37aadb71e5b93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ko/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ko/firefox-102.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "be15acf337f72f52a5536efd10956ee7a212d0148c4a2eb305932032e1966cf0"; + sha256 = "6bbd43408079b08a26217a198ee0493607573da97a056aad7f6a45d38242b59e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/lij/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/lij/firefox-102.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "ec94ff3d26a6de292bac97af985f966c2c1864c05ac3050491f5a1e19859cf3d"; + sha256 = "23dbff1ae5de2282280ba3e789b51c235302e131d4f8dce8bd189363b58f76c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/lt/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/lt/firefox-102.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "cb6139fb6bc1f393832b78fedaf43e1c86b2fc704221f1fba4dcbb9e70e04ab5"; + sha256 = "12def4de968be402f5b510472924e47129a35b48c0a18ff8ff6b93ba26533201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/lv/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/lv/firefox-102.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "994a7e0e7b425f41024a4aee7603c4c241ff6e89f27c1c7d92907df9c054744d"; + sha256 = "9b334e85fe418403370dbe157ca5a701dc8609a5e44dbfd7fb56d0758a45825e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/mk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/mk/firefox-102.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8aa4f6d76f7187713fd34482d280a94115abdc24a566ec0a1d05d09972fe680a"; + sha256 = "9e120cbbd6a3011b84925656abb779383a24f0166c4e388b29b6ca48ac59eb06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/mr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/mr/firefox-102.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "43ddf0bff2404b97fe87c8fa66362a653ddc69475e272cfbb5766c9294e930d8"; + sha256 = "dd07b03bb19d23ce8f6511a119975413c6301cf472e481f756dfd3a70a37ca44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ms/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ms/firefox-102.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f9e79a74fb263b27c3360a1e51e94fe9c554a02fc039f707a4ec861b779a6b2c"; + sha256 = "b45e50a06ca6f848765a3d11de32fb1271a4dc04f1973d638289e9bfd8234d68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/my/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/my/firefox-102.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "516308b634800aed937c47723039e11700a39b81be661a1072fd19303d880aaa"; + sha256 = "1fd25682cb4357b494e53dcdf4778ceb61efda4fa164e32f6a35d3d4195a028d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/nb-NO/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/nb-NO/firefox-102.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "3003668aed8415cbc7a3f27c2a08a7cf13b7093d74c0d0a1134c368f48c3dc9a"; + sha256 = "7b51ee57818c032a4b0e40a6138f51c249639d6f33ee7ac5ec02653b7b9b1b50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ne-NP/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ne-NP/firefox-102.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "07d23009316018189a0d25f5d42bbb5e6d4fdd353f7e83f0310d5a0fdba9a6ea"; + sha256 = "4a27e82e5b9e6058cdf135d13712f9d72a521e6360fee3dc59bbd5d929c79ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/nl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/nl/firefox-102.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8f6eba3559269aaa6c96cda529cb20284d19c50db4f663c5f2386e3af711353d"; + sha256 = "cb25d590024b8ed1eeeba4a3f5272d4f7446fcf948adb307b3650f4abdfc5832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/nn-NO/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/nn-NO/firefox-102.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e0a3920c73b5b9ca5d67faeb0df7e52155ff76a196e24c6539face7b16f3687f"; + sha256 = "5282a779407c72df80600f77de7e2da94d5fc38f233feae27dd23d7688ee5509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/oc/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/oc/firefox-102.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "13d2aa642d28cd3be64d13f9ba15eed52779906a780ad288863bb17f651809dd"; + sha256 = "9dafe1b6c3e2525e8f2280de325fecbcc82d691b94d3173819dcd7c32cd91174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/pa-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/pa-IN/firefox-102.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f1b3719e423828eed2bb6d5fc4e0d2a1b1c9f491cc511cb799b742ea2c1e0fd1"; + sha256 = "93964e2a205cc6483ce789747351d1c4f5bee7901c49094bf53ea80d554fdc0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/pl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/pl/firefox-102.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f33a9e8473786d0edd9436e59320f015992e5ffc2c14a94f3e975af94b6e4b7d"; + sha256 = "646f5e7dab305ce63a40a35ffcfe7b96d115d3d5a575279c4979db4d88c42e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/pt-BR/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/pt-BR/firefox-102.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6ce5d183b5559351fb03f8cfbfee1c3f7633c316acad0c3ecd1384195df66653"; + sha256 = "1c3fa6f027aee4f68ea2945aee20769717b7008184e06b577bafe82dddcf4daf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/pt-PT/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/pt-PT/firefox-102.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0c2a4dc6e857d852c6bcb2377815709bba08486fb1d0049eb35009fa0747bf1e"; + sha256 = "9df2f65cd2865558da6d6b55fe99302b6e9cc6ecce4972770b573f1bc48fe118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/rm/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/rm/firefox-102.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "b69f2aaf1570551ad54f917cdfc1211bc5d69d272424de5f5f5cf345ce70f542"; + sha256 = "da5524b9f08b675f28ff5eeaff2e2b5428795d3e793ee4f5f12e08482b59ff52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ro/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ro/firefox-102.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c513e2f949089afa5ce25cb8ac28cf10700c94ec7af6430b75ca954685c2bc27"; + sha256 = "cc0033b02c4fa831076fffe2c04fff40affaaaecbd626be2f40421fcd0281ab7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ru/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ru/firefox-102.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "7fe916f0299a0fdc8a7199066996f593ad364d4c4defd7e022fd22b5291d6506"; + sha256 = "646d11a5b02182ffb6986003503682c623491393eb4aafb8eee5ffed8e4ed552"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/sco/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sco/firefox-102.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2737424b3e5d170b368731842b6e3f7582e8f151bfbaafd741d594d4a59805af"; + sha256 = "69035477633b94fc85b7dac6206cc3f03e505b9d04fd508aca0b89e628a30588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/si/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/si/firefox-102.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "18e6cd6c5bbc22108df818c294764dd4f5ce9181206faed40508b223803f75d1"; + sha256 = "bce7537aea70a67adcc47fd5b5e459b6ea64d91e23ac80f331d653792b723fa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/sk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sk/firefox-102.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "f15cb6651f34728e419d3db98d206220cb098c5156b64024ff27c9dd1a4cdac4"; + sha256 = "a29f75cd874ea82f958261995c97bcba1f4e141f90c660060a51a279d43429ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/sl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sl/firefox-102.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5262f936643a798c42c9ea4e7d9929f9989b9d0e1407690369ab7efa0def8d42"; + sha256 = "dabe09a1c7e72c06aa3aed1dcc1ef1d1861fd957d8a9bda7251725186afac730"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/son/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/son/firefox-102.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "dba232f97f7281d7db69d9af1cc7e00477ac3307b4c1c1e38b736b49738dd5b4"; + sha256 = "8250f9a3563f8ec1d020530361f5dbd936210cdd3b90842d54d76a022ee2666a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/sq/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sq/firefox-102.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7feecfc1ad5c93dd9f1a16a34d6bdf1f82a2edf11036d358782a7b2df8c95cc1"; + sha256 = "36c1782d325e9dcfb5361c1353b225f4524dbd32b11809468338d30c2f4a349a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/sr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sr/firefox-102.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "447b1722eccc890b187f343dbca7ac54aea9d990d28a3fa521b481f39c27c145"; + sha256 = "d74ae16920ce78661c89b7c34470585dc417ad59e6554f8f1cecf519a9268f20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/sv-SE/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sv-SE/firefox-102.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "afc8450e122ccd3556d7cb8141e37e6d64e4298846b9f901704d53fb21bc2ed4"; + sha256 = "fbb041c3d4200620fffea26a1aeb48bb1b50cf06135b99359828ef56d1e37ad3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/szl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/szl/firefox-102.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "32e8e492fa65c19d413b154b67b1c16c01abd8f533226ffc0cc8e457bc11667b"; + sha256 = "3ddf5abafd04a01e2d33d991738e238d95248d855bac108c5b2a9878e5e2e85d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ta/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ta/firefox-102.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1fce4f6137f83861636405651c6dbb3cd65efa2b21d2c897f5518906e285a768"; + sha256 = "59c2139dee10b8b2f21d27758dac079b4284a6ae8f45f697258bcb9f8592a3c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/te/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/te/firefox-102.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "4d0468b9131cdbf27747165731d3155af2d9dee306c3091832b75d9d4ef486cf"; + sha256 = "e0ea6b586cdc2d9d033433e67c2c93ccbdf9306dc66f053839f41b513df8b73b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/th/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/th/firefox-102.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e2961e8403dee552e4229560f94880739b929b586935728aef470d432a327c1a"; + sha256 = "f8f878a7a3b9267e03072108830abfda957b477a942149374bc4a83d8f62180b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/tl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/tl/firefox-102.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "1fca14fd54605caa8cbdef36a30cb6f86e9814e420d6ca6f181930621cbce0b3"; + sha256 = "e569c469ac3c2b8e021fd5d0d9858007c41254c78cc66c82e3b9f3aaeb6de8a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/tr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/tr/firefox-102.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d3aca0838f9cad9d89a64a1931c3eed797e18dc92d2a55c7492a0915a2c225bb"; + sha256 = "595750b491505178c43eb54e0855f0a0a7b9505d12b4b4021f36718463a8f978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/trs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/trs/firefox-102.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d9a12fa029eacae9f8da979123d45aad8b5bfa266c242522b7afa63a060ab337"; + sha256 = "0b44f31f42b4951169c90263204e80ac74156575af838d1082356733f6a1dd31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/uk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/uk/firefox-102.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c15733c5a391ca5248626fff6eab633ae556d828f10395633ede013bc066a6a3"; + sha256 = "c0309af70b5a663d1791fe66523b50e888c69e5503ef0e994efbac4a8176bfe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/ur/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ur/firefox-102.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e30a0d3dab7355a3f96aaa7a648fab419cb8f92d9cc119d6b3d4b70e7ae7d179"; + sha256 = "1484e464b336d7f00b200fb434f01743ac97453ebe1465fc46bb9a244c6fdfe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/uz/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/uz/firefox-102.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c4cda21f12e63e51b2a58229a5102c4747706296ddd2df64c1e5682c2e3a1674"; + sha256 = "70ed74140744b996aeb28028fb249d8930821319887a391d22393a53edf61793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/vi/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/vi/firefox-102.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4886b762811649fe9c0ee970e48cd7fb58c9e9afa8ce24f8b071b74232be93c1"; + sha256 = "b3cb678b053c6d922f8e0ccd3f84c6ccd06186fef707e35c949cdef5904eca38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/xh/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/xh/firefox-102.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "95f75a06bf14c603d41728892fe7cd942f36083134469125c64e3c4a61e5fbd8"; + sha256 = "2a98c11a8cf701fa768ab950fc1d8b7df60ed7a7e973596342339745a5fc8ea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/zh-CN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/zh-CN/firefox-102.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "86990983cb6143b8da7a88291964cd89d232d64b8b808c7e3e9dd41817b59460"; + sha256 = "6e7daad9047854f5b7a454d11e52641e35b25c3284fa5e4d89187b9c1714992b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/101.0b9/linux-i686/zh-TW/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/zh-TW/firefox-102.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a855bead500cdfbd85386f63a98fcf7f13c7f457291d1b913c5b2083dcff2759"; + sha256 = "00846889533b8c072df2b34a04689de826ac3cdf9e78e5d401ae46095dc10417"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index a71cb84a05c36..5d221a9c70c2e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -199,13 +199,14 @@ stdenv.mkDerivation { inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" - then "http://archive.mozilla.org/pub/devedition/releases/" - else "http://archive.mozilla.org/pub/firefox/releases/"; + then "https://archive.mozilla.org/pub/devedition/releases/" + else "https://archive.mozilla.org/pub/firefox/releases/"; }; meta = with lib; { description = "Mozilla Firefox, free web browser (binary package)"; - homepage = "http://www.mozilla.org/firefox/"; + homepage = "https://www.mozilla.org/firefox/"; license = licenses.mpl20; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = builtins.attrNames mozillaPlatforms; hydraPlatforms = []; maintainers = with maintainers; [ taku0 lovesegfault ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 37c8751d4a022..30db6ce57638c 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 = "101.0b9"; + version = "102.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ach/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ach/firefox-102.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "51b1754ae3d864c9f535938163287a4b40e9274493b5740119a2ee8e29860aa8"; + sha256 = "1a5e41a1a972a03fb693d9ab93822697292255c9b1bdfe48691ee2e8f3ac69d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/af/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/af/firefox-102.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e29565c3caab8f9f16a07059bccacb6d64cd656e69f2ef14e3b7380e358427c4"; + sha256 = "d6a0a64bae306060a45f498d41157f79a6d89c36ca0e6ec67e9aed364fafb073"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/an/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/an/firefox-102.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6acfa2c566be141ed7372d55654c1be2346a4cbb84fbf36eb9b21d3727d728e0"; + sha256 = "b86a4a25517d1035be526313449545e5f3388a4c7a6018c067ff485fbc2872c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ar/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ar/firefox-102.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b249ceea6a6ad19505d243c9e018cb8c21d35b949c1b01b04c75fce4b874f5f3"; + sha256 = "79859079210cbf3764a2fa6589e322931cdc654e41658e4d6160524b785bbdfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ast/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ast/firefox-102.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "da027d237755963910a8d361c27213cf3cca1c9211d0c58b9a4c46a4fd0b29a5"; + sha256 = "ab6a10d2aaae6668f8b30a1987afc41aba9c01948c478357b0da3290a7d56243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/az/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/az/firefox-102.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "7bda9277819b76215c0e938042d6e5398aab3d22ec5e4cff1746436ddb097139"; + sha256 = "8dd7274d51d8625734d1ae9803124d86bcdfb0bdbf82b33819d1079d4b9f3508"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/be/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/be/firefox-102.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "3d9cddaa1b83001014f7c0021eb48d66331b5bee91bfbad6eded5072248c4505"; + sha256 = "6998f76cac59ca479e34131fbe9dc47ebce99823831896df98a721cc724be8a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/bg/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/bg/firefox-102.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "8c6cd54c990c289cb77e1b1eea59f1ce37331d374f2ef19360075fdd21ea3a04"; + sha256 = "3087a15600bf4d88a10741d3ecba4fa8e5ced23e858ee797a7a0243bd9c012b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/bn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/bn/firefox-102.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "53d52004c3307582e1ae1607363a6c92e8ecd1910a61211d3721ddb7126db0d4"; + sha256 = "b7a7a7f7ed2d9faf3714504b1146f87ce55a6370d56378de018d16d0ec73d29f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/br/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/br/firefox-102.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "80a9e8a8bc216c931880320cc19f854965accd27e49a44a38f1fa5101899def8"; + sha256 = "7cfa14ee570dff3beb8691683079f2dc7e193117153036a93e6f8998004f996a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/bs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/bs/firefox-102.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "beb82789240aa1b560ac3480536335d50697ee06307a69c5ff9b2daf224b849d"; + sha256 = "0d2a837dec23c4f232c16137e82bcfc0b1c194c0bda4727930f4d06d936e861f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ca-valencia/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ca-valencia/firefox-102.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9d10b6ce6dfbf123389210d7ed61b2929b7b4721d99f3cf653003ea5e13f40a2"; + sha256 = "0fc5a60806a91760ec8e2c4708001260d6da89d7c47a6c8737c03338879cba48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ca/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ca/firefox-102.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ea34e445d4e59e3df3df71af13b40e659a53208c540090d8580662209d2d6685"; + sha256 = "b84e85ec868289f3733fd522e9ffeb14d2a829e14925a5b2951ade216b04123f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/cak/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/cak/firefox-102.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ad350d6511f8ef95c9487aa9899e33e99fefd9e3ed99530701bb7ef4c0b27a15"; + sha256 = "f3c9f9a3bc4d9b2257c4b57a9705b4d42f40001a7dfbd55e72648f478c6fd48d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/cs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/cs/firefox-102.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0cf08cbbdc86d7f6762fd734b44bb66ef27a7d9ec98bb7f9c0b770dd16e9493b"; + sha256 = "789fe9999e6449ce02a925ed4a1b99c5ab11fbfe1e6cfa540edd01a68cea6a4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/cy/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/cy/firefox-102.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c5c6047e3345af863d05d929ac98b6f4f7e4dc04a949d3f942010009da45228f"; + sha256 = "8b7e6c0880c01ba5bbef05d6a569a1a5eea4489807ea2ce777206f311436a7af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/da/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/da/firefox-102.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3f4f43a2eec19c2523c4adfc02ec10bd10687a7613c3482107f6ad8be1be1a06"; + sha256 = "ca83b1561a9fdc50a9608ab00d3ab653b4619be38a205ee4038fa3ebc4a9f5e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/de/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/de/firefox-102.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b490052b41cbd11c48e1c4e61263cc7200996e4cad3a6302c36986f14d6e7e7e"; + sha256 = "eb17a15586dec4ad7e8a22ab09e64f70e455a4f99a10730244d2617f30aa1985"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/dsb/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/dsb/firefox-102.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2fd7e45b4af689addcb1434f5c0e00703b54e2e35ed7ce266d948ed4a3439cca"; + sha256 = "77cf1e4b4ddf15a379360bfe51d35cee72fe63da3e9083631e3d1be8fb9dbe6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/el/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/el/firefox-102.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "656f3d9feb45b1925d38eac50bb15be1c5af266431a19343f57c485a845112d0"; + sha256 = "0ae67c082eb32aa868b5c499fc2310a13342c0484899ccf0163a3ac678c46d50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/en-CA/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/en-CA/firefox-102.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3e2d42955700bebe09f2db19f96475b6d257ac007a10ca22dbcd8e2bf7a8ba80"; + sha256 = "c7a1d3ebbd41f900cc03252fea79e2c455b03a1dd97b5ca9ee6ebc2ef2fec028"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/en-GB/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/en-GB/firefox-102.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "1283522310cf6b80d31f9877f27b2129fba243f0bcc5363de259d42d836ea515"; + sha256 = "308e6fb5df7a3d0ae5926fccf656f5d3e43e3cf87c3dc4080f48e945922b92c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/en-US/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/en-US/firefox-102.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f63b448c20fe3acb759e635cfffb91263a30c60262273f0f096bad4714197e86"; + sha256 = "ffb6f51c96b3cac58f57b62d03820d77a25eabb886dfdd43af9fda4e2f4d7812"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/eo/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/eo/firefox-102.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "faf800699f24cee014b9557b5277d18f162eede9e9cf9909dfcdc2d1e81457ca"; + sha256 = "42a744c58486da5d1bf2962dc39e01d671eea7a78fb84de4a87d6a91fa1c5c50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/es-AR/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/es-AR/firefox-102.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "16c90172eaef02ede80768af15a224d1d5eb152d814767ce5dddcf3b356c4eb8"; + sha256 = "4b1964daa9cedaaf070804ac22c2b62e68564a5b7ffc7c68a959eab165fac33d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/es-CL/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/es-CL/firefox-102.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8c09f45e8e2d1f312af0db99b906c5ca4a7559ec5f752d574b4c2bf5065064d8"; + sha256 = "43ff5d8079a2878c67ddc24d266f1541ae4a2b050a6631cbd7a10ebb736a095f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/es-ES/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/es-ES/firefox-102.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "d6186d9e5f6092e2d838bafb63b07cf2e149a7d7b08e81c7c60e189dbfac3bb4"; + sha256 = "68a32bbec42be6f6c4dac5745da961074b30b22aa6cf4e7f0fc1886d834fcd16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/es-MX/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/es-MX/firefox-102.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "04e29557a075140f8eb29c26bd5b0dc950c1451ce7cc4f3877ad2a68432f2199"; + sha256 = "4f1e09f82fa4c2e1adc5c671543c2f0a2c59fa589bff6f50395c14681be9213b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/et/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/et/firefox-102.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e4094095142e0e620abf7874bf2744594aad4e7a4ead4b21b2670973260267bb"; + sha256 = "22a79259b5d520c6a02e7b2d8c4fdffa8b44a57ba89fe6c805bc77e5c388f6e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/eu/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/eu/firefox-102.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "37bc71769f33b3878c26cd3401c285ac5378bae1c9ca96ebc59b0c74b62646f9"; + sha256 = "bed20f26a0e06e68889a299f4c964cb27e80453d4fa2a693fafb5e22c2cc1fc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/fa/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/fa/firefox-102.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7ed72ea62c701451e0b4ca0112fbe7f66f0ef1d3c9abbcd9538dc4028badaf71"; + sha256 = "6e987af60eb49dad2975cb80e7e50944dfb74e4d57e1c3db4bd84d809e7413ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ff/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ff/firefox-102.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "a35db256a2ac71844ee7c5cba868aff9452c1f7fbb6f0a6812c325781d0e1926"; + sha256 = "da10b9d805a6e8a1d784a6f6c63215b185099b195b3f2a645fc0fab00f8ea4df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/fi/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/fi/firefox-102.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9b4dcbeea88282095390a0ee9cb85b725a1b4c56bb6fdfa426871ab89508a5b5"; + sha256 = "0e0129c4b4bdf2a3601ba05bdab71576e61510a176221210ea7a2e0e1de5c0dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/fr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/fr/firefox-102.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b5c650f4b60a505a31f0ae75fe123bfb9ec81af632ad8faa3f6fc4782a077867"; + sha256 = "78f3f76bc8864a5e01b4f969005a98fecf8494f9314b44de5bebefe81ddf75b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/fy-NL/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/fy-NL/firefox-102.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "58d10008c70293b2704a5e99a364c614febe6ad7a62d647d0953cceaa0ee16e2"; + sha256 = "09d76c19b14cabae4fea4eb78a25e02c39833018e311b5e2d491851bd06c1ba5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ga-IE/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ga-IE/firefox-102.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "825a2048b6d8163f30e110dfcb72bd73eb259d9958d185d1bd3f80330597148f"; + sha256 = "d42e1e05d47fbf4817af085f00b9240dd430b41ede83fbc7085b7447ad6b179c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/gd/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/gd/firefox-102.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "02e1e2921c383a7803df028507e4e87366f62d044e5c5097ae9dd56c28ccfa90"; + sha256 = "5bdb489aebdb7959caed9e5f9e6594da7be7ede8d1950b6a376d21caacde530e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/gl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/gl/firefox-102.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "518ed85359766042e332aea5752851d40dc77c47a1af77b4d4606c63713af17e"; + sha256 = "a1af14c81acf5e29e322d70e009da5019f28c1487cac98e24c10a2215a6a8729"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/gn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/gn/firefox-102.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "df5de0bbbef549d67a23c467f68dd81c236e66f40bb3c9bee116e71d38adbc1c"; + sha256 = "fb3a85d4f98c296bc9e63910523288b771cd37b3c121b6cfccb9f71773646de1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/gu-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/gu-IN/firefox-102.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0093b50851bca18b15773cc36737a2543832cf046f58bf4ba2746c461151ab1e"; + sha256 = "1df3bb7c597dc80c2f499e99a7376d6e1447036d683df395934099c083d62e7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/he/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/he/firefox-102.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "15b18fe81d4cfd04a8a537e6d5a86e8d21d8f169d82e5b29a46beb4f96ac53f4"; + sha256 = "859d115acacfc08a532da15d5d0ac6707f9d594a40355f73a1b5964b2c8ee965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/hi-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hi-IN/firefox-102.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "aee1cbcfebdafe9c71b12889a5c55abd9637152d2d00d45be7422e073f7ad616"; + sha256 = "7ce20086aa50f8e04c81921830e9a878e340c512af980d5438d83cf4ef238d6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/hr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hr/firefox-102.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4072b4a0b9df99a1cb2432e2099cef01a239974c98bbc6075bcd2ab72752e40c"; + sha256 = "5d2cfd725aa903e8e9882fffdd965ad44fc4955aa52bc7306c227067369df7c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/hsb/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hsb/firefox-102.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1c40dcddf098d970be57d58f5a3f5b5439c66d3a99201156f4af2c7a45708215"; + sha256 = "a445f73d7c64a27ac029225a7a5004d80cbf4f9a7f5b7bc22950d9c7a2af9698"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/hu/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hu/firefox-102.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "761d54bb685a6ed144bcdc2caeeab6bd044c770856cb35e166f27ad4b03b6aab"; + sha256 = "e59e8cd84fa9eafe840ec9df9a188bc7423fbf2726600d9ecfcedac03e860d7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/hy-AM/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hy-AM/firefox-102.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0935ff231fb52e149944448a76a30cb5de9105748901a5b942de6f672db9ef1e"; + sha256 = "8592842744d4b6aeade8ce488f1bbbebe03b47dab78b1ae068f2aa8ca3933dc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ia/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ia/firefox-102.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "137c25267b7f3ea080cab852ad4852d1bafa19b01af67d4fc1031e857c924ac5"; + sha256 = "8641ac4759c4534aaaa9d8837006860221b3f37d9b9befc894eb0a150a4d596f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/id/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/id/firefox-102.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "52c10e10f7c09c1da9de02da8c82fe7b971a94fbcb7f4ab216c6d1a75e33668d"; + sha256 = "7dd98fbed1f0e63d3215492f70b3835aa36917655a619548b2eff4fb2cc456ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/is/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/is/firefox-102.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8688168ea4e7099caf7141c815b3a6470080a2a2976b86f4415b1f56d3940fa7"; + sha256 = "8c27c86757ab0f705cc022b83baddf0cf5c79525bf57c9ad2b22d6b05008ebbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/it/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/it/firefox-102.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "5fa83bac7df59ba6f7be8c7321d67c7d1c64cf246d52abc2a3b7dd81c9347fcd"; + sha256 = "b5cbdd6141c9940efa12d326224955e9294215ca91d41d8167fd5d873d7c2e1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ja/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ja/firefox-102.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4f6d06374574fe242145f0ea84dc7b4430463083786b509a6835245b1a071bfe"; + sha256 = "416d2e4f5eb11ab304f65eeda1a8dcb48c88b0235113ff2830075b26079be2d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ka/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ka/firefox-102.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1aa8571648641b73d82a5e9da04f6b62230fd43be951e788b8d5d88226cc5f51"; + sha256 = "3cb646b36ce61027f60b853b45b1fb3d31a69b0b0a8f68a500f12b6e4b283faf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/kab/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/kab/firefox-102.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "213bb6fa88425de0df3ade49ffe84a562cfa02d38e367662659b4828036fc094"; + sha256 = "b2827101227cdfb8a543dd3af4fe1e94d3a987787cbf8d7fe27258a74f664b37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/kk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/kk/firefox-102.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "38deb01d3c044ecdba59639e5c50549c55acf88a48774ab665714bb12cfa908a"; + sha256 = "ddedb793a91c37f0bfc78447353a172687f2676b116c2a87c6255af8e0f3349e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/km/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/km/firefox-102.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a28cac2089e9d4605670df2b55993f4519b15a2a94e98a09d867f9e6e682e3b4"; + sha256 = "2d1f44e4789f0692e7ce2284792c2b316c74adec7b06518de1b63f9bbaba719c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/kn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/kn/firefox-102.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "03c1ab57d433615b6a4a7a4e0499ff271ec0985cc0b3dde795320753b4210109"; + sha256 = "79ae890ef2c37bb51315881913d32c0c24405c41d8d953b7d77509dcde128cb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ko/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ko/firefox-102.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "457f0ef990ace5b977d620728af74862c605a30ca8005441042e0134b2d10948"; + sha256 = "d1494533ef6ba57e3984c66d4b6ea9db2e6566cd8f9b02d6e66d5e3a40703177"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/lij/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/lij/firefox-102.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ad02358c944bf2519ed2f3d0ee646fe82a63dce049ec31b6e00d0cdde0d4be52"; + sha256 = "bf5f594a0c8eb88a5c927660ead52509e59fa80dda8332c6ea8cff898b421a8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/lt/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/lt/firefox-102.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "47180658f8a6c7be6863f3c75d8cf09632367b29a9359dd6f7eb1f396d3a2389"; + sha256 = "32faa406db1968ea6f780dfe40d36a43b06c1637529da37f441217a583557c2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/lv/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/lv/firefox-102.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a669f30e0bee7a8c1a729775508e5a15ae0ef582eca0dccb8968aea5758103ae"; + sha256 = "782bd3d5d32e4f7ae602c9f312a76c1ca47e7708e5d8514aad12482ccd4998bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/mk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/mk/firefox-102.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "da3fd784ba213b90da55fd6a807f0620872e0a51eeb62a5e026e1439383c9ea2"; + sha256 = "0a4f1495c7da3929392d21a87d96a688bd6110b40e8f7907bfff8d7c35646126"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/mr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/mr/firefox-102.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b5ac685b23bd00080f7e8133e7f99cd0c71bc8428c1fb80b568ad3c91afbd05f"; + sha256 = "0768fdfaa4ff531c69db1d3f68fafff6286b7d9ad1b813b2243cab9ea9780421"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ms/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ms/firefox-102.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "988b4684f396eda8934a4ae2eb82d02c7445e73002af315ac703ab7f78db605f"; + sha256 = "d94e43d757fd456381b95c95d83235b7ddda5a6a4d54dcbad7f4823dcfb463a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/my/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/my/firefox-102.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "837fe9791a8d4bba89be9cd32aaa794f721999a13950d44333241c305703ef4e"; + sha256 = "3e44a4c3fc4d383da591c412c3a60e1795dfbf9e96060b884677561b77b38846"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/nb-NO/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/nb-NO/firefox-102.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d0b231b936dfefba9b45a5b044b63373c8e3c87eeebd5b785346dd4ff53fefdc"; + sha256 = "c2b63c0036171be80f27e81ef06be28a64c092e57176b7a7742cec3fe2cffc70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ne-NP/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ne-NP/firefox-102.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "dd0f9b9867c55b69c3e725dfb718c8551942d5571d63e8216b53b9f83de26b0f"; + sha256 = "dc7bdd61aa30795e6d83e5b02d4b168458e83c418088ff32b569253df010ba1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/nl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/nl/firefox-102.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2f1eb60500ebc47723e66d24d6293ef36719a774f2dfbe2d9747d3bf4225e1e3"; + sha256 = "59505fd41ba4ce9f057ba3d80c6b653b878da7f82f1ebfe3ea84d1eb68740351"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/nn-NO/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/nn-NO/firefox-102.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a413040866fe257ffc0fc09f7503a84f22719cb788624c1417955402ad43a7dd"; + sha256 = "1b18eeabecda5ee31a40fdbeb8c53ed433f73cde066568df03ee17da3a1f6fd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/oc/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/oc/firefox-102.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "f49e7cb85d5df810975f73c5d6f50475829d499804c082ea04421c554cae485a"; + sha256 = "3fc80bcdae0ff7a0e1a72849c6ff5d76c9d06f86f96e758587f8bb07901f68d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/pa-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/pa-IN/firefox-102.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "114d20a66b320b9bd7cd1189c7348742794ac8cf00c5528c8bab3d87a1778d4b"; + sha256 = "421abeaf294ba035dac388f634abdec00378d58857b0968c1cd544d764505f48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/pl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/pl/firefox-102.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a1d2a08da0a167173054e0e15d30ca39c832d6d3755f1b109796b77965c1cd28"; + sha256 = "f224d45978ac5d77fa5e10707f0530344ab3bafe56b81ef412effd8d838d0d24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/pt-BR/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/pt-BR/firefox-102.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "78ee67985cb75261421498d370ce8530a1f9fd1cbf8988d70410fdcc21908eeb"; + sha256 = "3bca4a224fe5bdb2fa309af3ad431dcab8bf1c393cfc87bb0ece866fd0046730"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/pt-PT/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/pt-PT/firefox-102.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "5da39633a6b500d98c64af27812aa568053d5240317e464586097d4563f1ca3f"; + sha256 = "8e85dd8c3215b7f070b01b9df8105176d2d40c542246a116932aa6b67548e948"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/rm/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/rm/firefox-102.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "53a652b2ee5b0610bbdd54bc34bf125ece0712fbac783581242a2ca4565439b7"; + sha256 = "0c27e0102f3c51c0b0c7a862a44e17b4eaef349eed4de8af7329b656d0d9cb83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ro/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ro/firefox-102.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "2d039e0a8228d9ebee4507f46de09459e9c5bf1e953a239d6523e2a3a8c498c7"; + sha256 = "9fdc9b1d1a421260b2b0258d5edb3eb26a6ec934248b5e481aa7a2f9a5f6e9b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ru/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ru/firefox-102.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "9e2777201b4389bdcaee8d6f4888b5d92a699bb2f78153e779a9961ca896bfe8"; + sha256 = "693dd65d47b4fcf2653a71a65af22efbe7fec2811124e1760b726c7a92a015f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/sco/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sco/firefox-102.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "a063fef6bf12d39245d436ca7269bfe02b9d964b0bf18e90c8438a3f9fd1a88a"; + sha256 = "15473a22b5548976a4b651be112f589a7ac2534ed4961031cced654d34dd140f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/si/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/si/firefox-102.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1748fa8998e3b65fb0e2dbe0c4a5c13a7cd0ab573cc2d1eee9e049acba1c1461"; + sha256 = "7923f0e3e0485cada413520b5a15b418a737d047120a8c1b076c22432de05bbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/sk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sk/firefox-102.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7af81d1755789a5e96e657e623c8b4e048e3a78327edd6e3986af0761cb39d3d"; + sha256 = "d5c9ae52af4d8ad812b56b093dab4fd9b9cc180f12fe88a560d9cbaf9ae9174b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/sl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sl/firefox-102.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "b838972bbd89bbc9d015263422140ea11cb4e4a3556722b9c4733b16288d501f"; + sha256 = "9119bf5c163d8700d888c0aa957eec0c6108044af667f81e48d868ab3423d2b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/son/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/son/firefox-102.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "6f123c54e64c26a44c33bf7ccd0b331b7e25744e0ea27c3cce7ba7edbaa704b7"; + sha256 = "0a5711cedc0040fb676a8873efb9c725fb0fcd444dae077291b32a5947b44111"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/sq/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sq/firefox-102.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ee988b4f94fc63163f967726b5caa301e63a86e3629b8312a72840a309c149df"; + sha256 = "c657853f1692789436031e7bc5bcf605dda1c238d61939a0004dc0ea5e17b4fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/sr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sr/firefox-102.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "402d7134120a462e1a0cb4cfb9d3173ece443f0230aaf17c684d23d303d28e47"; + sha256 = "806c5bdf82e6cdab072a6de659d92a3ee4cb85daf152e67e33590e7b2a106198"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/sv-SE/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sv-SE/firefox-102.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a12bf6d6b0ab7db2251c454929765516c52291901be2e3f3b6aefbcff4a13ba5"; + sha256 = "2def75eb1ae4f095843a4bf8aa763f69a496217d06beded65a06167e2dd195ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/szl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/szl/firefox-102.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "fa54a3d25dd2e24baf72cf9f4a34255fba063708a3e047d78167be9efe2a962d"; + sha256 = "c6210f98b15c0667e638672c1c34382395170e980e1f9d981d12f171007498ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ta/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ta/firefox-102.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "856e55fb2fc64267a7421f55c760fda0c4e200959447349e37e1aacabc76276e"; + sha256 = "53b92f4613ea7847fa96f5b328b4f7dde0a0969a8b6697469b4e04216aca951d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/te/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/te/firefox-102.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b419c6967f62845c441fe19908dff490e0ecc91aeb6a5360d455c18c623a0bac"; + sha256 = "316761dd16ea27b0a72417722ecba7215fb6b9f885b37fd95a49cde166305839"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/th/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/th/firefox-102.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c3a3b04f8ce2a5bf7d592926fdea63a4039714791e7f0a48541ee9de73a17c8e"; + sha256 = "eb205e189270bd50765cf23a5e14c0b5e9078ee5cc923860d6a661f4e2be2c9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/tl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/tl/firefox-102.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "a848c97e8ba510fe98b4da98c96a7ecfdcca215e0a475d40ab808d14dc2ba774"; + sha256 = "f333dc4695ba4e3e9a20b521c8d1d3d078ae9074541eb16178718827ec7819fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/tr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/tr/firefox-102.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0952a7053bb3e64eecbfc522b2422d1322d22e22a4ff531038d72da87357d82d"; + sha256 = "151a205e266aa76efe06a96a5b064438c3abd38605e945b4864696f226aa557c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/trs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/trs/firefox-102.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c51991039eeacf7a094581724e3c31636579762abf6c00c3ab24a52397c739ab"; + sha256 = "d40ba44f885081356d9b933005f59fd6da0cc25af7936c8ed3b609873fe50714"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/uk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/uk/firefox-102.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "32d6896a26105b60e8a9d5e9c0cfbcc3e0a225f969a1b1b66af8072219f02cf8"; + sha256 = "9700faf2856fecf9be38b488d497dd641a38db0808bd13d2df335f67088f4622"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/ur/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ur/firefox-102.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "30c5c04ceca1996ff51df5ead63d5ededec2a393d06b4216d58f8b32deb48238"; + sha256 = "c23d1c1966fd0b5e85a5bce8026ef80989f4bcdfb398c11c7977988f63290d25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/uz/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/uz/firefox-102.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c99c9442c0ec73c7965d90994295bf2d349076613b09528ec705d058eb7a9ec0"; + sha256 = "992a3032a97c64b08d4a57e474a3ba1f9644af3d221b4a0084ed3e5f85e18cce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/vi/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/vi/firefox-102.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cd7c90d30ea1aa4a9ad6426917aa85f54ce1f88abedbb54777f104f84d264f7b"; + sha256 = "3226d0eb7662cf35224d431be8a735e2c1300fce3bb1c6628e2d041ac5266d6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/xh/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/xh/firefox-102.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3afba7baea1f7ee7d8b0f8a1cd7af26921b30e94c582d4fe774b35302b6a9476"; + sha256 = "5cff24dec61b3038ade2cd37191eadbb8232fcbe270c3fe55632f2c7b740f401"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/zh-CN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/zh-CN/firefox-102.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "882ea861902ccc8698cec041ac9b27ec4164876fca18569eaf5ef4398410fc3f"; + sha256 = "ff4a234906bc47315b26e8f5efed0e5442c9df8ec13e02c9bd16d2e6435667a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-x86_64/zh-TW/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/zh-TW/firefox-102.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "53bacc7e75669499538381441dcca7270054e15c8626332f9f87f3804499e40e"; + sha256 = "f2a6326ad37e65f026b2129f90be7300827867cc5fa6701570b83c81f83c804a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ach/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ach/firefox-102.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "40c2e9d80c7e4bb225e14f0fc35403c6605180eea9d0ce0fe690e17a83f441b6"; + sha256 = "433952be7ad3f8416230ed6049b3df93b426de9433f450764049645c5703d18f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/af/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/af/firefox-102.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d88dc2dd027b90ecdd27e2293484c0a89c9dc026d56684a2873a25ae18ccd90f"; + sha256 = "b6dcb02b8e862ee2b1071547a111238907f307834953d9256df153210e5da1ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/an/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/an/firefox-102.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0e958410815e2054f1ccd49e038281112fc0fb68de4a3f4b317d701a9cabac27"; + sha256 = "a11771763fea6860f8b94e4441144e5c0413d5db2f12feb804f09decc587bfd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ar/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ar/firefox-102.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "5db4690752f171bd3314f02556d5a4443c564b4b1962cb48fb8206ecf85c77f0"; + sha256 = "a4ad2aeeeb7c88d51382c0b0fcdd23ca58e8ca81c2cf44b2d9f6fe9d89e09ef7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ast/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ast/firefox-102.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b5f716347e17c88f72ae770489c1e22ea7ccf7c88537d1139c238e03302897f5"; + sha256 = "7f22f4d8e405bdef7815c96e54456d25f7f1a0f5c9eb443346d052b575510c0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/az/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/az/firefox-102.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "62b543e89a0f6f66cb6524adf22665965b01173298f6501737b60f7f7ab67d0f"; + sha256 = "371bbf1ba3bf1505b931d9efad07fcbce090eebd9ea7aa349c927506b5e32961"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/be/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/be/firefox-102.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fab20786e0817d4947302f8b256c41dacedd643926a8e39c9ed2fd3c4e6d5396"; + sha256 = "fd537cff6c5be96c2ebf303808e352dcae7425c779a7a7603b37393d6b3883c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/bg/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/bg/firefox-102.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "aa500f768044be8c7aa94eeba9a3d43a32375d8d75e3fb8a7b7e864aaf0ca6b4"; + sha256 = "ef5703d8eb4150721e3ffb6df7b031c6115401683f8df965e9c62de4c3e8586c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/bn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/bn/firefox-102.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "af36728b49e0bb6c5d1071720170576a2ebf72e652503a0ed5a9681bc93143fd"; + sha256 = "3acd10e98e85339da5e3efc4b3879d6371d796fc0ef559daec79559d94ec74f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/br/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/br/firefox-102.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "de57869f78250f3e79bbe97539a368d0cfb1f3db50ea7a0a6eed0f6be10c4dca"; + sha256 = "4e07f618a70a3ba83dde4320608f03f55d583692f0cb4a316da3e46375e54de6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/bs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/bs/firefox-102.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "008d7f95e124683a6f086a0b77f2749bc52e6afa2ede62c4609c01185c6db5d0"; + sha256 = "be1e8a8690d5a0042f9d7c63bd70e5abe0f87a85e6783f72af8109176499abcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ca-valencia/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ca-valencia/firefox-102.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "3b80603f7d38fdf32a4a64cf5e54f3d4413850a0ca6174b26565f9f437e56227"; + sha256 = "8dd5706395fddc49825431bcfaa66102fa4e623bea0bf796b5e620fc70030198"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ca/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ca/firefox-102.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f692f580fa6bece8d1a0aef9f55ebf091fcb3b5f0991cba7cdaab14131ff9aad"; + sha256 = "f2371094234cfc28ea7c873ff62ab20782d76dc23e5596200762b4afd66b7e5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/cak/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/cak/firefox-102.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "56096c3944e828f1c345b4cb5c4c4db39d87d5d056d7dba5435da86245ee298c"; + sha256 = "1dc95886244ca2e77e82923cff11d222973a8f293e010ff1a2fd77b8c94d4194"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/cs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/cs/firefox-102.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7965b459056f4bfae8b162119f0c8a4a88fd9e18b7fc4d65b9782b2de2b61cf9"; + sha256 = "dfc0666f67ade708f90ca2ee311a462c4bced25f782e31972e0b589e5e740f2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/cy/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/cy/firefox-102.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c50094be3fea5a75c4a7965c79d6fc640a375a958f907c5ab950a63270a111d5"; + sha256 = "ab49163b0ad5eaf22874381399ed82f15f9af67b3ebb79ead3714ca705866676"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/da/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/da/firefox-102.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "89f5ff2433f1f2306b46c708123757284e178d257f15fa02d59c5af2cb2a5b41"; + sha256 = "3b5e773f2b8419a9067c2ba577280e4defd436081d706c2bbf1bbc80a872a81a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/de/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/de/firefox-102.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c66945dcdabb3aabb120b7af826870b0b9c2163a9372c2b35e6da4a467389622"; + sha256 = "63313e7f568feb506fd1a69014406c2715eea6c77402f125d7f5c4a83b9c2199"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/dsb/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/dsb/firefox-102.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "57a0c5447d8a77cf6a59b69d6652e9348edec1b8f7e7a0612b4b177a5628035f"; + sha256 = "69f66f057febea4484166cc324ff60d55a1021c98f8dc4d9bd7c7e83219ca6ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/el/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/el/firefox-102.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "bec4c447b48be53dc444a10fb8e2024f03aeca28d0c1f924545b32f031187c0b"; + sha256 = "ee73de5881d6185b309ee4332935364bad6efed583cc823a1090425d263cc0f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/en-CA/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/en-CA/firefox-102.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f0f5acca315896921a7585ae8a065971779678420f1eb6c9282894736e64172c"; + sha256 = "76deafb0629214764e7d5c06cb65a01836d39067096c4ad3ef6d6f33560abe61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/en-GB/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/en-GB/firefox-102.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "91e283cf7039ada850dba22fd4cfbc2f22dfa1a1388ab1f9d8d67d4a42b9b8c0"; + sha256 = "29c894d423003e083be48432a1494d6af6cb8c8106f2c4432a18f6d30150946f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/en-US/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/en-US/firefox-102.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "31c02a25efc179f0512957de2d3a979d7a82c875bc0773d8a3afd4e27edbf22c"; + sha256 = "a65f5c26f259b49a70df68ed6f0f36db65a1f12e077b8bf48b1aadae1f53a32d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/eo/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/eo/firefox-102.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3fc680fc56d628b35e989d51c4559d78d510cedb6a60f4f44526c30dbe2601d7"; + sha256 = "f001b00098e259db413b0f958694993be4a7a6913f8a432f91ce6cd9c4df4288"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/es-AR/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/es-AR/firefox-102.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "8b1433dafc4174c0f939c80ed5b61ae8eb1d01719126c7b311f91cb3c71abc5f"; + sha256 = "8fef275c843bad0b5395aad9d80aa4c2ad0ffbf188b24ecd6ac1cefb285feab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/es-CL/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/es-CL/firefox-102.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a60f5017f68cd48476c9aee40e4041c60c1f0434530313e374e6da39e00c41ab"; + sha256 = "25e82c26d33aebcf9f440c78ad77dc2478cfa260253a14008e06b518f50ae982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/es-ES/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/es-ES/firefox-102.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3e69135395aecac514b1bf2bbf1fbc7c9ab1bdaea712136423c0f0296c8f2338"; + sha256 = "15b930d22c4e04e7e0c867ba7d946d5c5ece3e256b4a5af8a148d94a1f2f0846"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/es-MX/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/es-MX/firefox-102.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "fd16ed8120365b053593fd4317faad82b22e538ee2fb5c1232c4fea414b551e4"; + sha256 = "57bc7958e5975aaed879d494d5cf73f20e145a08f02e309cdb7b229692bebd61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/et/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/et/firefox-102.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9fa08caf69cbe2aca5738df9e2b1b0cd79513f1dfee638f352cd754c3b17dd0e"; + sha256 = "7cc8c38cb33f0a38f594281c82507e22b929d794c14993e94946aa86bb79af28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/eu/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/eu/firefox-102.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "94a5097df79182cf3a7f7a0740936beda02b666de005daab93d119011ed2372e"; + sha256 = "6a178ef79b141625e301f6b9ad07ebf0aa1e2a9d43746491d4d800565590402d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/fa/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/fa/firefox-102.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "927bf74effee01adbe4e73ee1adf3a8846ca7f8648679016fccd83f0fcf6211a"; + sha256 = "a8926507c074cb58a0951c1d2e66db039faa6a540a212121169081254bc22629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ff/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ff/firefox-102.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "fc3d4cfda60737d244190fd77483f635102016728d57540b2ede2beccdafa3ea"; + sha256 = "47b0615b81eeeaae2d6fdfdb8a94fc47519553204c54c96d4423c05ca4243014"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/fi/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/fi/firefox-102.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "51c65fab027ec69d1261c4917d1c082b656306c0b5a1e64c771df6035ca89adf"; + sha256 = "88b2b1001d93fb8cfc94bd43d1cf1dddde506abd8dd5ada955417bc3c2441050"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/fr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/fr/firefox-102.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3e7380db9a56c624e04c66f50b7167a1b6932c64bb687d723b035f34d0e7837e"; + sha256 = "bcbe7950ebc56473a86e64defc21f43fb619d36ed8b408a38debf7b17339afc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/fy-NL/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/fy-NL/firefox-102.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "aed3d04d0198c4449861a15e35392bbe3e05d043c92d63a34cb204a63515bad2"; + sha256 = "f089fe7d3a46106fc4591d3736a4272a0a8942fd97e173c7c3e02bbba0ebbc1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ga-IE/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ga-IE/firefox-102.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b8c2328f8793d1ae930aa0aae77f144a71c007eea8fb22867bbfacfa7e6c51a4"; + sha256 = "75c7a68124e657f9cb0908ac23dede6761dec3bb0a386b8cf37dd28ba73ebcf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/gd/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/gd/firefox-102.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "02e8a9ac80aa7c35395e9b8d071cd3ec392285a66b929dd14b76d90e6994a698"; + sha256 = "70742e0fee63fd8da839fe8bf3e1b86a7d0b4afaf1cd69848f8cde2778a50d38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/gl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/gl/firefox-102.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8a3e1429021228a616a6c309ca52e2606a319fde5bab64859d5ce2b7a471aacd"; + sha256 = "631e4d5c796fab822631b2f59e4016b9f15ab54393480376e1cd983b9b9ec74b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/gn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/gn/firefox-102.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "198a1cfbbc143ba4a509877837efa3b777a56a0a2bb753f0feb84eae0e9c1631"; + sha256 = "822f44a187d962e070e75feaa3395a6545ac189694a61cf256da4cb98f8a7b92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/gu-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/gu-IN/firefox-102.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "eac041f094375ccef72cd1f3064b2913522bc6f1c7857f4eb3e64684e19730c7"; + sha256 = "e51f78ab4e7d360b90d57a6b19225d8d74be1676d8c4e53999f00a07b991e6ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/he/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/he/firefox-102.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a68ade36b290e63052720325f5aa22976761c9c2e295510af6ab0dd5661d6da7"; + sha256 = "3e9d4e15e3357f25826264829fef141fdd6425bccff9ce6b171e683bb113b0c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/hi-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hi-IN/firefox-102.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8825e8254b6772d51720e122c9ee709a3b1ea564d4fb29a8a6ba929fcfc5437c"; + sha256 = "f67c5291a3f163b23fa024ad2f213237535e7a743bd008daed9ce951abd25e48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/hr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hr/firefox-102.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "762de5ec6480b9a860d998427ae821f06b1396bd1243561ff5e4c7d03be6fa06"; + sha256 = "e45776b7c582fb3ed32dd77a2d9809f2b0c5bf1374e8c102e9ddcb119ef7696a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/hsb/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hsb/firefox-102.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e857edad50260853c45f28628b2d995bb91350c16ad255ae796942784b5b482a"; + sha256 = "ffe92e7183d538a00fdfedb811bb4cdd504b380bce6e5857c509021aa0789b0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/hu/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hu/firefox-102.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "08d7e05caf74c5738d1cf739a485450b2f6412a16fc8f3a823822fb53d796ec2"; + sha256 = "51f8b6f968d55a443aa73c2d815c31ea7968f5feedd843cdb100d1ac6a4ccf3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/hy-AM/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hy-AM/firefox-102.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e963239a29db7c532110a53411f0c8d22c92f4bc82d8ffd3827d129e8913665a"; + sha256 = "4f40cdab8bccba72f8d1ff4d0214d4573169373dd46ef8f23db915696f1dacd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ia/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ia/firefox-102.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "2fe4b8500d98ff61e621659df71bbe67f18a005a7e235e0793f8740c6b453b2d"; + sha256 = "23a0c5f1ffc3b92a79fc6633f68619c28fd306b38bd7e1307cc8bf230aa0dd7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/id/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/id/firefox-102.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c25f563b35ff9544c7024f6b66e2d2b1314fcb43a5b2307f2a15ac1186a5b11a"; + sha256 = "616663dd0dd966acfade5dc2e9b25056e9e7922d73264cb054df8b7a334c244e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/is/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/is/firefox-102.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "90ef654ae1601e97c7fb474216d35938cb25e9a9e36551389c5294f615bc1352"; + sha256 = "c2eae8cade38437aefc8499884a5a5faa0ce0b47aa01563cf66cab4a4f1f412c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/it/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/it/firefox-102.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5c7b23d95b3179942e03ab1f1e26b20e677e75e19c257b5eb474d21d2d74161d"; + sha256 = "7d02e30abb489197f1b928e7afe7e09eb63d94d390a3d0293e0b4228779b7a32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ja/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ja/firefox-102.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e20483525772a203c6468a807d7ef6f39a17edb1f00b3a39adca0e5c32c2b11b"; + sha256 = "7a601336e5affd854cf70d515e882797f6fb868ece894a6a097b60466511aa3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ka/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ka/firefox-102.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7679fce7930cdd9f1fff4cb31bc1bc51fd2fa7ebb4236703e0aa60381bc1c62b"; + sha256 = "5f277ad954baaa715e99a7591f3bd6252914ad731db7e9c6d292c10d633896ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/kab/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/kab/firefox-102.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1ab08ecf7cb3f21e48b2fbbd4dc2eb1e9a0065644aba22a71ed58e0247009022"; + sha256 = "bfd044fca456f10dc8d4ab6cd23673109d8115c4cd9119568517dcd0d699630d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/kk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/kk/firefox-102.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "48832d04c96272bfdb14eea01789fd487cc18b1e9904b074b4aa9d729644e2cd"; + sha256 = "7adbc87dabbe73fa48c27eb709e6a4e93b9ba2596ed1bfb6dad950c72c3d102b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/km/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/km/firefox-102.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e4d3a9bede49e675e6b0f1afa3637adfbe29e1693ba2985cb45c20ffc279b8c6"; + sha256 = "0aed3077a571fad35b214ff8995da0e23fdd3c1e94565f03e7e14f76bac50804"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/kn/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/kn/firefox-102.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "11a27061c8599edf173970683b596d24848c99f160d9d0ba29bdb9294064ec6d"; + sha256 = "40ea65410906b2dbce37e856f6becc664ea2901b65cfa8e80e0853a597577fe4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ko/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ko/firefox-102.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "90b5cf8e356293e96a0a016d04afe0db4066d9f31ab1493e506f64ebb2e85a7d"; + sha256 = "4c51e32ed8a62ab4e88bff143778a791426af38b560fdeaf70ae46d0d0d6e82d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/lij/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/lij/firefox-102.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "b66ac05f2abc62c8b417f3d9f8d5d86c8664ada139e369fc06a8919d2f9c1892"; + sha256 = "f965b833fd0f6e58ca4a22347466d271aa7616603fd986f663dc293219e87228"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/lt/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/lt/firefox-102.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "bfcd0f7e9e9079e6bfea626bf14eb807527def8095173a769ef98e35e44427ad"; + sha256 = "316f2afc49d01147397b5e8a20186551f1354a6e601c2bf3c13612ab0d803410"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/lv/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/lv/firefox-102.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "cce7fb3ced85549d7833749e6c24be0642d56929586f3d13be434c662a29d085"; + sha256 = "00288295569d6aae0deb79923a8abdfd2a4340b2af8e9e607b372ed1b1bc6c3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/mk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/mk/firefox-102.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "70d85396e328d74be237bcf1a0780b2aff480038ea5c3d56f26c5123c8258f53"; + sha256 = "78083c6829d30b4f340cecae6a126da43cddea95003e7c74029527a7d1400086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/mr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/mr/firefox-102.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "5564c7293c9fcbe25e894cc8d1f8f4a07c63fae20067ecdb073a63dec3b213fb"; + sha256 = "1ba82a6b7bd4c875710dc5c6cc36a54b5c14d10b67fa8e9946c9b1f24a621778"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ms/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ms/firefox-102.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "697d805d838834b516a90ecea22d15bff7a4de3c1a787b048522feed1ad7a813"; + sha256 = "f1bf54ae0c85c23cb79ba17ed5bb532665a26170460dba04480bf1e5f93ee76a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/my/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/my/firefox-102.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ef20a125e732c27541c299a02e3883cde2b52e46bf2eb15b744f32e2163bf6c2"; + sha256 = "e87264cda611f39e4d94953f48d3dfb3d603408789ce96fcb9e4c9495e20a54a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/nb-NO/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/nb-NO/firefox-102.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9cabd3dd614e014e179510c5d46b0faec737be27f669be08bb0b0f9f636f9d3f"; + sha256 = "e7254987ed65efb8afd2936343a5b9a7bf7a6ccebcf979e03986e8a348febfe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ne-NP/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ne-NP/firefox-102.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9dfb4e5787523517f2084e447c2226b1c696e4cd30d3f74c1277235aab9c7ad5"; + sha256 = "1184293695999b241591cd4ed095a4854b1b86491d3fae4859f295558f744eb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/nl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/nl/firefox-102.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a847671ad6728c3e4cbaec7db3b65d82bff007f9532957273cda2c15ea2a9855"; + sha256 = "23dc62d58c2a29c44346cf640f99725bc502efe4b0e3d2a9d11e06ece8676ea1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/nn-NO/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/nn-NO/firefox-102.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0a70eea06255bb9fb507c4168660484a8ff8ec1f3bc5f3b27328adf7dfea0b7d"; + sha256 = "8d76b7d04e02e05986edfcf649c7f795e0be804f688d02d7c5639bcc7fabf977"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/oc/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/oc/firefox-102.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "5a75fd0d96ead0b7a4e835b50e9663a3d2cf328a7f9a8031de9bd787b320a004"; + sha256 = "3e24172252e35adbf43f50f3556328539f76802ed217925149aca0abe5b153b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/pa-IN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/pa-IN/firefox-102.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5764236d5c0100a8d3125e5b71def40a6fd1bceda1e4e488f29e4ce583532ee7"; + sha256 = "c6f40a2f4e221b246fae8a90453c42cad9b79934b6f9b9acf5728ec158229b9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/pl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/pl/firefox-102.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "3b6e73f2155797cbfde8569969fac4769d594ec3e5e3572259ff45e06ac0b1b8"; + sha256 = "505a7449393c7c4480404c51a53dc6b78f31d57f1c8088a66b035a1f9f45d9d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/pt-BR/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/pt-BR/firefox-102.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7e8ec8d7ad729b2f7451a3cb9c3e965c9eeb9f173dd371e774a8738ed7c3cf7a"; + sha256 = "07375e45b3700cf3fe3d5f1176e23c9be20e763a2a0cd1258af2451182ac87aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/pt-PT/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/pt-PT/firefox-102.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d68b4d0fb8073beec30db808d6cfd3c160305a14bb5a6141ae6e2101af2a0ede"; + sha256 = "adf7b806fd1d6488cd33c4c997fe6996f9b600636afc39c2c647c6349fedccef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/rm/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/rm/firefox-102.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "e1a2854a0f463dd07e40f28e056bf6f94a445fb85fe2e2cc520b69c9c0d078ce"; + sha256 = "d9e248830083d19716249ed2a624c06a2c0c4555f784d86211e07f2a47bcc9fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ro/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ro/firefox-102.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "73e6752bea75727451516a0aef9566abff583741fd512b6b0c480d6fd10aa416"; + sha256 = "e719694ae5b070ff42badbc08f1a335664a9af4d54923709fa4980ae48b6a333"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ru/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ru/firefox-102.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "56a5488e9b56f8100921ebfeda2ed983fde74efaf9b261ba6ccde8097d268d39"; + sha256 = "67084117828276fed9261611fa3d39a6de631d45179d241211807416e07c1d44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/sco/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sco/firefox-102.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "f82204131daf34e49ede6f3d06e9da8ea52167e860c09358b63d54546d1a8eee"; + sha256 = "a731a2a6150939c9294b4a9bc6fca582c266bac4429f781abdb8d96883a1ab70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/si/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/si/firefox-102.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "500285c2acb758aecd84cf029dd2a0cc961ca897a54fb7ffc5a85344e6573758"; + sha256 = "47837be1db501d2fecd0d31747eafedad762a5017c99cd1a7eaa6431f069d8fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/sk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sk/firefox-102.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "53358b16d382b1c843ee75c6d60276bd4c28648fceb7e3cf9d526fa9bc98e899"; + sha256 = "b6b7ce10155b9c5c5d168f73570ac23a0288ce580bef229f726fd2e1579cc51d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/sl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sl/firefox-102.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0f3e08fe4c298fe9311b35d2e856c28e3e659c0a5f7a7726bd95b5f2c904b28c"; + sha256 = "ea7eaffc8aad34eef722fdf6c2a664895d184b099a25f10234f0fce940233864"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/son/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/son/firefox-102.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "1001ef5c55c9c409cdda832adf41bae783b91c55e59a6704a14eca03fc7cecb5"; + sha256 = "53c5a451ed323ff7b41712af6781b3792a86f14622ba490392c1b7a0855384af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/sq/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sq/firefox-102.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5f066ae630a65c0c9d8b0fcedf4bbfc190156272f992892e42d18d8adf3a7106"; + sha256 = "0296523f33b6632f2c15ede741bc5a7cd41ecdc32dd1e9395ef42008ba93b41d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/sr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sr/firefox-102.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6f1efb8804631b8a35dbad650e355ba525c12b63f561734006fd9eac5a0edb7f"; + sha256 = "dd3857681b7b7c64c6d0d0293395647dff678736e9384530d1f6094c9750a19e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/sv-SE/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sv-SE/firefox-102.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f570e2af2fa662642ea2ffb61e13d907862b154d9c6f8a15920f4f17bd6ddada"; + sha256 = "8b9cfd1f112a617c0d069868c371e802ff25ab99e8eafc39f32cb19acc7dff4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/szl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/szl/firefox-102.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "1594ba0f331b813023167c56d7c6bd75132fe6a50f3bfbb4cc6562aaa983819c"; + sha256 = "a0ea0af3af63298220cb57aa42475a9b7b45cffe35ac385e506e48ddb75bf156"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ta/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ta/firefox-102.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "417e61b3ed39def1afd7e3905a4229bc17ea7eeec4d3a849401af48995a7da60"; + sha256 = "b6c91a94ee7513fc3167e8018d16947090a0836c54b4ccab563baf422932fc59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/te/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/te/firefox-102.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d3f69da2ea3b6552496ea88de644af21e25c59c3ef1141ca8e0f8d67e6cb384d"; + sha256 = "a1ed0d315e09600a89c63f173a4550968290f0c449c76ae776be53324616fb38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/th/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/th/firefox-102.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "1d9c3fc39dd51087fdf1e841ab0c256ef8d7081f4cd837e05085f434150a101f"; + sha256 = "fc6dfd8e5a985ff0dccf3d2ea744be16c5a870a295aedf253d7a6374cc944660"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/tl/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/tl/firefox-102.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e60422b379dc3646b597979fe2a0afdda49be87ec021e16e1d2f8fbb4041fac3"; + sha256 = "93aa331e1229262de5f45dc50e5a8ffeabdc8bcde08eab2c021f9bd41e3ff812"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/tr/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/tr/firefox-102.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4e10d3efa80426fd6f8213715d028fcdb4c611e1b66e698dc31d47ce77fa9c78"; + sha256 = "f4066a7ef491e6699b4f4004d8d2b9d2ca4cf3cbf2202c370c462c8bb4438fe1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/trs/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/trs/firefox-102.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "73cb3c95e4e0657e24100a4164da9f66e79f1327ecb7a1786368c57e9825940b"; + sha256 = "e6c28cb21e808f9fcffe6e88f3e03b81cfa30aee3a7ce8bc9e3c7900142216a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/uk/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/uk/firefox-102.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c4a6980744b64a6577df515a51bd9c90510b08de98efa14118d1c14de86458c8"; + sha256 = "6f1db006276427267b9eaeb64d116c252eae46f0512c818ca1f654a955047121"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/ur/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ur/firefox-102.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2c2f7c47bfd37f86c9d3850ab57041f87c612a0fb247a2cd19c35b8e3e443ec3"; + sha256 = "f6fc22d3811fe242aec4cde4242e1caadb672c0a1d8ac0a38ec04a35f890fadb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/uz/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/uz/firefox-102.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e2ff4caf5379e4edf867c7c2e39785ff2f7426c524ae6b20915fd94e061ed8cd"; + sha256 = "dca5936956d46103e7a9daaadbadf598bf034553fd5191d3bcfcbe7c45493584"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/vi/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/vi/firefox-102.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "57c595c8c22709065795430586b2762edb67d2ca573232bc626952fb7abc6b3a"; + sha256 = "9f3ed580b5bb30c45b0de1835577fed411c9d313a36aeb886d8e5f2572c00df6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/xh/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/xh/firefox-102.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "bdb23fab3ef55f03bc4c3ac4488fdb30b174ffbbcbc89d9387ccf9cd1528e91b"; + sha256 = "1084d9e7b7247a9e75b916be41e0ac1471d5a5c9871011870aca7f63e22aaf2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/zh-CN/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/zh-CN/firefox-102.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3019768b3a9115b07a2e3d05868598c656f0ced8c50500fdf55a4db959ebc4f0"; + sha256 = "8e8f7adac1d6e6bbcca4693e72e2b1b3146267f9c0de0634c02eb580017d4205"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b9/linux-i686/zh-TW/firefox-101.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/zh-TW/firefox-102.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "73e243126bfa419e310f5f3aafa119b2ac516bea23c37e653193fa6bd75172a4"; + sha256 = "db770a52b74dcd8ad0ebb551c9b96a2558d8ff21cc4d106c68461970ea4dfc86"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index ba279ca33820b..a78a0c1314aa4 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 = "100.0.2"; + version = "102.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ach/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ach/firefox-102.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "c780a37812ae0aa875c3057a6bb6a7490912e1acf9b505558244347f5822a08e"; + sha256 = "46bb0d10257cf4ca8bcb80ddd7e223a8bdaf4e28fb658f41af46c8ec0b321bb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/af/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/af/firefox-102.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0d29189c4f25852317cc37b0daab3e7f240371ce1d2dcc19a9e069411c48f57d"; + sha256 = "59995d60269d943d9bf0a0bde29e6e507e91494508bba827b9d49af5341530bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/an/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/an/firefox-102.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "b30da8be85534cf005412c8714bd6b4a8be80278b55d953a662d14d6637ab1f0"; + sha256 = "f9131bc2881f830687c0dff1f431948774ac770b1542c56f42c93ad775d27492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ar/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ar/firefox-102.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f31dbcfcd091e6c8d1f13ee606e09e8c378d7f56cfe9aa4748512acfc29a5bd1"; + sha256 = "5c769f460e97549546a877ad27818244f2289a4818bf145237d9809551ddbe13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ast/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ast/firefox-102.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b86f64c68e65f1955f3753b8f005888787188c668b8e968da40e08cdaf5673d1"; + sha256 = "91e2ea408bf6deb74f174d13718158e09a3fcd9aafaf39b0dee632a02698ad49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/az/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/az/firefox-102.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e4420f829a30c18f06ce5d1460992497d7652b07ed34b8cbc78c16617f9b1ee9"; + sha256 = "d9582e3bb3f057c9e906a821a30b0f01e2a3349f6ca9b4533c6671b15081b087"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/be/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/be/firefox-102.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "bd615ccb833b44d6b6e45b04d94b2124d7c0468c27536c82cf3370d66d4bcb56"; + sha256 = "234982c40f48f19df333a92323ca4448e9439dca37a759957df6f1b66068d4b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/bg/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/bg/firefox-102.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1137d03ce1dbafa7bbacb139f05eb45b370df4d218cf292d6d9408a2c0a65806"; + sha256 = "fa861f846d558c0f7120f80b2f56f4400bcae56b21fbcdc32325fce4d67992c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/bn/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/bn/firefox-102.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f01e8ce4b227a96fe5d74dc10558d3fd930dfc3de101360f5c9145fb818f6a76"; + sha256 = "22ec4bbc08bf793db33ca285e54a52cc6fbb9e85712f1a96d7a36e2beeea427c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/br/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/br/firefox-102.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5c425762b69702287977245e5ae5873b83ef404bf30c6f5eed9db71af3ab166a"; + sha256 = "c4a11e9d01eee94b9a36a47bc5a9714046c510132a12e0d596ad8144c515dc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/bs/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/bs/firefox-102.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c7e54c5317d9612de77aa1e66cc1a97d0e5638fde5dabd7c0b90b5aedd357f73"; + sha256 = "960a0cb14cffa767cb398e7e59f9e68eb884093eaae55b9f88feae8ae55f2df1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ca-valencia/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ca-valencia/firefox-102.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "dcf5011207d1e3b4c3a6597821ec9472d6b329e66fb03f2f648631003037e45f"; + sha256 = "510d3746629976424f07f39094574b67c1b83d5a348b5be2a9f670f24027de07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ca/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ca/firefox-102.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "061b69726b40e5f47b0d9319ca81a4137b62240303c4f4000523707243ebc914"; + sha256 = "91bc95b46b4208b252ec3bbc941fe66d1cb3a8ed2ebafbe7dd4d7de10461c14a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/cak/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/cak/firefox-102.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a7d5bcd79465b280ce9901d4825f7aef361e3d8019a3659da69b484a76068556"; + sha256 = "ea2c15ef82e772141df11de2fcc86adb4ae3ed6a87ff9f48e5d4feaf2a6a2398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/cs/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/cs/firefox-102.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "341022099d92bdb0445d181522281c819fd441825c330d06218d15bf29dd3fde"; + sha256 = "0594c8fbacdeb6a5255c67522713eee28427d08e3a3fabd855febaddae089275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/cy/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/cy/firefox-102.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "094d87c9ca25b4a1ec3ad28a6721b7c712627ff20cf268b208a66ea19143a905"; + sha256 = "0c02f758b7ee899068953d2ec3fb00586fed52b35af25a7e2743a7bb8a79ad0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/da/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/da/firefox-102.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "14484560f67d8edb395bcb6c5d97372fc40f389a5fd9baf1afbbed2c8c3c4a45"; + sha256 = "50bf4e3bf21760d3e2cfc20ab46c7973bc2b7b6f1373a784b74b7caefd9f7df6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/de/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/de/firefox-102.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "693a2ef07ad927d94f9eb2ba91fb02c2ae0eb7239ebc5c146f6475a2ba9e67a4"; + sha256 = "ec93b1d7eb44a85ee19ea0ce00eea9df2395412986ff2bc5d5afe5562cda6995"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/dsb/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/dsb/firefox-102.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8c1014642041c9d74ae2d3a5f7d68ea0d4e67d9ac55cbf0d645f14071a43966f"; + sha256 = "12d83d8ef2af3330da0796b151f096336db9b32afccd8b78fbae20af901472a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/el/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/el/firefox-102.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "299ea488d9654798cee04483ee7171e14a6869184df23d3a47924e70356e627a"; + sha256 = "c72a0c9b18c06759389c89c1ecbccd62b5613f9e7a07ae9a4b12e404ff1f8b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/en-CA/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/en-CA/firefox-102.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "0599d3566e6d23ab400116ef3bfb21f1f2cf50e196977def75fd573647541d1b"; + sha256 = "2b5b3628ce47624b0710dd72ca93c5eab58a18a9dd493f6cd8bc3cc973168a6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/en-GB/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/en-GB/firefox-102.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "7495a84b63760213f66b5c23a41435c7e3d081178e365996b3a6ed78c52a0539"; + sha256 = "489cd4c9cf1d95eb1ddfe7a00d73bca62145c3bb03ff9c48db76ddff374654cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/en-US/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/en-US/firefox-102.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e7b42e9fd82bcd569cbca1fc95b7e1a364c3dbf4d44a0624b4466ec1bd67f836"; + sha256 = "1b9b7f04dad1954cdcb16d6d52938e3c6d8f2679c78807a06e04489d2affd6b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/eo/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/eo/firefox-102.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c34ae185dcb4e1adebb5acd0bddaf3201cd2873b9661ae2a31a2aed25036ecc1"; + sha256 = "c9a99397f6fc63411fe9c420584d1f0bc3a6198d9e82f9d2ac542675405c023e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/es-AR/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/es-AR/firefox-102.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b6dd7deb95fe13341c5e47d7d4c0eba8751421af02a2f8d51500522fdeb688b0"; + sha256 = "94b42f9e14bb8402c6b51ce448d3e9e83db3ab4c7ab0749b62363b6f6b6714b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/es-CL/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/es-CL/firefox-102.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "dc89f4a7d99d62f998bfd3c73197b279a2edb20da8a2954c96413c64f5b47226"; + sha256 = "44fcd6fa6dcd135a52510bff5f16570c79398cc5599eb4ce4680ca5c5bb7fc6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/es-ES/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/es-ES/firefox-102.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6e52ac53a02df76bb56106ac8418e6f54f089b65ebbe9ec339d8aad209535721"; + sha256 = "8f7d2c1d5ee82c344149e7ec68e538ceb116c4781ea0478087aa8051de0360f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/es-MX/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/es-MX/firefox-102.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0650233bbd7a672f4d4bd1f1ac274f68ee47515447a6eaa4cae7a138f72a3249"; + sha256 = "e7e3c46bb5371675e08254f63281fd333deacf91426c563d3eea4ea59f804bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/et/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/et/firefox-102.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "bf607b4c76342da084597d0d2c92972236b847cbb1dd62d4c255a11de2b25ce5"; + sha256 = "43a5c07768df98fdba670436db37070cd26bfe5fd9fac9ed8ee09ab192c41441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/eu/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/eu/firefox-102.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4c1c3576cb9c151e81c0baefb854165dc00de39ccefede65f1f423a5438ffb43"; + sha256 = "bed9fac2f760ca237267976be131125ef1d20379237f6e35ef1e037ffdb46c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/fa/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/fa/firefox-102.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "39b0a53b67628f7a03c955da4a0cd66bd7d9d07cb7100134ea27dc57a8e84485"; + sha256 = "cf087b5bbbff300fc921727a8f6f19d8522cfe394957f9bfab1c24b25b797c30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ff/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ff/firefox-102.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f72efc16d5ccddec83d93e7600c99dea4fa45aee1f706b1cd1fa569aa58819aa"; + sha256 = "89edad833ebe7d9014c6418cdd45b7da0b5c02a26ac73461094c0e4d6f747c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/fi/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/fi/firefox-102.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "7f61b5f4c8835f62ec07e285fc2801e66911f498d2dfac1b4d8662955b32c107"; + sha256 = "08bce8ee22e05d1923ceb2cce574627e434be03269606ccfcb989376021b9253"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/fr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/fr/firefox-102.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "dd8ba0017a12593395dbf3331227b7e849c9605ec7576339a6c7899b6cd841bf"; + sha256 = "a09f140dc6c4cb1c5feb36d86376b28a8ec110ee7b464bc474dc432d69cca590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/fy-NL/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/fy-NL/firefox-102.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "53e79bff1b1f3a7140ec5d267b373bbed2e85e755fef75a847c8fb457a5679a2"; + sha256 = "c74790d0b6ee2dac789c7ac900d1331398a8b584e570fe535ee98ebf2121f699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ga-IE/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ga-IE/firefox-102.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e991b794d1b2ae0b87a52c5e55336bfa3b735e79d7bf84afbeead49d1b2ea92f"; + sha256 = "f3f4d9ac1cdce936d2dd21500e96a8fbca71c598c9884821d847caf3a1af96ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/gd/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/gd/firefox-102.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "95303d605278ab5bd8d1990fa262724756a30043b274b0ce51ceb496767ecd72"; + sha256 = "6f1985aacede5eefaeb238214b3e9710a6b9ad09658af0b88175bcfb84de3e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/gl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/gl/firefox-102.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f3d72b39e375272922804c6bc9036e243554a6d2014ce4f4fb2db57fc9ecd00e"; + sha256 = "0e54f941198dc2613ee086893d77d1cc0acb5f5c63920f3e90e5790b07526b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/gn/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/gn/firefox-102.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9557215a185992ebd4105f578a1ce24eaa795ed3fe59cd4c41dc5a0d35339459"; + sha256 = "c90295ddd2b8d4a81974337f6ac5927a00c73f6594f74363529539c6cc2f1e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/gu-IN/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/gu-IN/firefox-102.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f45ce9ebb0f773ceb6ec1bafe71f30625e7e90bdafb527ad26d54cfe6a17ea37"; + sha256 = "4f360d3f3e19691796e09acfb4e3a113e8e0abaa65a73202d532877940d7ed40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/he/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/he/firefox-102.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "ecfa6544e19c4550e52bedd739d67248a9ef282752699285c83cb139e1c3d7de"; + sha256 = "68e2e8feb093d43b7c6fd9437888b8ad38ad59f175d0b288b92b4408551754d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/hi-IN/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hi-IN/firefox-102.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6af2cbc926375ad508fc8d436b9de24ffc6dda0d2520af2696e5df517920c62d"; + sha256 = "29f8b443bf6452c1f72163e153a816858b5e6f3aa25a426f123c29d2c0848180"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/hr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hr/firefox-102.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "49d90776c8fd2f68383cacc7b56e0f7d010ed68a2bdd3f1e985117fa6861a498"; + sha256 = "95b87f107a2ee9049c64fafe475338365530d6748650602d9394a7d788590264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/hsb/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hsb/firefox-102.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "566f07a2f0cf51b52b0031f80b224b952b4f49d3651295cc9f810f24f658adaa"; + sha256 = "7dd555015b95436ef4fca0fd44135286db04a82f21f8ac28ed34a1bcdea7ab84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/hu/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hu/firefox-102.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "43f71c5bfd0a928d78dbc6f62f5ce34c1f156c75b5b500cf965617b651d5ac2e"; + sha256 = "68336899032caf24f732c851089eed028829362b6170372482a12c9ec2a5ad1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/hy-AM/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hy-AM/firefox-102.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e16d68212052cc83de8d35056cff7d0e9a774ecd77603d199e61cf90b6c11474"; + sha256 = "6dabf9f63acbb98bf2e8e58113ab1633e99224bed43de5945c298ab920a88c28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ia/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ia/firefox-102.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "a3f7718cc9ec80e0398bf3276d2ca2ea0db6e4026bf2fa21300f9e5bc7c1902f"; + sha256 = "28b5bac350c250111def748b3488310167ced514efda3d66652cf302b51f27d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/id/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/id/firefox-102.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "4b837ccb4e78e92552c0da74f9af9478b96a38560681d12ddf9842980772d6a4"; + sha256 = "3a6619999d4f6d7ac6e3e950a10815be5f39bd07c4e331a729a237bf757f6a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/is/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/is/firefox-102.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "64e95ecaec980bd97551e328f0ed878c92120588ed24bd3a155e8443e7e4767f"; + sha256 = "81a85f231acd5c5d13d72529fcf3b46714ac6ff18f7da5fed2792fa9f6b837c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/it/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/it/firefox-102.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "234f09fce994adcb53a9d11c68cf7ccb1b0bde15992da05242b0be79b0dbb247"; + sha256 = "084028f8ae4de1fa5197908e6123454cee9005836df6e27d09908bda454bd862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ja/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ja/firefox-102.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1989bff3e8e70c5804048e1e2f738cf42adc3d6a19c56ed3b580400e2d7459e2"; + sha256 = "fc57d26f133d9b6689fb72bf923327f9343fe1117f2a6b4d70555d8e4b10f138"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ka/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ka/firefox-102.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b4c06e751f8fcfd5bb1b1142e961fb46826e3e15f37085caa65af7bac7109351"; + sha256 = "13b7b1f15eb0dfe45608e105b2754ffc3f9f4f0f42c3e382e69824eb50ecba76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/kab/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/kab/firefox-102.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9b3fccea1c5b44e51e6cfd5e6f7b08254296a6106fbbf39f242795741ff0692a"; + sha256 = "c8941464d28d59e9761a58e1649e105cb37da3ef6f4804baca41edd8d177c24c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/kk/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/kk/firefox-102.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "38d09329bc5c08e4a518d9ac026d5af449bba8fc210c6903f748902e0a013f92"; + sha256 = "37e1e5ba8e629d46338669d5e5c26e2e9a5fb3c7d33b52aa28cae757d883cd19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/km/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/km/firefox-102.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "bc7d6215affefc5d6b474603f698b431b5dcbadf5d305705be8d83b169b07416"; + sha256 = "9d557b921da0456b39be36e2991807ce70c1df8e047d1609f08a78ce31f5706f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/kn/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/kn/firefox-102.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "af8613118b280e481250bdfb0e0ca53fbfd337a783c712b69fde707754c557f5"; + sha256 = "75101de577da0e10a111d76674948cb1e659bc0a6a36b9b35900b88f782af18a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ko/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ko/firefox-102.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1d20212da26b9ed952ce6ea60c6f769b1b737d35cc3e0ab095b5aab9b3c447da"; + sha256 = "779c0f54ef3d552ede4d5ff40d97f6be25d64e2773b94402355278648182e0ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/lij/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/lij/firefox-102.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "61521146ef77f25dd205187a03fc26c1bd527c7fedc831e9b8b6703ef37ee9ce"; + sha256 = "c64c00ef5985018c535fb70913e39c7d2f6ea68b82724d0c6a649f90def4fb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/lt/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/lt/firefox-102.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "808dd0fcc4e2b96ad5c83087827065fbab0c62b4eb9b49cbf865f3b6fe0972cf"; + sha256 = "46b734a29f772d4cf3cb9d576e855e5cca4af343df4d18937d9d6b69677af549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/lv/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/lv/firefox-102.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4684218cb17a75c2b622dc83deb3380f7eea4b8a580d07e9f60bb0bd3d59f1bd"; + sha256 = "3c282564c0185d848365ac5b7f7b08da0ea2a603209cbc6faeb5acfce7470630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/mk/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/mk/firefox-102.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "906affcb5603ecf006a24f02d9d7d83c5543c658d6ffc589a4d9ac103c1d8d83"; + sha256 = "940ec4b5e536141c133d91ce91f82c1fba6ad54ab80f5cccb48ae6791517e32e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/mr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/mr/firefox-102.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "18f2eb581b5f2e0a5b2403a04db05e4be95b94221627d0b9ab163edbf09af320"; + sha256 = "2879456b59139bba481b010600aba352eead272d9551f817bed91bc56730d922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ms/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ms/firefox-102.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a0464688640cbd8b5221c0d48f8d4147c59754b0657b771ddda5651a7fa341e8"; + sha256 = "a58e62395a63973e35bfad2adcae08ab6fd03397f0e2c6d0beabb54628943406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/my/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/my/firefox-102.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0121fa63fc9c2486101239cc09d3795fa461a36dba957a37ebc3a44228bfe590"; + sha256 = "4b823ef88950d285c623cd9d566cd236e58beca9330341cde9a2cb326240647b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/nb-NO/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/nb-NO/firefox-102.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7a91d9022e166e67259e8b5879d6a7a803e249830594c5796fef08ce1accb5f8"; + sha256 = "838a9a3de0037f76f7f1a4b2a36dad1519de075fb07b601cb7b12fa7a5ec1444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ne-NP/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ne-NP/firefox-102.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0c7febc07fc27e2d68426436a1fb72781db5b4a5d5d078cde0dc1648cd8cd5c4"; + sha256 = "f38894580d0e30144934949e53b6d8592874419900b115288d1d1236aab6bdb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/nl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/nl/firefox-102.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "8e833fbfcbd681e89bdc3d6b75fcd8432c12d820aea9a5adf8ecfa45dfcd260c"; + sha256 = "364ebf214ee76a134022b5a9ea5fe93733a0e1f84b8fd1c656de86faab58ebb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/nn-NO/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/nn-NO/firefox-102.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "af1ad4071c51ccc7a9621637dc97e99cdcfc62f32c5bed3bfbafb16230218fb1"; + sha256 = "6848b59e176f32c8a303fb6fc3725bb93a09846bb794210216a309be41bc5348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/oc/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/oc/firefox-102.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "b0cc307c384070d292953e9a81b49a742caed18e01e2da19404feceffa917f10"; + sha256 = "e0854f481b5f409560fe3c55022dc9372bcf31b714b6340db75451790a542429"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/pa-IN/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/pa-IN/firefox-102.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4cc6dadf08119dd67098a5d65248306e3970ccec15450000a61bf5dda109e045"; + sha256 = "536b87ed410bccecd1116f809465e6b1c103298ed1e0c9ae2480c3d9ff9e9929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/pl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/pl/firefox-102.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "619a694dd537ac2bd94eed9debc72f1bf9e8d35f617727f43f7defdc2804f063"; + sha256 = "2a844f057be8af4006e258d41906639a882f6b3220b41a0434de239a1910a8a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/pt-BR/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/pt-BR/firefox-102.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "21c3b85c4b936f1f5f4e1ee7f9aa3a42ceb2049dc752f2dd27c71dc4fc5e7408"; + sha256 = "ba789f481e5a35b86defdb020ead396932184ff782c8dc7a64951175473c8255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/pt-PT/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/pt-PT/firefox-102.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ae7a09bd78dfe0c4a7ab9c003cc3987ec68d481fc1cd13960b9ae08900e47ab3"; + sha256 = "0ad35706daac73d0013b02b77195f22bf75b3ef71652f3521221bfdb67401feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/rm/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/rm/firefox-102.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6c1a34331c8c09dbb9fac083f6f4dee3e80cc6fbbfc3bda82ddadc9546dfb8ac"; + sha256 = "87d0e1dc7bf312b8ecd58dcd1507eeb24ae7dcf240b2e054818a9fc5bc1427d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ro/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ro/firefox-102.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3722ddfafc4e69c6268d8e5d289bf64b691eedd34cb0e9a5986c33ec3fec1d75"; + sha256 = "7a7e9b5d051c94ce968b41f278a179b9610b4205d69934862f600d7b028bc194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ru/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ru/firefox-102.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "3dad696e2bf507be93c9ebe24f52daf801fb2db49607b22101f7a9e63afb47a2"; + sha256 = "7de6e2ed3e23fb4ddec0555af5143ebb5797ec7d9e2c6622e8eaadfd40531d8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/sco/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sco/firefox-102.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "fe387073c83a77f004c3219a3d22ee228e7437884e1488073ae3549370cf42d0"; + sha256 = "67e9ce90897a429ae2f13e27af66375564f05af02b01d7e292c7b061ea86e3a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/si/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/si/firefox-102.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "6dc9a38665cd5da3f2c6ee1e814a452c3c647932ce6352a540bdad78b076aee4"; + sha256 = "0a34f41d508d00f1a104991403b7a7be68c2d6e41ec9bd89915d86b1eeef4d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/sk/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sk/firefox-102.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b03321858d4cb8fd95f8cae16169e5fa8df042dba2459589eda8ddf60a8328e5"; + sha256 = "6ddcac0827bb9c052d36b19e81ea0dcd43f6e825448bd39af4975f15c56601f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/sl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sl/firefox-102.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "334c0ff537a6af1dd46fb145a0ea5bdd343ef12693c563a37dfcf4f6ac59c395"; + sha256 = "89626505a507621b729a4f1337b18da3203331933ec87419960e8185c1646fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/son/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/son/firefox-102.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "98dc720c267a7eb72a1b676f5d7bcdc1ed5bf08e4c5728fec34e73825f0b5490"; + sha256 = "59f4e313ae965c62999a6d657f4269c4552abb1dc00fb7d664f1f1380c372dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/sq/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sq/firefox-102.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f1ed88e2cb6b3e5e8f5d73df6605c76f46bb435c0e05524c54435d5d83db30c3"; + sha256 = "b17195c8d38e95354392a1856989c6409cd1ff3dadede5cf2c34fdafd3007c2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/sr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sr/firefox-102.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5359c2fa8496d67874681d66a694e943f92edfe01f6413aa0ba2529707461c38"; + sha256 = "3087ff60f3f6ee9eb02d758259d43d9eda0b9f065701a5de52d524847778f7e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/sv-SE/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sv-SE/firefox-102.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ca15b8f2764c7f23450f6bfd9cf48f41d8beda50e8e9edd248d229c279f51518"; + sha256 = "3085bc8ecb12293487bc6eddc0667f50821375332f08eb306bf9d1f10a1f95b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/szl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/szl/firefox-102.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2f9647af8b549c218199d497c71412badfcf95e6b9ff8e5635933b474d584b5f"; + sha256 = "1524a056299caa58953e2cb86ccc0a1cbdfcd12cda552235099c5f94fe468cc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ta/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ta/firefox-102.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "26d229ea43e636d241b3904cd395ebf9b7df817751315578fc09f0e32f89973b"; + sha256 = "bdaedc46817ddbe489e943d9476c3b6e9fb0a4d9e3d3e06889a06cb713ccd497"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/te/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/te/firefox-102.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "0523980454e94b4d06493e57099d1e4100fe71b739d16b7221f2fdab6c2837ef"; + sha256 = "fe2b9b572683bcc0a4d5f49cff84575b7c2df6aff856c9c6d2764240550cedcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/th/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/th/firefox-102.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "29c8d2c2113f964902a7aa26c23a4698366d3e8fc92d29867bab06fcb3412bb6"; + sha256 = "6e236f5cb5cbf2680fdfa5478bbcb713068a80127abd8b7211d4310af3f912f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/tl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/tl/firefox-102.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2f3371d833de8e225d6b697404b769c3db240d87c8635120872a1ce01b3f8fa7"; + sha256 = "7979d7cd412453a0d8271566d53a2e9aea6276a2699f8f19512d10c899d61727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/tr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/tr/firefox-102.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9bf81a49a73faa431add2918120256beff97e2f5a18f3f2f0f650ee94b74adf1"; + sha256 = "f7fab006ae3012b6e5a69e7053698fdfad5354dbe19f4e7cf96062b96134fcca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/trs/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/trs/firefox-102.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "ef360e374b83af8718aaed412b4b53dd75fdbb075066ef5dd4109304de6538b2"; + sha256 = "e6daae370f97e48a034c601123dbe3de9de5a24b7a56929bbc47d3c7eb48f008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/uk/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/uk/firefox-102.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "40d7305062cea9f154e74d0ca2b13173423aee72600bf1bbc7dae0a8e34bb23e"; + sha256 = "a2155e80740ea11fca29aedceda897d199af30c66b545998787361af7e540b30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/ur/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ur/firefox-102.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "acca93d14b7dcca56e764c3fe45a7fb162042b3c0135b35da98aa7c6d25299ee"; + sha256 = "d8d63bf451f3bee189471de2cc89f56e9a617b2436e5e5cd6dbb5e7dcba602f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/uz/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/uz/firefox-102.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4ed0df0b2695c85fea1559bf2e66b5afd1dfcb6af1f3a4fce6fd002c1fcfd3aa"; + sha256 = "901d130bae7926d04d2b2dcd5bdf2aba6db864cfed7766961794b3183816ebc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/vi/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/vi/firefox-102.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "14de32ad78a699ba0081d8086048070a66a0703897c5bca4325b81705c7911a2"; + sha256 = "113b29309cfef424a7eeb7693c596fc4eb68d5f969c2f74cb16b0dc373613583"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/xh/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/xh/firefox-102.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "16436cb5dcc4376320157f299bd7cb6a16ca4dd309db484acb805ddc052b06ce"; + sha256 = "31f55399b30544f6c1d2191132f145aa2c9c608aa91abfb1f5c298c751f3819c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/zh-CN/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/zh-CN/firefox-102.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b4c0b35289313033c828327fccdeda48d153b55a6ca575ec04ef181dd1ca3a96"; + sha256 = "5f9530eb7e67ebcd1188e481520600f646a85650f4038588fb9f6a7152473731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-x86_64/zh-TW/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/zh-TW/firefox-102.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "44123156fee60e38c66174ea3d4d3b1e9fb896b9fb1b724f37f243cd91aeb9a5"; + sha256 = "8bd5db690b53e47ec261d595b7c60b7aec6d70bd9ed42bea0ae4254ebb44fe87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ach/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ach/firefox-102.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "3730091d837d6ce8929d67f2a75b3eac0e3429177d73f351897a21c0a957e533"; + sha256 = "fbdfb32bdb1b1d336c8c7882f3942fa45cc6a1dd8388290f4c63b68f1aa46331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/af/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/af/firefox-102.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "15126a658b2611fa62a393b90b80510ffdffe75c3f169be48aa48f7c4adaf417"; + sha256 = "409af0720c69fcea10d7b34fc730121a03d10a16eb38a4bb7be2b3477f06e19e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/an/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/an/firefox-102.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d1ccd4db01db49faf062f6b5c5cf4026c30bb86b0f7b7ed7450630f0214a73b2"; + sha256 = "cd86aa9c20e803b7308cd7ef01f2e00a31ad7cb8a895a50f721e97e4d438c729"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ar/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ar/firefox-102.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "66506e827292032df317ed27d9232479c0dfa4192009efd9d8bfd72353503992"; + sha256 = "4ebd6e2f0d84136174587e51dfce1a269c40aae4361bad15f78f91da8e073fc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ast/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ast/firefox-102.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5a7dd3da57c35cb496853a3bb630a6f04fa352642fb7a2a63e525c4d0c70d61c"; + sha256 = "408a63cb9127e9efac43204385723c3bb51810db721a0573830e8f4f0e44c310"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/az/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/az/firefox-102.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "72de1f6a586c30ecfe6d9071bc745da99d5f250934689ddcd43b367941c0e36c"; + sha256 = "0f69ced32b17199c49a1043e41dce80e35515c9e16667364446e2d3f45441b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/be/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/be/firefox-102.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b0383fe35a2a6670d5f470f9e63251e2d703dc16b1afc707522bff6ad9ec9ab9"; + sha256 = "a809e9068bc372ff072e1b34d0ec62ee077d3ee9b928c9a73648605e81b90f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/bg/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/bg/firefox-102.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "74b69784aefe4ba9fc8a45573385655bc9223a0d0d878266eda3cdc9474d795d"; + sha256 = "000c520bd71c2590638bed40b90cc3075e09d397d0db4b8c351776635ecb1107"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/bn/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/bn/firefox-102.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "5c38263647a72cce19602b027015bbd826779717b7d54b60fe2cdc9c54db7b93"; + sha256 = "5a2974627a5aec428e80c6518faa28554fff2c86700309ca33f7c78a1d02cf8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/br/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/br/firefox-102.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8088dc85a7f875b80c9c5deab139d78fe91a35dec09dfe114ace00424c6084bb"; + sha256 = "895d42bc70a97c8518c97c25909cd01866a92d6f5b88dbfd8d07df0d4a1166b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/bs/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/bs/firefox-102.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "3dc170d87e780e495818907921dbd0fc95a9e83979767b69a48b844ebd242958"; + sha256 = "94b1c4a00045b99f58eaabc0b12b912a83e6c1d79d318ecad4f92313a67ff6e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ca-valencia/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ca-valencia/firefox-102.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "eb1c20effdb474054c84722ee2e4b37a7b45ec7403268edcfdd39f3cecce8431"; + sha256 = "778de777b2fe32798d24b7a4638c07b2fc0fffbda00d703cae128d609e3a0654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ca/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ca/firefox-102.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ddf1b8f12b7fe29873cb1031a8be746b165932db2c758f1194c6fcaca31c1e95"; + sha256 = "7d4dd5441522ce7191fdc4a07c15031a9b2c1ddef02d4dfa326267ba8304756d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/cak/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/cak/firefox-102.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "083c850720c6607f469059d76393e0794679789c03242c394ef92ee2926e91d8"; + sha256 = "2a0869ce3590affd116c10d5b234642d6066bebf6c7d5f2daff6448a2199661c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/cs/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/cs/firefox-102.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "ad509e0556df3eccf6f93689abf2d47bdb9774994de6d69a900933c748cbf836"; + sha256 = "fe10703ec63227e228ec3b5c128855016f6a5151d73a5e20a316741b12c75800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/cy/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/cy/firefox-102.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "76cb0b781283f55204b4fbca5707000db9394205286298a16faf7223a0ef72ca"; + sha256 = "4fcdb9a767e02fe7f16278f37e66a086c49b05ffe96ea42e5144d6bbdb61dd98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/da/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/da/firefox-102.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a43c8b82a3c3728dbd18f9bb631b48bc8ffb2180988b00744bf6002934652520"; + sha256 = "f31b5be4fe48fe39490e1de239e66aaeffb4612dbbe9018cfa872682ecb15c34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/de/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/de/firefox-102.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "7fcf3e841085502ef3be08e189e5a625a4f5e3f7781bac1e9af07bdc8d5d8991"; + sha256 = "389bdc21a35170212a1e2314c2b4281450a466a1858cd11c3a4fafbb03b6ab8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/dsb/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/dsb/firefox-102.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5bf2bc5c5e984f7e4f9f098e13ff8ffe68e52c4a35f240bc8e0c0c5c3363ffc6"; + sha256 = "c60a73d2f3aeb511afb2544667032bb547a63f90413fbe7cbd64feef51666207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/el/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/el/firefox-102.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a2f111852f4d16f7ac14dc4bf57d95a1e67a6e45926beccdd5738e803dffaad5"; + sha256 = "ddfcc601f810ead91aeee633470774b9d3a659b20c1d58e6d07d2d78f8adb47d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/en-CA/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/en-CA/firefox-102.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "863befdc4085eb9a13cfaba07f5d5f3cefd03ea4e0f9f24baca3ecdcedf44166"; + sha256 = "a0d8f5c7db5a9213827eddd2c3fc58e347bb2163448b6f0b2592f0968467c074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/en-GB/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/en-GB/firefox-102.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a1e39a64862fc3652e02dab5b69f20d10c06d23f5443bf7b1a51e583da7c85ff"; + sha256 = "8cd6d10bcc63a1a55c88e7f691c38f1b8e62a9a8cb951461706ff0b1213d870c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/en-US/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/en-US/firefox-102.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fe4155a4a0c7ef39d9dd4b21158ddf54db5cee8e1937c8f92222030a072a5e96"; + sha256 = "643f899b1a3b2bb2a34c9ccab3375881ca7a9bda193c118927ba1f9dfbe56b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/eo/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/eo/firefox-102.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "6265123c726cd2632c757c960fb53227e191851a67fe46d2b6b17837e6e96f16"; + sha256 = "fdf74607b94e39c97f38b4a39195c90c9070e2177a929f861b7380b91996f465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/es-AR/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/es-AR/firefox-102.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "d8ca4ff428a197afca38b4d574c32d75ad53098b426ea607f9e65e1e4b1937e3"; + sha256 = "077d138678f2fcec2b23c99f5beb049f370885a099d2a717b86e6a33facaaf6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/es-CL/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/es-CL/firefox-102.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "83e3717dfcf0a8c7dedbdb9406d46d59d74c49e6d4f906ea7fe91ead38e5563b"; + sha256 = "82e97dd939939445c7d1e982f2b53d71099fc28503f7cde167d81ef596638f1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/es-ES/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/es-ES/firefox-102.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "5138926d7929c6bc9593129d84b9826d413c3d581ac9c724ed60c0fa00a199b6"; + sha256 = "72ca69b410be2b94dd652678b6a12b9d72b2f40b7029a0073dc14026e5a9c17e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/es-MX/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/es-MX/firefox-102.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "82ba6b83d431f90d9cc085cc5da06d7225e959821b6d4044f522a9064dcc210f"; + sha256 = "88ef1651217bedb95982ec13787a97b382bdf1300341b830bb349fdc8869f239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/et/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/et/firefox-102.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c5a18532919764b5eb1a6c3d57451691d978fdba19edd08f6cfd628db0a8ebb6"; + sha256 = "a804fd794a309d16d681e75279cdfbf1eb34594d002e543f3bb452e8cfd9a371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/eu/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/eu/firefox-102.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9998f18a3fcb4adb00af2d75cd04516d2a98c2ffff95e3ae7a9b0867ab564d5a"; + sha256 = "0a45d439ef31f40e795cdc4b1bac9ccf7047feeb9330a62c2e0eba108e8c4b85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/fa/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/fa/firefox-102.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ab3f03e446861f63e5d939d428c91ab4ae5703c10c523c64852f4ef6323ec7ba"; + sha256 = "c80eca05272939e9fb8204d7e81d4c7e5cc94f674c622f0d2d02c34071540bae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ff/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ff/firefox-102.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "5a9177363814dcd79b119323e3b1c40ff57eee9b079bc1caa563f8ed10673ce0"; + sha256 = "7cd45d4bd0de9493c70a327722cc55fa61ae4ac088b3738683e018f33dbcb089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/fi/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/fi/firefox-102.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "7938c33f9940b9243f4b9c30392904270ff48556b4f391f1d725a35ad9cf3ef6"; + sha256 = "e3b42cf290b78cd42e7354942dd9976a327302074d032f868c377912631ec565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/fr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/fr/firefox-102.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "005818dfba4e42cd2ab19032c67da52bbbd3fdee5af32363da0364b12cca0520"; + sha256 = "589665a8515564aa9fe907fc9f2eadfb1ef85afd199c0d4add59339ebf2aac60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/fy-NL/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/fy-NL/firefox-102.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "30e8ccb6abc250d91e05a128e49e93bec1bbd9837ad22531110fe876105fd2e0"; + sha256 = "83855c24442b8d8989077192d29201d3ad6dea8e2bc6d80d978ce5564be8293b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ga-IE/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ga-IE/firefox-102.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "6f94e7bc7ce2f939e172287f5e3dd7a919be3a3e51d3cc6e4d04f7d19f7c4311"; + sha256 = "f240285131c060417ba9091341f1bb399936a25068f680e021389e2a498f9b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/gd/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/gd/firefox-102.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "54314836fc112ed38af0e67c0d06549e8f1360fd129e82f35e6679bf47e40bc1"; + sha256 = "c8e2a0350c5b6e9b62028bbad184291c15c10fc5814c948f54d4d2fb29f52534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/gl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/gl/firefox-102.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "3bb7f7c2295f80094a9413a2dbd2632ae3185e82288ffba2f94c89b9207113f7"; + sha256 = "0635e6015c14abb8680794800e0f8400a7cc123639b782b9757bc0b6095a5ee3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/gn/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/gn/firefox-102.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c109e5109eb6bf908bfb40eaf209887e96cf0e6fa9f215eed1192a83c471a9c2"; + sha256 = "9418e2b79581a9c2b17c4cecf7175a1456db572e8af437480758c3201fd3f40a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/gu-IN/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/gu-IN/firefox-102.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "b46a52077ec16056c47db5e77e78e6ebd63c079eef13eb106c4547e6757add49"; + sha256 = "d0662e73146b3c35998f4da55297b6785e291c2dd25fd71f9276e592f347468c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/he/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/he/firefox-102.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "ed8cdcbe05a11bdc5d366679ee8ea8fbbb62db74dc451b5a3a1cfb7706d73231"; + sha256 = "4a9481f68c4386a331b00613f572ca39645de17b2c639b0cc61a8d94eaf54b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/hi-IN/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hi-IN/firefox-102.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fec133a50d9c0ef91b24231e6eb1bfe91a66224bdbe985773312f6d14a1ffaef"; + sha256 = "0bf61ee762d7fa4826ea1aa3004acf6d01dc86112d32a3232e623198407bdffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/hr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hr/firefox-102.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f95594469af643f49fae13e48a40c0c4a9e3bf81f1ac9a7e4f42002c464fd7c2"; + sha256 = "d1c05d24c85255f2347eac4e816d0474e630db3b621931889efdece93096dcce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/hsb/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hsb/firefox-102.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "218df4ce22d93f0487346de842d83c6175c1301c68a3990ed79a1d307bf38074"; + sha256 = "d0792a4eb606bac718c73d303287769fd86f2ea21c8974987b04374be091060f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/hu/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hu/firefox-102.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "1db15330db682da2332958848cbdc6e3c89038ceac65050911f2fac75c00bf51"; + sha256 = "3f90a3a53b6487fa0df6f34a5c2934b033b5c054eb5c261c2b165627bb3689ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/hy-AM/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hy-AM/firefox-102.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "71bcda0474fa2e5546bb55b6cf1199baac1c277258b2be015b6a0d833be2514f"; + sha256 = "d4a6a5640f6228dafe21a14dcb5db7fa8c779587e0ab956df36c7be8b11c87ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ia/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ia/firefox-102.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d02299856a2508098141ad78ccbf15c5f827f5e8a0cdd33f39028e99059513ab"; + sha256 = "4430bf86d60254a2aada4cba2ab341d1e50e55954b425fae91470bc290fe42fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/id/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/id/firefox-102.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d79ebf284b2c503083335c3c953b4ff382cc611f8a5a2cb4a037a349bae25bf6"; + sha256 = "c155a606ffbc0353aeaa96f4a55c97fc866e0e544d726da85201869308860d4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/is/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/is/firefox-102.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5f430fd77ce8a6a4c21aca62b58e095e1a9ae02c9d3694de49447f32226fef83"; + sha256 = "d54ef1d69c63dcf52bde7ee2edcc7198296a5262d53e4a7f9d3afce033ef325f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/it/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/it/firefox-102.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "79aed49e98d5798c65f268ad8506f89ffbed3b980a289af6ecbfa265f3790ef8"; + sha256 = "126d84de003c8580b690682b9e0ba2f6f99704f4b9373e5965ab718d62166d3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ja/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ja/firefox-102.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ec4c928f3fab6366105e722478b997c53102fca980071548c2d60902387891ae"; + sha256 = "8d126a58462dae9f382074e65fc36f803402e0ade5863a8193eff150881ece92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ka/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ka/firefox-102.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d2763ea580ea6d1cdcbd753f1d4bc3358bcc08a97658d1a05969ecfa22eca653"; + sha256 = "191bed12e433b9abfc6ea6529f3b3ac3b61bdde481bc5a9a72041d70ba6340d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/kab/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/kab/firefox-102.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a41ebdfa04d63d892e114ca31a666fee61d369640a9509b2ff94f05f7b656add"; + sha256 = "f60ec7bc77fe04abb54ed8a6707fe9ecdf599e863e97b0b0f38978550e003b03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/kk/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/kk/firefox-102.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "79a80098990c0d103d4733ab0a541187f719b0bfead5f30f332f6c941bea3e22"; + sha256 = "923e5e44e9372861edcd676fb7fda2dbd7bb86746ba493d7b1931e736d197095"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/km/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/km/firefox-102.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "afa21a83356769a9ddc74ddfb2598809485a3f89e4c7063e1bc18180e3ac9464"; + sha256 = "f95a2ce04a221d25fce530aea15ca8775c27946ede27dce968d954139b7ef8db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/kn/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/kn/firefox-102.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "9eae9e16db05c2ba1bcbb8613885b358ecb295c6e220fb53d59ad7cf067016a8"; + sha256 = "5ac2b0ccdaa80df9407fec4bc28bebd197b15e46b909010e4846fa0ee5fac7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ko/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ko/firefox-102.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d043c244d9e91d606095ea08d3e197cda8fe5d78c07230f13f99d751c1e324f9"; + sha256 = "26f7118844251d21809334a95718e59e6aa7343f20c997048aac398f3abbaa44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/lij/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/lij/firefox-102.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "cf3d5899bd663ab15afa357ac32e7871d86f3f7f4c0e447dabb6fa71bbbe1ba3"; + sha256 = "7ea29446320a4360a3c2931707f06bc28497dc1e126a79287a44c53abb4f0fac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/lt/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/lt/firefox-102.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "82ecbeb020e63b5bced7571ba93c2e3ce73be85bc9d186f40e9f201e1bff2876"; + sha256 = "4d568ea735e757e21e96abbf5ccbca6f507c1d539a4ad19ce2d69a7091271f56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/lv/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/lv/firefox-102.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7439b7ce1ae5aed8179729664a6b4ef3bcea62735bc0a0d009efa036977df069"; + sha256 = "493ef18c7f5e5604ab3e6744255c316a279b52b6a669ba9753241947a3798219"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/mk/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/mk/firefox-102.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "126798aafbc5d36c2ee20ce5af940d25aed23aba0d7d24c8548830711d6ba33a"; + sha256 = "0213a3d4ecf5e3e270d8881d893441740849059e5db89d134f07ffedef152452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/mr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/mr/firefox-102.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "407d3a3a41cd6aadb8cbb10c1a759b14238f9e1fcc72b26a9bc5c6e48003705c"; + sha256 = "feaba709b7699e83bed8cfb64ea8bf5acf38ecf112860353303231acb5579a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ms/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ms/firefox-102.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f68179a547c53c3fb4abface982b36948bdda51ae45fc77782a8b2ffc5c289fe"; + sha256 = "592bc3716c07eb6f097d546538f8828e84ab6006e6459dfe5deebc06969f08a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/my/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/my/firefox-102.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "55ffa1b1ab79073acb88dc1cc2a28641b6e4d237c60ae2fc21ccd5112ea75e80"; + sha256 = "aaf34b393f58dafedf934ec76ff01bdcbf2dbe09b984846616860c5a505db8ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/nb-NO/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/nb-NO/firefox-102.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "538e77cd9ddce689aa117668ad75968b010025e6b400fc7bd96b5204ce9a9537"; + sha256 = "0a31ea0a6f8af9205ba043e3a213407f20d33477557bee9f50bc12e67c2aa4da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ne-NP/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ne-NP/firefox-102.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ccd76c2e71b2d96481a75070ffec326c42e20b8024a0f99ca86056bdb67f2e7f"; + sha256 = "a2db06b7b440fa82788dd98587d16ad66d9e8515fb36695d65ceb00f36b3d9b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/nl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/nl/firefox-102.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "682076a78e8d7fb7b2575e55dc78274299cd909ec5c9ff3d543092c98b9c9f40"; + sha256 = "ea3e758916e49e34156ee401d18c1d476286f81941fb12ecd9e38708173e9e72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/nn-NO/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/nn-NO/firefox-102.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6f8506ffcafc4508833a753f8df3f329a0b5f5ba452ecefca8a0b8f224398421"; + sha256 = "b30bddce41b5620c9e354281835130776d6499bc3612a0d773e2e55712499a21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/oc/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/oc/firefox-102.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "8ae874315a44ac0e0de348082529e307ded81aae9252e2bb267b5eceddce65f3"; + sha256 = "d1d644e54224043e243ead3cc901b5b8e0345cb9e4f8c229d32e66bcc910a667"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/pa-IN/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/pa-IN/firefox-102.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d8c59bc7d2ce3f983fd8b0871d2f9a3ba59c4c6d82704923f5372b5e27be0d1d"; + sha256 = "19085cdca4fc685a2a7a7cbd9654ff1d597c8be39fcbf83786641ec01823878f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/pl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/pl/firefox-102.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a4e8fb0156d7b3826adf9fd232caa548bc855926eae1ef67503ef76f72f216e2"; + sha256 = "d69e2b0ccaa0980ded04452d9fa1b79e85cf39f60f03b7566c3b2f428b678ab3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/pt-BR/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/pt-BR/firefox-102.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "938817deabf50ffbf3aac9aff7da7c97a9ce3758a6c78524fee99b24db2528a9"; + sha256 = "90aea975b47dc134ca37a927ef8a6aca4b0e8a54bbcb62aac48be5c5284a14f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/pt-PT/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/pt-PT/firefox-102.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0f3dc9df4946e917b6d3f5ba59cb5224c5b10ea03f0769dfbb62560774fdde8a"; + sha256 = "3ed70ae4017110efff1b6484415931b209944f1c0175ff65904753f8d635ef19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/rm/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/rm/firefox-102.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "957f9794b99fddc4b778e5f0aac854d5310e2e4c8f157f3d96602abb20a8e3fc"; + sha256 = "eedd78a7eb96cf59edce029d83185708e5e870401359cd5871b7fd21bb535ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ro/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ro/firefox-102.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "5fce2289eee60f15fc6c868192f571fa4faac863702bd35fcc65ba4b2b3270ca"; + sha256 = "22aa2cac8285f5a8bb6d1e9773d2ea0ba77284715657a8d678bdc9dc26fd05d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ru/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ru/firefox-102.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "2c226a1da278e8924296c190c7e9cbd6f0d986652b4536ecc017626434507e50"; + sha256 = "c7e19d09aaaf8a1ba83cb8554e6ea5acc7ab2967249cc605dceab8348dbe3d0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/sco/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sco/firefox-102.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5cb621b1686672305bc9c597a8f11dd44f205054ffe5690994cfff3907a0ab22"; + sha256 = "72a99f4fb3138cdaa4aa2b21898aab53b99826283619d4873e845ed0e39886be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/si/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/si/firefox-102.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bb2ac6167632254f04ea446f5f819cab31fca61c630a9e2b17253f581017d27f"; + sha256 = "d7b50cac4d681c6f80ce712fbea95683a329b4240df99eee6eef2eb37943670f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/sk/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sk/firefox-102.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e9740de798e369179a5b963f650ea003de3d8d2959989cd7a5a39ec49ca69016"; + sha256 = "577ae57c5b945670505c0c41a91b85ec07213482073bd38e7ad30abbe8fa58b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/sl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sl/firefox-102.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "881ba248e489edee338aca98792d206cb8f749ef957197a9d6498595ed85e721"; + sha256 = "01982ebf9f2fd307d002c8d887861ddd63f7a939dd086fad00a9ce10f7b38662"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/son/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/son/firefox-102.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "7a9774c565cafaa531b43cda5242f2d0d7fbf3c5daa595f53e1de4019125a7b6"; + sha256 = "19d1cbc9647b7cff655a84ad383911ec29928dc14fa2782cf7ea8da833fbe89f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/sq/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sq/firefox-102.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2ed96996f3dd7a6da33403af096dbf8e077c141a8d7930384b916c43b606fbb8"; + sha256 = "d272017b07c3b840331a7cb752af406eb7e5b5349df3bcf764774e1482830184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/sr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sr/firefox-102.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "15c96cc5f76b9067a0f7e7adb58ae23a37f9b06a5094c14bab382577fc4629db"; + sha256 = "b212c14f52e01c967e6e17ef14415f2d46fa285f2b7f9487d0822e5a39c8673f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/sv-SE/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sv-SE/firefox-102.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "608945e00e5322c6e7ca814154d3e6df333f8114ad21f0ffd8a9d87efd2a8972"; + sha256 = "13a289c4a25512dc8c9c9d08ed8ea2ffd24956756b74f02375dedb4e8696ac4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/szl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/szl/firefox-102.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "5fa3b0bc14887479c7a82ba17d2f6a63a3715b63ac5e19d4576af89f8c84ea10"; + sha256 = "dd9b42a7fa3a06c0956e9aa4ef95767a81a9ea2b410708bc394c0b066bbb0711"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ta/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ta/firefox-102.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "08f646c6d6e64b954923cc02fdd820e413f3e3dc120b4d4fc189f52d70d7b6e6"; + sha256 = "8e869f787bffb0c76a913999baf087f4cbb30598950e2c7c5d48c1d99eed7042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/te/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/te/firefox-102.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "514f5a8927a82c0b5ec4746554daffeac2403c10e7c76833d2d3cf77557820d4"; + sha256 = "06cd50bd7f577f915efa0c904bdb27906df9bcd24a94f35aa904299471a01cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/th/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/th/firefox-102.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "93a6bcad7acf3588b13ee7e7537d68988785d04a245dcb2bb6bee7644d0bed73"; + sha256 = "21bf4b45ddcec7f901d8dfb98bb6d176c5f05384b4764745f2634c29c9a91248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/tl/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/tl/firefox-102.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "7c1ccf221ed095d7c8afbf8903ced04f908f90bc3c83cfb207b5c4c2c3155053"; + sha256 = "0d19a59ca94d2e561d2084bd0b25806077da7bb14d0d94e062d28804b7dc3b8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/tr/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/tr/firefox-102.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "010dc56e6966947dd1a4a1b7462e7db842df03da955228e7d1a36906e7fbacfc"; + sha256 = "26fb0058417e1799025b3d2d045f7e4f33e82f69312d138afb5fb3713eda5a71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/trs/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/trs/firefox-102.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "c684639b05c2cac1b569ec22ae8a559dd4ef3f1f27bcbf350424142f752541fc"; + sha256 = "846d4a907f4af9a85d72ce00e3ae1793e35d1f1df96b57711cfa8dc4cfe5c0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/uk/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/uk/firefox-102.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "799d73d67f45ece8ea1e30ab7b99a263c8a79cebb9cd47fbc373a6a145782a88"; + sha256 = "0506e021bf1c34c6b1b4fb3c3fd095431bd4852224bbfe807a99404c9fed0d1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/ur/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ur/firefox-102.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "429b7fc64018c271a4177b746cb7a757cd1c3027e49a3f7e2cec25164b7d1950"; + sha256 = "a0fe16bebc32cb512df1b1251b87f59bf14da25d18b2bab85fad96f5be796466"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/uz/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/uz/firefox-102.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9f1fde31d699fcefd001eb80aa3fb20fffacddd69cf9dcc83f16d20dec809444"; + sha256 = "4ef1a2b0708e3263799d353d1a363e02870da08a608e8282b982bdf93e200cfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/vi/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/vi/firefox-102.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1286ea53f633fc126134f6f1787f72c676c8ef33668dc331d1fa9d02ddff015a"; + sha256 = "7325a392d359c72807f30992469d72c36b8351b1c5b08d96cf77d8ed5def7437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/xh/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/xh/firefox-102.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ae793a6c51bf274b5fa7f802325db70cd1d4aea5fef310dedd67d1945bebe3fd"; + sha256 = "83d21390a892cd3bf381f990a9bc51703432c2daea99aee9d07a5225a3199b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/zh-CN/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/zh-CN/firefox-102.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e7fc147e67eb25a1c5a4d7aebcaaed6830c3c532dc0c79568f5932c0b30f7399"; + sha256 = "b4e2e92dd46553a94eba49af88229f5d60f2c6d00539276799cb8be65bbab21c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/100.0.2/linux-i686/zh-TW/firefox-100.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/zh-TW/firefox-102.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "cddc2580b752569d6a71e96fb0c5f9f9fb93dbcdb25c64cdb66645731c415839"; + sha256 = "0f9cc66cdc5478cb8c270db76dd5396ac9c8aa0a8c81b5d8236b0b4f3c5a8a3e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 06bfddd1d8d92..9e3a08cb66684 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -21,6 +21,7 @@ { lib , pkgs , stdenv +, fetchpatch # build time , autoconf @@ -87,7 +88,7 @@ , jackSupport ? stdenv.isLinux, libjack2 , jemallocSupport ? true, jemalloc , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages -, pgoSupport ? (stdenv.isLinux && stdenv.isx86_64 && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run +, pgoSupport ? (stdenv.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run , pipewireSupport ? waylandSupport && webrtcSupport , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , sndioSupport ? stdenv.isLinux, sndio @@ -219,6 +220,12 @@ buildStdenv.mkDerivation ({ ]; patches = [ + (fetchpatch { + # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 + name = "rust-cbindgen-0.24.2-compat.patch"; + url = "https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch"; + hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o="; + }) ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch @@ -328,7 +335,7 @@ buildStdenv.mkDerivation ({ # please get your own set of keys at https://location.services.mozilla.com/api. echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") - '' + lib.optionalString enableOfficialBranding '' + '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' export MOZILLA_OFFICIAL=1 ''; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 43703daf2787c..788a339ea0d28 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 = "100.0.2"; + version = "102.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "6d9922e35e496fa63833ba03d1466e075287e40e50854ddc4f4a2036d9c7ca1f35c03bc6f708a3c469e0ec3b389b3346ac754bb84df0fecb86955fc21c05e00f"; + sha512 = "a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417"; }; meta = { @@ -26,13 +26,39 @@ rec { }; }; + firefox-esr-102 = buildMozillaMach rec { + pname = "firefox-esr"; + version = "102.0esr"; + applicationName = "Mozilla Firefox ESR"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "76494363ffdbd33b61912ac72b5cc15450e4b2936898c84fcf3980ccfa6d7ecc05524a63a60827d6caba999ada5cfd6f121e893ba0587778ce11654d0daf21d7"; + }; + + meta = { + description = "A web browser built from Firefox Extended Support Release source tree"; + homepage = "http://www.mozilla.com/en-US/firefox/"; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = lib.licenses.mpl20; + }; + tests = [ nixosTests.firefox-esr-102 ]; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-102-unwrapped"; + versionSuffix = "esr"; + }; + }; + firefox-esr-91 = buildMozillaMach rec { pname = "firefox-esr"; - version = "91.9.1esr"; + version = "91.11.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d432d559f2c5f4b0bc66a755db7d61585e24a727cd8d18630854b3fb8633d54baf61ed65b580345b13d52b66288aa15ca8ca5cfcde8231e88108241f0b007683"; + sha512 = "bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6d93629e71884..1b8e3c879676e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -97,12 +97,15 @@ let nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + requiresSigning = browser ? MOZ_REQUIRE_SIGNING + -> toString browser.MOZ_REQUIRE_SIGNING != ""; + # Check that every extension has a unqiue .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if ! (lib.hasSuffix "esr" browser.name) then - throw "Nix addons are only supported in Firefox ESR" + else if requiresSigning && !lib.hasSuffix "esr" browser.name then + throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" @@ -118,28 +121,27 @@ let lib.optionalAttrs usesNixExtensions { ExtensionSettings = { "*" = { - blocked_install_message = "You can't have manual extension mixed with nix extensions"; - installation_mode = "blocked"; - }; - - } // lib.foldr (e: ret: - ret // { - "${e.extid}" = { - installation_mode = "allowed"; - }; - } - ) {} extensions; - } // lib.optionalAttrs usesNixExtensions { - Extensions = { - Install = lib.foldr (e: ret: - ret ++ [ "${e.outPath}/${e.extid}.xpi" ] - ) [] extensions; + blocked_install_message = "You can't have manual extension mixed with nix extensions"; + installation_mode = "blocked"; }; - } // lib.optionalAttrs smartcardSupport { - SecurityDevices = { - "OpenSC PKCS#11 Module" = "onepin-opensc-pkcs11.so"; - }; - } + } // lib.foldr (e: ret: + ret // { + "${e.extid}" = { + installation_mode = "allowed"; + }; + } + ) {} extensions; + + Extensions = { + Install = lib.foldr (e: ret: + ret ++ [ "${e.outPath}/${e.extid}.xpi" ] + ) [] extensions; + }; + } // lib.optionalAttrs smartcardSupport { + SecurityDevices = { + "OpenSC PKCS#11 Module" = "opensc-pkcs11.so"; + }; + } // extraPolicies; }; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 4d096f46ce082..c1c431f7300d9 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -162,6 +162,7 @@ in stdenv.mkDerivation { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ primeos ]; # Note from primeos: By updating Chromium I also update Google Chrome and # will try to merge PRs and respond to issues but I'm not actually using diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 4f778ae138970..68e1f3bc720d5 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.13.5"; + version = "1.13.7"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-HZGI9vWSYCDH0lW+k6hvPm3UVW6lR8Lhr3H7blNupNk="; + sha256 = "sha256-WUNDkLKT/AgS5WkBKbVSM5/1zSjQuE8Aq68JLSOHFEs="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index bec0c3a9eda9e..55451167e0a85 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, buildMozillaMach }: +{ stdenv, lib, callPackage, buildMozillaMach, nixosTests }: let librewolf-src = callPackage ./librewolf.nix { }; @@ -22,6 +22,7 @@ in maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; }; + tests = [ nixosTests.librewolf ]; updateScript = callPackage ./update.nix { attrPath = "librewolf-unwrapped"; }; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 5bad3f1ed7fb1..e5dc54729e510 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "100.0-3", + "packageVersion": "102.0.1-1", "source": { - "rev": "100.0-3", - "sha256": "1n99amk6ngxa7wipc402gffqjv4qmgbaahpz3xydfarxw8gk37pl" + "rev": "102.0.1-1", + "sha256": "10f9gngn04nwrhcqkdznx7209c4javscqz8arswyrn4c8rc5x6w5" }, "firefox": { - "version": "100.0", - "sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa" + "version": "102.0.1", + "sha512": "a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417" } } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index ce7aecb1dc57a..227442b1e4b6a 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -30,6 +30,7 @@ , at-spi2-core , libuuid , systemd +, wayland }: let @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXrandr libxkbcommon gtk3 pango cairo gdk-pixbuf mesa - alsa-lib at-spi2-core xorg.libxshmfence systemd + alsa-lib at-spi2-core xorg.libxshmfence systemd wayland ]; naclHelper = lib.makeLibraryPath [ glib nspr atk libdrm xorg.libxcb mesa xorg.libX11 @@ -185,6 +186,7 @@ stdenv.mkDerivation rec { homepage = "https://www.microsoft.com/en-us/edge"; description = "The web browser from Microsoft"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zanculmarktum kuwii ]; }; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 4acdd563d66f7..c769937ee86bc 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "101.0.1210.19"; + version = "103.0.1264.21"; revision = "1"; - sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p"; + sha256 = "sha256:1336i0hy7xnla0pi4vahaxshhmivi1zljhaxyg63352bc7w9j64f"; }; dev = import ./browser.nix { channel = "dev"; - version = "102.0.1227.0"; + version = "104.0.1287.1"; revision = "1"; - sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x"; + sha256 = "sha256:10h360vfsfql42i6mpdvf8d0219506ipbk3hdpwl0jhlsphmhw61"; }; stable = import ./browser.nix { channel = "stable"; - version = "100.0.1185.44"; + version = "102.0.1245.44"; revision = "1"; - sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89"; + sha256 = "sha256:10r12xlkcnag5jdmnwpqsbkjx1ih1027l573vxmcxmvpmj6y4373"; }; } diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix new file mode 100644 index 0000000000000..c3e73e18de0c0 --- /dev/null +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -0,0 +1,66 @@ +{ + fetchFromGitea, + less, + lib, + makeWrapper, + offpunk, + python3, + ripgrep, + stdenv, + timg, + xdg-utils, + xsel, +}: + +let + pythonDependencies = with python3.pkgs; [ + beautifulsoup4 + cryptography + feedparser + pillow + readability-lxml + requests + setproctitle + ]; + otherDependencies = [ + less + ripgrep + timg + xdg-utils + xsel + ]; +in +stdenv.mkDerivation (finalAttrs: { + pname = "offpunk"; + version = "1.4"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "ploum"; + repo = "offpunk"; + rev = "v${finalAttrs.version}"; + sha256 = "04dzkzsan1cnrslsvfgn1whpwald8xy34wqzvq81hd2mvw9a2n69"; + }; + + buildInputs = [ makeWrapper ] ++ otherDependencies ++ pythonDependencies; + + installPhase = '' + runHook preInstall + + install -D ./offpunk.py $out/bin/offpunk + + wrapProgram $out/bin/offpunk \ + --set PYTHONPATH "$PYTHONPATH" \ + --set PATH ${lib.makeBinPath otherDependencies} + + runHook postInstall + ''; + + meta = with lib; { + description = "An Offline-First browser for the smolnet "; + homepage = "https://notabug.org/ploum/offpunk"; + maintainers = with maintainers; [ DamienCassou ]; + platforms = platforms.linux; + license = licenses.bsd2; + }; +}) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 7c37531263fb8..a891708c65824 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -127,5 +127,6 @@ in stdenv.mkDerivation rec { description = "Web browser"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index a07ca4e581de5..c4c00d563786a 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,15 +45,15 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.0.0"; + version = "31.1.0"; src = fetchFromGitea { domain = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; - rev = "${version}_Release"; + rev = "${version}_Release_build2"; # Remove _build2 when bumping past 31.1.0 fetchSubmodules = true; - sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc="; + sha256 = "sha256-x3n4OeZbnJCPCVjsZJW1nBYlsEYn6fXt80voYWQSNq4="; }; nativeBuildInputs = [ @@ -113,6 +113,13 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure + # Too many cores can lead to build flakiness + # https://forum.palemoon.org/viewtopic.php?f=5&t=28480 + export jobs=$(($NIX_BUILD_CORES<=32 ? $NIX_BUILD_CORES : 32)) + if [ -z "$enableParallelBuilding" ]; then + jobs=1 + fi + export MOZCONFIG=$PWD/mozconfig export MOZ_NOSPAM=1 @@ -120,7 +127,7 @@ stdenv.mkDerivation rec { export gtkversion=${if withGTK3 then "3" else "2"} export xlibs=${lib.makeLibraryPath [ xorg.libX11 ]} export prefix=$out - export mozmakeflags="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}" + export mozmakeflags="-j$jobs" export autoconf=${autoconf213}/bin/autoconf substituteAll ${./mozconfig} $MOZCONFIG diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 91ef3270dc455..ce2392ab4edca 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -14,12 +14,11 @@ assert withMediaPlayback -> gst_all_1 != null; let python3Packages = python3.pkgs; pdfjs = let - version = "2.8.335"; + version = "2.14.305"; in fetchzip rec { - name = "pdfjs-${version}"; - url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1zschfpxnhdinn9nasl5in4s62ad0h1g369cglamjgxx36x27zly"; + url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; + hash = "sha256-E7t+0AUndrgi4zfJth0w28RmWLqLyXMUCnueNf/gNi4="; stripRoot = false; }; @@ -33,12 +32,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.5.0"; + version = "2.5.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1zai8ivc9cqax2idspwvyp24dkis0x6sv29fia8ja3sp62i45171"; + hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg="; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index c79aa1d6f1d69..6573821d05984 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit , pkg-config, wrapGAppsHook , glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk -, xorg, dmenu, findutils, gnused, coreutils +, xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null }: @@ -17,7 +17,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; + buildInputs = [ + glib + gcr + glib-networking + gsettings-desktop-schemas + gtk + libsoup + webkitgtk + ] ++ (with gst_all_1; [ + # Audio & video support for webkitgtk WebView + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); inherit patches; diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix index 552c05ac9cd4a..92124531691d7 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -8,17 +8,18 @@ , ncurses , autoreconfHook , buildPackages +, memstreamHook }: stdenv.mkDerivation rec { pname = "telescope"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-W42e1p70dMhF9C7BBPp1Yhp2PrRb8/Lu07yOGiUSmNg="; + sha256 = "sha256-9gZeBAC7AGU5vb+692npjKbbqFEAr9iGLu1u68EJ0W8="; }; nativeBuildInputs = [ @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { libevent libressl ncurses - ]; + ] ++ lib.optional stdenv.isDarwin memstreamHook; configureFlags = [ "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 1023928e4b2e5..042e3e661d0b5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.13"; + version = "11.0.15"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "03pzwzgikc43pm0lga61jdzg46fanmvd1wsnb2xkq0y1ny8gsqfz"; + sha256 = "1gv44bi3gfg5z46fvs9wy46fgvfshad5kbxl43x3x4r70ps1nc3l"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0j8h2g404sagzjxnwf55n8hpvmwk52qhml98nyliajf1xg8v8k19"; + sha256 = "109291wwcy63k8hs23kx8vffpj4zvywdpy8srwaq367l0ffvfqn2"; }; }; in @@ -434,5 +434,6 @@ stdenv.mkDerivation rec { # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. license = licenses.free; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6e496c30ecf6a..9d29fc6c0bbc7 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.2.2623.41-1"; + version = "5.3.2679.68-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d"; + sha256 = "0dfpxjr1sknkppazmw6dwrczv6gvh14nyc3la3q1y7cdzp95jpx3"; }; unpackPhase = '' @@ -101,6 +101,7 @@ in stdenv.mkDerivation rec { description = "A Browser for our Friends, powerful and personal"; homepage = "https://vivaldi.com"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ otwieracz badmutex ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index c550c8cea25a6..e9228493de3eb 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "101.0.4951.15"; + version = "103.0.5060.53"; src = fetchurl { - url = "https://launchpadlibrarian.net/594594495/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-aelr/jODmgyVunSFFn6W+QHEmSWJeWzU4SaS5rjHli4="; + url = "https://launchpadlibrarian.net/607589056/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-Tsp5Y6sCn+mKrLGZSAWGFoSTHiyfANQ5VA7pesU1HyU="; }; buildInputs = [ dpkg ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Additional support for proprietary codecs for Vivaldi"; homepage = "https://ffmpeg.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.lgpl21; maintainers = with maintainers; [ betaboon cawilliamson lluchs ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 740e325fca4e9..65c58775874b1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Widevine support for Vivaldi"; homepage = "https://www.widevine.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ betaboon ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index dab9794277f6e..bc64ac840d20c 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -130,6 +130,7 @@ stdenv.mkDerivation rec { description = "Yandex Web Browser"; homepage = "https://browser.yandex.ru/"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 064213b01ae33..66ec0a7c7b470 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -57,6 +57,7 @@ let description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; maintainers = with maintainers; [ kalbasit ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix index f7e7317131202..422ccd05cffcb 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -83,6 +83,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ lucasew ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix index 9bc8900174547..0dd31aea0619d 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -125,6 +125,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ lucasew ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 96cddf0f42a00..4990d008c276a 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.5.1"; + version = "2022.5.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-yv4ulVkc7WX6T287kXecyE6lFlxh4YKAi2UCGkOf/lk="; + hash = "sha256-xE/Bc+6Ob2u4tQQoykoaa8MhFH2czwz5rMABUqfXNMM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index deb61af1ae88c..371d0b3a55d60 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-RgjoRvLsd+WHTpFy1WbJtrVaMnRp6/7A921+abCMGu0="; + sha256 = "sha256-1oF93+pN9wyCq5R5bTeMN/uzg9DHpc/AkX/d1lB5r1g="; }; vendorSha256 = "sha256-URuIeF1ejKdMGxziJbujLctYheiIr/Jfo+gTzppZG9E="; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 1881009f3e2c5..624814c1bb650 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "3.3.2"; + version = "3.3.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-tl1UpoXBuIyJyMLHeIhQ6EHG1XqAGE6Tw5jU6rW+DXc="; + sha256 = "sha256-9RwUKLVf8ArDAE6ivbWqxDCCW4OjqQFEEoWHBIv/cww="; }; vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0="; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index c56f937223c97..7023e94f0a20e 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.3.5"; + version = "0.3.9"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-YqnmtDVtprQQFbL++X9rUJFGj+fMD+fvDRWsQ+uOxxo="; + sha256 = "sha256-LX/26fOvQYnzCbVuMxsuD/3bdZx/mVD47v8l4DppUPA="; }; - vendorSha256 = "sha256-r8RTwMzFS/BkxW08+wfAovuFLpIOReDsuHi/Hx9cVPc="; + vendorSha256 = "sha256-UYTEQ3RvSJB+9zduw0xCDU71Zp54ilZzNucuzTMKEHA="; proxyVendor = true; @@ -24,7 +24,7 @@ buildGoModule rec { "-X ${package_url}.version=${src.rev}" "-X ${package_url}.buildDate=unknown" "-X ${package_url}.gitCommit=${src.rev}" - "-X ${package_url}.installationManifestURL=github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=${src.rev}" + "-X ${package_url}.installationManifestsURL=github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=${src.rev}" "-X ${package_url}.installationManifestsNamespacedURL=github.com/argoproj-labs/argocd-autopilot/manifests/insecure?ref=${src.rev}" ]; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 9ce9286e610c8..c97d28de8d3d2 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "argocd"; - version = "2.3.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-ChgWqhkzVKhbyEA+g2flWK/WMxur7UHWXJUcLzp9RTE="; + sha256 = "sha256-rmgXsA9rOCUy1HDm09Aq5s8EfkM71We76gffPElnUAU="; }; - vendorSha256 = "sha256-XrIIMnn65Y10KnVTsmw6vLE53Zra1lWNFgklmaj3gF8="; + vendorSha256 = "sha256-32cuYIySHtV+PfN2wrqf+p01+F6uBZJN3w2MeDQ8hbI="; - # Set target as ./cmd per release-cli - # https://github.com/argoproj/argo-cd/blob/master/Makefile#L222 + # Set target as ./cmd per cli-local + # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 subPackages = [ "cmd" ]; ldflags = @@ -26,6 +26,11 @@ buildGoModule rec { "-X ${package_url}.gitCommit=${src.rev}" "-X ${package_url}.gitTag=${src.rev}" "-X ${package_url}.gitTreeState=clean" + "-X ${package_url}.kubectlVersion=v0.23.3" + # NOTE: Update kubectlVersion when upgrading this package with + # https://github.com/argoproj/argo-cd/blob/master/go.mod#L95 + # Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18 + # Will need a way to automate it :P ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 47a5e8d22facc..420d093755b4c 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.23"; + version = "0.8.29"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-y3NsYPGVlWA/N2AYw3EQKUwLeGYwRI29tC9iTPeyU3Q="; + sha256 = "sha256-VCscevLGRpBgqxhRNcvIkCdroE0MawG1fROVOLjZLW0="; }; CGO_ENABLED = 0; - vendorSha256 = "sha256-E+fjDW7UIAYDiDI8Eb8atAtccEIRcV5hqYdSxRYM9fc="; + vendorSha256 = "sha256-CoIlqDMmhZY+B5SEabmnbP2QUu1jkFluCzLp3Y8Z7n0="; # 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 55807caa5afb1..9b615f151c25c 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.19.2"; + version = "0.19.6"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-cd2dhrqJl/VRhOYB1g9OpOnPV92EQm8f3rRGZGVN+IY="; + sha256 = "sha256-A4OJNZHCERV2Sd/XQgt29xeBP+8PEIrpk22QypeVQ/A="; }; - vendorSha256 = "sha256-ux+Hw/TjeiY9VYhIQxaltZGk5CkxAab8R7kAsTaMUGc="; + vendorSha256 = "sha256-k8FvHvo2qrQcYNKXH0LiAjaW+J+BKEflhjaulQ3SRMI="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 069307c41e910..da3f684398e25 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.17"; + version = "7.0.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oVL7tBtdFJt6ktctSZiNZMd6g1LEWQ/Hra4rcGM6BnQ="; + sha256 = "sha256-CNicDFmWq2tgw3LEw8nOlwewY3cpzwS9ea4fxbwVJc0="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index bde7a21b33ef1..f9b66041d40f9 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -1,23 +1,47 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "cilium-cli"; - version = "0.11.1"; + version = "0.11.11"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8twqA8aUuk5+LzjxMRbRA3m6qiEbk60A0q3nw9uzCvU="; + sha256 = "sha256-IZMtkTKslFvbk/qwfZpFZAV6VUj66JKGFewXH1Ujxbw="; }; vendorSha256 = null; + subPackages = [ "cmd/cilium" ]; + + ldflags = [ + "-s" "-w" + "-X github.com/cilium/cilium-cli/internal/cli/cmd.Version=${version}" + ]; + + # Required to workaround install check error: + # 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied + HOME = "$TMPDIR"; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/cilium version | grep ${version} > /dev/null + ''; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd cilium \ + --bash <($out/bin/cilium completion bash) \ + --fish <($out/bin/cilium completion fish) \ + --zsh <($out/bin/cilium completion zsh) + ''; + meta = with lib; { description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; license = licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with maintainers; [ humancalico ]; + maintainers = with maintainers; [ humancalico bryanasdev000 ]; mainProgram = "cilium"; }; } diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index ec9f45a83886e..b7992e2c723df 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs="; + sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40="; }; - vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg="; + vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 786615801baa7..c2b313d442e38 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.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-0njXmYhZM4DXFeK9KboXnVw8uHdz4PFJ2aJxwhgyEc8="; + sha256 = "sha256-Nnfy8KOMJqg2sXrNDZlrcrpWfc70sXL1tNlXSgg5ZZg="; }; - vendorSha256 = "sha256-JVRLPsfI1ITilAOkVIAa2IjjuAlJ2PCpvYEkhnTzRDA="; + vendorSha256 = "sha256-zRdtd/mE9AQtqw9Z/Tatd9vEx9l/XSFge8sOLbS/Wrs="; subPackages = [ "cmd/clusterctl" ]; @@ -25,7 +25,7 @@ buildGoModule rec { postInstall = '' # errors attempting to write config to read-only $HOME - export HOME=$(mktemp -d) + export HOME=$TMPDIR installShellCompletion --cmd clusterctl \ --bash <($out/bin/clusterctl completion bash) \ diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 86c7eddd7ab02..28a0df2fcd24f 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cmctl"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - sha256 = "sha256-h7GyzjVrfyMHY7yuNmmsym6KGKCQr5R71gjPBTUeMCg="; + sha256 = "sha256-sfC1acnCrcQ4A1tXXcjh47Af6xeJqjdGXy0gK21ZSFg="; }; vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI="; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 0cd05cfddd580..0cde6d0090e7b 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.30.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-kjXqkaBF3rAaGnDDVmAoFmvH4t8/seC+KF7K78eKZco="; + sha256 = "sha256-/tdAmu/BurCFB82i9pT2+PNOsPtHdlL/brUt4B9Q/EA="; }; - vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA="; + vendorSha256 = "sha256-KChEDFZj5zsZ/viOVWgC15WI8mp5cUC+SdNwkCjo6bI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fetchit/default.nix b/pkgs/applications/networking/cluster/fetchit/default.nix new file mode 100644 index 0000000000000..b4e7e66d7dcee --- /dev/null +++ b/pkgs/applications/networking/cluster/fetchit/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +, lvm2 +, pkg-config +}: + +buildGoModule rec { + pname = "fetchit"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "fetchit"; + rev = "v${version}"; + sha256 = "sha256-hxS/+/fbYOpMJ5VfvvG5l7wWKBUUR22rYn9X79DzUUk="; + }; + + vendorSha256 = "sha256-SyPd8P9s8R2YbGEPqFeztF98W1QyGSBumtirSdpm8VI="; + + subPackages = [ "cmd/fetchit" ]; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ lvm2 ]; + + # Flags are derived from + # https://github.com/containers/fetchit/blob/v0.0.1/Makefile#L20-L29 + ldflags = [ + "-X k8s.io/client-go/pkg/version.gitMajor=0" + "-X k8s.io/client-go/pkg/version.gitMinor=0" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.gitVersion=v0.0.0" + "-X k8s.io/component-base/version.gitMajor=0" + "-X k8s.io/component-base/version.gitMajor=0" + "-X k8s.io/component-base/version.gitMinor=0" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.gitVersion=v0.0.0" + "-s" + "-w" + ]; + + tags = [ + "containers_image_openpgp" + "exclude_graphdriver_btrfs" + "gssapi" + "include_gcs" + "include_oss" + "netgo" + "osusergo" + "providerless" + ]; + + # There are no tests for cmd/fetchit. + doCheck = false; + + postInstall = '' + for i in bash fish zsh; do + installShellCompletion --cmd fetchit \ + --$i <($out/bin/fetchit completion $i) + done + ''; + + meta = with lib; { + description = "A tool to manage the life cycle and configuration of Podman containers"; + longDescription = '' + FetchIt allows for a GitOps based approach to manage containers running on + a single host or multiple hosts based on a git repository. This allows for + us to deploy a new host and provide the host a configuration value for + FetchIt and automatically any containers defined in the git repository and + branch will be deployed onto the host. This can be beneficial for + environments that do not require the complexity of Kubernetes to manage + the containers running on the host. + ''; + homepage = "https://fetchit.readthedocs.io"; + changelog = "https://github.com/containers/fetchit/releases/tag/${src.rev}"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 21e2f00c3e2f8..7d060c546d594 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.30.2"; - sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl"; - manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb"; + version = "0.31.3"; + sha256 = "16c6rr0hzlzlfc5xsphp23s3rxavkgfcsblzm15wzd85c2ahm81l"; + manifestsSha256 = "1nr44h5sy97ki2vn2426i2idnnc4pv1n3j6n4p11mf73dy9qzgzp"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk="; + vendorSha256 = "sha256-vHRk6oADEvDmYCeBK/puGSMd4L9K1x/CVPtuYZY9klk="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index c132a09fce344..dd9875929258c 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.25.0"; + version = "1.25.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-EFB8iAs7e4FigYnTvkh+dpZq6ymX7Qfy0cUDtUaPdmM="; + sha256 = "sha256-OZLTT54InDPF+m5e4xtuAL311wCD16Ne/T0PbgiSaN4="; }; - vendorSha256 = "sha256-9RyTeGjp7mEpmWnQeK2uG1krO6+1sK6fsID6JVrejHw="; + vendorSha256 = "sha256-Q9THG76/B/gdfhf5wLxVXoAAzXeOjaaAyYaGKy9LeF0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 22e596dabf263..c9895fccc9b72 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.17"; + version = "0.6.20"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-u/YISLlZFYlAUejSlaH7POA2WwKURPN8phFU86/caXU="; + sha256 = "sha256-HeyWMzxSga6T2/BRVwrmgb3utjnVTJk3zhhcVfq8/Cc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix new file mode 100644 index 0000000000000..714d1e1e4d8ea --- /dev/null +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "gatekeeper"; + version = "3.8.1"; + + src = fetchFromGitHub { + owner = "open-policy-agent"; + repo = "gatekeeper"; + rev = "v${version}"; + sha256 = "sha256-zEUH88sjgR738BXK2oSSM6jf5oHZt0VJv61BcxclG1Q="; + }; + + vendorSha256 = null; + + nativeBuildInputs = [ + installShellFiles + ]; + + subPackages = [ "cmd/gator" ]; + + postInstall = '' + installShellCompletion --cmd gator \ + --bash <($out/bin/gator completion bash) \ + --fish <($out/bin/gator completion fish) \ + --zsh <($out/bin/gator completion zsh) + ''; + + meta = with lib; { + description = "Policy Controller for Kubernetes"; + homepage = "https://github.com/open-policy-agent/gatekeeper"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 202b9fd5e68d6..ff5d0403f4a58 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -65,6 +65,7 @@ let homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; longDescription = '' The Apache Hadoop software library is a framework that allows for @@ -77,7 +78,7 @@ let so delivering a highly-availabile service on top of a cluster of computers, each of which may be prone to failures. ''; - maintainers = with maintainers; [ volth illustris ]; + maintainers = with maintainers; [ illustris ]; platforms = attrNames sha256; }; }; diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 1d3c9f43e906b..cdd6c68a76fba 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.8.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw="; + sha256 = "sha256-V7Qw20PPoAEXl/XAMj/WSM73fLdp/gH4G3ipx49p06o="; }; vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw="; diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 127ee9c6895a6..85971b8dfb10c 100644 --- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LNCzz5me60R/moFfdJhGMgUToFxADiPL02G4QCv0DLg="; + sha256 = "sha256-WGoLj6IuhxARSB3vAnprW1UO2g142uKZVHI3ubJepRs="; }; - vendorSha256 = "sha256-38ufXHzGlZgEh6swD/GhWbIYdY5uYznKCQ9OaoyOEiY="; + vendorSha256 = "sha256-gXW1NarCo42d/awg22wr6bIQQFRVTVnRUUAtQU8zY4M="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index 172f866c48ab6..e6e5e6c1ce6cb 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hubble"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "cilium"; @@ -13,10 +13,36 @@ buildGoModule rec { vendorSha256 = null; + ldflags = [ + "-s" "-w" + "-X github.com/cilium/hubble/pkg.GitBranch=none" + "-X github.com/cilium/hubble/pkg.GitHash=none" + "-X github.com/cilium/hubble/pkg.Version=${version}" + ]; + + # Test fails at Test_getFlowsRequestWithInvalidRawFilters in github.com/cilium/hubble/cmd/observe + # https://github.com/NixOS/nixpkgs/issues/178976 + # https://github.com/cilium/hubble/pull/656 + # https://github.com/cilium/hubble/pull/655 + doCheck = false; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/hubble version | grep ${version} > /dev/null + ''; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd hubble \ + --bash <($out/bin/hubble completion bash) \ + --fish <($out/bin/hubble completion fish) \ + --zsh <($out/bin/hubble completion zsh) + ''; + meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Network, Service & Security Observability for Kubernetes using eBPF"; license = licenses.asl20; homepage = "https://github.com/cilium/hubble/"; - maintainers = with maintainers; [ humancalico ]; + maintainers = with maintainers; [ humancalico bryanasdev000 ]; }; } diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 1f2e98593529f..051a3f9ae4cd9 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.13.3"; + version = "1.14.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-XvV6OlGHW/eB0EUrmyTlFVbDjbxUpVo6WvrEnh6Q68I="; + sha256 = "sha256-Y8Bo2niIyvBE3BPpnSanFrR8ZHIUdG7iKSOyD6YadIM="; }; - vendorSha256 = "sha256-Ex86yLMTqqiSkJns/eeodmGswAzPVQAQOf8Wqi7DRaE="; + vendorSha256 = "sha256-MnSOWJwTOQmHnABRYNJwU9kOr7g51rkUaERksupBTb4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index d9b04aaf7fc6e..0afe7b8344959 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "jx"; @@ -34,6 +34,7 @@ buildGoModule rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Command line tool for installing and using Jenkins X"; homepage = "https://jenkins-x.io"; longDescription = '' diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index b30a7174902d0..2d6f7ea2ac964 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -1,29 +1,21 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , installShellFiles }: buildGoModule rec { pname = "k0sctl"; - version = "0.12.6"; + version = "0.13.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TkkMO6xBHY5t5Rpd0ieSDXMrnQ+Xdq+65Rk93ZkYcUs="; + sha256 = "sha256-A50PbZTgv0EfL5aqTiTEOdfRXUgKGzTsRIiMgXItkxI="; }; - vendorSha256 = "sha256-nTAuvHcsJiW0XYX5GM1SL8cnOhwdrj6iw8tuAkEWNzQ="; - - patches = [ - (fetchpatch { - url = "https://github.com/k0sproject/${pname}/commit/22c694ab0335a1e6146d0d3f939ef79d2c005a3d.patch"; - sha256 = "sha256-Ftq/vbQd5ArdHboDt6NdyuqpFalHVnsQBdpmyDG/t5Q="; - }) - ]; + vendorSha256 = "sha256-2i6SoixE5RitRuJpOU4LdzN9JY/76c3mjsbsXlQp854="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 3cceae804cff6..b1c00f223b403 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,10 +46,10 @@ 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.23.6+k3s1"; # k3s git tag - k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version - k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i"; - k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs="; + k3sVersion = "1.24.2+k3s2"; # k3s git tag + k3sCommit = "a237260237b549b90dd3aae449de09231caf1351"; # k3s git commit at the above version + k3sRepoSha256 = "1dmlsq7f0z0wq8ypbmdqwk1hl59pcnywvqhz7qblzm3wnbdb62cl"; + k3sVendorSha256 = "sha256-w5dYkewoNnI9GvqCAkmecg7JsKgO+gu1WcyPRItLvWY="; # 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. @@ -61,16 +61,16 @@ let k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 - k3sCNIVersion = "1.0.1-k3s1"; - k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92"; + 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.11-k3s2"; - containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2"; + containerdVersion = "1.5.13-k3s1"; + containerdSha256 = "09bj4ghwbsj9whkv1d5icqs52k64m449j8b73dmak2wz62fbzbvp"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag - criCtlVersion = "1.22.0-k3s1"; + criCtlVersion = "1.24.0-k3s1"; baseMeta = { description = "A lightweight Kubernetes distribution"; @@ -323,7 +323,7 @@ buildGoModule rec { passthru.updateScript = ./update.sh; - passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; }; + passthru.tests = { inherit (nixosTests) k3s-single-node; }; meta = baseMeta; } diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 48236cdc25e2e..e31c9dc4b933b 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,28 +1,46 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, k9s }: buildGoModule rec { pname = "k9s"; - version = "0.25.18"; + version = "0.25.21"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-iUhMPtFX7qFULegiyhlT4aG9q3deZ8aRqyEcbZ9jY/s="; + sha256 = "sha256-ziIMTMK6G8vXje6GWPvcIWmlubq75XVrJUzZlA+R0Rc="; }; ldflags = [ "-s" "-w" "-X github.com/derailed/k9s/cmd.version=${version}" "-X github.com/derailed/k9s/cmd.commit=${src.rev}" + "-X github.com/derailed/k9s/cmd.date=1970-01-01T00:00:00Z" ]; - vendorSha256 = "sha256-mMob7M9RQlqaVK0DgHpaAK9d1btzfQetnliUqFTvjJQ="; + tags = [ "netgo" ]; - preCheck = "export HOME=$(mktemp -d)"; + vendorSha256 = "sha256-wL8Unht/ZRAGDuC/U4SFV5PdExy78F4DMyM8+7CMtOY="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + # Required to workaround test check error: + preCheck = "export HOME=$(mktemp -d)"; + # For arch != x86 + # {"level":"fatal","error":"could not create any of the following paths: /homeless-shelter/.config, /etc/xdg","time":"2022-06-28T15:52:36Z","message":"Unable to create configuration directory for k9s"} + passthru.tests.version = testers.testVersion { + package = k9s; + command = "HOME=$(mktemp -d) k9s version -s"; + inherit version; + }; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd k9s \ + --bash <($out/bin/k9s completion bash) \ + --fish <($out/bin/k9s completion fish) \ + --zsh <($out/bin/k9s completion zsh) + ''; meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 69142045fee8f..25363e7789ed7 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-Q67dictDE+HWw99lFAiidBvIL30mMAkjYb2CDLDcalw="; + sha256 = "sha256-etENW/zP9xy0pyUT2UoFXrzgkSXrfp8dxl35bD2t/Yc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 2b80dfc6815a3..a4081408871ac 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose, git }: buildGoModule rec { pname = "kompose"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles git ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 2da8b7894f2ba..8382f6f519dbe 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,16 +1,12 @@ -{ lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: let - goPackagePath = "k8s.io/kops"; - generic = { version, sha256, rev ? version, ... }@attrs: let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "rev" ]; in - buildGoPackage + buildGoModule { pname = "kops"; inherit version; - inherit goPackagePath; - src = fetchFromGitHub { rev = rev; owner = "kubernetes"; @@ -18,24 +14,26 @@ let inherit sha256; }; - nativeBuildInputs = [ go-bindata installShellFiles ]; + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/kops" ]; ldflags = [ + "-s" + "-w" "-X k8s.io/kops.Version=${version}" "-X k8s.io/kops.GitVersion=${version}" ]; - preBuild = '' - (cd go/src/k8s.io/kops - go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...) - ''; + doCheck = false; postInstall = '' - for shell in bash zsh; do - $out/bin/kops completion $shell > kops.$shell - installShellCompletion kops.$shell - done + installShellCompletion --cmd kops \ + --bash <($GOPATH/bin/kops completion bash) \ + --fish <($GOPATH/bin/kops completion fish) \ + --zsh <($GOPATH/bin/kops completion zsh) ''; meta = with lib; { @@ -49,15 +47,8 @@ let } // attrs'; in rec { - mkKops = generic; - kops_1_21 = mkKops rec { - version = "1.21.4"; - sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs="; - rev = "v${version}"; - }; - kops_1_22 = mkKops rec { version = "1.22.4"; sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; @@ -69,4 +60,11 @@ rec { sha256 = "sha256-9GANjGRS9QaJw+CEeMv/f+rEu37QV2YxMvSRSH6+3PM="; rev = "v${version}"; }; + + kops_1_24 = mkKops rec { + version = "1.24.0"; + sha256 = "sha256-4vvmwqsRSu8hZZE7fZUTv9v19wRtJvA5IX5w9jr5pEI="; + rev = "v${version}"; + }; + } diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/applications/networking/cluster/ktunnel/default.nix new file mode 100644 index 0000000000000..368532dbef4e7 --- /dev/null +++ b/pkgs/applications/networking/cluster/ktunnel/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub }: +let + version = "1.4.8"; +in +buildGoModule { + pname = "ktunnel"; + inherit version; + + src = fetchFromGitHub { + owner = "omrikiei"; + repo = "ktunnel"; + rev = "v${version}"; + sha256 = "sha256-Iw7Z4iuKxmRrS51KP3k/ouXW4xssdNgxDDzNQR2Zygg="; + }; + + ldflags = [ + "-s" "-w" + ]; + + vendorSha256 = "sha256-p9AYZWNO2oqLich0qzZYuAk55HqB6ttS66ORuNZ4rJg="; + + preCheck = "export HOME=$(mktemp -d)"; + + # # TODO investigate why some tests are failing + doCheck = false; + + installCheckPhase = '' + runHook preInstallCheck + "$out/bin/ktunnel" --version + runHook postInstallCheck + ''; + + meta = with lib; { + description = "A cli that exposes your local resources to kubernetes "; + homepage = "https://github.com/omrikiei/ktunnel"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index c74fdbc749d47..dbdc45355f456 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -22,8 +22,6 @@ buildGoModule rec { "-X github.com/cloudnativelabs/kube-router/pkg/version.BuildDate=Nix" ]; - checkFlags = [ "-short" ]; - passthru.tests.version = testers.testVersion { package = kube-router; }; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e4203f0028add..5cbd307a3d73d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,11 +1,11 @@ -{ stdenv -, lib +{ lib +, buildGoModule , fetchFromGitHub , which -, go , makeWrapper , rsync , installShellFiles +, runtimeShell , kubectl , nixosTests @@ -19,42 +19,38 @@ ] }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubernetes"; - version = "1.23.5"; + version = "1.23.8"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-LhJ3gThcsWnawSOmHSzWOG8tfODIPo4dJTMeLKmvMdM="; + sha256 = "sha256-mu+jBSypoMNxOugLbS3foH4C4AqSZnlic4Bf1v9dYc8="; }; - nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; + vendorSha256 = null; - outputs = [ "out" "man" "pause" ]; - - patches = [ ./fixup-addonmanager-lib-path.patch ]; + doCheck = false; - postPatch = '' - # go env breaks the sandbox - substituteInPlace "hack/lib/golang.sh" \ - --replace 'echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"' 'echo "${go.GOOS}/${go.GOARCH}"' + nativeBuildInputs = [ makeWrapper which rsync installShellFiles ]; - substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - # hack/update-munge-docs.sh only performs some tests on the documentation. - # They broke building k8s; disabled for now. - echo "true" > "hack/update-munge-docs.sh" + outputs = [ "out" "man" "pause" ]; - patchShebangs ./hack - ''; + patches = [ ./fixup-addonmanager-lib-path.patch ]; WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" ] ++ components); - postBuild = '' + buildPhase = '' + runHook preBuild + substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${runtimeShell}" + patchShebangs ./hack ./cluster/addons/addon-manager + make "SHELL=${runtimeShell}" "WHAT=$WHAT" ./hack/update-generated-docs.sh + runHook postBuild ''; installPhase = '' @@ -77,7 +73,6 @@ stdenv.mkDerivation rec { --subst-var out chmod +x $out/bin/kube-addons - patchShebangs $out/bin/kube-addons wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh @@ -88,10 +83,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - disallowedReferences = [ go ]; - - GOFLAGS = [ "-trimpath" ]; - meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index ae8db695b9fe0..1176f0f28f684 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,25 +1,19 @@ -{ lib, stdenv, kubernetes }: +{ lib, kubernetes }: -stdenv.mkDerivation rec { +kubernetes.overrideAttrs (_: rec { pname = "kubectl"; - inherit (kubernetes) - disallowedReferences - GOFLAGS - nativeBuildInputs - postBuild - postPatch - src - version - ; + outputs = [ "out" "man" "convert" ]; - outputs = [ "out" "man" ]; - - WHAT = "cmd/kubectl"; + WHAT = lib.concatStringsSep " " [ + "cmd/kubectl" + "cmd/kubectl-convert" + ]; installPhase = '' runHook preInstall install -D _output/local/go/bin/kubectl -t $out/bin + install -D _output/local/go/bin/kubectl-convert -t $convert/bin installManPage docs/man/man1/kubectl* @@ -35,4 +29,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kubernetes/kubectl"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index 151649ba22ee9..ef70e28328005 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -2,13 +2,13 @@ let pname = "lens"; - version = "5.3.4"; - build = "${version}-latest.20220120.1"; + version = "5.5.3"; + build = "${version}-latest.20220602.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - sha256 = "sha256-9vRLQFSocVkHAfgwdKSPhSAO4G/v/ANd0WQmilcZiVw="; + sha256 = "sha256-lwiwyXoO+7KgDnQ2Ly0QK0oEVHR73nsMZMGOd2j48dg="; name = "${pname}.AppImage"; }; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index f0c9ada6ca80b..fed35f12bedc9 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.11.1"; - sha256 = "09zwxcaqn537ls737js7rcsqarapw5k25gv41d844k73yvxm882c"; - vendorSha256 = "sha256-RayboJdjkmCiUsUBab9ntIH+koOCgp3gmVqXZEUWK88="; + version = "2.11.2"; + sha256 = "sha256-6FlOHnOmqZ2jqx9qFMPA5jkxBaNqzeCwsepwXR1Imss="; + vendorSha256 = "sha256-wM5qIjabg9ICJcLi8QV9P4G4E7Rn3ctVCqdm2GO8RyU="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 74b5578d02391..4d3c30e333755 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.2.4"; - sha256 = "1s53zlb7f0xp2vqa5fnsjdhjq203bsksrmdbrxkkm1yi3nc3p369"; - vendorSha256 = "sha256-cN19kKa4Ieweta95/4bKlAYn/Bq8j27H408za3OoJoI="; + version = "22.6.1"; + sha256 = "sha256-YM6d2bWcjoNMEbgXVR79tcklTRqAhzm6SzJU2k+7BNU="; + vendorSha256 = "sha256-i+AbrzN9d9CGZcGj/D4xnYlamp0iOlq2xcax14/GqEE="; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 3ee00d4121a90..11a06f5775e02 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.25.2"; + version = "1.26.0"; - vendorSha256 = "sha256-8QqRIWry15/xwBxEOexMEq57ol8riy+kW8WrQqr53Q8="; + vendorSha256 = "sha256-3ME8bs4TAQRAECko7+ZXBCFf4IyTn1P/+hParpc5QTU="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg="; + sha256 = "sha256-vGlW65jf3XGFNK9aSvsK7V0OmUOCtgJcWeNFOZVuH00="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 1f08aad53e4ec..58229718aa58a 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -10,6 +10,7 @@ let interpreter = ( poetry2nix.mkPoetryPackages { projectDir = ./.; + python = pkgs.python39; overrides = [ poetry2nix.defaultPoetryOverrides (import ./poetry-git-overlay.nix { inherit pkgs; }) diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 27c496905e5ed..c388f6a9e2689 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -65,8 +65,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops-hetzner"; - rev = "84f4eebb89b049c4f86aa779349397c3dedc0c43"; - sha256 = "0qx8v775jhlbqyhid8wkzy3xcha08kkzb42h6ayszwq4alyfx0b0"; + rev = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35"; + sha256 = "0kmzv5dzh828yh5jwjs5klfslx3lklrqvpvbh29b398m5r9bbqkn"; }; } ); @@ -74,9 +74,9 @@ self: super: { nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { - url = "https://github.com/lovesegfault/nixops-libvirtd.git"; - rev = "84d1688ee06afff136738b3eaf51f9cc3c08c350"; - sha256 = "1f3q9bwmdjr3qac7fh9b9hgw7l43hmiixbsmqm2zrnhb7xcyfmfg"; + url = "https://github.com/nix-community/nixops-libvirtd.git"; + rev = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51"; + sha256 = "06bcxchjgmgfvhg9dzlcdnr4ak0h1rdpfpgbix3z2via2gad8bvj"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index fa17d4286b34d..7b287734c5e76 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -1,14 +1,6 @@ [[package]] -name = "alabaster" -version = "0.7.12" -description = "A configurable sidebar-enabled Sphinx theme" -category = "dev" -optional = false -python-versions = "*" - -[[package]] name = "apache-libcloud" -version = "3.5.0" +version = "3.6.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 @@ -18,17 +10,6 @@ python-versions = ">=3.6, <4" requests = ">=2.26.0" [[package]] -name = "babel" -version = "2.9.1" -description = "Internationalization utilities" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[package.dependencies] -pytz = ">=2015.7" - -[[package]] name = "boto" version = "2.49.0" description = "Amazon Web Services Library" @@ -38,43 +19,43 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.21.18" +version = "1.24.16" description = "The AWS SDK for Python" category = "main" optional = false -python-versions = ">= 3.6" +python-versions = ">= 3.7" [package.dependencies] -botocore = ">=1.24.18,<1.25.0" -jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.5.0,<0.6.0" +botocore = ">=1.27.16,<1.28.0" +jmespath = ">=0.7.1,<2.0.0" +s3transfer = ">=0.6.0,<0.7.0" [package.extras] crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.24.18" +version = "1.27.16" description = "Low-level, data-driven core of boto 3." category = "main" optional = false -python-versions = ">= 3.6" +python-versions = ">= 3.7" [package.dependencies] -jmespath = ">=0.7.1,<1.0.0" +jmespath = ">=0.7.1,<2.0.0" python-dateutil = ">=2.1,<3.0.0" urllib3 = ">=1.25.4,<1.27" [package.extras] -crt = ["awscrt (==0.12.5)"] +crt = ["awscrt (==0.13.8)"] [[package]] name = "certifi" -version = "2021.10.8" +version = "2022.6.15" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false -python-versions = "*" +python-versions = ">=3.6" [[package]] name = "cffi" @@ -99,14 +80,6 @@ python-versions = ">=3.5.0" unicode_backport = ["unicodedata2"] [[package]] -name = "colorama" -version = "0.4.4" -description = "Cross-platform colored terminal text." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] name = "cryptography" version = "3.4.8" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." @@ -126,14 +99,6 @@ ssh = ["bcrypt (>=3.1.5)"] test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] [[package]] -name = "docutils" -version = "0.16" -description = "Docutils -- Python Documentation Utilities" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] name = "hetzner" version = "0.8.3" description = "High level access to the Hetzner robot" @@ -150,38 +115,16 @@ optional = false python-versions = ">=3.5" [[package]] -name = "imagesize" -version = "1.3.0" -description = "Getting image size from png/jpeg/jpeg2000/gif file" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "jinja2" -version = "3.0.3" -description = "A very fast and expressive template engine." -category = "dev" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -MarkupSafe = ">=2.0" - -[package.extras] -i18n = ["Babel (>=2.7)"] - -[[package]] name = "jmespath" -version = "0.10.0" +version = "1.0.1" description = "JSON Matching Expressions" category = "main" optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +python-versions = ">=3.7" [[package]] name = "jsonpickle" -version = "2.1.0" +version = "2.2.0" description = "Python library for serializing any arbitrary object graph into JSON" category = "main" optional = false @@ -189,26 +132,18 @@ python-versions = ">=2.7" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "scikit-learn", "sqlalchemy", "enum34", "jsonlib"] -"testing.libs" = ["demjson", "simplejson", "ujson", "yajl"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "scikit-learn", "sqlalchemy", "pytest-flake8 (<1.1.0)", "enum34", "jsonlib", "pytest-flake8 (>=1.1.1)"] +"testing.libs" = ["simplejson", "ujson", "yajl"] [[package]] name = "libvirt-python" -version = "8.1.0" +version = "8.4.0" description = "The libvirt virtualization API python binding" category = "main" optional = false python-versions = "*" [[package]] -name = "markupsafe" -version = "2.1.0" -description = "Safely add untrusted strings to HTML/XML markup." -category = "dev" -optional = false -python-versions = ">=3.7" - -[[package]] name = "nixops" version = "2.0.0" description = "NixOS cloud provisioning and deployment tool" @@ -346,7 +281,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops-hetzner" reference = "master" -resolved_reference = "84f4eebb89b049c4f86aa779349397c3dedc0c43" +resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" [[package]] name = "nixops-virtd" @@ -363,9 +298,9 @@ nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} [package.source] type = "git" -url = "https://github.com/lovesegfault/nixops-libvirtd.git" -reference = "update-libvirt" -resolved_reference = "84d1688ee06afff136738b3eaf51f9cc3c08c350" +url = "https://github.com/nix-community/nixops-libvirtd.git" +reference = "master" +resolved_reference = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51" [[package]] name = "nixopsvbox" @@ -404,17 +339,6 @@ reference = "master" resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" [[package]] -name = "packaging" -version = "21.3" -description = "Core utilities for Python packages" -category = "dev" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" - -[[package]] name = "pluggy" version = "0.13.1" description = "plugin and hook calling mechanisms for python" @@ -442,25 +366,6 @@ optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] -name = "pygments" -version = "2.11.2" -description = "Pygments is a syntax highlighting package written in Python." -category = "dev" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "pyparsing" -version = "3.0.7" -description = "Python parsing module" -category = "dev" -optional = false -python-versions = ">=3.6" - -[package.extras] -diagrams = ["jinja2", "railroad-diagrams"] - -[[package]] name = "python-dateutil" version = "2.8.2" description = "Extensions to the standard Python datetime module" @@ -484,38 +389,30 @@ jsonpickle = "*" requests = "*" [[package]] -name = "pytz" -version = "2021.3" -description = "World timezone definitions, modern and historical" -category = "dev" -optional = false -python-versions = "*" - -[[package]] name = "requests" -version = "2.27.1" +version = "2.28.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" [package.dependencies] certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2.0.0,<2.1.0" +idna = ">=2.5,<4" urllib3 = ">=1.21.1,<1.27" [package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.5.2" +version = "0.6.0" description = "An Amazon S3 Transfer Manager" category = "main" optional = false -python-versions = ">= 3.6" +python-versions = ">= 3.7" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -532,116 +429,6 @@ optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] -name = "snowballstemmer" -version = "2.2.0" -description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." -category = "dev" -optional = false -python-versions = "*" - -[[package]] -name = "sphinx" -version = "3.5.4" -description = "Python documentation generator" -category = "dev" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -alabaster = ">=0.7,<0.8" -babel = ">=1.3" -colorama = {version = ">=0.3.5", markers = "sys_platform == \"win32\""} -docutils = ">=0.12,<0.17" -imagesize = "*" -Jinja2 = ">=2.3" -packaging = "*" -Pygments = ">=2.0" -requests = ">=2.5.0" -snowballstemmer = ">=1.1" -sphinxcontrib-applehelp = "*" -sphinxcontrib-devhelp = "*" -sphinxcontrib-htmlhelp = "*" -sphinxcontrib-jsmath = "*" -sphinxcontrib-qthelp = "*" -sphinxcontrib-serializinghtml = "*" - -[package.extras] -docs = ["sphinxcontrib-websupport"] -lint = ["flake8 (>=3.5.0)", "isort", "mypy (>=0.800)", "docutils-stubs"] -test = ["pytest", "pytest-cov", "html5lib", "cython", "typed-ast"] - -[[package]] -name = "sphinxcontrib-applehelp" -version = "1.0.2" -description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books" -category = "dev" -optional = false -python-versions = ">=3.5" - -[package.extras] -lint = ["flake8", "mypy", "docutils-stubs"] -test = ["pytest"] - -[[package]] -name = "sphinxcontrib-devhelp" -version = "1.0.2" -description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document." -category = "dev" -optional = false -python-versions = ">=3.5" - -[package.extras] -lint = ["flake8", "mypy", "docutils-stubs"] -test = ["pytest"] - -[[package]] -name = "sphinxcontrib-htmlhelp" -version = "2.0.0" -description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" -category = "dev" -optional = false -python-versions = ">=3.6" - -[package.extras] -lint = ["flake8", "mypy", "docutils-stubs"] -test = ["pytest", "html5lib"] - -[[package]] -name = "sphinxcontrib-jsmath" -version = "1.0.1" -description = "A sphinx extension which renders display math in HTML via JavaScript" -category = "dev" -optional = false -python-versions = ">=3.5" - -[package.extras] -test = ["pytest", "flake8", "mypy"] - -[[package]] -name = "sphinxcontrib-qthelp" -version = "1.0.3" -description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document." -category = "dev" -optional = false -python-versions = ">=3.5" - -[package.extras] -lint = ["flake8", "mypy", "docutils-stubs"] -test = ["pytest"] - -[[package]] -name = "sphinxcontrib-serializinghtml" -version = "1.1.5" -description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)." -category = "dev" -optional = false -python-versions = ">=3.5" - -[package.extras] -lint = ["flake8", "mypy", "docutils-stubs"] -test = ["pytest"] - -[[package]] name = "typeguard" version = "2.13.3" description = "Run-time type checker for Python" @@ -663,50 +450,42 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.8" +version = "1.26.9" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" [package.extras] -brotli = ["brotlipy (>=0.6.0)"] +brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"] secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" -python-versions = "^3.8" -content-hash = "63b68a38ca6f7b9189d2403c2c6d1ec7af29cc1ccdeab2fbc970b5dbd766c3c6" +python-versions = "^3.9" +content-hash = "781bb4378f4491b427372322c3ec71131ed7a28e0a166e0bc43969b016b5d926" [metadata.files] -alabaster = [ - {file = "alabaster-0.7.12-py2.py3-none-any.whl", hash = "sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359"}, - {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, -] apache-libcloud = [ - {file = "apache-libcloud-3.5.0.tar.gz", hash = "sha256:073f10492976faa383a22b13b82c249827cfe90a083c71620e8316e815a6db3b"}, - {file = "apache_libcloud-3.5.0-py2.py3-none-any.whl", hash = "sha256:3789f4f2464fe18e317cdd3a03eff363268e096bc47f1f5770ee82d6ffe28c40"}, -] -babel = [ - {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, - {file = "Babel-2.9.1.tar.gz", hash = "sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"}, + {file = "apache-libcloud-3.6.0.tar.gz", hash = "sha256:4a3b9141033798e4fb07886ff26254e635e022acbdd708375eac6f56e323506c"}, + {file = "apache_libcloud-3.6.0-py2.py3-none-any.whl", hash = "sha256:4aa8cf11caad7090753d6b19af2abfe779847df4296b15a39db3ded15a122478"}, ] boto = [ {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.21.18-py3-none-any.whl", hash = "sha256:d857feb6af9932e1ee3a748060a2cd9fd6043dbbccf66976eda54586597efdc0"}, - {file = "boto3-1.21.18.tar.gz", hash = "sha256:8d6f3c548f0ee03d742f404c96515e7579fc6968135aaa50dd855a046698ff79"}, + {file = "boto3-1.24.16-py3-none-any.whl", hash = "sha256:2c6f7e4103d41ca07d6b934a6612e4b9a2666eae36e8289f88726868534b8de2"}, + {file = "boto3-1.24.16.tar.gz", hash = "sha256:422c000ff2ee5226e89fe427a9c4c09db095d69c179a3bcc3cfba37cbc5e787e"}, ] botocore = [ - {file = "botocore-1.24.18-py3-none-any.whl", hash = "sha256:7ea8ef1ff7c4882ab59b337662f90ddf5ea860e95e7e209dca593a34ea585b1b"}, - {file = "botocore-1.24.18.tar.gz", hash = "sha256:d2da7ccbc5ddd61fe3cd45fcbd3de380d9e3a15bfa8fbfd2d9259a93dcc60c56"}, + {file = "botocore-1.27.16-py3-none-any.whl", hash = "sha256:f117d59899d21beeb200130d7af2090a8112d702a06e2c2794ef576bcea36773"}, + {file = "botocore-1.27.16.tar.gz", hash = "sha256:b3b9710902f675a11f5bfd46afda770150530876ae6541d099584462bf949fd1"}, ] certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, + {file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"}, + {file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"}, ] cffi = [ {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, @@ -764,10 +543,6 @@ charset-normalizer = [ {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"}, {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, ] -colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, -] cryptography = [ {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"}, {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"}, @@ -789,10 +564,6 @@ cryptography = [ {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"}, {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"}, ] -docutils = [ - {file = "docutils-0.16-py2.py3-none-any.whl", hash = "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"}, - {file = "docutils-0.16.tar.gz", hash = "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"}, -] hetzner = [ {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, ] @@ -800,66 +571,16 @@ idna = [ {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] -imagesize = [ - {file = "imagesize-1.3.0-py2.py3-none-any.whl", hash = "sha256:1db2f82529e53c3e929e8926a1fa9235aa82d0bd0c580359c67ec31b2fddaa8c"}, - {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"}, -] -jinja2 = [ - {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"}, - {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"}, -] jmespath = [ - {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, - {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, + {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, + {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, ] jsonpickle = [ - {file = "jsonpickle-2.1.0-py2.py3-none-any.whl", hash = "sha256:1dee77ddc5d652dfdabc33d33cff9d7e131d428007007da4fd6f7071ae774b0f"}, - {file = "jsonpickle-2.1.0.tar.gz", hash = "sha256:84684cfc5338a534173c8dd69809e40f2865d0be1f8a2b7af8465e5b968dcfa9"}, + {file = "jsonpickle-2.2.0-py2.py3-none-any.whl", hash = "sha256:de7f2613818aa4f234138ca11243d6359ff83ae528b2185efdd474f62bcf9ae1"}, + {file = "jsonpickle-2.2.0.tar.gz", hash = "sha256:7b272918b0554182e53dc340ddd62d9b7f902fec7e7b05620c04f3ccef479a0e"}, ] libvirt-python = [ - {file = "libvirt-python-8.1.0.tar.gz", hash = "sha256:a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43"}, -] -markupsafe = [ - {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3028252424c72b2602a323f70fbf50aa80a5d3aa616ea6add4ba21ae9cc9da4c"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:290b02bab3c9e216da57c1d11d2ba73a9f73a614bbdcc027d299a60cdfabb11a"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e104c0c2b4cd765b4e83909cde7ec61a1e313f8a75775897db321450e928cce"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24c3be29abb6b34052fd26fc7a8e0a49b1ee9d282e3665e8ad09a0a68faee5b3"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:204730fd5fe2fe3b1e9ccadb2bd18ba8712b111dcabce185af0b3b5285a7c989"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d3b64c65328cb4cd252c94f83e66e3d7acf8891e60ebf588d7b493a55a1dbf26"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:96de1932237abe0a13ba68b63e94113678c379dca45afa040a17b6e1ad7ed076"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75bb36f134883fdbe13d8e63b8675f5f12b80bb6627f7714c7d6c5becf22719f"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-win32.whl", hash = "sha256:4056f752015dfa9828dce3140dbadd543b555afb3252507348c493def166d454"}, - {file = "MarkupSafe-2.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:d4e702eea4a2903441f2735799d217f4ac1b55f7d8ad96ab7d4e25417cb0827c"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f0eddfcabd6936558ec020130f932d479930581171368fd728efcfb6ef0dd357"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ddea4c352a488b5e1069069f2f501006b1a4362cb906bee9a193ef1245a7a61"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:09c86c9643cceb1d87ca08cdc30160d1b7ab49a8a21564868921959bd16441b8"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0a0abef2ca47b33fb615b491ce31b055ef2430de52c5b3fb19a4042dbc5cadb"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:736895a020e31b428b3382a7887bfea96102c529530299f426bf2e636aacec9e"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:679cbb78914ab212c49c67ba2c7396dc599a8479de51b9a87b174700abd9ea49"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:84ad5e29bf8bab3ad70fd707d3c05524862bddc54dc040982b0dbcff36481de7"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-win32.whl", hash = "sha256:8da5924cb1f9064589767b0f3fc39d03e3d0fb5aa29e0cb21d43106519bd624a"}, - {file = "MarkupSafe-2.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:454ffc1cbb75227d15667c09f164a0099159da0c1f3d2636aa648f12675491ad"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:142119fb14a1ef6d758912b25c4e803c3ff66920635c44078666fe7cc3f8f759"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b2a5a856019d2833c56a3dcac1b80fe795c95f401818ea963594b345929dffa7"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d1fb9b2eec3c9714dd936860850300b51dbaa37404209c8d4cb66547884b7ed"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62c0285e91414f5c8f621a17b69fc0088394ccdaa961ef469e833dbff64bd5ea"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fc3150f85e2dbcf99e65238c842d1cfe69d3e7649b19864c1cc043213d9cd730"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f02cf7221d5cd915d7fa58ab64f7ee6dd0f6cddbb48683debf5d04ae9b1c2cc1"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d5653619b3eb5cbd35bfba3c12d575db2a74d15e0e1c08bf1db788069d410ce8"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7d2f5d97fcbd004c03df8d8fe2b973fe2b14e7bfeb2cfa012eaa8759ce9a762f"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-win32.whl", hash = "sha256:3cace1837bc84e63b3fd2dfce37f08f8c18aeb81ef5cf6bb9b51f625cb4e6cd8"}, - {file = "MarkupSafe-2.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:fabbe18087c3d33c5824cb145ffca52eccd053061df1d79d4b66dafa5ad2a5ea"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:023af8c54fe63530545f70dd2a2a7eed18d07a9a77b94e8bf1e2ff7f252db9a3"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d66624f04de4af8bbf1c7f21cc06649c1c69a7f84109179add573ce35e46d448"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c532d5ab79be0199fa2658e24a02fce8542df196e60665dd322409a03db6a52c"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e67ec74fada3841b8c5f4c4f197bea916025cb9aa3fe5abf7d52b655d042f956"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:30c653fde75a6e5eb814d2a0a89378f83d1d3f502ab710904ee585c38888816c"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:961eb86e5be7d0973789f30ebcf6caab60b844203f4396ece27310295a6082c7"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:598b65d74615c021423bd45c2bc5e9b59539c875a9bdb7e5f2a6b92dfcfc268d"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:599941da468f2cf22bf90a84f6e2a65524e87be2fce844f96f2dd9a6c9d1e635"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-win32.whl", hash = "sha256:e6f7f3f41faffaea6596da86ecc2389672fa949bd035251eab26dc6697451d05"}, - {file = "MarkupSafe-2.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:b8811d48078d1cf2a6863dafb896e68406c5f513048451cd2ded0473133473c7"}, - {file = "MarkupSafe-2.1.0.tar.gz", hash = "sha256:80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f"}, + {file = "libvirt-python-8.4.0.tar.gz", hash = "sha256:6d252ad4e0f765620bbde450be8f2b844e4f85c568b207ac644f52c6a982f46c"}, ] nixops = [] nixops-aws = [] @@ -871,10 +592,6 @@ nixops-hetzner = [] nixops-virtd = [] nixopsvbox = [] nixos-modules-contrib = [] -packaging = [ - {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, - {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, -] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, @@ -888,14 +605,6 @@ pycparser = [ {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] -pygments = [ - {file = "Pygments-2.11.2-py3-none-any.whl", hash = "sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65"}, - {file = "Pygments-2.11.2.tar.gz", hash = "sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"}, -] -pyparsing = [ - {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"}, - {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, -] python-dateutil = [ {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, @@ -904,54 +613,18 @@ python-digitalocean = [ {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"}, {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, ] -pytz = [ - {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"}, - {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, -] requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, + {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, + {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, ] s3transfer = [ - {file = "s3transfer-0.5.2-py3-none-any.whl", hash = "sha256:7a6f4c4d1fdb9a2b640244008e142cbc2cd3ae34b386584ef044dd0f27101971"}, - {file = "s3transfer-0.5.2.tar.gz", hash = "sha256:95c58c194ce657a5f4fb0b9e60a84968c808888aed628cd98ab8771fe1db98ed"}, + {file = "s3transfer-0.6.0-py3-none-any.whl", hash = "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd"}, + {file = "s3transfer-0.6.0.tar.gz", hash = "sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] -snowballstemmer = [ - {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"}, - {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, -] -sphinx = [ - {file = "Sphinx-3.5.4-py3-none-any.whl", hash = "sha256:2320d4e994a191f4b4be27da514e46b3d6b420f2ff895d064f52415d342461e8"}, - {file = "Sphinx-3.5.4.tar.gz", hash = "sha256:19010b7b9fa0dc7756a6e105b2aacd3a80f798af3c25c273be64d7beeb482cb1"}, -] -sphinxcontrib-applehelp = [ - {file = "sphinxcontrib-applehelp-1.0.2.tar.gz", hash = "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"}, - {file = "sphinxcontrib_applehelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a"}, -] -sphinxcontrib-devhelp = [ - {file = "sphinxcontrib-devhelp-1.0.2.tar.gz", hash = "sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"}, - {file = "sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e"}, -] -sphinxcontrib-htmlhelp = [ - {file = "sphinxcontrib-htmlhelp-2.0.0.tar.gz", hash = "sha256:f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"}, - {file = "sphinxcontrib_htmlhelp-2.0.0-py2.py3-none-any.whl", hash = "sha256:d412243dfb797ae3ec2b59eca0e52dac12e75a241bf0e4eb861e450d06c6ed07"}, -] -sphinxcontrib-jsmath = [ - {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"}, - {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"}, -] -sphinxcontrib-qthelp = [ - {file = "sphinxcontrib-qthelp-1.0.3.tar.gz", hash = "sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"}, - {file = "sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"}, -] -sphinxcontrib-serializinghtml = [ - {file = "sphinxcontrib-serializinghtml-1.1.5.tar.gz", hash = "sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"}, - {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, -] typeguard = [ {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, @@ -962,6 +635,6 @@ typing-extensions = [ {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"}, - {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"}, + {file = "urllib3-1.26.9-py2.py3-none-any.whl", hash = "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"}, + {file = "urllib3-1.26.9.tar.gz", hash = "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e"}, ] diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index acee33da249a9..1a1097649493e 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -5,7 +5,7 @@ description = "NixOps 2.0" authors = ["Adam Hoese <adam.hose@tweag.io>"] [tool.poetry.dependencies] -python = "^3.8" +python = "^3.9" nixops = {git = "https://github.com/NixOS/nixops.git"} nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} nixops-digitalocean = {git = "https://github.com/nix-community/nixops-digitalocean.git"} @@ -14,13 +14,7 @@ nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"} nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} -# FIXME: Once #30 lands this can be replaced -# https://github.com/nix-community/nixops-libvirtd/pull/30 -# nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} -nixops-virtd = { git = "https://github.com/lovesegfault/nixops-libvirtd.git", branch = "update-libvirt" } - -[tool.poetry.dev-dependencies] -sphinx = "^3.1.2" +nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} [build-system] requires = ["poetry>=0.12"] diff --git a/pkgs/applications/networking/cluster/nixops/shell.nix b/pkgs/applications/networking/cluster/nixops/shell.nix index 0139cb2c81257..a40c600691ea9 100644 --- a/pkgs/applications/networking/cluster/nixops/shell.nix +++ b/pkgs/applications/networking/cluster/nixops/shell.nix @@ -5,6 +5,6 @@ pkgs.mkShell { pkgs.poetry2nix.cli pkgs.pkg-config pkgs.libvirt - pkgs.poetry + pkgs.python39Packages.poetry ]; } diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix index c888581ae4d85..5df87528448c4 100644 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -1,11 +1,9 @@ { callPackage , buildGoModule -, nvidia_x11 -, nvidiaGpuSupport }: callPackage ./generic.nix { - inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + inherit buildGoModule; version = "1.2.8"; sha256 = "11yn8g9wsdb35q97wn5vy93kgbn5462k0a33wxlfdz14i5h00yj8"; vendorSha256 = "06wyfnlm37qjvd1pwzygflfpcp9p52f61wgi6pb9l7hnqy2ph6j5"; diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix index 6670b35f67e01..0145a5b109050 100644 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -1,11 +1,9 @@ { callPackage , buildGoModule -, nvidia_x11 -, nvidiaGpuSupport }: callPackage ./generic.nix { - inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + inherit buildGoModule; version = "1.3.1"; sha256 = "03ckhqh5xznvhbk380ka0g9w9hrvsi389h5maw68f3g3acx68jm7"; vendorSha256 = "08k5dxaq4r2q0km6y9mc14haski6l7hmhmzn5wjb961hwf5hkfgh"; diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index 180cf48e3fb19..c5d92eaf1f7ea 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -4,9 +4,6 @@ , version , sha256 , vendorSha256 -, nvidiaGpuSupport -, patchelf -, nvidia_x11 , nixosTests }: @@ -25,22 +22,10 @@ buildGoModule rec { inherit vendorSha256; - nativeBuildInputs = lib.optionals nvidiaGpuSupport [ - patchelf - ]; - # ui: # Nomad release commits include the compiled version of the UI, but the file # is only included if we build with the ui tag. - tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; - - # The dependency on NVML isn't explicit. We have to make it so otherwise the - # binary will not know where to look for the relevant symbols. - postFixup = lib.optionalString nvidiaGpuSupport '' - for bin in $out/bin/*; do - patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" - done - ''; + tags = [ "ui" ]; passthru.tests.nomad = nixosTests.nomad; diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index 73a5d964f34bb..46fdeef2ac83f 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -1,23 +1,38 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, ocm }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv, testers, ocm }: buildGoModule rec { pname = "ocm"; - version = "0.1.62"; + version = "0.1.64"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "0kv0zcx6wdlyid37ygzg05xyyk77ybd2qcdgbswjv6crcjh1xdrd"; + sha256 = "sha256-RMXiEXgf8tAdp2d97kaOzXgFCFVkaMhkJF8AHXIEJm8="; }; - vendorSha256 = "sha256-nXUrbF9mcHy8G7c+ktQixBmmf6x066gpuaZ0eUsJQwc="; + vendorSha256 = "sha256-4m5Ej2Ql9+wGqrzvXQkY8fL2I9tYE6Tm6s9+qcZBHQI="; + + # Strip the final binary. + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ installShellFiles ]; # Tests expect the binary to be located in the root directory. preCheck = '' ln -s $GOPATH/bin/ocm ocm ''; + # Tests fail in Darwin sandbox. + doCheck = !stdenv.isDarwin; + + postInstall = '' + installShellCompletion --cmd ocm \ + --bash <($out/bin/ocm completion bash) \ + --fish <($out/bin/ocm completion fish) \ + --zsh <($out/bin/ocm completion zsh) + ''; + passthru.tests.version = testers.testVersion { package = ocm; command = "ocm version"; @@ -28,5 +43,6 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://github.com/openshift-online/ocm-cli"; maintainers = with maintainers; [ stehessel ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 70c255790790d..733e4c04a9cca 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { introspective tooling, cluster navigation, and object management along with a plugin system to further extend its capabilities. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ jk ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/cluster/pgo-client/default.nix b/pkgs/applications/networking/cluster/pgo-client/default.nix index fc7110a89ae81..0ea3a13688a33 100644 --- a/pkgs/applications/networking/cluster/pgo-client/default.nix +++ b/pkgs/applications/networking/cluster/pgo-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgo-client"; - version = "4.7.4"; + version = "4.7.5"; src = fetchFromGitHub { owner = "CrunchyData"; repo = "postgres-operator"; rev = "v${version}"; - sha256 = "sha256-8L3eFMATCGIM6xxUM7mi/D3njHMFk7cgPLJotilAS5k="; + sha256 = "sha256-1GYpvw3ch03Cx4BReNwLnbgbds4uuSe/cjvbHuRhLOw="; }; - vendorSha256 = "sha256-4Vz7Lioj6iLU7dbz/B2BSAgfaCl2MyC8MM9yiyWLi2o="; + vendorSha256 = "sha256-5/mLlgNdlX/ABrpofPqowCskxFwJAEKVpbsMOvMvTWc="; subPackages = [ "cmd/pgo" ]; diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index 3ee09b14ce960..d0a506f88475a 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-5ceyScsCidJpHGfwhsq7/hDd3CClx29cD5Cdc1PSxTU="; + sha256 = "sha256-/HI3qcpgNJTurPFEZFlg+H0ndowSgEF6cHp1cuaJjR8="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 4d62dad4af6e5..f022fc90b5408 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, roxctl }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, roxctl }: buildGoModule rec { pname = "roxctl"; - version = "3.69.1"; + version = "3.70.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4="; + sha256 = "sha256-T06VldyPBIpYWs8+N4OWmaCwXCcb37F7lLD4jHcm1uc="; }; - vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g="; + vendorSha256 = "sha256-xh2bgLSWjQHOjHrgDpQri78LvCL4CDbMteQYARyGLgg="; nativeBuildInputs = [ installShellFiles ]; @@ -30,7 +30,7 @@ buildGoModule rec { --zsh <($out/bin/roxctl completion zsh) ''; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = roxctl; command = "roxctl version"; }; diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix index 684e9f65a5bf8..fa7cef34da18c 100644 --- a/pkgs/applications/networking/cluster/spacegun/default.nix +++ b/pkgs/applications/networking/cluster/spacegun/default.nix @@ -25,6 +25,7 @@ nodePackages.package.override { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Version controlled multi-cluster deployment manager for kubernetes"; maintainers = with maintainers; [ ]; license = licenses.mit; diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh index bda3d1727c4f3..3d1b470edfcdf 100644 --- a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh +++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh @@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json node2nix \ - --nodejs-10 \ + --nodejs-16 \ --node-env ../../../../development/node-packages/node-env.nix \ --development \ --input package.json \ diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 9d532a3861a1e..0c0b678d98f22 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index a3ca42dff3424..2a9046d94a0bb 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -64,6 +64,7 @@ let meta = { description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "https://spark.apache.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 1fd71cb8e9914..7350a8bd460b4 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: let - ver = "1.2.312.0"; + ver = "1.2.331.0"; source = if stdenv.isDarwin then { url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; - sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9"; + sha256 = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf"; } else { url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; - sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7"; + sha256 = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q="; }; archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; in @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mbaillie ]; }; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 8476fc810ba43..42d451bd44db4 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,42 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -let - # look for GO_LDFLAGS getting set in the Makefile - version = "1.0.5"; - sha256 = "sha256-xgzIbhgV1AAUa0tooYtzUMqK4Co3PvWQ0YbZuf0JgFE="; - vendorSha256 = "sha256-Gp30qCGV+EaJ1lvfleZHRWVL6rdSj0mvpumWsqr9IT0="; - pkgsVersion = "v1.0.0-17-g7567bf4"; - extrasVersion = "v1.0.0-3-g6327c36"; -in +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + buildGoModule rec { pname = "talosctl"; - inherit version vendorSha256; - # nixpkgs-update: no auto update + version = "1.1.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - inherit sha256; + sha256 = "sha256-52WzQ5LWgIX/XBJPNvWV0tAPnw1AiINDL/7D3UYvvn4="; }; - ldflags = - let - versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG - imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS - mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG - in - [ - "-X ${versionPkg}.Name=Client" - "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do - "-X ${versionPkg}.Tag=${src.rev}" - "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS - "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS - "-X ${imagesPkgs}.Username=siderolabs" # USERNAME - "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY - "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS - "-s" - "-w" - ]; + vendorSha256 = "sha256-iluI4UGw5cZ70wmC9jDiGttvxZ7xFyqcL9IZX4ubJqs="; + + ldflags = [ "-s" "-w" ]; + + GOWORK = "off"; subPackages = [ "cmd/talosctl" ]; @@ -56,5 +35,8 @@ buildGoModule rec { homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; + # requires >= 10.14 SDK https://github.com/NixOS/nixpkgs/issues/101229 + # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 0c9776f9f7920..c9a5d7c60cee7 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.20.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wtfn9ffUNKuwByRbeCYq27xvr2DuzxSSQMH9Sv5a7rU="; + sha256 = "sha256-MMQv3/Ft6/FUueGEXGqYWAYy4zc2R6LASbh2x7eJNdQ="; }; - vendorSha256 = "sha256-ed6rC+wrZHDViGfJrSBl5VUqX/o6RKytXbTKqxb3ZtU="; + vendorSha256 = "sha256-QwtcWzJbusa8BxtG5xmGUgqG0qCMSpkzbmes/x3lnWc="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index bf5dc60d88b5e..23914a6a9fe82 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fOq67Cxtb2A9Obh2o5/aFy5bYBnyFKYQDPcpxOXMy1s="; + sha256 = "sha256-mrTtg60LZpRONrEhX53EhSYpfdfGMvPK4WhTHeAKsoQ="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 49d64283ca0f0..0d326d5ad458a 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -1,26 +1,17 @@ -{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }: +{ lib, fetchFromGitHub, buildGoModule, testers, temporal-cli }: buildGoModule rec { pname = "temporal-cli"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s="; + sha256 = "sha256-KLcCFQJlFeioIhqrbkhgoNPcbAYvy1ESG8x9Y/I7+nw="; }; - patches = [ - # Fix tests - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch"; - sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ="; - }) - ]; - - vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o="; + vendorSha256 = "sha256-kczmoP32/V0HHeC3Mr+giuMB+McVTNeC2F+t1ohY4/U="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index db423d619b526..b4844015eb6e5 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -17,7 +17,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkFlags = [ "-short" ]; + # There too many integration tests. + doCheck = false; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 0be97ceb9b14f..e89af8de6b621 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,5 +1,7 @@ { lib +, stdenv , buildGoModule +, buildGo117Module , fetchFromGitHub , callPackage , config @@ -16,13 +18,14 @@ let , rev , version , sha256 - , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ + , vendorSha256 , deleteVendor ? false , proxyVendor ? false + , mkProviderGoModule ? buildGoModule , # Looks like "registry.terraform.io/vancluever/acme" provider-source-address }@attrs: - buildGoModule { + mkProviderGoModule { pname = repo; inherit vendorSha256 version deleteVendor proxyVendor; subPackages = [ "." ]; @@ -56,54 +59,35 @@ let # These are the providers that don't fall in line with the default model special-providers = { - # Packages that don't fit the default model - - # mkisofs needed to create ISOs holding cloud-init data, - # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 + # go-module vendor fails with 1.18 + buildkite = automated-providers.buildkite.override { mkProviderGoModule = buildGo117Module; }; + # go-module vendor fails with 1.18 + checkly = automated-providers.checkly.override { mkProviderGoModule = buildGo117Module; }; + # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); + # fails to build on x86_64-darwin with 1.18 + lxd = automated-providers.lxd.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + netlify = automated-providers.netlify.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + pass = automated-providers.pass.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + skytap = automated-providers.skytap.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-{darwin,linux} with 1.18 + tencentcloud = automated-providers.tencentcloud.override { mkProviderGoModule = buildGo117Module; }; }; # Put all the providers we not longer support in this list. removed-providers = let - archived = date: throw "the provider has been archived by upstream on ${date}"; - removed = date: throw "removed from nixpkgs on ${date}"; + archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}"; + removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { - arukas = archived "2022/01"; - chef = archived "2022/01"; - cherryservers = archived "2022/01"; - clc = archived "2022/01"; - cloudstack = removed "2022/01"; - cobbler = archived "2022/01"; - cohesity = archived "2022/01"; - dyn = archived "2022/01"; - genymotion = archived "2022/01"; - hedvig = archived "2022/01"; - ignition = archived "2022/01"; - incapsula = archived "2022/01"; - influxdb = archived "2022/01"; - jdcloud = archived "2022/01"; - kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; - librato = archived "2022/01"; - logentries = archived "2022/01"; - metalcloud = archived "2022/01"; - mysql = archived "2022/01"; - nixos = archived "2022/01"; - oneandone = archived "2022/01"; - packet = archived "2022/01"; - profitbricks = archived "2022/01"; - pureport = archived "2022/01"; - rancher = archived "2022/01"; - rightscale = archived "2022/01"; - runscope = archived "2022/01"; - segment = removed "2022/01"; - softlayer = archived "2022/01"; - telefonicaopencloud = archived "2022/01"; - teleport = removed "2022/01"; - terraform = archived "2022/01"; - ultradns = archived "2022/01"; - vthunder = throw "provider was renamed to thunder on 2022/01"; + b2 = removed "b2" "2022/06"; + opc = archived "opc" "2022/05"; + oraclepaas = archived "oraclepaas" "2022/05"; + template = archived "template" "2022/05"; }; # excluding aliases, used by terraform-full diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7e379d480936e..e7a2bf691814a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -3,19 +3,19 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v2.2.1", - "sha256": "sha256-WYKlkvGmTeaI4+7uWLy6/y+NtFb9n3Lu9lrwSR8Vg/0=", + "rev": "v2.3.0", + "sha256": "sha256-V4LvMVWuKsGMVo/P8r79ICy3SrsVmCOMl75yRIixqAQ=", "vendorSha256": null, - "version": "2.2.1" + "version": "2.3.0" }, "acme": { "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.8.0", - "sha256": "06wjvjsh8qgncrbdhziqjd4pgp550q21p0xm4igdx80gd7541hr1", - "vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc", - "version": "2.8.0" + "rev": "v2.10.0", + "sha256": "sha256-nafJJ2Gr2jA09mjh8hozdDgl67h+10D35KtqjTUPgBE=", + "vendorSha256": "sha256-lNI0u8DCBl4mGVecRfAqieCooyJlqK+Z4eixPFFyBuU=", + "version": "2.10.0" }, "age": { "owner": "clementblaise", @@ -30,37 +30,37 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.0.0", - "sha256": "sha256-k3F6AUcGAddDD3Wy1THgTlcNzDBB403Vy+6c+avi+vQ=", - "vendorSha256": "sha256-gVZpN7Hwi+PbJDgEHSJRYq0tC1GVcetfPBY5pGhMPAc=", - "version": "3.0.0" + "rev": "v3.2.1", + "sha256": "sha256-XEosTsTMrJM4WYizjbT5Rv8dkrOssnxXNV1K92OpmEk=", + "vendorSha256": "sha256-k6pKet1YdQYCyFICw67nKI3RGNZ4b+zA+T9jpa2ZLFM=", + "version": "3.2.1" }, "akamai": { "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v2.0.0", - "sha256": "sha256-LcqP4gO1dhNaLkpaZIRxmC8B7DUTLC1fPZutohBqKSQ=", - "vendorSha256": "sha256-Vu5vyCEkZNf8TXryDalI5RKM/hjWeEkXbnYLhGwc2y8=", - "version": "2.0.0" + "rev": "v2.2.0", + "sha256": "sha256-OhHzFRxOmJR2NW1UX38+ep/VmmZ9xfPqwUo/37/hGyU=", + "vendorSha256": "sha256-rhA0Mm+Uu+F8zyRLj4fRED+pJ0TpZvVSFKvmm0OAhPY=", + "version": "2.2.0" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.168.0", - "sha256": "sha256-NN4dqEywcoP4tk2J6RfWqoGw+95bIEoxb4YpwPtoTZ0=", - "vendorSha256": "sha256-qZNYfSlUkCu7FudbKF4IOgK1xWM5LqUghclOeGOxYXg=", - "version": "1.168.0" + "rev": "v1.174.0", + "sha256": "sha256-sdfdc2QOuEmfB0f7A15GZAGY82L9e54DqDXZ7FM6Avg=", + "vendorSha256": "sha256-6FiVXy/q3WImYDbwvj9e3ns9gilaL6GBW5qCpaUNCW0=", + "version": "1.174.0" }, "ansible": { "owner": "nbering", "provider-source-address": "registry.terraform.io/nbering/ansible", "repo": "terraform-provider-ansible", "rev": "v1.0.4", - "sha256": "1djjcrcm9218rfn51kpzp3cbb5qbkfwpjqm9h9rhadibbvjmly6y", - "vendorSha256": "1kc47n1janmiwwjphvxpily3dwyy1axxh36aj3sb2kpawi4pq1rq", + "sha256": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", + "vendorSha256": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=", "version": "1.0.4" }, "archive": { @@ -68,18 +68,18 @@ "provider-source-address": "registry.terraform.io/hashicorp/archive", "repo": "terraform-provider-archive", "rev": "v2.2.0", - "sha256": "11iv6c0bnrp2s69h3b7f238jdnkcjgrihp8c46lhw393ki6aqfhk", + "sha256": "sha256-EzqsTJwjDQ6pIQxdGPOTbNom0RDurAGT0eJmuwAzO4Y=", "vendorSha256": null, "version": "2.2.0" }, "auth0": { - "owner": "alexkappa", - "provider-source-address": "registry.terraform.io/alexkappa/auth0", + "owner": "auth0", + "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.26.2", - "sha256": "1n9gn7zsdygdr2ybki7xz2snp3fygls6myb1w5zndby497kgxrkw", - "vendorSha256": "1x61f7vz73m2q6pdb6ddy27j4npiwrrlgzvd90zrcc0yj22h6mms", - "version": "0.26.2" + "rev": "v0.32.0", + "sha256": "sha256-zy5brS1KsQM8JZahcmIsBdUS389OoQ53d4OGHpF6zwo=", + "vendorSha256": "sha256-xQEgoYPXt3ivgOMk+yQMS0SlPhDJ5qCVsI12LMU6ZcI=", + "version": "0.32.0" }, "avi": { "owner": "vmware", @@ -94,126 +94,118 @@ "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.22.0", - "sha256": "sha256-ZJs9XtoftMihY9VwWw0lPxH2Nu6NmcEcchsRg71os0c=", + "rev": "v2.22.1", + "sha256": "sha256-jvk6j/JZvRSq1ywlkJdCXGFrJccjViCVAIe+z4SjiUk=", "vendorSha256": null, - "version": "2.22.0" + "version": "2.22.1" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.15.1", - "sha256": "sha256-o8yUcjw4X+Vx49hV+0guccueWoHvpxSs+sMsbAoAw9o=", - "vendorSha256": "sha256-l7Fe5hhEvJ5DiZ3t79sZYIt+6eZkjjf7Npmr8p2/e/4=", - "version": "4.15.1" + "rev": "v4.22.0", + "sha256": "sha256-F+YzXIKkF/eGUY3l8MjeP+8GqS37e1N9b+fmNCkdeMM=", + "vendorSha256": "sha256-kz0bPsfLCekRj/ZGCBT+eFRMRkV+Dc69RkyBbFaztd0=", + "version": "4.22.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.22.0", - "sha256": "sha256-x3SRTGCokEZGoG2l46PSelI8+FkHp5sbDdd14Iyei54=", + "rev": "v2.26.0", + "sha256": "sha256-M61kkeBRLb0fDPH1FZH5koFRZqCVfTlEXJ8N0Amc8ac=", "vendorSha256": null, - "version": "2.22.0" + "version": "2.26.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.7.0", - "sha256": "sha256-dvkR2nEtf4HvLTIoa++4PI5oNOPuJzI4obxdI4meKG4=", + "rev": "v3.13.0", + "sha256": "sha256-ptEsCgJsB++RYtc+SekUPoV9ONRfGCCoPGM6alwQ/wY=", "vendorSha256": null, - "version": "3.7.0" + "version": "3.13.0" }, "azurestack": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", "rev": "v0.10.0", - "sha256": "0lcwrp6n3l1nink06wq2nrirs6k3wwjmya1w06x14pvqqdj1d5c8", + "sha256": "sha256-iJUWZMN4XxK6ATwoXyXnYxqdY7YCcwOmjTbQYc3NnFE=", "vendorSha256": null, "version": "0.10.0" }, - "b2": { - "owner": "Backblaze", - "provider-source-address": "registry.terraform.io/Backblaze/b2", - "repo": "terraform-provider-b2", - "rev": "v0.8.0", - "sha256": "sha256-2yyAKrDO7X5yujfrHhYuvXbuKk3yY1sCXRZ8U/9OnrM=", - "vendorSha256": "sha256-f5bvk0p7AU1i/xeapxyVRXIUARju6mNQokejaDnT/GI=", - "version": "0.8.0" - }, "baiducloud": { + "deleteVendor": true, "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.12.0", - "sha256": "1m7cw08ld073q1dsa7njshps21nc71gsz0kp6qj0p638zqx62xn7", - "vendorSha256": null, - "version": "1.12.0" + "rev": "v1.13.0", + "sha256": "sha256-C/dvFwtqOJAXgk5CNr06cehOiVZ2c4Zcqcb+g/k0iPY=", + "vendorSha256": "sha256-GZZKJkK9ug6iUhaAXxR2nKfQQ96MHiYv/hsaB5O9Oig=", + "version": "1.13.0" }, "bigip": { "owner": "F5Networks", "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.13.1", - "sha256": "sha256-nNcOHTFJrvvjKAZUsb1IVTp71/Xk5OuSzihPyi08anw=", + "rev": "v1.14.0", + "sha256": "sha256-Z3YqiKGlMrn55ZZsRjuvKAFRNW1G2D2Iczlk42yHk34=", "vendorSha256": null, - "version": "1.13.1" + "version": "1.14.0" }, "bitbucket": { "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.17.0", - "sha256": "sha256-nzwfhwiszzhoobq2PlgtKfCch46fLoBVbembzdnkrD4=", - "vendorSha256": "sha256-LLhnF0/tj44vN36yss1JzNvDYy64Iuk5WVRhehf0wkk=", - "version": "2.17.0" + "rev": "v2.20.0", + "sha256": "sha256-8GWxUb7ABulZ6jK9PATYfSbcyTCZ5Mqv3X3zjY3gquU=", + "vendorSha256": "sha256-h/hm5HtY3OCJ6Mtq+A3PBmH10xgYpKwjhwbDd1HtdoQ=", + "version": "2.20.0" }, "brightbox": { "owner": "brightbox", "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", - "rev": "v2.2.0", - "sha256": "1n0gdfsj8ylmm5pqsjs3dvjvj8larc30x5p9jq546xvi2idvl39n", - "vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71", - "version": "2.2.0" + "rev": "v3.0.4", + "sha256": "sha256-UUDL1w/3IEa+Na77FoYReevJLT3AJq5giHYS6Bq4DQs=", + "vendorSha256": "sha256-M/S7gRRcAs53Ctx1oecHrlTxYxI1Kpr3ygTZLHG/9pY=", + "version": "3.0.4" }, "buildkite": { "owner": "buildkite", "provider-source-address": "registry.terraform.io/buildkite/buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.9.0", - "sha256": "sha256-k7caRT/9YA198I6K3Qv3UcyQiULpOvJ3Smc816sKHkQ=", + "rev": "v0.11.0", + "sha256": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=", "vendorSha256": "sha256-smBADIbH/t2IUt2w0VQ2BOU6iAuxVRa1yu4C5P2VeIo=", - "version": "0.9.0" + "version": "0.11.0" }, "checkly": { "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.4.3", - "sha256": "sha256-5VF1cAFgdm2TR4wvuNlycpgQuVdHesFYnTv34MeauxY=", - "vendorSha256": "sha256-7X2cS5Erf373zu8xqe2KBSz52ZmZOnAlNC8lq2/LXV4=", - "version": "1.4.3" + "rev": "v1.6.1", + "sha256": "sha256-vzYOieW4KdYcaPSSa6j57GsPAAIdwmWu5hIBCCmnstM=", + "vendorSha256": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=", + "version": "1.6.1" }, "checkpoint": { "deleteVendor": true, "owner": "CheckPointSW", "provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint", "repo": "terraform-provider-checkpoint", - "rev": "v1.8.0", - "sha256": "sha256-+lcJr7C7FsvSzkfFwEfTrJedx6vMvOrTjNA+JTWBI4c=", - "vendorSha256": "sha256-mHLrrt6UJNfqtgjhWYDTvJcDtToHI34uoa0oyb9/XXk=", - "version": "1.8.0" + "rev": "v2.0.0", + "sha256": "sha256-z/mB20gQmglr0usVrzhqxR3v9vhoRHXNJ57j8fqNREM=", + "vendorSha256": "sha256-rb/X9C8eS9QH88FwuvfvDkGdrjZOTiI9nmcYqydOhdc=", + "version": "2.0.0" }, "ciscoasa": { "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/ciscoasa", "repo": "terraform-provider-ciscoasa", "rev": "v1.3.0", - "sha256": "0a7k9pvx4vfap484jyxxjba3a3n28pssnnjiwzlc7n1ja7h3hdy7", + "sha256": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", "vendorSha256": null, "version": "1.3.0" }, @@ -221,19 +213,19 @@ "owner": "cloudamqp", "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.16.0", - "sha256": "sha256-swE4Nr1cQzNQOq8q6o0nZhhYRtgAwTfx6Epm76Jjjqg=", - "vendorSha256": "sha256-oPeldPn30uS5Yl6IfXVPy2R7/wsAdZsEbbhVnVHQVwk=", - "version": "1.16.0" + "rev": "v1.19.0", + "sha256": "sha256-RwgqJl+W5L/2Qz5Wd0dBPUNhX5Q+7J/y7RfLprOBa3k=", + "vendorSha256": "sha256-OnkSfHEbbcnSs+pI5wphObRyIXGtNlpeTe/RqxF/pr4=", + "version": "1.19.0" }, "cloudflare": { "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.15.0", - "sha256": "sha256-y1UbirPJG9Behsr/VdILoVHIM2z9pF6iyEwXgDKbDaw=", - "vendorSha256": "sha256-R8B5fmjRBB2q12tzWbzOzzSOC0mNJNV1JiVjddDa11c=", - "version": "3.15.0" + "rev": "v3.18.0", + "sha256": "sha256-xmAy4xYpgn1hOIX1qNXIBQUGgeoaGVU8SOC8wos93kQ=", + "vendorSha256": "sha256-uvgghtPjFrzGGlrJod8VZb4DylPZT0P1BIiD5SFBifc=", + "version": "3.18.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -249,7 +241,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/cloudinit", "repo": "terraform-provider-cloudinit", "rev": "v2.2.0", - "sha256": "0yv52hz60whmqfwv2a6f9f1fpszcyzs78hhz3lq4imz9dv5bd29z", + "sha256": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=", "vendorSha256": null, "version": "2.2.0" }, @@ -286,36 +278,36 @@ "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", "rev": "v0.10.0", - "sha256": "1wh5qd4m0wxbgd84mnnv5ghi57721wz1bdw0k7ff7l7d4whb0q1z", - "vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk", + "sha256": "sha256-P2CwICft0OPcmYC3FT4P4pwS4Svb2kpQe6tzUEnDBfI=", + "vendorSha256": "sha256-E4OmSPV4gTo8I2cSRz+iaFugzGbgJtgKkptPbu8daGI=", "version": "0.10.0" }, "datadog": { "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.11.0", - "sha256": "sha256-9ugNj/D6VPaERckV0cCPlBjNtzS9tLJj+rc/8MhxCVU=", - "vendorSha256": "sha256-XxOOOljx+p4onI6SF8UY+gy7x7G2pduEqODT1UX4zfg=", - "version": "3.11.0" + "rev": "v3.12.0", + "sha256": "sha256-17VtO+dHYMVvbG8cOVRx5qKPvmOoUGkNUl4aHrdsemQ=", + "vendorSha256": "sha256-Od80m/RsxUQpyalF4jN1Hv6/+kVwYEmqeJyiTbEwC2g=", + "version": "3.12.0" }, "dhall": { "owner": "awakesecurity", "provider-source-address": "registry.terraform.io/awakesecurity/dhall", "repo": "terraform-provider-dhall", - "rev": "v0.0.2", - "sha256": "1fw83ic5wwhl5yk1asy8p4cxsdwclw639j7ki1xgpi284h6gmh5a", - "vendorSha256": "1wqbblqpb1lpbsn4k9yh43g19iw13q825l5i9wvy4w0w4nzz70p4", - "version": "0.0.2" + "rev": "v0.0.3", + "sha256": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", + "vendorSha256": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=", + "version": "0.0.3" }, "digitalocean": { "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.19.0", - "sha256": "sha256-I1BcBsl9liyg9XVd30q6Un+B8km7dpLhLMn1Vgn21dk=", + "rev": "v2.21.0", + "sha256": "sha256-ei3nr3SAxQBXQikzPtRs9Y6VyOavTg9GXnLVfAI7QvU=", "vendorSha256": null, - "version": "2.19.0" + "version": "2.21.0" }, "dme": { "owner": "DNSMadeEasy", @@ -339,46 +331,55 @@ "owner": "dnsimple", "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.11.3", - "sha256": "sha256-fUs54xIecPgeQucuQmlpF2iHGonx4OsqFbhkMnO7d0c=", - "vendorSha256": "sha256-csooFX64RmwVV+gIejQS3HJljsRAp+bM8x/OoiF7jxs=", - "version": "0.11.3" + "rev": "v0.13.0", + "sha256": "sha256-Wt/2L4NHaQv5tV2JIjcRMH/mLyfbIk88PFYYmeVNlSQ=", + "vendorSha256": "sha256-emwD+bOkkZhh1BOQlW0dfdeD4Y68cULhC+3S7Xrjas4=", + "version": "0.13.0" }, "docker": { "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.16.0", - "sha256": "0bh27al9s6zczdz208lr70qab517lsazpi708z6711pgns7qhwjm", - "vendorSha256": "0ykfmksffcc62xwni9dqwgj3vlcmzf6paz6kviljib6sv9vqf0pm", - "version": "2.16.0" + "rev": "v2.17.0", + "sha256": "sha256-V+FuDhgih/hTpyuT13INY5vWIaNS/7Z8RlK15mR+CnE=", + "vendorSha256": "sha256-nTulwft8xfpE83ZLJvG7xllQJIqd2M0zzbqpfD3/Mno=", + "version": "2.17.0" }, "dome9": { "owner": "dome9", "provider-source-address": "registry.terraform.io/dome9/dome9", "repo": "terraform-provider-dome9", - "rev": "v1.25.4", - "sha256": "sha256-s/wglGsk/Lm45PWmqNHiVjj6sfQzXue+GnjEALp5yDc=", + "rev": "v1.27.1", + "sha256": "sha256-VmobLWMjHH+GzxUk0bnIr4dWkuH8D00U7VrN9eApF5c=", "vendorSha256": null, - "version": "1.25.4" + "version": "1.27.1" }, "elasticsearch": { "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.1", - "sha256": "sha256-WdGwLQe4jInZiMxJ7BasfwVBsei0V02D6vAA4dLLoAI=", - "vendorSha256": "sha256-gBC5+6bGJzfb0yLKlolfrZNuhpPacqX3p1HjIB4i3IU=", - "version": "2.0.1" + "rev": "v2.0.2", + "sha256": "sha256-hbdPapnnkv8nhD63UquS5DwfETkjNKwpkdmo9LgpvM0=", + "vendorSha256": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=", + "version": "2.0.2" + }, + "equinix": { + "owner": "equinix", + "provider-source-address": "registry.terraform.io/equinix/equinix", + "repo": "terraform-provider-equinix", + "rev": "v1.6.1", + "sha256": "sha256-QktIBtSz7UZoU6+z/sjpU4bZhc+Cw1BptO6hW19uJoU=", + "vendorSha256": "sha256-G1lDfygJnuJaQ4ms2/R6oynZCJAtIwx7xoU6Bec3CfQ=", + "version": "1.6.1" }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.35.0", - "sha256": "sha256-iIClnbCldGnihpML9xF0kyR4viXZzAsTF8MFT53wg+A=", + "rev": "v0.38.0", + "sha256": "sha256-TVJlfce5bF5Z64FOPKqb0ac+NtjzeHsid+Q7vWIINuk=", "vendorSha256": null, - "version": "0.35.0" + "version": "0.38.0" }, "external": { "owner": "hashicorp", @@ -393,19 +394,19 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.0.0", - "sha256": "sha256-sk146gyBgMWV+EJUrQuC6XY3rRCegezYLympPqqkI2s=", + "rev": "v2.2.0", + "sha256": "sha256-x5Rl4JW59kuAoX0pSpCpto3dcvyEhvZlocg8fv2R6Jw=", "vendorSha256": null, - "version": "2.0.0" + "version": "2.2.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.29.0", - "sha256": "sha256-HPcJRLP20fDt3qr2edkol2jXSsWLotJkx13ZV7n7w8g=", - "vendorSha256": "sha256-De4NRWTdE4QutQkB0m0YlJg6LNysxi4bSSIxYY6lRP0=", - "version": "1.29.0" + "rev": "v1.31.0", + "sha256": "sha256-Vu6XRRtN+04Hg1OhZ42QaqFiVbov0Zg5v6Rbyeyz410=", + "vendorSha256": "sha256-P2/yK6aLNdmC8g5dMKK0hpAdj76KtewzVVHQsVgr3J4=", + "version": "1.31.0" }, "fortios": { "owner": "fortinetdev", @@ -420,66 +421,66 @@ "owner": "go-gandi", "provider-source-address": "registry.terraform.io/go-gandi/gandi", "repo": "terraform-provider-gandi", - "rev": "v2.0.1", - "sha256": "sha256-lcJoDBVoNvNbB5V1rSk09d7pnfVN+FHROtyZCNmZfBk=", - "vendorSha256": "sha256-sloRWqk8j8UWM7gVFaiJ3SmBgnWN/BbFfATQWzpXI7k=", - "version": "2.0.1" + "rev": "v2.1.0", + "sha256": "sha256-TAigFxgn8OufZTXCBhjURLcUaVvOWvNXonn/QV+Bt6I=", + "vendorSha256": "sha256-qDsBI+EruukMnLlLojC2An7lTafQoCkUQU+guhgctSk=", + "version": "2.1.0" }, "github": { "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.25.0", - "sha256": "sha256-9sZYg/gpCq2qpUhhFQjLVZLlNnYWaCz5K4/+TvCD/qk=", + "rev": "v4.26.1", + "sha256": "sha256-cfHv8QCx3OCnrXbj/B19bUSg/w4zuIphn6IdNYwGbLU=", "vendorSha256": null, - "version": "4.25.0" + "version": "4.26.1" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.14.0", - "sha256": "sha256-KUlFEVeST/ujerpkjHYzdROwkFD4ASx0juHOKWKM14o=", - "vendorSha256": "sha256-M03+MK7YB3IPHA/w+yrO6YohPzknCmhguO5b25qzDzw=", - "version": "3.14.0" + "rev": "v3.16.0", + "sha256": "sha256-RG1d0B6SdT3c9zIHtOZUZBHOdi7azc9uJe0aDdY5c/U=", + "vendorSha256": "sha256-5OXllLq5VjFpay2vVEXczqvSmgLeAQ66fXqYf+eDJOI=", + "version": "3.16.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.21.0", - "sha256": "sha256-xintCclIhM2FqmbYoWTPGq/twkUH3M2ebc/b0SZ/hXY=", - "vendorSha256": "sha256-B3JiVeCzeCtsAvQiHayZY3pahN4bwizE6d99Qw2VYK8=", - "version": "4.21.0" + "rev": "v4.27.0", + "sha256": "sha256-YI6lMHKuREzMf1gkFuBbllSjZcpi0oxZSRoXN7IgkDQ=", + "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", + "version": "4.27.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.21.0", - "sha256": "sha256-3oViGAFwUTBC4tMUlnjUDHdmk+sxtCeVZNbYGGwHhwU=", - "vendorSha256": "sha256-B3JiVeCzeCtsAvQiHayZY3pahN4bwizE6d99Qw2VYK8=", - "version": "4.21.0" + "rev": "v4.27.0", + "sha256": "sha256-vntZXROQUgiUYUxiDi/WFDNoUPCTw02fKQzF9bcx5cM=", + "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", + "version": "4.27.0" }, "googleworkspace": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", "repo": "terraform-provider-googleworkspace", - "rev": "v0.6.0", - "sha256": "06cbwkrqrsshnv8ccsnl424l2sq0shi18kxwvrnwg88xvm8qpcfi", - "vendorSha256": "1zid2f8c9yfl6zwqiacngaf2rvvgs4w9phqjamgzibz41ijk6655", - "version": "0.6.0" + "rev": "v0.7.0", + "sha256": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", + "vendorSha256": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=", + "version": "0.7.0" }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.22.0", - "sha256": "sha256-0OkFf2YiwJHwXheYkN1HA1DG5vadyhZOzVjmu0BNDHI=", - "vendorSha256": "sha256-Pd4cSmDzRhu8MD2osXg6mVYiKG2VM6MQ67aC6jDy59U=", - "version": "1.22.0" + "rev": "v1.24.0", + "sha256": "sha256-0E3yWEtt1o+K9/BoawL0Wyt+8yIDADZy6r9Kg7oNYPI=", + "vendorSha256": "sha256-YDWTHiRyY2bzX+ZgYbUTKO3IjsvbIEVWxqGhDNpVnhM=", + "version": "1.24.0" }, "gridscale": { "owner": "gridscale", @@ -494,28 +495,37 @@ "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.33.2", - "sha256": "sha256-kERpOIEy6UsT2BEY9kkINuWbncDXJuwWjR/Kzua97m8=", - "vendorSha256": "sha256-p+NFt9QjbR12bGnCrhUTJzwtBagjXn5w1UcQFMQpY+I=", - "version": "1.33.2" + "rev": "v1.34.3", + "sha256": "sha256-3p7pdpBxrbKZx6di39GQb2DOS2ZtN4uVmIb2OU0Zs+c=", + "vendorSha256": "sha256-3JFdsuJlDW6xTgSgn7hkIWfH9Iqr35t8op4yVXYIFpg=", + "version": "1.34.3" }, "helm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.5.1", - "sha256": "sha256-PX8mls0m/7B5WULEDVHutzvjAr0a54vg734mBbRQZNA=", + "rev": "v2.6.0", + "sha256": "sha256-OzxTPxk3lfmA13KfDGBvDd1AqCsKRw+bv7QiEo9fPQc=", "vendorSha256": null, - "version": "2.5.1" + "version": "2.6.0" }, "heroku": { "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.0.2", - "sha256": "sha256-HzbqqIr2RjarjuIw+9p8JqGRDbPRDfq2OLLztJLCLoM=", - "vendorSha256": "sha256-HrsjhaMlzs+uel5tBlxJD69Kkjl+4qVisWWREANBx40=", - "version": "5.0.2" + "rev": "v5.1.0", + "sha256": "sha256-MMX8zaM3J2GxMXUX0YNX03V8uQzb67cIUF432tjm3Mw=", + "vendorSha256": null, + "version": "5.1.0" + }, + "hetznerdns": { + "owner": "timohirt", + "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", + "repo": "terraform-provider-hetznerdns", + "rev": "v2.1.0", + "sha256": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=", + "vendorSha256": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=", + "version": "2.1.0" }, "htpasswd": { "owner": "loafoe", @@ -530,26 +540,26 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", - "rev": "v2.1.0", - "sha256": "1gih0ksrmhz82966c45ad2yv829pcgbvls92cll7r5haqgvx6k79", - "vendorSha256": null, - "version": "2.1.0" + "rev": "v2.2.0", + "sha256": "sha256-Ym9z/b2geSLdXYlQGggjyNTBZLo+GeMW5XLM+Gvk/gA=", + "vendorSha256": "sha256-Qk3ztfAtKt6Gq9QBtaeodwVkH/71TrCNMMAdrXO6Tjs=", + "version": "2.2.0" }, "huaweicloud": { "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.36.0", - "sha256": "sha256-bf/w6BxXOL/Fup8NmYi86tGK3HIYGaYWUSAZ0yUazb8=", + "rev": "v1.38.0", + "sha256": "sha256-kLjuZY9PoGjt2e3jBX0O1VTis2P8++pHWJXLnwltk1I=", "vendorSha256": null, - "version": "1.36.0" + "version": "1.38.0" }, "huaweicloudstack": { "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloudstack", "repo": "terraform-provider-huaweicloudstack", "rev": "v1.3.0", - "sha256": "0ywik9m2a69262ppsb1d97k7g5b1zwk84k05p7m573f5wakl68jr", + "sha256": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=", "vendorSha256": null, "version": "1.3.0" }, @@ -558,7 +568,7 @@ "provider-source-address": "registry.terraform.io/DeterminateSystems/hydra", "repo": "terraform-provider-hydra", "rev": "v0.1.2", - "sha256": "1a1ah5pzng9ik8f18kqx87fdh1c5wqbn2bsbhqrzd1nb8fc5xl03", + "sha256": "sha256-A9BemEPLhvYzhksvYRfmhQXY3EEdTxQcmjE9+2+BKqg=", "vendorSha256": null, "version": "0.1.2" }, @@ -566,17 +576,17 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.41.1", - "sha256": "sha256-eTwv7dtuFe7oEFFqnmpJMN2d/P5ow8HH1rXCE6xBEi4=", - "vendorSha256": "sha256-8s32A0qgODZZy3rSrHnnBkQyKLBj0fcCBJ9ja9gXc5Q=", - "version": "1.41.1" + "rev": "v1.43.0", + "sha256": "sha256-5oQqWr8s4wMiR58JITDH4e5iMPktmlItPjWwScbYSqo=", + "vendorSha256": "sha256-b1aKgB3iB9+7vCgEYuaaEcxgF8ptZOPOrZcpj+SscvA=", + "version": "1.43.0" }, "icinga2": { "owner": "Icinga", "provider-source-address": "registry.terraform.io/Icinga/icinga2", "repo": "terraform-provider-icinga2", "rev": "v0.5.0", - "sha256": "0s8a5i2sl7cp1v6v96s9fbhabrid7mv8hizq509flgzklk8smwv3", + "sha256": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", "vendorSha256": null, "version": "0.5.0" }, @@ -585,7 +595,7 @@ "provider-source-address": "registry.terraform.io/infobloxopen/infoblox", "repo": "terraform-provider-infoblox", "rev": "v2.1.0", - "sha256": "1agxlvm5gxgsfyg1kij09jaly4pj3wfbdc4hk7456m2v1k4r7asn", + "sha256": "sha256-VquTyQxbVFPImZCwthwf8hJPlUxAxhmed/r1V+qm/ak=", "vendorSha256": null, "version": "2.1.0" }, @@ -603,27 +613,27 @@ "provider-source-address": "registry.terraform.io/Mongey/kafka-connect", "repo": "terraform-provider-kafka-connect", "rev": "v0.2.4", - "sha256": "17qslh2axvwiqmqzaxdl75zg3ww6hcpq7k2bfx026ca7bifqx13f", - "vendorSha256": "0acl8ijai4awgxhps17bwnwd9aks0qbjvv4ad6pj8vbf496dc411", + "sha256": "sha256-boSOXVxHMSNAd0vMgy+DhvPxfjm0dfVxxZHvrgSkGp8=", + "vendorSha256": "sha256-IRDWTCJubSSvaYrsLRcGeqrUuOXrBH1hf1yRqGRElCk=", "version": "0.2.4" }, "keycloak": { "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.8.1", - "sha256": "sha256-++yoMIn6K4VwAGyRVe/MUjMU46gBeHjIRF2nrXktC7E=", + "rev": "v3.9.0", + "sha256": "sha256-MdsOZptj46RuvLK6wZJL3va8kMSzqxaS4wGEUpgky7Q=", "vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", - "version": "3.8.1" + "version": "3.9.0" }, "ksyun": { "owner": "kingsoftcloud", "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.43", - "sha256": "sha256-HOZ1nhHLdiYy+WR2y4OsyRGReK+OJFTaWqYU0X4eEQ0=", + "rev": "v1.3.46", + "sha256": "sha256-qaRsja+pj0DgOZX9nNHSnCI2Ew18r3b5F0Ovqj3mR/Q=", "vendorSha256": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=", - "version": "1.3.43" + "version": "1.3.46" }, "kubectl": { "owner": "gavinbunney", @@ -638,10 +648,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.11.0", - "sha256": "sha256-qrADveCJUvYcseTUmqQzmRKn4Whb/KfJjwz2+6V7yZc=", + "rev": "v2.12.1", + "sha256": "sha256-wswBD4XqtHZsg8vhxIqtjZkXNhFLu/nHUCJDW/24dbQ=", "vendorSha256": null, - "version": "2.11.0" + "version": "2.12.1" }, "launchdarkly": { "owner": "launchdarkly", @@ -657,18 +667,18 @@ "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", "repo": "terraform-provider-libvirt", "rev": "v0.6.14", - "sha256": "1x1xl3blcs4dpjavf4im82l9vrv0plyyiayy475qjf0sl028criy", - "vendorSha256": "1kq0sbz7sv4gw35wl52z7gjv588r82izhrz7ydf5n0c4d2izmg6a", + "sha256": "sha256-PmaGBKAaOInLId6r6D29YOedqEA1EreVvI1oRtegPfQ=", + "vendorSha256": "sha256-yrz6o2iEAVtc8+dn+KNAGaGy5TtfFMrL4I9sff7SAM8=", "version": "0.6.14" }, "linode": { "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.27.2", - "sha256": "sha256-Do9HOtgnSNnSUp3SSVwyzx9LPFSig/tO3GSigUrRcf4=", - "vendorSha256": "sha256-ZJQAZk4TaKT+hLM46gtV1XmBCtwuKwtoom9tPGaOWhc=", - "version": "1.27.2" + "rev": "v1.28.0", + "sha256": "sha256-FkfyyG+DcfsTQY319zmg5iiCgAW8Eu2PxWF35vd51Ng=", + "vendorSha256": "sha256-fWD1Qf6vFe/MH2K2yFufCFBcVuos7FD31ShOA9GvsWw=", + "version": "1.28.0" }, "linuxbox": { "owner": "numtide", @@ -692,10 +702,10 @@ "owner": "logicmonitor", "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor", "repo": "terraform-provider-logicmonitor", - "rev": "v2.0.1", - "sha256": "sha256-LW88NTWwzGrpOpliVqc1AOjxaZ4p/8gq9twEpjY3FzE=", + "rev": "v2.0.2", + "sha256": "sha256-F22tBNnH8dvSjrd0Wx+bAfiiQ9emJjHGXn3x4mQKH5E=", "vendorSha256": null, - "version": "2.0.1" + "version": "2.0.2" }, "lxd": { "owner": "terraform-lxd", @@ -720,18 +730,18 @@ "provider-source-address": "registry.terraform.io/poseidon/matchbox", "repo": "terraform-provider-matchbox", "rev": "v0.5.0", - "sha256": "0lzrs07kzx6bgmlahhgg6j7lpl9z2cbjy2880rwwzq89m8zhl6mz", - "vendorSha256": "0aacb973gisajv0wn00k50ddsma5rv7wy7mjz966a7pgpbmmi91f", + "sha256": "sha256-vxoKP6oJ4c95BggJLxcTP9FLjzTvQahofcv0Pw/Q+VM=", + "vendorSha256": "sha256-LqRY67rvHmVM+rIez8/ORVXdGigTAMvBlkrHN05aTCk=", "version": "0.5.0" }, "metal": { "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.2.2", - "sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi", - "vendorSha256": null, - "version": "3.2.2" + "rev": "v3.3.0", + "sha256": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=", + "vendorSha256": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=", + "version": "3.3.0" }, "minio": { "owner": "aminueza", @@ -746,10 +756,10 @@ "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.3.1", - "sha256": "sha256-X2Utt+MUboLc0/nAXB78ko3w2ieTIQaVsDK6MhbUKSQ=", - "vendorSha256": "sha256-yZ/TgAVlBxHhrrZU6SH1KXNoZj8oWRqx3BjVHkTtI+Q=", - "version": "1.3.1" + "rev": "v1.4.2", + "sha256": "sha256-bu/DpqeOIIgtUauBVzbKW+DHJUoD2oVhIhmk+M7fcBg=", + "vendorSha256": "sha256-yomqc0uxB02zi/IfZKIOBq3mcs0GkHbRpaQos0jcELw=", + "version": "1.4.2" }, "namecheap": { "owner": "namecheap", @@ -774,7 +784,7 @@ "provider-source-address": "registry.terraform.io/AegirHealth/netlify", "repo": "terraform-provider-netlify", "rev": "v0.6.12", - "sha256": "0h3ff1ligjvvlmhghx9g92an79b26nyyq5sq4cdsf6psvwfa2kzd", + "sha256": "sha256-7U+hHN/6GqcbI1gX7L01YqVjlUgvdfhgpXvLF2lwbkA=", "vendorSha256": null, "version": "0.6.12" }, @@ -782,37 +792,37 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.45.1", - "sha256": "sha256-KA4uvhK54JgzjAeIMvlLWQjul8ZZFbvmXyQTqOonxYY=", - "vendorSha256": "sha256-8nEbs5lDpXZ49QkIC1oRxZm+gVGx9xqDHe6jK8wWOA8=", - "version": "2.45.1" + "rev": "v2.48.1", + "sha256": "sha256-MySfZw6Og1gJs11u9r88uF1gcJbgsnPzduJZmr+06Jg=", + "vendorSha256": "sha256-/hkQ9SIsJhTfG0YEhTa+RGlZD4wHl5grFggbkgvHFGI=", + "version": "2.48.1" }, "nomad": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.16", - "sha256": "11pw1ss4rk8hmfk0q9n8nim441ig0cgl1qxsjzcfsznkp5bb11rw", - "vendorSha256": "0b813dnkn15sdgvi4lh1l5fppgivzrcv5w56w0yf98vyy8wq7p0j", - "version": "1.4.16" + "rev": "v1.4.17", + "sha256": "sha256-xP0E2rJbsthLIzN0zxDo1eGMb8xBetT+uuCcegVvJUU=", + "vendorSha256": "sha256-p+SCagP8Niuc4h1s8l1c7Dao78wnHPRz9vNbFH10BaA=", + "version": "1.4.17" }, "ns1": { "owner": "ns1-terraform", "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", - "rev": "v1.12.6", - "sha256": "sha256-nP951YipGzsweJvV2PE0UlWGP+cAM6s18F5MCcxTxeo=", + "rev": "v1.12.7", + "sha256": "sha256-pzFfU/fs+c0AjY63CmKeKEKrnf+PF1cfG5P4euFY4ns=", "vendorSha256": "sha256-MaJHCxvD9BM5G8wJbSo06+TIPvJTlXzQ+l9Kdbg0QQw=", - "version": "1.12.6" + "version": "1.12.7" }, "nsxt": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/nsxt", "repo": "terraform-provider-nsxt", - "rev": "v3.2.7", - "sha256": "sha256-Og/U9bmaZIN7b/JcMnNkt6c3/H+toe4dFYNaQYfxLPM=", + "rev": "v3.2.8", + "sha256": "sha256-oXcT1VmwC9a+U0vM5O9y2As2PbzPr95LrUB6KlFKcMc=", "vendorSha256": null, - "version": "3.2.7" + "version": "3.2.8" }, "null": { "owner": "hashicorp", @@ -828,126 +838,108 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.5.0", - "sha256": "sha256-H8wLMLBB4pSbiilmP9C0WPn62fCYHgPhy8OlvtrUYro=", + "rev": "v1.6.1", + "sha256": "sha256-eqWx48ARoL2elnaqTgp/L6a0K8TFSvIFaNH72gdbrZA=", "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.5.0" + "version": "1.6.1" }, "oci": { "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.76.0", - "sha256": "sha256-sJ837jK/iYOC3dPFHoix1fiiSFMCNSqYEus9VlhXqMg=", + "rev": "v4.83.0", + "sha256": "sha256-WuvWE3k2j1whH7UaEx7fa4lZF+GZUKp7T1bVpatxF1w=", "vendorSha256": null, - "version": "4.76.0" + "version": "4.83.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.27.0", - "sha256": "sha256-DDNq4Yvx45ynNePg8bW8tQ6LuyvUfudxY+M88+pIXMQ=", - "vendorSha256": "sha256-but/2CF3OW2aefUIy5XnDvhtXYqfCkHIrS1EDQoD9jM=", - "version": "3.27.0" + "rev": "v3.31.0", + "sha256": "sha256-IUCiImmT4LG58r342mvWVMxBjVO9zGX8BVHe5G1GiMg=", + "vendorSha256": "sha256-BnxtHEd1C0DOUPVggPCXSBtQ36gcNwL7Hl0Pl1B5e4U=", + "version": "3.31.0" }, "oktaasa": { "owner": "oktadeveloper", "provider-source-address": "registry.terraform.io/oktadeveloper/oktaasa", "repo": "terraform-provider-oktaasa", "rev": "v1.0.1", - "sha256": "0ibpa3bb7p5i02bliycg6bcak79gmixww7gc1k1z0aiaij173f6q", + "sha256": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", "vendorSha256": null, "version": "1.0.1" }, - "opc": { - "owner": "terraform-providers", - "provider-source-address": "registry.terraform.io/hashicorp/opc", - "repo": "terraform-provider-opc", - "rev": "v1.4.1", - "sha256": "1kylnjy7s5bkx6zjksbz8sfx77pxcc9ycbi8kd8axnrcmj4q01xc", - "vendorSha256": null, - "version": "1.4.1" - }, "opennebula": { "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v0.4.3", - "sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=", - "vendorSha256": null, - "version": "0.4.3" + "rev": "v0.5.1", + "sha256": "sha256-lrdL0aWgrODvgI0gUW1tmHEHldeD5jJzOCD2BMvGPM8=", + "vendorSha256": "sha256-NOIXn4RWMUz0invWRqAHxVWez7MD0DyWccwcKYz8jTY=", + "version": "0.5.1" }, "openstack": { "owner": "terraform-provider-openstack", "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", "rev": "v1.47.0", - "sha256": "0hbp5hk3b9fdsyqkxb3fzpjiw5dd7h7f3gs3xv5imzkfv1dmqghz", - "vendorSha256": "007qmkgp5svhy7gvlkbyxllh0ijsk4xq5kmy7zmjgf7mawp16ny6", + "sha256": "sha256-Hz5cW9hu/hrL7kO/4Q48rRUe5f1urD6x182lNSYsd0E=", + "vendorSha256": "sha256-xlsTLlf1uCfrP77OgjuZWkYAKe1+Tbrf8XDrct+s+AA=", "version": "1.47.0" }, "opentelekomcloud": { "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.29.3", - "sha256": "sha256-rFaryW9yibw5whTYOb7kDF45l5NI9bdZvVQezIqudE8=", - "vendorSha256": "sha256-FOcddb1+uG5avqYZMvzR1UXDvtDDwtxBzf7FsN6ZROM=", - "version": "1.29.3" + "rev": "v1.29.9", + "sha256": "sha256-jVDpiNGGw93XLAMYaDrO3mEcok3bnzC4y9tz6C27lhM=", + "vendorSha256": "sha256-ImrWG+IPNkFr9lTGdiYaBU2OnHrKXIiNIDGSy4Br+Aw=", + "version": "1.29.9" }, "opsgenie": { "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", "rev": "v0.6.10", - "sha256": "1kxq66skal10nx5mgk8qj15chk01fi1pjamgakr1j56m1dgw03cw", + "sha256": "sha256-nA3AXwvVFBnyVK8qeUN0AUzISpAYzVdLtyBQNbUxuM8=", "vendorSha256": null, "version": "0.6.10" }, - "oraclepaas": { - "owner": "terraform-providers", - "provider-source-address": "registry.terraform.io/hashicorp/oraclepaas", - "repo": "terraform-provider-oraclepaas", - "rev": "v1.5.3", - "sha256": "0xb03b5jgm06rgrllib6zj1nkh54zv2mqjnyfflgnazpf4c1ia15", - "vendorSha256": null, - "version": "1.5.3" - }, "ovh": { "owner": "ovh", "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.17.1", - "sha256": "sha256-bAwOxRexJuSw3Ntb8zXeTFPp23hCkCEI+zF4Q2SP3lA=", + "rev": "v0.18.1", + "sha256": "sha256-DoFjm2o6U/e16jhVNtezQ82dbSh1ZfTK/YPo38tHokA=", "vendorSha256": null, - "version": "0.17.1" + "version": "0.18.1" }, "pagerduty": { "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.4.2", - "sha256": "sha256-xCmfykHQvQ/O+8ZGe2s5Ic4n9aZvlQ34bpnVbJDCn98=", + "rev": "v2.5.1", + "sha256": "sha256-BcPfV+2izOiEk0hEuZOFDkQKPSXWzZ1skwu/moeKTD8=", "vendorSha256": null, - "version": "2.4.2" + "version": "2.5.1" }, "panos": { "owner": "PaloAltoNetworks", "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos", "repo": "terraform-provider-panos", - "rev": "v1.10.1", - "sha256": "sha256-acxObc7cgZgyxoCQusrkUzFC68cT3WhExiw2LscKoiQ=", + "rev": "v1.10.3", + "sha256": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=", "vendorSha256": null, - "version": "1.10.1" + "version": "1.10.3" }, "pass": { "owner": "camptocamp", "provider-source-address": "registry.terraform.io/camptocamp/pass", "repo": "terraform-provider-pass", "rev": "v2.0.0", - "sha256": "1hzfz9ca01i8q9gc0aisklblkyfgzn9bqndis7l0964r1rdhsn44", - "vendorSha256": "0fsl27p2p6s4xnmhlzb8bxrg8kjaaim7arj0l6p5y0z9mhy8jpmi", + "sha256": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=", + "vendorSha256": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=", "version": "2.0.0" }, "postgresql": { @@ -973,34 +965,43 @@ "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", "rev": "v1.6.0", - "sha256": "0src4d032z3mpv10fgya2izqm8qfdgr87rfhpnld1r90yvxqgnl2", - "vendorSha256": "0m5siifbq0j68dx2hapczhjlyq9wrgwf360vnl08fqlgrl0f7ff1", + "sha256": "sha256-gtqH+/Yg5dCovdDlg/JrDqOKfxTKPwfCvnV8MUAjLGs=", + "vendorSha256": "sha256-wbnjAM2PYocAtRuY4fjLPGFPJfzsKih6Q0YCvFyMulQ=", "version": "1.6.0" }, "rancher2": { "owner": "rancher", "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.23.0", - "sha256": "sha256-GmesO28YUaaBBTr+hbn8OxDf4oABQFEw8wPzA9LtFyM=", - "vendorSha256": "sha256-kTPL/db/wBzLWaqib6WQPokuuT2bcDyBgEvfm8xjhuw=", - "version": "1.23.0" + "rev": "v1.24.0", + "sha256": "sha256-rNoz34ogNcthKBO26OL4TkIOyD95amPT2ByC6afqV1w=", + "vendorSha256": "sha256-cSf/peZBChjrElkwAK4eoczll1fyDvfnxm16wF/pqTs=", + "version": "1.24.0" }, "random": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", - "rev": "v3.2.0", - "sha256": "sha256-acB1BHGxquiK137OfTe31pUGHdWp7xxlv5BINNzNLSs=", - "vendorSha256": "sha256-MMUit5RxsymBNX9fH8B6D2gJ/k5zaN6FCyP9N/+TV+E=", - "version": "3.2.0" + "rev": "v3.3.2", + "sha256": "sha256-izTx/uxe/SAsWSlN5husEWK64c9ugdg8BS7lScnWSX4=", + "vendorSha256": "sha256-ofU1zZb/C2LFaRCt0NULi+9dQY02lKBlz3jV1/ZhfWU=", + "version": "3.3.2" + }, + "remote": { + "owner": "tenstad", + "provider-source-address": "registry.terraform.io/tenstad/remote", + "repo": "terraform-provider-remote", + "rev": "v0.1.0", + "sha256": "sha256-h6V2sd6j2HzIN1MVMBMqquM54fzmzHPcPfsP5t4bU1A=", + "vendorSha256": "sha256-ckPs3iaFbmHbBnwRuYn9XdnGZsj+UoYK4OE/9B6Z6Kc=", + "version": "0.1.0" }, "rundeck": { "owner": "rundeck", "provider-source-address": "registry.terraform.io/rundeck/rundeck", "repo": "terraform-provider-rundeck", "rev": "v0.4.3", - "sha256": "1bvk5mfjpl57dfglksnz1cnvd5qgk2cnidwiwjwa3ssmm2kzji8s", + "sha256": "sha256-GkX5p6hV66G45JG3aJmYD5e2LQvf6kmfa6fQK10tc68=", "vendorSha256": null, "version": "0.4.3" }, @@ -1008,19 +1009,19 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.1", - "sha256": "sha256-a3tSxGTRYQeGfaJOR8z1Qd0SeuoiLwrEbdlw3B9gc2A=", - "vendorSha256": "sha256-D/pE1uEpkWIuICNJsuWVHfRNGPf73YliFxqODkl+4QY=", - "version": "2.2.1" + "rev": "v2.2.2", + "sha256": "sha256-uSJga2M+9unC8eJkUjhuCQbTTGXEYGky4MJyVL0ZfiQ=", + "vendorSha256": "sha256-DOL38q5463aOMijP6AbBuE7jI7hvLYLm8yCBxrr6DoA=", + "version": "2.2.2" }, "secret": { "owner": "numtide", "provider-source-address": "registry.terraform.io/numtide/secret", "repo": "terraform-provider-secret", - "rev": "v1.2.0", - "sha256": "1211vvcd00llajza3chw25h0sl43wl116ni4r251k00m6kb5nfwq", + "rev": "v1.2.1", + "sha256": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", "vendorSha256": null, - "version": "1.2.0" + "version": "1.2.1" }, "selectel": { "owner": "selectel", @@ -1035,18 +1036,18 @@ "owner": "jianyuan", "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", - "rev": "v0.7.0", - "sha256": "09rxgq4m28nhwg6y51m5sq3d12lx7r1q3k76zrd5gpbxagqhvhkr", - "vendorSha256": "1wh2nf5q69j1p568c0q5yhlkd8ij3r8jg2769qy51wsj3bbv0wcj", - "version": "0.7.0" + "rev": "v0.9.2", + "sha256": "sha256-/Am4v+s7l3hDCbvIV34aG9C+dMEtPS6qB97FywcZcho=", + "vendorSha256": "sha256-A8VxxoMYd8Z4DRFmBLh/uSzjWxIyLQGtV4kGbuDfv8I=", + "version": "0.9.2" }, "shell": { "owner": "scottwinkler", "provider-source-address": "registry.terraform.io/scottwinkler/shell", "repo": "terraform-provider-shell", "rev": "v1.7.10", - "sha256": "15pw8i1j47ppwrrh1gpfdkba54zab50ziqfqsc17pmv2gisq8d9d", - "vendorSha256": "1vgs7nvqa25c0qxhj7jpjfphshxsqhxvxnr9ny7x4ghzg9ab90rh", + "sha256": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", + "vendorSha256": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=", "version": "1.7.10" }, "signalfx": { @@ -1063,18 +1064,18 @@ "provider-source-address": "registry.terraform.io/skytap/skytap", "repo": "terraform-provider-skytap", "rev": "v0.14.5", - "sha256": "1l73p0ii9pnbvdv2gi69782w4yvfkf15cx1zvx3k0961wav4f5gj", + "sha256": "sha256-8hVHtuLBJDBH3z90VoKbbnvCBTrJxCd228veFCO449A=", "vendorSha256": null, "version": "0.14.5" }, "snowflake": { - "owner": "chanzuckerberg", - "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", + "owner": "Snowflake-Labs", + "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.33.1", - "sha256": "sha256-xFtk1WbMe2/UFGB/ej6QEL07+dZTsWFmqvyVCa2YBw8=", - "vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=", - "version": "0.33.1" + "rev": "v0.37.1", + "sha256": "sha256-2nCl//1s1M/XmoJLMyZJXgUr1ilE0V9RyEGfQuw/h6g=", + "vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=", + "version": "0.37.1" }, "sops": { "owner": "carlpett", @@ -1089,18 +1090,18 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.74.0", - "sha256": "sha256-wdhpkQM7J4WO4nN+0R8XfgbuusK0zDzSDy/DyOB8GcI=", - "vendorSha256": "sha256-OT5YuAlZNRCvwvZpCrhtKj4YiosEuHrTLQkWFYuKZrw=", - "version": "1.74.0" + "rev": "v1.79.0", + "sha256": "sha256-UOqXUUqbZ7qVlqFI1YABahfW4+ghyMS7n2Yc9Lfd6cc=", + "vendorSha256": "sha256-AJfQhIsh7a1WVQ//oT6P12H/sqmGtKD7jwW3JthvVNQ=", + "version": "1.79.0" }, "stackpath": { "owner": "stackpath", "provider-source-address": "registry.terraform.io/stackpath/stackpath", "repo": "terraform-provider-stackpath", "rev": "v1.4.0", - "sha256": "1c9ad2hwglajs9qsbkm0d01qfvqzi2mf4i0cxynx1f560hg7sd4x", - "vendorSha256": "1i65k1j6yfma1m7lr8qs714pv6rqvy0i8zycpjpdbcbmw3h2xy8n", + "sha256": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", + "vendorSha256": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=", "version": "1.4.0" }, "statuscake": { @@ -1116,37 +1117,28 @@ "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.16.0", - "sha256": "sha256-27+ofT5p073s2kEk87P/Witw5x9sVKOYrlBXp6/xKxk=", + "rev": "v2.16.2", + "sha256": "sha256-/JQXnGpUbAIsz2zErrHe97ggGdjnWkvhYm8SHTh/xCs=", "vendorSha256": "sha256-7DGY+L41bJJrtLwdWgu2aMCefgcmtR6tmH12foi68Kc=", - "version": "2.16.0" - }, - "template": { - "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/template", - "repo": "terraform-provider-template", - "rev": "v2.2.0", - "sha256": "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2", - "vendorSha256": null, - "version": "2.2.0" + "version": "2.16.2" }, "tencentcloud": { "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.72.5", - "sha256": "sha256-4ZnhE2Woy+CquDsqJvJMUib48eRJ9OWTrO/14NkI6iM=", + "rev": "v1.75.7", + "sha256": "sha256-FSdBAaG1xrr0Jnl7wPsaooraerlqKti5uskZyixkbSY=", "vendorSha256": null, - "version": "1.72.5" + "version": "1.75.7" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.31.0", - "sha256": "sha256-BvA+1oCh8xB0XcXMGOmAEdi/lEwGdRed5vDEDVBUMhE=", - "vendorSha256": "sha256-7TFfIk+aPbl3CLuNdeJg1O2n3WlCuG5tsayCtbo77I0=", - "version": "0.31.0" + "rev": "v0.33.0", + "sha256": "sha256-OmQQau3nr84sSIiCGeoi2vDvvoK2L7Zve2tzuul0Wyg=", + "vendorSha256": "sha256-IeteO1xIpEwdfHGkz9SKy5EZJCHsHho2L02O6yWzoTk=", + "version": "0.33.0" }, "thunder": { "owner": "a10networks", @@ -1162,8 +1154,8 @@ "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", "rev": "v0.7.2", - "sha256": "02b7l65civmphhdax05ajvbfm2ilqf421di1p3vj1zysz194wgl2", - "vendorSha256": "06f5rkxcfc221jl84x4z8q5iydrv8lypancn05kxj0ck89vhf650", + "sha256": "sha256-gj5OUvja/yD3uCG2IIjDNIrq1paqgK4ahLfuyIqhZwk=", + "vendorSha256": "sha256-oBgHd0KTAdlnAZZZdT1FOzcfC0afdIKoDEIwx/rMxRk=", "version": "0.7.2" }, "tls": { @@ -1181,8 +1173,8 @@ "provider-source-address": "registry.terraform.io/joyent/triton", "repo": "terraform-provider-triton", "rev": "v0.8.2", - "sha256": "0jhvslpv18yql5hz67hvagv5xdlnn6qsnvs91g0wf5rr4zbcmd9n", - "vendorSha256": "1a9a5jpbn8bikyya50zp1aaacj699gmk9p870a73ksh6w5lcgqjj", + "sha256": "sha256-NrXK1ic5F8fBC0lvq7GxlrZe9lMbHvNhodijsC/VG0o=", + "vendorSha256": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=", "version": "0.8.2" }, "turbot": { @@ -1190,7 +1182,7 @@ "provider-source-address": "registry.terraform.io/turbot/turbot", "repo": "terraform-provider-turbot", "rev": "v1.8.3", - "sha256": "0jx37w4sbm7gj8vqnb58rg24s6fafc73ds954vqh9rjn8a6x0qz9", + "sha256": "sha256-6WPQjUJW5gTxJiXpNg5zyhlNxMuoLIs3ku/UpQk/o0s=", "vendorSha256": null, "version": "1.8.3" }, @@ -1207,19 +1199,19 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.24", - "sha256": "sha256-/pM6PuvFsmRpBz5pqOy6mVlkbq+9IRlHug/DdoKjt4U=", - "vendorSha256": "sha256-4/Djmg6cONkJg1wH7M4Y2mZccbwyUXEvZ2bdBYEnV9w=", - "version": "0.17.24" + "rev": "0.17.26", + "sha256": "sha256-Lfl5BIFJNR8tDHjGJvA8AzteE+XcjkVRqTqmcDGZJCw=", + "vendorSha256": "sha256-BZNWM1ICaMl3q98WyTYs5JHxBBMj5TVpa5w5lH06XPg=", + "version": "0.17.26" }, "vault": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.6.0", - "sha256": "sha256-eeE6ThAz7RwePS65RZXbz+PUfm/KlE+f+nJWvLTCSmA=", - "vendorSha256": "sha256-KSGhIoUKadAuiMQkJEyYCDt7GXZ9deiV14LV4gEOpVg=", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "sha256-n2sUc71Ymk2kI9bpQxp2TRG4hte5/xIP+NbUxBwyNaM=", + "vendorSha256": "sha256-TqhnjsK36EGpDlN4yy1jd/1KpdOT+hu4koMM3VCJEV0=", + "version": "3.7.0" }, "vcd": { "owner": "vmware", @@ -1244,8 +1236,8 @@ "provider-source-address": "registry.terraform.io/ondrejsika/vercel", "repo": "terraform-provider-vercel", "rev": "v2.1.0", - "sha256": "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw", - "vendorSha256": "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k", + "sha256": "sha256-/LHyNxal5Il/UzXdCKfVRzK/VVfSYMgoeKerWsedmho=", + "vendorSha256": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=", "version": "2.1.0" }, "vpsadmin": { @@ -1253,53 +1245,53 @@ "provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin", "repo": "terraform-provider-vpsadmin", "rev": "v1.0.0", - "sha256": "1ci86ikdz8i6gwdiif4ayx15hjm9phr756rvywz8pblaa6niwl9h", - "vendorSha256": "1wc0kzinz39kv4gib438js2qv07ndm6yj2qpj041d75hnlq06drv", + "sha256": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", + "vendorSha256": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=", "version": "1.0.0" }, "vra7": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vra7", "repo": "terraform-provider-vra7", - "rev": "v3.0.5", - "sha256": "sha256-4YhaABbuG4GhWYEiGrUvf4H/8dd7wWHY08CkTWCqgr8=", + "rev": "v3.0.6", + "sha256": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=", "vendorSha256": null, - "version": "3.0.5" + "version": "3.0.6" }, "vsphere": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v2.1.1", - "sha256": "sha256-Xu5BMmOHEX+ctPu8374BDGsRC5hnvzji5oI69ptIi3Y=", - "vendorSha256": null, - "version": "2.1.1" + "rev": "v2.2.0", + "sha256": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=", + "vendorSha256": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=", + "version": "2.2.0" }, "vultr": { "owner": "vultr", "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.11.1", - "sha256": "sha256-EAkFlmQFPq9pSQ591GkX7um8tcBEGIJuiLuL5d9A8Ag=", + "rev": "v2.11.3", + "sha256": "sha256-Dq4keHT2AWh1zfBYFj6ig2BfU3u4amsp7IB/5Szo/38=", "vendorSha256": null, - "version": "2.11.1" + "version": "2.11.3" }, "wavefront": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.0.2", - "sha256": "sha256-HCo6Hw724kQrPOCHoyByThq7L5NIZ/0AHmnQD27RUFA=", - "vendorSha256": "sha256-PdSW3tyQUWbBiaM9U3NsqX/j4fMw9ZmjEDdyjxmRfD0=", - "version": "3.0.2" + "rev": "v3.1.0", + "sha256": "sha256-Q9ikBBlqprdu4BheItrWBoWqODgMXLgbtSg9RHtejBE=", + "vendorSha256": "sha256-sUzlDapp1smQ4lbgvsz22y3/fGkfJdHBlK7HNfihYpI=", + "version": "3.1.0" }, "yandex": { "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.74.0", - "sha256": "sha256-TeApvGYWBlCzxE7/t6cbb47L1oGUfx2B/cEW8UQieoU=", - "vendorSha256": "sha256-n1qcrvBKftKYm7nlTCeAOU/Q40xMpVlyKUKxR7wgPu4=", - "version": "0.74.0" + "rev": "v0.76.0", + "sha256": "sha256-QMeZjJ9Lm1ncB6xPd6NYJXVTOYvAUQfu7y/y30BvVB4=", + "vendorSha256": "sha256-E6keFmYkxAMSNWqPF9ghFKX1GjwalVx3RyYpUqdk/xE=", + "version": "0.76.0" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index fb506cefbe069..482da6a60275b 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -129,7 +129,7 @@ if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && $ echo_provider "already at version ${version}" exit fi -if [[ ${version} =~ (alpha|beta|pre) && ${force} != 1 ]]; then +if [[ ${version} =~ [[:alpha:]] && ${force} != 1 ]]; then echo_provider "not updating to unstable version ${version}" exit fi diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 59dfcb5eebdcf..dd4d69b11b24d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,35 +168,15 @@ rec { # Constructor for other terraform versions mkTerraform = attrs: pluggable (generic attrs); - terraform_0_13 = mkTerraform { - version = "0.13.7"; - sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_14 = mkTerraform { - version = "0.14.11"; - sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; - vendorSha256 = "sha256-tWrSr6JCS9s+I0T1o3jgZ395u8IBmh73XGrnJidWI7U="; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_15 = mkTerraform { - version = "0.15.5"; - sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; - vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; - patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; - }; - terraform_1 = mkTerraform { - version = "1.2.1"; - sha256 = "sha256-zvpKL7SsUeDu7pHSJTYbbJcn7kDcGk5M2jBMkkBLMtE="; - vendorSha256 = "sha256-2w0XAoja3DwztI3WxvLCUqrjW1PzSR6BU0T8TtM3TAw="; + version = "1.2.4"; + sha256 = "sha256-FpRn0cFO3/CKdFDeAIu02Huez4Jpunpf6QH9KFVn2lQ="; + vendorSha256 = "sha256-1RKnNF3NC0fGiU2VKz43UBGP33QrLxESVuH6IV6kYqA="; patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; + passthru = { + inherit plugins; + tests = { inherit terraform_plugins_test; }; + }; }; # Tests that the plugins are being used. Terraform looks at the specific diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/pkgs/applications/networking/cluster/terraform/provider-path.patch deleted file mode 100644 index 39a69e4a389fa..0000000000000 --- a/pkgs/applications/networking/cluster/terraform/provider-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/command/init.go b/command/init.go -index 403ca245b..05d98329a 100644 ---- a/command/init.go -+++ b/command/init.go -@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int { - return 1 - } - -+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") -+ if ok { -+ flagPluginPath = append(flagPluginPath, val) -+ } -+ - if len(flagPluginPath) > 0 { - c.pluginPath = flagPluginPath - c.getPlugins = false diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index 3e872c27142da..a57128907eee3 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1218"; + version = "0.13.1275"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-RJdbNXO+6TqFLapWiZ1UeXGS5522ykQvhhNDEHPr8xE="; + sha256 = "sha256-yuoJkVztLtlr4xOa4muWKquwAb8lo2IQpD7PLxEQfpg="; }; - vendorSha256 = "sha256-Xqgki072Iy+snRriPVJ9oaDNJ/LiKL+AuU+eVw0zlDU="; + vendorSha256 = "sha256-jM9xYwBshBpaT4duBTvVwYUOapQfUbq9kL7EaRIGfQY="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com @@ -22,7 +22,8 @@ buildGoModule rec { ''; meta = with lib; { - description = "A command line tool to switch between different versions of terraform"; + description = + "A command line tool to switch between different versions of terraform"; homepage = "https://github.com/warrensbox/terraform-switcher"; license = licenses.mit; maintainers = with maintainers; [ psibi ]; diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix index 5f669a6b9d8a3..31df14cebeda7 100644 --- a/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -1,21 +1,29 @@ -{ buildGoPackage, lib, fetchFromGitHub }: -buildGoPackage rec { +{ buildGoModule, lib, fetchFromGitHub }: +buildGoModule rec { pname = "tgswitch"; - version = "0.5.389"; + version = "0.6.0"; src = fetchFromGitHub { owner = "warrensbox"; repo = "tgswitch"; rev = version; - sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0="; + sha256 = "sha256-Q3Cef3B7hfVHLvW8Rx6IdH9g/3luDhpUMZ8TXVpb8gQ="; }; - goPackagePath = "github.com/warrensbox/tgswitch"; + vendorSha256 = "sha256-PlTdbA8Z2I2SWoG7oYG87VQfczx9zP1SCJx70UWOEog="; + + ldflags = [ "-s" "-w" ]; + + # There are many modifications need to be done to make tests run. For example: + # 1. Network access + # 2. Operation on `/var/empty` not permitted on macOS + doCheck = false; meta = with lib; { - description = "A command line tool to switch between different versions of terragrunt"; + description = "Command line tool to switch between different versions of terragrunt"; homepage = "https://github.com/warrensbox/tgswitch"; license = licenses.mit; maintainers = with maintainers; [ psibi ]; }; } + diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 7aaf5b8bc75fa..21619683b331c 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.0"; + version = "0.30.4"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bZYm9T3NRNNtT8RDGwnXcXC7Rb/GuIxI/U06By4gR/w="; + sha256 = "sha256-AdT3qL0frsTi4R4AbmZlPDx0Q2RixC3e4AyEMgGgnlc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 88c3a31fd2d77..5685b0b65072c 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,23 +2,25 @@ buildGoModule rec { pname = "velero"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58="; + sha256 = "sha256-zoHMyOhHEunJ8LirUxOT1qNY3jB28BEiQ+3GdqriTtQ="; }; ldflags = [ "-s" "-w" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-DyQ+MHRNZFg80Yz/SCxhnF4NVbIsyhz4mApx0+kgHoA="; + vendorSha256 = "sha256-PDXufnddHEA0qCfzJ0O+h3u50gWNkQAnWMZjSVQ0oHc="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 65e057b69fd13..d66d3380fcbe6 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -3,39 +3,45 @@ , buildGoModule , fetchFromGitHub , installShellFiles -, pkg-config -, gpgme -, glibc -, lvm2 , btrfs-progs +, glibc +, gitUpdater }: buildGoModule rec { pname = "werf"; - version = "1.2.99"; + version = "1.2.120"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-D9NwVZGB0UV0tRe927GpxHzdvAeqcRJOYfocbbj6BRM="; + sha256 = "sha256-Yy3nZGeEiolZawzvZCHM6vZje+eexbbsZN9lHJaDYwM="; }; - vendorSha256 = "sha256-ZMSTl9WFTF5x+tiQZ37ihVrOuLS0W5PjyXbbzyHJNsI="; + + vendorSha256 = "sha256-OqDiq2+XysHhmw8oI1eyCL0358Ii0f0FyMLJ9JgyULc="; + proxyVendor = true; - nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ gpgme ] - ++ lib.optionals stdenv.isLinux [ glibc.static lvm2 btrfs-progs ]; + subPackages = [ "cmd/werf" ]; - # Flags are derived from - # https://github.com/werf/werf/blob/main/scripts/build_release_v3.sh - ldflags = [ "-s" "-w" "-X github.com/werf/werf/pkg/werf.Version=v${version}" ] - ++ lib.optionals stdenv.isLinux [ - "-linkmode external" + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs glibc.static ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/werf/werf/pkg/werf.Version=${src.rev}" + ] ++ lib.optionals stdenv.isLinux [ "-extldflags=-static" + "-linkmode external" ]; - tags = [ "dfrunmount" "dfssh" "containers_image_openpgp" ] - ++ lib.optionals stdenv.isLinux [ + + tags = [ + "containers_image_openpgp" + "dfrunmount" + "dfssh" + ] ++ lib.optionals stdenv.isLinux [ "exclude_graphdriver_devicemapper" "netgo" "no_devmapper" @@ -43,7 +49,8 @@ buildGoModule rec { "static_build" ]; - subPackages = [ "cmd/werf" ]; + # There are no tests for cmd/werf. + doCheck = false; postInstall = '' installShellCompletion --cmd werf \ @@ -51,9 +58,20 @@ buildGoModule rec { --zsh <($out/bin/werf completion --shell=zsh) ''; + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = "1\.[3-9].*"; + rev-prefix = "v"; + }; + meta = with lib; { - homepage = "https://github.com/werf/werf"; description = "GitOps delivery tool"; + longDescription = '' + The CLI tool gluing Git, Docker, Helm & Kubernetes with any CI system to + implement CI/CD and Giterminism. + ''; + homepage = "https://werf.io"; + changelog = "https://github.com/werf/werf/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ azahi ]; }; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 4adc508392af6..68a14207e297a 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,32 +1,61 @@ -{ fetchurl, lib, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }: +{ stdenv +, fetchurl +, lib +, makeWrapper +, unzip +, glib +, gtk2 +, gtk3 +, jre +, libXtst +, zulu +, preferGtk3 ? true +, preferZulu ? true +}: +let + rev = 3390; + jre' = if preferZulu then zulu else jre; + gtk' = if preferGtk3 then gtk3 else gtk2; + + inherit (lib) makeLibraryPath versions; + +in stdenv.mkDerivation rec { pname = "davmail"; - version = "5.5.1"; + version = "6.0.1"; + src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3299.zip"; - sha256 = "sha256-NN/TUOcUIifNzrJnZmtYhs6UVktjlfoOYJjYaMEQpI4="; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip"; + sha256 = "1i1z1kdglccg7pyidlfbagdhgs0wqvybl8dwxcpglh2hkvi0dba0"; }; + postPatch = '' + sed -i -e '/^JAVA_OPTS/d' davmail + ''; + sourceRoot = "."; nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' runHook preInstall + mkdir -p $out/share/davmail cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ - --prefix PATH : ${jre}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 libXtst ]} + --set-default JAVA_OPTS "-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=${lib.versions.major gtk'.version}" \ + --prefix PATH : ${jre'}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk' libXtst ]} + runHook postInstall ''; meta = with lib; { - homepage = "http://davmail.sourceforge.net/"; description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - maintainers = [ maintainers.hinton ]; - platforms = platforms.all; + homepage = "http://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 c6ada11d356c1..88fe43884f872 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,21 +2,24 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.15.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-znBvV6z5rMfLeyEBRmAtfwVw1is5jJlGPQplXqEGAAM="; + sha256 = "sha256-eXm2oOHtNnDK4mikge8Ubjkg4b4mG7HMT17nL/CdU88="; }; - vendorSha256 = "sha256-S2og/isDy6Jvo9XgIV6XbgrmRJsLnePwh/gll/14Ds0="; - - subPackages = [ "." ]; + vendorSha256 = "sha256-14SnK5CeMTmt0ZQ+CI14FACcMaNNbBWvAYfbQoJ2K/A="; ldflags = [ "-s" "-w" ]; + preCheck = '' + # requires network + rm pkg/spflib/flatten_test.go pkg/spflib/parse_test.go + ''; + meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix index ef4baaadc2b8d..b83729ebc6936 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { ]; meta = { + broken = stdenv.isDarwin; description = "BitTorrent client written in C++"; longDescription = '' CTorrent, a BitTorrent client implemented in C++, with bugfixes and diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index f4a44275b693e..d9f02941b43c3 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -1,32 +1,12 @@ { lib -, ansi -, buildPythonApplication -, colorlog -, daemonize -, deepmerge -, dulwich , fetchFromGitHub -, flask , glibcLocales -, hypchat -, irc -, jinja2 -, markdown -, mock -, pyasn1 -, pyasn1-modules -, pygments -, pygments-markdown-lexer -, pyopenssl -, pytestCheckHook -, requests -, slackclient -, sleekxmpp -, telegram -, webtest +, python39 }: -buildPythonApplication rec { +let + python3 = python39; +in python3.pkgs.buildPythonApplication rec { pname = "errbot"; version = "6.1.7"; @@ -41,7 +21,7 @@ buildPythonApplication rec { buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ ansi colorlog daemonize @@ -64,7 +44,7 @@ buildPythonApplication rec { webtest ]; - checkInputs = [ + checkInputs = with python3.pkgs; [ mock pytestCheckHook ]; diff --git a/pkgs/applications/networking/expressvpn/default.nix b/pkgs/applications/networking/expressvpn/default.nix new file mode 100644 index 0000000000000..0bc0fd34fe5ad --- /dev/null +++ b/pkgs/applications/networking/expressvpn/default.nix @@ -0,0 +1,98 @@ +{ autoPatchelfHook +, buildFHSUserEnv +, dpkg +, fetchurl +, inotify-tools +, lib +, stdenvNoCC +, sysctl +, writeScript +}: + +let + pname = "expressvpn"; + clientVersion = "3.25.0"; + clientBuild = "13"; + version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ]; + + expressvpnBase = stdenvNoCC.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb"; + hash = "sha256-lyDjG346FrgT7SZbsWET+Hexl9Un6mzMukfO2PwlInA="; + }; + + nativeBuildInputs = [ dpkg autoPatchelfHook ]; + + dontConfigure = true; + dontBuild = true; + + unpackPhase = '' + runHook preUnpack + dpkg --fsys-tarfile $src | tar --extract + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + mv usr/ $out/ + runHook postInstall + ''; + }; + + expressvpndFHS = buildFHSUserEnv { + name = "expressvpnd"; + + # When connected, it directly creates/deletes resolv.conf to change the DNS entries. + # Since it's running in an FHS environment, it has no effect on actual resolv.conf. + # Hence, place a watcher that updates host resolv.conf when FHS resolv.conf changes. + runScript = writeScript "${pname}-wrapper" '' + cp /host/etc/resolv.conf /etc/resolv.conf; + while inotifywait /etc 2>/dev/null; + do + cp /etc/resolv.conf /host/etc/resolv.conf; + done & + expressvpnd --client-version ${clientVersion} --client-build ${clientBuild} + ''; + + # expressvpnd binary has hard-coded the path /sbin/sysctl hence below workaround. + extraBuildCommands = '' + chmod +w sbin + ln -s ${sysctl}/bin/sysctl sbin/sysctl + ''; + + # The expressvpnd binary also uses hard-coded paths to the other binaries and files + # it ships with, hence the FHS environment. + + targetPkgs = pkgs: with pkgs; [ + expressvpnBase + inotify-tools + iproute2 + ]; + }; +in +stdenvNoCC.mkDerivation { + inherit pname version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share + ln -s ${expressvpnBase}/bin/expressvpn $out/bin + ln -s ${expressvpndFHS}/bin/expressvpnd $out/bin + ln -s ${expressvpnBase}/share/{bash-completion,doc,man} $out/share/ + runHook postInstall + ''; + + meta = with lib; { + description = "CLI client for ExpressVPN"; + homepage = "https://www.expressvpn.com"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ yureien ]; + }; +} diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix index 9bb34ffbbd709..22bd33b87717f 100644 --- a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix +++ b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints"; homepage = "https://indigenous.realize.be/indigenous-desktop"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index ed5cad35474f9..a03b03b035f98 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.27"; + version = "2.28"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-cHUI95Zrwzg242BM8/roA40sAxijFw6go6BbQNZSzRw="; + hash = "sha256-MHbGCGtFPXG+82Qveoiv7f8qqZOxThEYb9y9Kv3pnFc="; }; - cargoHash = "sha256-YZpaPfExKNLHWHmnCery4fGAJmOhpK3umuO343qe0Zo="; + cargoHash = "sha256-9YcVKZn51fhkE6bZmaNu7PXsSG8j0M4piBnTWtX8Kcg="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index b937c35a3f969..5ec7bf0447367 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.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q="; + sha256 = "sha256-lLS4ISmx+BgAExiqNpYcSIFpSenRs4Kh25WyvTxPqPg="; }; patches = [ diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index d1bcab9a1a0a0..d8e4fbe492fbc 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.12"; + version = "3.3.19"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-DrM2925PcNuwJooq9qGHgIq64JWHb7byDeaeVsWgEjc="; + hash = "sha256-dt4XEGJGNq0njhuJBYA6xbyTx1jkrZlJ0Pl83Xjat6I="; }; postPatch = '' diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index d5e73f833c3a7..40e49ff3296ae 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,19 +18,13 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.58.0"; + version = "3.60.1"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-0P5/cuAfd0K6oGRmgYsYbo6R//Ytbuey8OiEtrM4XYg="; + hash = "sha256-gflsY2OMrxg44MY+WHT2AZISCWXYJSlKiUoit9QgZq8="; }; - # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 - postPatch = '' - sed -i src/interface/Mainfrm.h \ - -e '/^#define/a #include <list>' - ''; - configureFlags = [ "--disable-manualupdatecheck" "--disable-autoupdatecheck" diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index e1ce1914db927..25731fea4fb73 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "sha256-tj+jKJuKwuqic/qfaUbf+Tao1X2FW0VVoGwqyx3q+go="; + sha256 = "sha256-tAYFuxB8LSyFHraAQxCj8Q09mS/9RYcinVm5whpRh04="; }; - vendorSha256 = "sha256-aBw9C488a3Wxde3QCCU0eiagiRYOS9mkjcCsB2Mrdr0="; + vendorSha256 = "sha256-IFxKczPrqCM9NOoOJayfbrsJIMf3eoI9zXSFns0/i8o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix new file mode 100644 index 0000000000000..f919ff757fc9c --- /dev/null +++ b/pkgs/applications/networking/go-graft/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "go-graft"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "mzz2017"; + repo = "gg"; + rev = "v${version}"; + sha256 = "sha256-nuRkQEqytMPxd2Wh5XeUwk4YzIxnnNEiVTxFY4GlD1E="; + }; + + CGO_ENABLED = 0; + + ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; + vendorSha256 = "sha256-/ckudHo/ttNct+yrQYQEaC6hX+p+Q6M1I/cjJCgjYLk="; + subPackages = [ "." ]; + + meta = with lib; { + description = "A command-line tool for one-click proxy in your research and development without installing v2ray or anything else"; + homepage = "https://github.com/mzz2017/gg"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ xyenon ]; + mainProgram = "gg"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 29ae860cdadfb..02df4313f7fc2 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,23 +1,24 @@ { lib, buildDunePackage, fetchFromGitHub , ocaml_extlib, ocamlfuse, gapi_ocaml, ocaml_sqlite3 +, tiny_httpd +, ounit }: buildDunePackage rec { pname = "google-drive-ocamlfuse"; - version = "0.7.26"; - - useDune2 = true; - - minimumOCamlVersion = "4.06"; + version = "0.7.28"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "sha256-8s3DnpdYIVyJj5rtsof3WpLvX9wCrWU47dp4D6c986s="; + sha256 = "sha256:1layxqz5iz6wnvk83579m1im9vzq608h7n1h04znpkan0fls6nad"; }; - buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 ]; + doCheck = true; + checkInputs = [ ounit ]; + + buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 tiny_httpd ]; meta = { inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/gopher/geomyidae/default.nix b/pkgs/applications/networking/gopher/geomyidae/default.nix new file mode 100644 index 0000000000000..c9aa26ad98746 --- /dev/null +++ b/pkgs/applications/networking/gopher/geomyidae/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl, libressl, +}: + +stdenv.mkDerivation rec { + pname = "geomyidae"; + version = "0.50.1"; + + src = fetchurl { + url = "gopher://bitreich.org/9/scm/geomyidae/tag/geomyidae-v${version}.tar.gz"; + sha512 = "2a71b12f51c2ef8d6e791089f9eea49eb90a36be45b874d4234eba1e673186be945711be1f92508190f5c0a6f502f132c4b7cb82caf805a39a3f31903032ac47"; + }; + + buildInputs = [ libressl ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "A gopher daemon for Linux/BSD"; + homepage = "gopher://bitreich.org/1/scm/geomyidae"; + license = licenses.mit; + maintainers = [ maintainers.athas ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index 5252fe59c0984..1afcbe4d2a86b 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "sacc"; - version = "1.05"; + version = "1.06"; src = fetchurl { url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz"; - sha512 = "080vpacipdis396lrw3fxc1z7h2d0njm2zi63kvlk0n2m1disv97c968zx8dp76kfw1s03nvvr6v3vnpfkkywiz1idjc92s5rgcbsk1"; + sha512 = "7a895e432e1d28b7d9b2bb2a5326ca32350876a2c80d39dc6c19e75347d72a4847f1aa4ff11f07e8a9adea14ea71b84d70890dcc170ff6ce0b779e1d6586b4fa"; }; inherit patches; diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index 64a237480c651..5417cc6fda145 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -50,6 +50,7 @@ mkDerivation rec { meta = { description = "Client for HPE's MyRoom web conferencing solution"; maintainers = with lib.maintainers; [ johnazoidberg ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; homepage = "https://myroom.hpe.com"; # TODO: A Darwin binary is available upstream diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index e8299a8899aba..4b8d077c39f1f 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.21"; + version = "0.2.23"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fF+pQnqAWBktc4NdQFTHeB/sEg5bPTxXtdL1x5JuXU8="; + sha256 = "sha256-Hc348rlwICnPWq7qYzFE01QeeJuQpSP19NjXtGqI10o="; }; vendorSha256 = "sha256-M5QlhF2Cj1jn5NNiKj1Roh9+sNCWxQEb4vbtsDfapWY="; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index adbda434b422d..ddeb03698e953 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-axNImzBJTHxd2kU/xQmB5ZQ9ZxW2ybW3qFq7gLvm0RY="; + sha256 = "sha256-9Q3X24uAmnSnLUAklK+gC0Mu8eh81ZE2h/7uIVc8cAw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 7b4ddb6134db4..d4709e6655f06 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://www.shrew.net/software"; description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 90a0cd6f53a37..98049a092878c 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.44.0"; + version = "8.47.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-6BhhUfULtCUO5jZFF+HxGuFCg0XojQ0NJUXHxMtnwN4="; + sha256 = "sha256-KpFLKl5ifncO3lQbEowwLavsfvNcYyrlvNINqAvNWBY="; }; nativeBuildInputs = [ @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; homepage = "https://alfaview.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang hexchen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index c902a7e67c57e..c74bffdd5e2a7 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.27.0.130"; + version = "2.29.1.3"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-J0BGL03k1NAJLLEUOfvKjZEsBlupeHJR2Bp3c0ANBwg="; + sha256 = "sha256-vWViSJXRPZ4B40LNnoKRZNbxB1YKnaW2ay6GCjnFLGY="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; @@ -127,6 +127,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; homepage = "https://www.bluejeans.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix new file mode 100644 index 0000000000000..1b16786649f90 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchzip +, openjdk +, makeWrapper +, tor +, p7zip +, bash +, writeScript +}: +let + + briar-tor = writeScript "briar-tor" '' + #! ${bash}/bin/bash + exec ${tor}/bin/tor "$@" + ''; + +in +stdenv.mkDerivation rec { + pname = "briar-desktop"; + version = "0.2.1-beta"; + + src = fetchzip { + url = "https://code.briarproject.org/briar/briar-desktop/-/jobs/18424/artifacts/download?file_type=archive"; + sha256 = "sha256-ivMbgo0+iZE4/Iffq9HUBErGIQMVLrRZUQ6R3V3X8II="; + extension = "zip"; + }; + + nativeBuildInputs = [ + makeWrapper + p7zip + ]; + + installPhase = '' + mkdir -p $out/{bin,lib} + cp ${src}/briar-desktop.jar $out/lib/ + makeWrapper ${openjdk}/bin/java $out/bin/briar-desktop \ + --add-flags "-jar $out/lib/briar-desktop.jar" + ''; + + fixupPhase = '' + # Replace the embedded Tor binary (which is in a Tar archive) + # with one from Nixpkgs. + cp ${briar-tor} ./tor + for arch in {aarch64,armhf,x86_64}; do + 7z a tor_linux-$arch.zip tor + 7z a $out/lib/briar-desktop.jar tor_linux-$arch.zip + done + ''; + + meta = with lib; { + description = "Decentalized and secure messnger"; + homepage = "https://code.briarproject.org/briar/briar-desktop"; + license = licenses.gpl3; + maintainers = with maintainers; [ onny ]; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 7a24151993757..e637881d968c8 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "chatterino2"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZmUM56+YNH98J3XE/mWOOIfb0qBld2n4iuHpImbrU4o="; + sha256 = "sha256-ozfLLoNUN+1SPXbMNbF1V5sdZgPZEA/J3xXzJP9D3uI="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; @@ -15,6 +15,9 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" + '' + '' + mkdir -p $out/share/icons/hicolor/256x256/apps + cp $src/resources/icon.png $out/share/icons/hicolor/256x256/apps/chatterino.png ''; meta = with lib; { description = "A chat client for Twitch chat"; diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 35266eff90092..fc9c4c10b2187 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.6.4"; + version = "0.6.7"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-uDuSx+tWv6DV93/99QUcUKZaWA9kNW8phHZhetYlG/M="; + hash = "sha256-W4w/00mRgjfyQmLQ81/EAN+80qk7kDkBmMPJnOU+AIc="; }; postPatch = '' @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "XMPP and SMS messaging via libpurple and ModemManager"; homepage = "https://source.puri.sm/Librem5/chatty"; + changelog = "https://source.puri.sm/Librem5/chatty/-/blob/${src.rev}/NEWS"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index d27512bf5bcd6..3f3d71a337183 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.0.3"; + version = "2.0.4"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "13jg28dypp7x6wgsc6vikbqnagp1grqsdmmwhll8qz9ih9rq9fxd"; + sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index 42e5d63240a9d..8e1ce52c266e9 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.4.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - hash = "sha256-li6HsatiRJPVKKBBHyWhq2b8HhvDrOUiVT2tSupjuag="; + hash = "sha256-EA3yTP4j/jj26E8zdRwTIW+9FkI0ehK4Y8AqiCnF2xA="; }; nativeBuildInputs = [ @@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ deltachat + emoji notify-py urwid-readline ]; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 009ece90b4c69..980ff7e9b548d 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,13 +1,12 @@ { lib , copyDesktopItems -, electron_16 +, electron_18 , esbuild , fetchFromGitHub -, fetchpatch , libdeltachat , makeDesktopItem , makeWrapper -, nodejs-14_x +, nodePackages , noto-fonts-emoji , pkg-config , roboto @@ -19,24 +18,23 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.76.0"; + version = "1.86.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; + hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; + hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; }; - patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches; }); electronExec = if stdenv.isDarwin then - "${electron_16}/Applications/Electron.app/Contents/MacOS/Electron" + "${electron_18}/Applications/Electron.app/Contents/MacOS/Electron" else - "${electron_16}/bin/electron"; + "${electron_18}/bin/electron"; esbuild' = esbuild.overrideAttrs (old: rec { version = "0.12.29"; src = fetchFromGitHub { @@ -46,15 +44,15 @@ let hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; }; }); -in nodejs-14_x.pkgs.deltachat-desktop.override rec { +in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; - version = "1.28.2"; + version = "1.30.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-jhtriDnt8Yl8eCmUTEyoPjccZV8RNAchMykkkiRpF60="; + hash = "sha256-gZjZbXiqhFVfThZOsvL/nKkf6MX+E3KB5ldEAIuzBYA="; }; nativeBuildInputs = [ @@ -75,10 +73,15 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec { USE_SYSTEM_LIBDELTACHAT = "true"; VERSION_INFO_GIT_REF = src.rev; + preRebuild = '' + substituteInPlace package.json \ + --replace "node ./bin/check-nodejs-version.js" true + ''; + postInstall = '' - rm -r node_modules/deltachat-node/{deltachat-core-rust,prebuilds,src} + rm -r node_modules/deltachat-node/node/prebuilds - npm run build + npm run build4production npm prune --production @@ -117,7 +120,9 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec { meta = with lib; { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; + changelog = "https://github.com/deltachat/deltachat-desktop/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; + mainProgram = "deltachat"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch deleted file mode 100644 index caa44a62a062d..0000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ed8020c..44ca43e7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16) - project(deltachat LANGUAGES C) - include(GNUInstallDirs) - -+if(APPLE) -+ set(DYNAMIC_EXT "dylib") -+elseif(UNIX) -+ set(DYNAMIC_EXT "so") -+else() -+ set(DYNAMIC_EXT "dll") -+endif() -+ - find_program(CARGO cargo) - - add_custom_command( - OUTPUT - "target/release/libdeltachat.a" -- "target/release/libdeltachat.so" -+ "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - COMMAND - PREFIX=${CMAKE_INSTALL_PREFIX} -@@ -32,11 +40,11 @@ add_custom_target( - ALL - DEPENDS - "target/release/libdeltachat.a" -- "target/release/libdeltachat.so" -+ "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - ) - - install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) --install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py -index c8ed43e2..714c7e30 100755 ---- a/python/install_python_bindings.py -+++ b/python/install_python_bindings.py -@@ -24,7 +24,7 @@ - - print("running:", " ".join(cmd)) - subprocess.check_call(cmd) -- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True) -+ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True) - - if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild": - subprocess.check_call([ diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index 4455868fe0b03..96778eda7aa6b 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -1,30 +1,28 @@ { "name": "deltachat-desktop", - "version": "1.28.2", + "version": "1.30.1", "dependencies": { - "@blueprintjs/core": "^3.22.3", - "@deltachat/message_parser_wasm": "^0.3.0", + "@blueprintjs/core": "^4.1.2", + "@deltachat/message_parser_wasm": "^0.4.0", + "@deltachat/react-qr-reader": "^4.0.0", "@mapbox/geojson-extent": "^1.0.0", "application-config": "^1.0.1", "classnames": "^2.3.1", "debounce": "^1.2.0", - "deltachat-node": "1.76.0", + "deltachat-node": "1.86.0", "emoji-js-clean": "^4.0.0", - "emoji-mart": "^3.0.0", + "emoji-mart": "^3.0.1", "emoji-regex": "^9.2.2", "error-stack-parser": "^2.0.7", "filesize": "^8.0.6", "immutable": "^4.0.0", "mapbox-gl": "^1.12.0", "mime-types": "^2.1.31", - "moment": "^2.27.0", - "node-fetch": "^2.6.7", + "moment": "^2.29.2", "path-browserify": "^1.0.1", "rc": "^1.2.8", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-qr-reader": "^2.2.1", - "react-qr-svg": "^2.1.0", "react-string-replace": "^1.0.0", "react-virtualized-auto-sizer": "^1.0.5", "react-window": "^1.8.6", @@ -32,26 +30,23 @@ "react-zoom-pan-pinch": "^2.1.3", "source-map-support": "^0.5.19", "stackframe": "^1.2.1", - "tempy": "^0.3.0", "url-parse": "^1.5.9", "use-debounce": "^3.3.0", "@babel/core": "^7.7.7", "@babel/preset-env": "^7.7.7", "@babel/preset-react": "^7.7.4", "@types/debounce": "^1.2.0", - "@types/emoji-mart": "^3.0.2", + "@types/emoji-mart": "^3.0.9", "@types/mapbox-gl": "^0.54.5", "@types/mime-types": "^2.1.0", "@types/node": "^14.14.20", - "@types/node-fetch": "^2.5.7", - "@types/prop-types": "^15.7.3", "@types/rc": "^1.1.0", - "@types/react": "^16.9.17", - "@types/react-dom": "^16.9.4", + "@types/react": "^17.0.2", + "@types/react-dom": "^17.0.2", "@types/react-window": "^1.8.4", "@types/react-window-infinite-loader": "^1.0.4", "@types/url-parse": "^1.4.3", - "electron": "^14.2.9", + "electron": "^18.0.3", "esbuild": "^0.12.29", "glob-watcher": "^5.0.5", "sass": "^1.26.5", diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index c3119a79afd83..a21a97b3b83c0 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -29,7 +29,7 @@ tac default.nix \ src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) -jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \ +jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@types/node-fetch","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","node-fetch","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \ "$src/package.json" > package.json.new if cmp --quiet package.json{.new,}; then diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 4bc9ac98df1f6..aa1cfaa045ca4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }: +{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, withOpenASAR ? false }: stdenv.mkDerivation { inherit pname version src meta; @@ -8,7 +8,15 @@ stdenv.mkDerivation { sourceRoot = "."; installPhase = '' + runHook preInstall + mkdir -p $out/Applications cp -r "${desktopName}.app" $out/Applications + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString withOpenASAR '' + cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar ''; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 287c23401e064..87fad54f7bc67 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,8 +1,7 @@ -{ branch ? "stable", pkgs, lib, stdenv }: +{ branch ? "stable", callPackage, fetchurl, lib, stdenv }: let - inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { - stable = "0.0.17"; + stable = "0.0.18"; ptb = "0.0.29"; canary = "0.0.135"; } else { @@ -21,7 +20,7 @@ let stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil"; + sha256 = "1hl01rf3l6kblx5v7rwnwms30iz8zw6dwlkjsx2f1iipljgkh5q4"; }; ptb = fetchurl { url = @@ -55,14 +54,23 @@ let description = "All-in-one cross-platform voice and text chat for gamers"; homepage = "https://discordapp.com/"; downloadPage = "https://discordapp.com/download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ldesgoui MP2E devins2518 ]; platforms = [ "x86_64-linux" "x86_64-darwin" ] ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; }; package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; + + openasar = callPackage ./openasar.nix { }; + packages = (builtins.mapAttrs - (_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; })) + (_: value: callPackage package + (value // { + inherit src version openasar; + meta = meta // { mainProgram = value.binaryName; }; + }) + ) { stable = rec { pname = "discord"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index b960caa64d802..846ac82d172b2 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,11 +1,11 @@ -{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook +{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook , makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript -, common-updater-scripts }: +, common-updater-scripts, withOpenASAR ? false }: stdenv.mkDerivation rec { inherit pname version src meta; @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { ]; installPhase = '' - mkdir -p $out/{bin,opt/${binaryName},share/pixmaps} + runHook preInstall + + mkdir -p $out/{bin,opt/${binaryName},share/pixmaps,share/icons/hicolor/256x256/apps} mv * $out/opt/${binaryName} chmod +x $out/opt/${binaryName}/${binaryName} @@ -90,9 +92,17 @@ stdenv.mkDerivation rec { ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${ lib.strings.toLower binaryName } || true + ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png + ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png ln -s "${desktopItem}/share/applications" $out/share/ + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString withOpenASAR '' + cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar ''; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix new file mode 100644 index 0000000000000..ba4b5f0ffd4e9 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -0,0 +1,60 @@ +{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }: + +let + # OpenAsar fails with default unzip, throwing "lchmod (file attributes) error: Operation not supported" + unzipFix = + if stdenv.isLinux then + unzip.overrideAttrs (oldAttrs: { + buildFlags = oldAttrs.buildFlags ++ [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; + }) + else + unzip; +in +stdenv.mkDerivation rec { + pname = "openasar"; + version = "unstable-2022-06-27"; + + src = fetchFromGitHub { + owner = "GooseMod"; + repo = "OpenAsar"; + rev = "6f7505fb91a07035d3661a3a7bf68b3018ddfd82"; + sha256 = "2tb6OgYOnpryiyk7UH39sgzwtGJf9hNOpy74YqLI+Uk="; + }; + + postPatch = '' + # Hardcode unzip path + substituteInPlace ./src/updater/moduleUpdater.js \ + --replace \'unzip\' \'${unzipFix}/bin/unzip\' + # Remove auto-update feature + echo "module.exports = async () => log('AsarUpdate', 'Removed');" > ./src/asarUpdate.js + ''; + + buildPhase = '' + runHook preBuild + + bash scripts/injectPolyfills.sh + substituteInPlace src/index.js --replace 'nightly' '${version}' + ${nodejs}/bin/node scripts/strip.js + ${nodePackages.asar}/bin/asar pack src app.asar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install app.asar $out + + runHook postInstall + ''; + + doCheck = false; + + meta = with lib; { + description = "Open-source alternative of Discord desktop's \"app.asar\"."; + homepage = "https://openasar.dev"; + license = licenses.mit; + maintainers = with maintainers; [ pedrohlc ]; + platforms = nodejs.meta.platforms; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index b470f658042fa..269d928f4366b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.13", + "version": "1.10.15", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 2ad5d8c4654f9..c8c186045394c 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -48,9 +48,9 @@ mkYarnPackage rec { runHook preBuild export HOME=$(mktemp -d) pushd deps/element-desktop/ - npx tsc + yarn run build:ts yarn run i18n - node ./scripts/copy-res.js + yarn run build:res popd rm -rf node_modules/matrix-seshat node_modules/keytar ${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar"} @@ -91,11 +91,8 @@ mkYarnPackage rec { runHook postInstall ''; - # Do not attempt generating a tarball for element-web again. - # note: `doDist = false;` does not work. - distPhase = '' - true - ''; + # Do not attempt generating a tarball for element-desktop again. + doDist = false; # The desktop item properties should be kept in sync with data from upstream: # https://github.com/vector-im/element-desktop/blob/develop/package.json diff --git a/pkgs/applications/networking/instant-messengers/element/element-web-package.json b/pkgs/applications/networking/instant-messengers/element/element-web-package.json new file mode 100644 index 0000000000000..a67fc7a682b94 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/element-web-package.json @@ -0,0 +1,206 @@ +{ + "name": "element-web", + "version": "1.10.15", + "description": "A feature-rich client for Matrix.org", + "author": "New Vector Ltd.", + "repository": { + "type": "git", + "url": "https://github.com/vector-im/element-web" + }, + "license": "Apache-2.0", + "files": [ + "lib", + "res", + "src", + "webpack.config.js", + "scripts", + "docs", + "release.sh", + "deploy", + "CHANGELOG.md", + "CONTRIBUTING.rst", + "LICENSE", + "README.md", + "AUTHORS.rst", + "package.json", + "contribute.json" + ], + "style": "bundle.css", + "scripts": { + "i18n": "matrix-gen-i18n", + "prunei18n": "matrix-prune-i18n", + "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", + "clean": "rimraf lib webapp", + "build": "yarn clean && yarn build:genfiles && yarn build:bundle", + "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats", + "build:jitsi": "node scripts/build-jitsi.js", + "build:res": "node scripts/copy-res.js", + "build:genfiles": "yarn build:res && yarn build:jitsi", + "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js", + "build:bundle": "webpack --progress --bail --mode production", + "build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json", + "dist": "scripts/package.sh", + "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"", + "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --https\"", + "start:res": "yarn build:jitsi && node scripts/copy-res.js -w", + "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot", + "lint": "yarn lint:types && yarn lint:js && yarn lint:style", + "lint:js": "eslint --max-warnings 0 src", + "lint:js-fix": "eslint --fix src", + "lint:types": "tsc --noEmit --jsx react", + "lint:style": "stylelint \"res/css/**/*.scss\"", + "test": "jest", + "coverage": "yarn test --coverage" + }, + "dependencies": { + "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz", + "browser-request": "^0.3.3", + "gfm.css": "^1.1.2", + "jsrsasign": "^10.2.0", + "katex": "^0.12.0", + "matrix-js-sdk": "18.1.0", + "matrix-react-sdk": "3.47.0", + "matrix-widget-api": "^0.1.0-beta.18", + "prop-types": "^15.7.2", + "react": "17.0.2", + "react-dom": "17.0.2", + "sanitize-html": "^2.3.2", + "ua-parser-js": "^0.7.24" + }, + "devDependencies": { + "@babel/core": "^7.12.10", + "@babel/eslint-parser": "^7.12.10", + "@babel/eslint-plugin": "^7.12.10", + "@babel/plugin-proposal-class-properties": "^7.12.1", + "@babel/plugin-proposal-export-default-from": "^7.12.1", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", + "@babel/plugin-proposal-numeric-separator": "^7.12.7", + "@babel/plugin-proposal-object-rest-spread": "^7.12.1", + "@babel/plugin-proposal-optional-chaining": "^7.12.7", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.12.10", + "@babel/preset-env": "^7.12.11", + "@babel/preset-react": "^7.12.10", + "@babel/preset-typescript": "^7.12.7", + "@babel/register": "^7.12.10", + "@babel/runtime": "^7.12.5", + "@principalstudio/html-webpack-inject-preload": "^1.2.7", + "@sentry/webpack-plugin": "^1.18.1", + "@svgr/webpack": "^5.5.0", + "@types/flux": "^3.1.9", + "@types/jest": "^27.0.2", + "@types/modernizr": "^3.5.3", + "@types/node": "^14.14.22", + "@types/react": "17.0.14", + "@types/react-dom": "17.0.9", + "@types/sanitize-html": "^2.3.1", + "@types/ua-parser-js": "^0.7.36", + "@typescript-eslint/eslint-plugin": "^5.6.0", + "@typescript-eslint/parser": "^5.6.0", + "allchange": "^1.0.6", + "autoprefixer": "^9.8.6", + "babel-jest": "^26.6.3", + "babel-loader": "^8.2.2", + "chokidar": "^3.5.1", + "concurrently": "^5.3.0", + "cpx": "^1.5.0", + "css-loader": "^3.6.0", + "dotenv": "^10.0.0", + "eslint": "8.9.0", + "eslint-config-google": "^0.14.0", + "eslint-plugin-import": "^2.25.4", + "eslint-plugin-matrix-org": "^0.4.0", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.3.0", + "extract-text-webpack-plugin": "^4.0.0-beta.0", + "fake-indexeddb": "^3.1.2", + "file-loader": "^5.1.0", + "fs-extra": "^0.30.0", + "html-webpack-plugin": "^4.5.2", + "jest": "^26.6.3", + "jest-environment-jsdom-sixteen": "^1.0.3", + "jest-raw-loader": "^1.0.1", + "jest-sonar-reporter": "^2.0.0", + "json-loader": "^0.5.7", + "loader-utils": "^1.4.0", + "matrix-mock-request": "^2.0.0", + "matrix-react-test-utils": "^0.2.3", + "matrix-web-i18n": "^1.2.0", + "mini-css-extract-plugin": "^0.12.0", + "minimist": "^1.2.6", + "mkdirp": "^1.0.4", + "modernizr": "^3.12.0", + "node-fetch": "^2.6.7", + "optimize-css-assets-webpack-plugin": "^5.0.4", + "postcss-easings": "^2.0.0", + "postcss-hexrgba": "^2.0.1", + "postcss-import": "^12.0.1", + "postcss-loader": "^3.0.0", + "postcss-mixins": "^6.2.3", + "postcss-nested": "^4.2.3", + "postcss-preset-env": "^6.7.0", + "postcss-scss": "^2.1.1", + "postcss-simple-vars": "^5.0.2", + "postcss-strip-inline-comments": "^0.1.5", + "raw-loader": "^4.0.2", + "rimraf": "^3.0.2", + "shell-escape": "^0.2.0", + "simple-proxy-agent": "^1.1.0", + "string-replace-loader": "2", + "style-loader": "2", + "stylelint": "^13.9.0", + "stylelint-config-standard": "^20.0.0", + "stylelint-scss": "^3.18.0", + "terser-webpack-plugin": "^2.3.8", + "typescript": "^4.5.3", + "webpack": "^4.46.0", + "webpack-cli": "^3.3.12", + "webpack-dev-server": "^3.11.2", + "worker-loader": "^2.0.0", + "worklet-loader": "^2.0.0" + }, + "resolutions": { + "@types/react": "17.0.14" + }, + "jest": { + "testEnvironment": "jest-environment-jsdom-sixteen", + "testMatch": [ + "<rootDir>/test/**/*-test.[tj]s?(x)" + ], + "setupFilesAfterEnv": [ + "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js" + ], + "moduleNameMapper": { + "\\.(css|scss)$": "<rootDir>/__mocks__/cssMock.js", + "\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js", + "\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js", + "\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json", + "^browser-request$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/browser-request.js", + "^react$": "<rootDir>/node_modules/react", + "^react-dom$": "<rootDir>/node_modules/react-dom", + "^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src", + "^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src", + "decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js", + "decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js", + "waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js", + "context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js", + "FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js", + "workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js", + "^!!raw-loader!.*": "jest-raw-loader", + "RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js" + }, + "transformIgnorePatterns": [ + "/node_modules/(?!matrix-js-sdk).+$", + "/node_modules/(?!matrix-react-sdk).+$" + ], + "coverageReporters": [ + "text-summary", + "lcov" + ], + "testResultsProcessor": "jest-sonar-reporter" + }, + "jestSonar": { + "reportPath": "coverage", + "sonar56x": true + } +} diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index fae96e8e5e7ae..3b43946045985 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: +{ lib +, mkYarnPackage +, runCommand +, fetchFromGitHub +, fetchYarnDeps +, writeText +, jq +, yarn +, fixup_yarn_lock +, jitsi-meet +, conf ? { } +}: let pinData = lib.importJSON ./pin.json; @@ -8,25 +19,62 @@ let }; configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); -in stdenv.mkDerivation rec { +in +mkYarnPackage rec { pname = "element-web"; inherit (pinData) version; - src = fetchurl { - url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = pinData.webHash; + src = fetchFromGitHub { + owner = "vector-im"; + repo = pname; + rev = "v${version}"; + sha256 = pinData.webSrcHash; }; + packageJSON = ./element-web-package.json; + # Remove the matrix-analytics-events dependency from the matrix-react-sdk + # dependencies list. It doesn't seem to be necessary since we already are + # installing it individually, and it causes issues with the offline mode. + yarnLock = (runCommand "${pname}-modified-lock" {} '' + sed '/matrix-analytics-events "github/d' ${src}/yarn.lock > "$out" + ''); + offlineCache = fetchYarnDeps { + inherit yarnLock; + sha256 = pinData.webYarnHash; + }; + + nativeBuildInputs = [ jq ]; + + configurePhase = '' + runHook preConfigure + ln -s $node_modules node_modules + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export VERSION=${version} + yarn build:res --offline + yarn build:bundle --offline + + runHook postBuild + ''; + installPhase = '' runHook preInstall - mkdir -p $out/ - cp -R . $out/ - ${jq}/bin/jq -s '.[0] * .[1]' "config.sample.json" "${configOverrides}" > "$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] * .[1]' "config.sample.json" "${configOverrides}" > "$out/config.json" runHook postInstall ''; + # Do not attempt generating a tarball for element-web again. + doDist = false; + meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; @@ -34,6 +82,5 @@ in stdenv.mkDerivation rec { maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; - hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 9d46657e0ab57..550d01695ca04 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, removeReferencesTo +{ lib, stdenv, fetchFromGitHub, nodejs, python3, callPackage, removeReferencesTo , fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: let @@ -15,12 +15,12 @@ in stdenv.mkDerivation rec { sha256 = pinData.srcHash; }; - nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config ] + nativeBuildInputs = [ nodejs python3 yarn pkg-config ] ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; - npm_config_nodedir = nodejs-14_x; + npm_config_nodedir = nodejs; yarnOfflineCache = fetchYarnDeps { yarnLock = ./yarn.lock; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index c2bc3d8a89eea..c40d978c8c043 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,7 @@ { - "version": "1.10.13", - "desktopSrcHash": "tTvpjSIipvmJIfZF1RiRtlDjsKJYHoPQ6XSqI8TGH14=", - "desktopYarnHash": "105bphn4ga4f0n60cvrlppf8wim2c1qy09g8arraadcxymds98n6", - "webHash": "1zxjlzlxh2gbswa1063zbw6ahwlcnvyqkvbwj92vk873c3g8ba72" + "version": "1.10.15", + "desktopSrcHash": "2XSTE6NbhWYAH3tr1Kd16vEAGn3ApZ0a9PdpoHJn3uE=", + "desktopYarnHash": "1rnzaxy7l7912j6df8w2kw66pqwrs7kg7hd0680i38c1db5f4y6n", + "webSrcHash": "lX31OWJ6/S+PbOKvEqYALtOIoaJjwg4ng/wHOfXCSqg=", + "webYarnHash": "0j6xv64w5vszhlfqz37asqxsql0m89gscrl270dlxzycd4ybzghz" } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 3c4ac2f52ae1b..97d6a7d5204a0 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }: let pinData = lib.importJSON ./pin.json; @@ -16,10 +16,10 @@ in rustPlatform.buildRustPackage rec { sourceRoot = "source/seshat-node/native"; - nativeBuildInputs = [ nodejs-14_x python3 yarn ]; + nativeBuildInputs = [ nodejs python3 yarn ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; - npm_config_nodedir = nodejs-14_x; + npm_config_nodedir = nodejs; yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/seshat-node/yarn.lock"; diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index 364f63a18bb61..a9c55a926ce7b 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -18,17 +18,29 @@ fi # strip leading "v" version="${version#v}" -desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version" +# Element Web +web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version" +web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .sha256) +wget "$web_src/package.json" -O element-web-package.json + +web_tmpdir=$(mktemp -d) +trap 'rm -rf "$web_tmpdir"' EXIT + +pushd $web_tmpdir +wget "$web_src/yarn.lock" +sed -i '/matrix-analytics-events "github/d' yarn.lock +web_yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd +# Element Desktop +desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version" desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .sha256) -web_hash=$(nix-prefetch-url "https://github.com/vector-im/element-web/releases/download/v$version/element-v$version.tar.gz") - wget "$desktop_src/package.json" -O element-desktop-package.json -tmpdir=$(mktemp -d) -trap 'rm -rf "$tmpdir"' EXIT +desktop_tmpdir=$(mktemp -d) +trap 'rm -rf "$desktop_tmpdir"' EXIT -pushd $tmpdir +pushd $desktop_tmpdir wget "$desktop_src/yarn.lock" desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock) popd @@ -38,6 +50,7 @@ cat > pin.json << EOF "version": "$version", "desktopSrcHash": "$desktop_src_hash", "desktopYarnHash": "$desktop_yarn_hash", - "webHash": "$web_hash" + "webSrcHash": "$web_src_hash", + "webYarnHash": "$web_yarn_hash" } EOF diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix new file mode 100644 index 0000000000000..4dfd048b1b8a9 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -0,0 +1,173 @@ +{ alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, autoPatchelfHook +, cairo +, cups +, dbus +, dpkg +, expat +, fetchurl +, fontconfig +, freetype +, gdk-pixbuf +, glib +, glibc +, gnutls +, gtk3 +, lib +, libGL +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libappindicator-gtk3 +, libcxx +, libdbusmenu +, libdrm +, libgcrypt +, libglvnd +, libnotify +, libuuid +, libxcb +, libxkbcommon +, libxkbfile +, libxshmfence +, makeShellWrapper +, mesa +, nspr +, nss +, pango +, pciutils +, pipewire +, pixman +, stdenv +, systemd +, wayland +, wrapGAppsHook +, xdg-utils +}: + +stdenv.mkDerivation rec { + version = "5.9.18"; + pname = "feishu"; + packageHash = "5db94058d7ad"; # A hash value used in the download url + + src = fetchurl { + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb"; + sha256 = "ffb29b5a184b025d4e4ea468a8f684a7067ab5bfd45867abc370e59be63892c7"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeShellWrapper + dpkg + ]; + + buildInputs = [ + gtk3 + + # for autopatchelf + alsa-lib + cups + libXdamage + libdrm + libxshmfence + mesa + nspr + nss + ]; + + rpath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + glibc + gnutls + libGL + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libappindicator-gtk3 + libcxx + libdbusmenu + libdrm + libgcrypt + libglvnd + libnotify + libuuid + libxcb + libxkbcommon + libxkbfile + libxshmfence + mesa + nspr + nss + pango + pciutils + pipewire + pixman + stdenv.cc.cc + systemd + wayland + xdg-utils + ]; + + dontUnpack = true; + installPhase = '' + # This deb file contains a setuid binary, + # so 'dpkg -x' doesn't work here. + dpkg --fsys-tarfile $src | tar --extract + mkdir -p $out + mv usr/share $out/ + mv opt/ $out/ + chmod -R g-w $out + + substituteInPlace $out/share/applications/bytedance-feishu.desktop \ + --replace /usr/bin/bytedance-feishu-stable $out/opt/bytedance/feishu/bytedance-feishu + + wrapProgram $out/opt/bytedance/feishu/feishu \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu + + mkdir -p $out/share/icons/hicolor + base="$out/opt/bytedance/feishu" + for size in 16 24 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps + ln -s $base/product_logo_$size.png $out/share/icons/hicolor/''${size}x''${size}/apps/bytedance-feishu.png + done + ''; + + meta = with lib; { + description = "An all-in-one collaboration suite"; + homepage = "https://www.feishu.cn/en/"; + downloadPage = "https://www.feishu.cn/en/#en_home_download_block"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 90ab331426a09..edd05a83ad639 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -26,6 +26,7 @@ mkFranzDerivation' rec { meta = with lib; { description = "Combine your favorite messaging services into one application"; homepage = "https://getferdi.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ davidtwco ma27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix new file mode 100644 index 0000000000000..cbc87fc5ac92a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -0,0 +1,22 @@ +{ lib, mkFranzDerivation, fetchurl, xorg }: + +mkFranzDerivation rec { + pname = "ferdium"; + name = "Ferdium"; + version = "6.0.0-nightly.65"; + src = fetchurl { + url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/ferdium_${version}_amd64.deb"; + sha256 = "sha256-vmu74aLAKGbmRf9hkMUL5VOfi/Cbvdix9MzsZK1qW80="; + }; + + extraBuildInputs = [ xorg.libxshmfence ]; + + meta = with lib; { + description = "All your services in one place built by the community"; + homepage = "https://ferdium.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ magnouvean ]; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index b3d9194c6fe4b..a910105fde808 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -11,6 +11,7 @@ mkFranzDerivation rec { meta = with lib; { description = "A free messaging app that combines chat & messaging services into one application"; homepage = "https://meetfranz.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.free; maintainers = [ maintainers.davidtwco ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index aad4b24d74045..7c18ebf763c8c 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.4.1"; + version = "1.4.3"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256:0mbx7s1d2xgk7bkhwqcdss6ynshkqdiwh3qgv7d45frb4c3k33l2"; + sha256 = "sha256:0n6v96pwgds8655877fjgsphq4rd4gb9mz7cbqp4nkd4m7kvr3xv"; }; buildInputs = [ @@ -43,21 +43,6 @@ python3.pkgs.buildPythonApplication rec { gettext wrapGAppsHook ]; - # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719. - # We don't use plugin release URL because it's updated in place. - plugins = fetchFromGitLab { - domain = "dev.gajim.org"; - owner = "gajim"; - repo = "gajim-plugins"; - rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99"; - sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE="; - }; - - postPatch = '' - mkdir -p gajim/data/plugins - cp -r $plugins/plugin_installer gajim/data/plugins - ''; - dontWrapGApps = true; preFixup = '' @@ -65,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python3.pkgs; [ - nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging + nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] @@ -88,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { description = "Jabber client written in PyGTK"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin abbradar ]; - downloadPage = "http://gajim.org/downloads.php"; + downloadPage = "http://gajim.org/download/"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 8ed85cba8546f..04d8909f3d892 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -94,6 +94,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Where developers come to talk"; downloadPage = "https://gitter.im/apps"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = [ maintainers.imalison ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index 9cab98156c81c..bd0da749e0961 100644 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -32,6 +32,12 @@ buildGoModule rec { # Checking requires a working display doCheck = false; + postInstall = '' + echo 'X-Purism-FormFactor=Workstation;Mobile;' >> .nix/com.github.diamondburned.gotktrix.desktop + install -Dm444 .nix/com.github.diamondburned.gotktrix.desktop -t $out/share/applications/ + install -Dm444 .github/logo-256.png -T $out/share/icons/hicolor/256x256/apps/gotktrix.png + ''; + meta = with lib; { description = "Matrix client written in Go using GTK4"; homepage = "https://github.com/diamondburned/gotktrix"; diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 6430ebdd22fc7..924a918ebceb6 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -7,21 +7,22 @@ rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "boxdot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4="; + sha256 = "sha256-WZUoUvu7GaiBOaRAOGRCXrLe6u3DRbI6CDTAf5jryGc="; }; - cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY="; + cargoHash = "sha256-81ZW61JX40W0D/cmYogR3RJH2dvEKW1K7sIsl2io/7E="; buildInputs = [ protobuf ]; PROTOC = "${protobuf}/bin/protoc"; meta = with lib; { + broken = stdenv.isDarwin; description = "Signal Messenger client for terminal"; homepage = "https://github.com/boxdot/gurk-rs"; license = licenses.agpl3Only; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 6a677c9e0d612..8debefa0c11c4 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -81,6 +81,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Desktop client for HipChat services"; homepage = "http://www.hipchat.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/applications/networking/instant-messengers/jami/client-gnome.nix b/pkgs/applications/networking/instant-messengers/jami/client-gnome.nix deleted file mode 100644 index 8cb748f540599..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/client-gnome.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ version -, src -, jami-meta -, stdenv -, lib -, pkg-config -, cmake -, wrapQtAppsHook -, wrapGAppsHook -, gtk3-x11 -, networkmanager # for libnm -, libayatana-appindicator -, libnotify -, clutter-gtk -, libcanberra-gtk3 -, webkitgtk -, qrencode -, jami-libclient -, qttools -}: - -stdenv.mkDerivation { - pname = "jami-client-gnome"; - inherit version src; - - sourceRoot = "source/client-gnome"; - - preConfigure = '' - echo ${version} > version.txt - ''; - - nativeBuildInputs = [ - pkg-config - cmake - wrapGAppsHook - wrapQtAppsHook - ]; - # To spare double wrapping - dontWrapGApps = true; - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - # Users that set CLUTTER_BACKEND=wayland in their default environment will - # encounter a segfault due to: - # https://git.jami.net/savoirfairelinux/jami-client-gnome/-/issues/1100 . - qtWrapperArgs+=("--unset" "CLUTTER_BACKEND") - ''; - - buildInputs = [ - qttools - jami-libclient - gtk3-x11 - networkmanager - libayatana-appindicator - libnotify - clutter-gtk - libcanberra-gtk3 - webkitgtk - qrencode - ]; - - meta = jami-meta // { - description = "The client based on GTK" + jami-meta.description; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix b/pkgs/applications/networking/instant-messengers/jami/client-qt.nix index 0c952fd1ecad2..74bfbc600689e 100644 --- a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix +++ b/pkgs/applications/networking/instant-messengers/jami/client-qt.nix @@ -1,8 +1,8 @@ { version , src , jami-meta -, mkDerivation , lib +, stdenv , pkg-config , cmake , networkmanager # for libnm @@ -10,18 +10,19 @@ , qttools # for translations , wrapQtAppsHook , libnotify -, qrencode -, qtwebengine +, qt5compat +, qtbase , qtdeclarative -, qtquickcontrols2 +, qrencode , qtmultimedia +, qtnetworkauth , qtsvg +, qtwebengine , qtwebchannel -, qtgraphicaleffects # no gui without this , jami-libclient }: -mkDerivation { +stdenv.mkDerivation { pname = "jami-client-qt"; inherit version src; @@ -33,6 +34,7 @@ mkDerivation { ''; nativeBuildInputs = [ + wrapQtAppsHook pkg-config cmake python3 @@ -43,14 +45,20 @@ mkDerivation { jami-libclient networkmanager libnotify + qtbase + qt5compat qrencode - qtwebengine + qtnetworkauth qtdeclarative - qtquickcontrols2 qtmultimedia qtsvg qtwebchannel - qtgraphicaleffects + qtwebengine + ]; + + qtWrapperArgs = [ + # With wayland the titlebar is not themed and the wmclass is wrong. + "--set-default QT_QPA_PLATFORM xcb" ]; meta = jami-meta // { diff --git a/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_common b/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_common new file mode 100644 index 0000000000000..5c3f607e5c0e4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_common @@ -0,0 +1,19 @@ +--disable-sound +--enable-video +--enable-ext-sound +--disable-speex-aec +--disable-g711-codec +--disable-l16-codec +--disable-gsm-codec +--disable-g722-codec +--disable-g7221-codec +--disable-speex-codec +--disable-ilbc-codec +--disable-opencore-amr +--disable-silk +--disable-sdl +--disable-ffmpeg +--disable-v4l2 +--disable-openh264 +--disable-resample +--disable-libwebrtc diff --git a/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_linux b/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_linux new file mode 100644 index 0000000000000..d1292afe3a29f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_linux @@ -0,0 +1 @@ +--enable-epoll diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index f39b731132ea0..635cc569e86fb 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -58,16 +58,22 @@ let pjsip-jami = pjsip.overrideAttrs (old: let - src-args = import ./pjproject-src.nix; - version = lib.concatStrings (lib.lists.take 7 (lib.stringToCharacters src-args.rev)); patch-src = src + "/daemon/contrib/src/pjproject/"; in - { - inherit version; + rec { + version = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a"; - src = fetchFromGitHub src-args; + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "pjproject"; + rev = version; + sha256 = "sha256-6t+3b7pvvwi+VD05vxtujabEJmWmJTAeyD/Dapav10Y="; + }; patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + + configureFlags = (readLinesToList ./config/pjsip_args_common) + ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); }); opendht-jami = opendht.override { diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index ef8959b57a97f..32b5a26638988 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -4,21 +4,21 @@ , fetchzip , jack , udev -, libsForQt5 +, qt6Packages }: -rec { - version = "20211223.2.37be4c3"; +let + version = "20220503.1550.0f35faa"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - sha256 = "1zw9azwmxr4991nq5kl527lbwlj7psrissgvrkl1kxxbfbdncbhh"; + hash = "sha256-iCmsgjgGogNjj1k0sYRqx59ZEwFZcJOeVGBNyBlcy1M="; stripRoot = false; postFetch = '' cd $out - mv ring-project/* ./ - rm -r ring-project.rst ring-project client-android client-ios client-macosx client-uwp + mv jami-project/* ./ + rm -r jami-project.rst jami-project client-android client-ios client-macosx client-uwp rm daemon/contrib/tarballs/* ''; }; @@ -30,12 +30,11 @@ rec { platforms = platforms.linux; maintainers = [ maintainers.linsui ]; }; - +in +rec { jami-daemon = callPackage ./daemon.nix { inherit version src udev jack jami-meta; }; - jami-libclient = libsForQt5.callPackage ./libclient.nix { inherit version src jami-meta; }; - - jami-client-gnome = libsForQt5.callPackage ./client-gnome.nix { inherit version src jami-meta; }; + jami-libclient = qt6Packages.callPackage ./libclient.nix { inherit version src jami-meta; }; - jami-client-qt = libsForQt5.callPackage ./client-qt.nix { inherit version src jami-meta; }; + jami-client-qt = qt6Packages.callPackage ./client-qt.nix { inherit version src jami-meta; }; } diff --git a/pkgs/applications/networking/instant-messengers/jami/libclient.nix b/pkgs/applications/networking/instant-messengers/jami/libclient.nix index b5ea7431b9150..d998fe7a0612a 100644 --- a/pkgs/applications/networking/instant-messengers/jami/libclient.nix +++ b/pkgs/applications/networking/instant-messengers/jami/libclient.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { buildInputs = [ jami-daemon + jami-daemon.ffmpeg ]; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix b/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix deleted file mode 100644 index 76e88d8875556..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - owner = "savoirfairelinux"; - repo = "pjproject"; - rev = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a"; - sha256 = "0inpmyb6mhrzr0g309d6clkc99lddqdvyf9xajz0igvgp9pvgpza"; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh index 10d9bb885c35d..ecf14e25ddaf4 100755 --- a/pkgs/applications/networking/instant-messengers/jami/update.sh +++ b/pkgs/applications/networking/instant-messengers/jami/update.sh @@ -3,11 +3,14 @@ set -e -jami_dir="$( dirname "${BASH_SOURCE[0]}" )" +jami_dir=$(readlink -e $(dirname "${BASH_SOURCE[0]}")) + +cd $jami_dir/../../../../.. # Update src version and hash version=$(curl -s 'https://dl.jami.net/release/tarballs/?C=M;O=D' | sed -n -E 's/^.*jami_([0-9.a-f]+)\.tar\.gz.*$/\1/p' | head -n 1) -update-source-version jami-libclient "$version" --file=pkgs/applications/networking/instant-messengers/jami/default.nix + +update-source-version jami-libclient "$version" --file=$jami_dir/default.nix src=$(nix-build --no-out-link -A jami-libclient.src) @@ -43,8 +46,15 @@ echo "${pjsip_patches}" > "$config_dir/pjsip_patches" # Update pjsip version pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak) -nix-prefetch fetchFromGitHub \ - --owner savoirfairelinux \ - --repo pjproject \ - --rev ${pjsip_version} \ - --output nix > "${jami_dir}/pjproject-src.nix" +update-source-version jami-daemon.pjsip "$pjsip_version" --file=pkgs/applications/networking/instant-messengers/jami/daemon.nix + +pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak" + +# Update pjsip args +pjsip_args_common=$(sed -n '/PJPROJECT_OPTIONS :=/,/with-gnutls/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*\\/\1/p') +echo -e "Common args for pjsip:\n${pjsip_args_common}\n" +echo "${pjsip_args_common}" > "$config_dir/pjsip_args_common" + +pjsip_args_linux=$(sed -n '/HAVE_LINUX/,/endif/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') +echo -e "Linux args for pjsip:\n${pjsip_args_linux}\n" +echo "${pjsip_args_linux}" > "$config_dir/pjsip_args_linux" diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 21c28c7391ae2..0ef6b2e74d7b8 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -65,6 +65,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jitsi.org/"; description = "Open Source Video Calls and Chat"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = teams.jitsi.members; diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index ad3248fabba94..85c3dc86ea0f7 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -1,38 +1,63 @@ -{ stdenv, lib, fetchFromGitHub, cacert, python3 }: +{ lib +, fetchFromGitHub +, buildPythonApplication +, cacert +, setuptools +, matrix-nio +, python-magic +, markdown +, pillow +, urllib3 +, aiofiles +, notify2 +, dbus-python +, xdg +, python-olm +}: -stdenv.mkDerivation { +buildPythonApplication rec { pname = "matrix-commander"; - version = "unstable-2021-08-05"; + version = "2.37.3"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander"; - rev = "7ab3fd9a0ef4eb19d882cb3701d2025b4d41b63a"; - sha256 = "sha256-WWf7GbJxGlqIdsS1d0T1DO0WN2RBepHGgJrl/nt7UIg="; + rev = "v${version}"; + sha256 = "sha256-X5tCPR0EqY1dxViwh8/tEjJM2oo81L3H703pPzWzUv8="; }; - buildInputs = [ - cacert - (python3.withPackages(ps: with ps; [ - matrix-nio - magic - markdown - pillow - urllib3 - aiofiles - notify2 - ]))]; - - installPhase = '' - runHook preInstall + format = "pyproject"; - mkdir -p $out/bin - cp $src/matrix-commander.py $out/bin/matrix-commander - chmod +x $out/bin/matrix-commander + postPatch = '' + # Dependencies already bundled with Python + sed -i \ + -e '/uuid/d' \ + -e '/argparse/d' \ + -e '/asyncio/d' \ + -e '/datetime/d' \ + setup.cfg requirements.txt - runHook postInstall + # Dependencies not correctly detected + sed -i \ + -e '/dbus-python/d' \ + setup.cfg requirements.txt ''; + propagatedBuildInputs = [ + cacert + setuptools + matrix-nio + python-magic + markdown + pillow + urllib3 + aiofiles + notify2 + dbus-python + xdg + python-olm + ]; + meta = with lib; { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; homepage = "https://github.com/8go/matrix-commander"; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 6f53fe2b3a3b2..bb900654d1e8a 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -14,17 +14,17 @@ let pname = "mattermost-desktop"; - version = "5.0.3"; + version = "5.1.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-KLSWJpNSMGmfugbkFIJLDnxcZtrtBZOGjLlR+kAoMTA="; + hash = "sha256-KmtQUqg2ODbZ6zJjsnwlvB+vhR1xbK2X9qqmZpyTR78="; }; "i686-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; - hash = "sha256-4ofjOsfGbgO1PSqQpigNp90JsvlGP1kGexVAR/h3/88="; + hash = "sha256-X8Zrthw1hZOqmcYidt72l2vonh31iiA3EDGmCQr7e4c="; }; }; @@ -84,6 +84,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Mattermost Desktop client"; homepage = "https://about.mattermost.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.joko ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index cb450aa1bc332..c52082e06c908 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "purple-xmpp-upload"; - version = "unstable-2017-12-31"; + version = "unstable-2021-11-04"; src = fetchFromGitHub { owner = "Junker"; repo = "purple-xmpp-http-upload"; - rev = "178096cbfc9df165c2dc1677666439969d212b37"; - sha256 = "12l9rqlgb4i50xxrfnvwz9sqfk0d3c0m6l09mnvfixqi8illyvlp"; + rev = "f370b4a2c474c6fe4098d929d8b7c18aeba87b6b"; + sha256 = "0n05jybmibn44xb660p08vrrbanfsyjn17w1xm9gwl75fxxq8cdc"; }; buildInputs = [ pidgin glib libxml2 ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix new file mode 100644 index 0000000000000..af123e98d5616 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libwebp, pidgin, tdlib } : + +stdenv.mkDerivation rec { + pname = "tdlib-purple"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "ars3niy"; + repo = "tdlib-purple"; + rev = "v${version}"; + sha256 = "sha256-mrowzTtNLyMc2WwLVIop8Mg2DbyiQs0OPXmJuM9QUnM="; + }; + + patches = [ + # Update to tdlib 1.8.0 + (fetchpatch { + url = "https://github.com/ars3niy/tdlib-purple/commit/8c87b899ddbec32ec6ab4a34ddf0dc770f97d396.patch"; + sha256 = "sha256-sysPYPno+wS8mZwQAXtX5eVnhwKAZrtr5gXuddN3mko="; + }) + ]; + + preConfigure = '' + sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION "lib/purple-2|' CMakeLists.txt + sed -i -e 's|DESTINATION.*PURPLE_DATA_DIR}|DESTINATION "share|' CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libwebp pidgin tdlib ]; + + cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required + + meta = with lib; { + homepage = "https://github.com/ars3niy/tdlib-purple"; + description = "libpurple Telegram plugin using tdlib"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix deleted file mode 100644 index 6f7aab564fac9..0000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } : - -stdenv.mkDerivation rec { - pname = "telegram-purple"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "majn"; - repo = "telegram-purple"; - rev = "v${version}"; - sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10="; - }; - - NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pidgin libwebp libgcrypt gettext ]; - - preConfigure = '' - sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/purple-2/server.tglpub|g" telegram-purple.c - echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h - ''; - - installPhase = '' - mkdir -p $out/lib/purple-2/ - cp bin/*.so $out/lib/purple-2/ #*/ - cp tg-server.tglpub $out/lib/purple-2/server.tglpub - mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} - cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16 - cp imgs/telegram22.png $out/pixmaps/pidgin/protocols/22 - cp imgs/telegram48.png $out/pixmaps/pidgin/protocols/48 - ''; - - meta = with lib; { - homepage = "https://github.com/majn/telegram-purple"; - description = "Telegram for Pidgin / libpurple"; - license = licenses.gpl2; - maintainers = [ maintainers.jagajaga ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix deleted file mode 100644 index 568a2a5bd51b1..0000000000000 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3, - fetchFromGitHub }: - -let - gui = true; # Might be implemented with nixpkgs config. -in -buildGoPackage rec { - pname = "pond"; - version = "unstable-2015-08-30"; - - goPackagePath = "github.com/agl/pond"; - - src = fetchFromGitHub { - owner = "agl"; - repo = "pond"; - rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; - sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y="; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ trousers gtk3 gtkspell3 ] - ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi - ++ lib.optionals gui [ wrapGAppsHook ]; - tags = lib.optionals (!gui) [ "nogui" ]; - excludedPackages = [ "appengine" "bn256cgo" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 '' - grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ - -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ - -e "s,bn256\.,bn256cgo.,g" - ''; - - # https://hydra.nixos.org/build/150102618/nixlog/2 - meta.broken = stdenv.isAarch64; -} diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.nix b/pkgs/applications/networking/instant-messengers/pond/deps.nix deleted file mode 100644 index 55850f0a89c22..0000000000000 --- a/pkgs/applications/networking/instant-messengers/pond/deps.nix +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/agl/ed25519"; - fetch = { - type = "git"; - url = "https://github.com/agl/ed25519"; - rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; - sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "github.com/agl/go-gtk"; - fetch = { - type = "git"; - url = "https://github.com/agl/go-gtk"; - rev = "91c1edb38c241d73129e6b098ca1c9fa83abfc15"; - sha256 = "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"; - }; - } -] diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 3f6d374c3996a..659b6411b48a8 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -69,6 +69,7 @@ mkDerivation rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Qt Tox client"; homepage = "https://tox.chat"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix index ef9dad66b5d65..39403ba774fa3 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix @@ -25,6 +25,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Desktop chat client for Slack and Discord"; homepage = "https://cancel.fm/ripcord/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mikroskeem ]; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 7379d769288bd..7fd0bd9bb1d34 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -60,6 +60,7 @@ mkDerivation rec { meta = with lib; { description = "Desktop chat client for Slack and Discord"; homepage = "https://cancel.fm/ripcord/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 71379039de6f2..d854414a36b63 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Official Desktop client for Rocket.Chat"; homepage = "https://github.com/RocketChat/Rocket.Chat.Electron"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ gbtb ]; platforms = platforms.x86_64; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix deleted file mode 100644 index 6a6302e74955e..0000000000000 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchurl, python27Packages, file }: - -let - inherit (python27Packages) python; - requirements = (import ./requirements.nix { - inherit lib fetchurl; - pythonPackages = python27Packages; - }); - -in - stdenv.mkDerivation rec { - pname = "salut-a-toi"; - version = "0.6.1"; - - src = fetchurl { - url = "ftp://ftp.goffi.org/sat/sat-${version}.tar.bz2"; - sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d"; - }; - - buildInputs = with python27Packages; - [ - python twisted urwid wxPython pygobject2 - dbus-python wrapPython setuptools file - pycrypto pyxdg - ] ++ (with requirements; [ - pyfeed - wokkel - ]); - - configurePhase = '' - sed -i "/use_setuptools/d" setup.py - sed -e "s@sys.prefix@'$out'@g" -i setup.py - sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh - sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh - - echo 'import wokkel.muc' | python - ''; - - buildPhase = '' - ${python.interpreter} setup.py build - ''; - - installPhase = '' - ${python.interpreter} setup.py install --prefix="$out" - - for i in "$out/bin"/*; do - head -n 1 "$i" | grep -E '[/ ]python( |$)' && { - wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}" - } || true - done - ''; - - meta = with lib; { - homepage = "http://sat.goffi.org/"; - description = "A multi-frontend XMPP client"; - platforms = platforms.linux; - maintainers = [ maintainers.raskin ]; - license = licenses.gpl3Plus; - }; - } diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix deleted file mode 100644 index a8e711c447d57..0000000000000 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ fetchurl -, lib -, pythonPackages -}: - -let - buildPythonPackage = pythonPackages.buildPythonPackage; - - xe = buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; - name = lib.nameFromURL url ".tar"; - src = fetchurl { - inherit url; - sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = "http://home.blarg.net/~steveha/xe.html"; - description = "XML elements"; - }; - }; - -in { - - pyfeed = (buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; - - name = lib.nameFromURL url ".tar"; - - src = fetchurl { - inherit url; - sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; - }; - - propagatedBuildInputs = [ xe ]; - - # error: invalid command 'test' - doCheck = false; - - meta = with lib; { - homepage = "http://home.blarg.net/~steveha/pyfeed.html"; - description = "Tools for syndication feeds"; - }; - - }); - - wokkel = buildPythonPackage (rec { - url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = lib.nameFromURL url ".tar"; - src = fetchurl { - inherit url; - sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; - }; - - propagatedBuildInputs = with pythonPackages; [twisted python-dateutil]; - - meta = with lib; { - description = "Some (mainly XMPP-related) additions to twisted"; - homepage = "http://wokkel.ik.nu/"; - license = licenses.mit; - }; - }); - -} diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index 0c11beb9ebc25..61166a82f38e1 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -4,15 +4,16 @@ , stdenvNoCC , fetchurl , appimageTools +, makeWrapper }: let - version = "1.8.4"; + version = "1.8.6"; pname = "session-desktop-appimage"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "Az9NEsqU4ZcmuSno38zflT4M4lI6/4ShEh3FVTcyRJg="; + sha256 = "h7uEdxBuqPNWGFp5wWWRI9VsK3HYOtLVgj7rIbeO9kY="; }; appimage = appimageTools.wrapType2 { inherit version pname src; @@ -25,7 +26,7 @@ stdenvNoCC.mkDerivation { inherit version pname; src = appimage; - nativeBuildInputs = [ copyDesktopItems ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; desktopItems = [ (makeDesktopItem { @@ -46,6 +47,9 @@ stdenvNoCC.mkDerivation { mkdir -p $out/ cp -r bin $out/bin + wrapProgram $out/bin/session-desktop-appimage-${version} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + runHook postInstall ''; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index bca45576db713..e0eff91f983bd 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.10.2"; + version = "0.10.8"; # Building from source would be preferred, but is much more involved. src = fetchurl { - url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "sha256-etCO7sy48A7aL3mnXWitClNiw/E122G4eD6YfVmXEPw="; + url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; + sha256 = "sha256-vZBFYPim/qBC8hJHvp5gK6P2JxIs9rzR/hIMjW3kNM8="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 537f78fbcadb8..090f80357383f 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -5,26 +5,11 @@ , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: , systemd, libnotify, libdbusmenu, libpulseaudio, xdg-utils -# Unfortunately this also overwrites the UI language (not just the spell -# checking language!): -, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" -# For a full list of available languages: -# $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' }: -let - customLanguageWrapperArgs = (with lib; - let - # E.g. "de_DE" -> "de-de" (spellcheckerLanguage -> hunspellDict) - spellLangComponents = splitString "_" spellcheckerLanguage; - hunspellDict = elemAt spellLangComponents 0 + "-" + toLower (elemAt spellLangComponents 1); - in lib.optionalString (spellcheckerLanguage != null) '' - --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ - --set LC_MESSAGES "${spellcheckerLanguage}"''); - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.43.0"; # Please backport all updates to the stable channel. + version = "5.49.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-DYJ3WZbaalKhQXhVQO3qhJiGj92Cc+pwRDx/YBIi6gg="; + sha256 = "sha256-rrDUaFcqslSuJwTYx1exEfvuHKKnPZKh+RYerOcKGG0="; }; nativeBuildInputs = [ @@ -82,6 +67,7 @@ in stdenv.mkDerivation rec { runtimeDependencies = [ (lib.getLib systemd) + libappindicator-gtk3 libnotify libdbusmenu xdg-utils @@ -122,7 +108,6 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - ${customLanguageWrapperArgs} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) @@ -149,5 +134,6 @@ in stdenv.mkDerivation rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ mic92 equirosa ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 1070821f5d2e8..adbe34207c025 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 = "20220517"; + version = "20220526"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-6jKsdilgWm6oDAuzE1aToMg9oV9BmTgQrOvvlwPA5gc="; + sha256 = "sha256-vFq9NvQboqGVzwiH2KPhT6jsdY5i2oKIgEaZKfBsb/o="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index e60a683a491db..ac7040a9aaca6 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -103,6 +103,10 @@ in stdenv.mkDerivation rec { clients. ''; homepage = "https://signald.org"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ expipiplus1 ma27 ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix index 464d4d77f9461..e949625875e58 100644 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -59,6 +59,7 @@ mkDerivation rec { meta = { description = "Lync & Skype for Business on Linux"; homepage = "https://tel.red/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 024ac9a143182..515290ab91559 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -120,6 +120,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Linux client for skype"; homepage = "https://www.skype.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 30cc7396c562a..e2135734bd7f0 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -1,18 +1,16 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - # https://github.com/erroneousboat/slack-term +buildGoModule rec { pname = "slack-term"; version = "0.5.0"; - goPackagePath = "github.com/erroneousboat/slack-term"; - src = fetchFromGitHub { owner = "erroneousboat"; repo = "slack-term"; rev = "v${version}"; sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6"; }; + vendorSha256 = null; meta = with lib; { description = "Slack client for your terminal"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index f4574e02a49dc..5d497546095b4 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -44,14 +44,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.25.0"; - x86_64-darwin-sha256 = "1ffg003ic0jhkis9ai2873axwzqj9yvjab8212zwhvr3a23zzr5c"; + x86_64-darwin-version = "4.27.154"; + x86_64-darwin-sha256 = "0a3cc9kkiq18vr4hk532vc59cza1hq8qh9x9hlhli4n72n3h7y3n"; - x86_64-linux-version = "4.25.1"; - x86_64-linux-sha256 = "sha256-ndDVipgcLELRZ2siIAurq7umL62+g3yRL0U311DC8Ik="; + x86_64-linux-version = "4.27.156"; + x86_64-linux-sha256 = "sha256-/xtD+/+KGtPr4vQJm8ZczvpyPxfMBw0OE7hzTzFhSs0="; - aarch64-darwin-version = "4.25.0"; - aarch64-darwin-sha256 = "0s4c66bzi42y2r1c94r4ds5fyzzgvzkvrria0z45ysa47lnldp0f"; + aarch64-darwin-version = "4.27.154"; + aarch64-darwin-sha256 = "1n3vgcsbi1w49w4xqc5hyadb9qwvsqdiirfw9v4s65wsnark1iz6"; version = { x86_64-darwin = x86_64-darwin-version; @@ -80,6 +80,7 @@ let meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mmahut maxeaubrey ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix deleted file mode 100644 index 026dc5b640567..0000000000000 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig -, freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }: -let - fullPath = lib.makeLibraryPath [ - alsa-lib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk2 - nspr - nss - pango - udev - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - ] + ":${stdenv.cc.cc.lib}/lib64"; -in -stdenv.mkDerivation rec { - version = "1.17.82"; - pname = "stride"; - - src = fetchurl { - url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb"; - sha256 = "0lx61gdhw0kv4f9fwbfg69yq52dsp4db7c4li25d6wn11qanzqhy"; - }; - - dontBuild = true; - dontFixup = true; - - buildInputs = [ dpkg ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase ='' - mkdir "$out" - mv usr/* "$out/" - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${fullPath}:\$ORIGIN" \ - "$out/bin/stride" - ''; - - meta = with lib; { - description = "Desktop client for Atlassian Stride"; - homepage = "https://www.stride.com/"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ puffnfresh ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 07462b4cc26f8..dd4e104aa66ab 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -28,6 +28,7 @@ let description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; downloadPage = "https://teams.microsoft.com/downloads"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; @@ -57,7 +58,12 @@ let ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") + gappsWrapperArgs+=( + --prefix PATH : "${coreutils}/bin:${gawk}/bin" + + # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 + --append-flags '--disable-namespace-sandbox --disable-setuid-sandbox' + ) ''; @@ -118,15 +124,6 @@ let echo "Adding runtime dependencies to RPATH of Node module $mod" patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" done; - - # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - wrapped=$out/bin/.teams-old - mv "$out/bin/teams" "$wrapped" - cat > "$out/bin/teams" << EOF - #! ${runtimeShell} - exec $wrapped "\$@" --disable-namespace-sandbox --disable-setuid-sandbox - EOF - chmod +x "$out/bin/teams" ''; }; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 80d04eabc824c..5a0a9006e0df5 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ts3client \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \ + '' /* wayland is currently broken, remove when TS3 fixes that */ + '' + --set QT_QPA_PLATFORM xcb \ --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb ''; @@ -102,6 +104,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The TeamSpeak voice communication tool"; homepage = "https://teamspeak.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = { fullName = "Teamspeak client license"; url = "https://www.teamspeak.com/en/privacy-and-terms/"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 44430ef62e2d3..577589f6a40b0 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,13 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.13.6"; + version = "3.13.7"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "sha256-U3BNJ4Jjhd39gD7iMsHT8CGtm/GFQDE2kYQa2btyK+w=" - else "sha256-8UKiFedv6w5bmqNvo3AXwQnUROwbZnU0ZTh9V17zmxQ="; + then "sha256-d1pXMamAmAHkyPkGbNm8ViobNoVTE5wSSfKgdA1QBB4=" + else "sha256-aMEDOnvBeKfzG8lDFhU8I5DYgG53IsCDBMV2MUyJi2g="; }; buildInputs = [ stdenv.cc.cc postgresql.lib ]; @@ -58,6 +58,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "TeamSpeak voice communication server"; homepage = "https://teamspeak.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ arobyn gerschtli ]; 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 d7dbff715bacd..a336e048d1e46 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -217,6 +217,7 @@ stdenv.mkDerivation rec { }; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Kotatogram – experimental Telegram Desktop fork"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index df86ccd062bb0..212092d8a1ff1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -9,6 +9,7 @@ , wrapQtAppsHook , extra-cmake-modules , qtbase +, qtwayland , qtsvg , qtimageformats , qt5compat @@ -70,7 +71,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "3.7.3"; + version = "4.0.2"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -79,7 +80,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "01b3nrhfbxhq4w63nsjnrhyfsdq3fm4l7sfkasbh8ib4qk3c9vwz"; + sha256 = "07fhm36394171w0rvay1x9x1br3z36z4dlpi57bkq23dvi331pxj"; }; postPatch = '' @@ -112,6 +113,7 @@ env.mkDerivation rec { buildInputs = [ qtbase + qtwayland qtsvg qtimageformats qt5compat 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 bb07989531468..9d50168323d50 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-04-14"; + version = "unstable-2022-05-08"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396"; - sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM="; + rev = "10d5f4bf77333ef6b43516f90d2ce13273255f41"; + sha256 = "02sky7sx73rj8xm1f70vy94zxaab6qiif742fv0vi4y6pfqrngn7"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix index 3b69aa5566dc0..c8e8598c14030 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages +{ stdenv, fetchFromGitHub, fetchpatch, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages , makeWrapper, openssl, pkg-config, python3, readline, zlib }: @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Pull patch pending upstream upstream inclusion for -fno-common toolchains: + # https://github.com/kenorb-contrib/tg/pull/61 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/kenorb-contrib/tg/commit/aad2e644fffa16066b227741d54de31bddb04ff8.patch"; + sha256 = "sha256-LAa5J4BVj3QCiDSs+p2bynDroMSIqCeexQvrgaDl6OE="; + }) + ]; + buildInputs = [ jansson libconfig diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix deleted file mode 100644 index 882fae1c3b5fa..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup -, libuuid, openssl, pcre, sqlite, pkg-config }: - -stdenv.mkDerivation rec { - pname = "telepathy-salut"; - version = "0.8.1"; - - src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-${version}.tar.gz"; - sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; - }; - - # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 - buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl - sqlite pcre python2 ]; - - nativeBuildInputs = [ libxslt pkg-config ]; - - configureFlags = [ "--disable-avahi-tests" ]; - - meta = with lib; { - description = "Link-local XMPP connection manager for Telepathy"; - platforms = platforms.gnu ++ platforms.linux; # Random choice - maintainers = [ ]; - broken = true; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 0951f1d3d8e7d..852abe8e6dc45 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.0"; + version = "1.2.13"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20220408213031if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "7c8e1e76ad82a0cf776eb8b0a683a41a00dc8752bb79a24b0ae9d795fdedcde6"; + url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE="; }; nativeBuildInputs = [ @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop client for Threema, a privacy-focused end-to-end encrypted mobile messenger"; homepage = "https://threema.ch"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix deleted file mode 100644 index 224a70ce9f723..0000000000000 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }: - -stdenv.mkDerivation rec { - pname = "torchat"; - version = "0.9.9.553"; - - src = fetchFromGitHub { - owner = "prof7bit"; - repo = "TorChat"; - rev = version; - sha256 = "2LHG9qxZDo5rV6wsputdRo2Y1aHs+irMwt1ucFnXQE0="; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = with python2.pkgs; [ python wxPython wrapPython ]; - pythonPath = with python2.pkgs; [ wxPython ]; - - preConfigure = "cd torchat/src; rm portable.txt"; - - installPhase = '' - substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f" - - wrapPythonPrograms - - mkdir -p $out/lib/torchat - cp -rf * $out/lib/torchat - makeWrapper ${python2}/bin/python $out/bin/torchat \ - --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ - --chdir "$out/lib/torchat" \ - --add-flags "-O $out/lib/torchat/torchat.py" - ''; - - meta = with lib; { - homepage = "https://github.com/prof7bit/TorChat"; - description = "Instant messaging application on top of the Tor network and it's location hidden services"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/pkgs/applications/networking/instant-messengers/trillian-im/default.nix new file mode 100644 index 0000000000000..0d4a6299adfce --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/trillian-im/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, atkmm +, cairo +, cairomm +, gtk3 +, gtkmm3 +, libnotify +, libsecret +, pangomm +, xorg +, libpulseaudio +, librsvg +, libzip +, openssl +, webkitgtk +, libappindicator-gtk3 +}: + +stdenv.mkDerivation rec { + pname = "trillian-im"; + version = "6.3.0.1"; + + src = fetchurl { + url = "https://www.trillian.im/get/linux/6.3/trillian_${version}_amd64.deb"; + sha256 = "42e3466ee236ac2644907059f0961eba3a6ed6b6156afb2c57f54ebe6065ac6f"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + atkmm + cairo + cairomm + gtk3 + gtkmm3 + libnotify + libsecret + pangomm + xorg.libXScrnSaver + libpulseaudio + librsvg + libzip + openssl + webkitgtk + libappindicator-gtk3 + ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + dpkg -x $src $out + cp -av $out/usr/* $out + rm -rf $out/usr + + rm $out/bin/trillian + ln -s "$out/share/trillian/trillian" "$out/bin/trillian" + + runHook postInstall + ''; + + meta = with lib; { + description = "Modern instant messaging for home and work that prioritizes chat interoperability and security"; + homepage = "https://www.trillian.im/"; + license = licenses.unfree; + maintainers = with maintainers; [ majiir ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 42dd9f835c9ad..c368c049daf02 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -19,6 +19,10 @@ let rev = "v${version}"; sha256 = "0k4bdlwjna6f1k19jki4xqgckrinkkw8b9wihzymr1l04rwd05nw"; }; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ + super.six + super.requests.optional-dependencies.socks + ]; doCheck = false; }); }; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index f8e048edc4b02..be19ec257424b 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ jagajaga ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix index bb34fd7534c95..a22437bf8da00 100644 --- a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A console (ncurses) client for vk.com written in D"; homepage = "https://github.com/vk-cli/vk"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 5fb0f14f36a04..1d249794d4431 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -24,6 +24,7 @@ let meta = with lib; { description = "Simple and Convenient Messaging App for VK"; homepage = "https://vk.com/messenger"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ ]; platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4d7a2218e7dfa..304d1bf4255c8 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -47,6 +47,7 @@ let ''; homepage = "https://wire.com/"; downloadPage = "https://wire.com/download/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ arianvp diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix deleted file mode 100644 index 4367230f77565..0000000000000 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "xmpp-client"; - version = "20160916-${lib.strings.substring 0 7 rev}"; - rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; - - goPackagePath = "github.com/agl/xmpp-client"; - - src = fetchFromGitHub { - owner = "agl"; - repo = "xmpp-client"; - inherit rev; - sha256 = "0j9mfr208cachzm39i8b94v5qk9hws278vv2ms9ma4wn16wns81s"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "An XMPP client with OTR support"; - homepage = "https://github.com/agl/xmpp-client"; - license = licenses.bsd3; - maintainers = with maintainers; [ codsl ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix deleted file mode 100644 index caa41024fc61a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } -] diff --git a/pkgs/applications/networking/instant-messengers/xmppc/default.nix b/pkgs/applications/networking/instant-messengers/xmppc/default.nix new file mode 100644 index 0000000000000..c1a8891a073ef --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/xmppc/default.nix @@ -0,0 +1,38 @@ +{lib, stdenv, fetchFromGitea, autoconf-archive, autoreconfHook, pkg-config, libstrophe, glib, gpgme }: + +stdenv.mkDerivation rec { + pname = "xmppc"; + version = "0.1.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Anoxinon_e.V."; + repo = "xmppc"; + rev = version; + sha256 = "07cy3j4g7vycagdiva3dqb59361lw7s5f2yydpczmyih29v7hkm8"; + }; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libstrophe + glib + gpgme + ]; + + preAutoreconf = '' + mkdir m4 + ''; + + meta = with lib; { + description = "Command Line Interface Tool for XMPP"; + homepage = "https://codeberg.org/Anoxinon_e.V./xmppc"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.jugendhacker ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix new file mode 100644 index 0000000000000..9b4a21cb7d288 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix @@ -0,0 +1 @@ +"0cwplzza8vv4nzxf35i2p4gfnna4dpgp0ddqbpdxl8cxrikq5rji" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix new file mode 100644 index 0000000000000..4fd4c471b3cfb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix @@ -0,0 +1 @@ +"5.11.1.8356" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 06f9a2d3e8ee7..f85fa1e28f6c7 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, pipewire , makeWrapper , xar , cpio @@ -44,23 +45,23 @@ let # Zoom versions are released at different times for each platform version = { - aarch64-darwin = "5.10.4.6592"; - x86_64-darwin = "5.10.4.6592"; - x86_64-linux = "5.10.6.3192"; + aarch64-darwin =import ./arm64-darwin-version.nix; + x86_64-darwin = import ./x86_64-darwin-version.nix; + x86_64-linux = import ./x86_64-linux-version.nix; }.${system} or throwSystem; srcs = { aarch64-darwin = fetchurl { - url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64"; - sha256 = "0jg5f9hvb67hhfnifpx5fzz65fcijldy1znlia6pqflxwci3m5rq"; + url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64"; + sha256 = import ./arm64-darwin-sha.nix; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${version}/Zoom.pkg"; - sha256 = "1p83691bid8kz5mw09x6l9zvjglfszi5vbhfmbbpiqhiqcxlfz83"; + sha256 = import ./x86_64-darwin-sha.nix; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "8QIkF5+875VFoGK6T0CROsqML6bJDG934c1gkuz8Klk="; + sha256 = import ./x86_64-linux-sha.nix; }; }; @@ -76,6 +77,7 @@ let expat libdrm libGL + pipewire fontconfig freetype gtk3 @@ -183,6 +185,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zoom.us/"; description = "zoom.us video conferencing application"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ danbst tadfisher doronbehar ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index 3ec1cccd0d64a..6d9b50252d121 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -1,10 +1,30 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl pup common-updater-scripts +#!nix-shell -i bash -p curl pup set -eu -o pipefail -version="$(curl -Ls https://zoom.us/download\?os\=linux | \ - pup '.linux-ver-text text{}' | \ - awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')" +dirname="$(dirname "$0")" -update-source-version zoom-us "$version" +uname="$(uname)" + +if [[ "$uname" == "Linux" ]]; then + version="$(curl -Ls https://zoom.us/download\?os\=linux | \ + pup '.linux-ver-text text{}' | \ + awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')" + printf '"%s"\n' ${version} > $dirname/x86_64-linux-version.nix + printf '"%s"\n' \ + $(nix-prefetch-url https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz) > \ + $dirname/x86_64-linux-sha.nix +elif [[ $uname == "Darwin" ]]; then + # The 1st line might be empty + # 2nd line is the version of the conference room application + version="$(curl -Ls https://zoom.us/download\?os\=mac | \ + pup '.ver text{}' | \ + sed '/^$/d' |\ + head -1 | \ + awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')" + printf '"%s"\n' ${version} > "$dirname/$(uname -m)-darwin-version.nix" + printf '"%s"\n' \ + $(nix-prefetch-url "https://zoom.us/client/${version}/Zoom.pkg?archType=$(uname -m)") > \ + "$dirname/$(uname -m)-darwin-sha.nix" +fi diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix new file mode 100644 index 0000000000000..a5ef33d28b56a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix @@ -0,0 +1 @@ +"12s4z80n1qk1vcp5vppabj6fxanm4q7pjj7mggalmjbj6984fsza" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix new file mode 100644 index 0000000000000..4fd4c471b3cfb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix @@ -0,0 +1 @@ +"5.11.1.8356" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix new file mode 100644 index 0000000000000..c50424c7a5b07 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix @@ -0,0 +1 @@ +"1ir5akl4vrzb0b5s37s2viqisvf4sylw8rfnfj434h1q0gqz79sc" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix new file mode 100644 index 0000000000000..e776017ccb047 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix @@ -0,0 +1 @@ +"5.11.1.3595" diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index 1775ce9a48179..ad16c84c69894 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -7,30 +7,28 @@ python3.pkgs.buildPythonApplication rec { pname = "zulip-term"; - version = "0.6.0"; + version = "0.7.0"; # no tests on PyPI src = fetchFromGitHub { owner = "zulip"; repo = "zulip-terminal"; rev = version; - sha256 = "sha256-nlvZaGMVRRCu8PZHxPWjNSxkqhZs0T/tE1js/3pDUFk="; + sha256 = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw="; }; - patches = [ - ./pytest-executable-name.patch - ]; - propagatedBuildInputs = with python3.pkgs; [ - urwid - zulip - urwid-readline beautifulsoup4 lxml - typing-extensions + pygments + pyperclip python-dateutil pytz + typing-extensions tzlocal + urwid + urwid-readline + zulip ]; checkInputs = [ @@ -45,6 +43,12 @@ python3.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ libnotify ]) ]; + disabledTests = [ + # IndexError: list index out of range + "test_main_multiple_notify_options" + "test_main_multiple_autohide_options" + ]; + meta = with lib; { description = "Zulip's official terminal client"; homepage = "https://github.com/zulip/zulip-terminal"; diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch deleted file mode 100644 index 4602a254ab88a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py -index 459aa82..c6e434e 100644 ---- a/tests/cli/test_run.py -+++ b/tests/cli/test_run.py -@@ -180,7 +180,7 @@ def test_main_multiple_autohide_options(capsys, options): - assert str(e.value) == "2" - captured = capsys.readouterr() - lines = captured.err.strip('\n') -- lines = lines.split("pytest: ", 1)[1] -+ lines = lines.split("__main__.py: ", 1)[1] - expected = ("error: argument {}: not allowed " - "with argument {}".format(options[1], options[0])) - assert lines == expected diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 380aad6c32914..5992453975d94 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { platforms = ["x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.benley ]; homepage = "https://www.insynchq.com"; diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index 49a5b892111e5..5efffab51c6cd 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = ["x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ benley ]; homepage = "https://www.insynchq.com"; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 85ad97f41b0bc..459610feea745 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.0"; + version = "1.0.1"; - vendorSha256 = "sha256-b0k1V1+JikGemSQjyiKcH7cgyDEt0Nn5aVUf6nnE+/0="; + vendorSha256 = "sha256-V+fqyrol+hXjjaCBlAs6f7FeqBqa2jTmMO2bvb6HfgY="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-vwu+Fj7PegbK9pmnsNuEl/AQz2gejRiFAAAov5+VNMQ="; + sha256 = "sha256-dwV5fx52QS2QiBUV8gkJ47tBqT54tEOfSpdXF6hmeLQ="; }; meta = with lib; { diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index e501137fa8383..2540c777f16df 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoModule, fetchurl, nixosTests }: +{ lib, buildGoModule, fetchurl, nixosTests, openssl, pkg-config }: buildGoModule rec { pname = "ipfs"; - version = "0.12.2"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.13.1"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - repoVersion = "12"; # Also update ipfs-migrator when changing the repo version + passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "sha256-66NNLMSfeBHQh/QlnETB/ssra9CKbD+jtaJuX+14x00="; + sha256 = "sha256-kGtqFb4Fxx9mxDqX8YSqnY875sU70pzL2BwWBQg5sTU="; }; # tarball contains multiple files/directories @@ -25,6 +25,10 @@ buildGoModule rec { subPackages = [ "cmd/ipfs" ]; + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + tags = [ "openssl" ]; + passthru.tests.ipfs = nixosTests.ipfs; vendorSha256 = null; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index a8888b8e29585..8164523244b9e 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipget"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; rev = "v${version}"; - sha256 = "sha256-qRPke8/CUmGX6v+8qv9JQCUC8T9pjwRRyGmBWvatsJ0="; + sha256 = "sha256-JGG3DsmFXmWFOFvJ8pKVhQMRgZ0cbkdtmBjMkLYqOwU="; }; - vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg="; + vendorSha256 = "sha256-scrueQoqr9nUONnpitUontcX3Xe0KmmUmvxOcpxK7M8="; postPatch = '' # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix deleted file mode 100644 index 2881991bf8234..0000000000000 --- a/pkgs/applications/networking/iptraf/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{lib, stdenv, fetchurl, ncurses}: - -stdenv.mkDerivation rec { - pname = "iptraf"; - version = "3.0.1"; - - src = fetchurl { - url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-${version}tar.gz"; - sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m"; - }; - - hardeningDisable = [ "format" ]; - - patchPhase = '' - sed -i -e 's,#include <linux/if_tr.h>,#include <netinet/if_tr.h>,' src/* - ''; - - preConfigure = "cd src"; - - installPhase = '' - mkdir -p $out/bin - cp iptraf $out/bin - ''; - - buildInputs = [ncurses]; - - meta = { - homepage = "http://iptraf.seul.org/"; - license = lib.licenses.gpl2Plus; - description = "Console-based network statistics utility for Linux"; - platforms = lib.platforms.linux; - broken = true; # required isdn headers have been removed from the linux kernel - }; -} diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index c8c36049a2a40..b9321f0797fa2 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -2,13 +2,16 @@ stdenv.mkDerivation rec { pname = "communi"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "communi"; repo = "communi-desktop"; - rev = "v${version}"; - sha256 = "sha256-Ua5uXs2mEDrljvtIcdn1Kb+l5NJtRpB0AAbBz+DU+YE="; + # Without https://github.com/communi/communi-desktop/pull/146 fetching fails with + # fatal: unable to connect to github.com: + # github.com[0: 140.82.112.3]: errno=Connection timed out + rev = "5d813dc6e64a623cd5d78f024c8a0720a5155a28"; + hash = "sha256-ci91Bf0EkhlPDO+NcpnMmT/vE41i5RD2mXbRAnMB++M="; fetchSubmodules = true; }; @@ -53,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/communi/communi-desktop"; license = licenses.bsd3; maintainers = with maintainers; [ hrdinka ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index 87d4b8777c3fc..ebb9d2ad15a61 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -1,14 +1,12 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "ircdog"; version = "0.3.0"; - goPackagePath = "github.com/ergochat/ircdog"; - src = fetchFromGitHub { owner = "goshuirc"; repo = pname; @@ -16,6 +14,7 @@ buildGoPackage rec { sha256 = "sha256-x3ihWLgVYu17vG1xQTgIr4TSkeZ467TZBV1fPTPnZgw="; fetchSubmodules = true; }; + vendorSha256 = null; meta = with lib; { description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes"; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 8dbd2cd73ee4b..9ea6c32c7de65 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,40 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr, git }: +{ lib +, stdenv +, fetchFromGitHub +, glib +, libgcrypt +, libintl +, libotr +, libtool +, meson +, ncurses +, ninja +, openssl +, perl +, pkg-config +}: stdenv.mkDerivation rec { pname = "irssi"; - version = "1.2.3"; - + version = "1.4.1"; src = fetchFromGitHub { - "owner" = "irssi"; - "repo" = "irssi"; - "rev" = "91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65"; - "sha256" = "efnE4vuDd7TnOBxMPduiV0/nez1jVhTjbJ0vzN4ZMcg="; - "leaveDotGit" = true; + owner = "irssi"; + repo = "irssi"; + rev = version; + hash = "sha256-HLcIhAZoJfCHoSNQCpoytBR0zmiZd919FcKWCl35G0A="; }; - nativeBuildInputs = [ pkg-config autoconf automake libtool git ]; - buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh - ''; + buildInputs = [ + glib + libgcrypt + libintl + libotr + ncurses + openssl + perl + ]; configureFlags = [ - "--with-proxy" - "--with-bot" - "--with-perl=yes" - "--with-otr=yes" - "--enable-true-color" + "-Dwith-proxy=yes" + "-Dwith-bot=yes" + "-Dwith-perl=yes" ]; - meta = { - homepage = "https://irssi.org"; - description = "A terminal based IRC client"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ lovek323 ]; - license = lib.licenses.gpl2Plus; + meta = with lib; { + description = "Terminal based IRC client"; + homepage = "https://irssi.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fab lovek323 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 2dc167012221e..601cb127ff1f6 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -2,6 +2,7 @@ , lib , python , fetchFromGitHub +, fetchpatch , pyopenssl , webcolors , future @@ -33,6 +34,11 @@ in buildPythonPackage { hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc="; }; + patches = fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/poljar/weechat-matrix/pull/309.patch"; + sha256 = "sha256-Grdht+TOFvCYRpL7uhPivqL7YzLoNVF3iQNHgbv1Te0="; + }; + propagatedBuildInputs = [ pyopenssl webcolors diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index a8923042c7d61..b16efb03655f1 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "An IRC channel management bot written purely in C/C++"; longDescription = '' Wraith is an IRC channel management bot written purely in C/C++. It has diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 1e7a78e4d4351..935c4ae571efb 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jmeter"; - version = "5.4.3"; + version = "5.5"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; - sha256 = "sha256-clISFMDLh9rFuXTBxug6F6AJx/03e1W/I1JcckA7He4="; + sha256 = "sha256-YOicfEUjcxRn/bcX8z1hQIbBDwMWNpy6pFZQrhxALh8="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index e6332832e3ec9..2a686fdd8b9e8 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graphical network monitoring and documentation tool"; homepage = "http://www.rakudave.ch/jnetmap/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; # Upstream supports macOS and Windows too. platforms = platforms.linux; diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index b22cea57987c8..ef7b33061dc95 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,20 +2,24 @@ buildGoModule rec { pname = "juju"; - version = "2.9.27"; + version = "2.9.31"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-4G+veQkPY6n/uRMsBWQgig/6IDc0Y2nXDpMUyC1ShF4="; + sha256 = "sha256-vRe7H7wtZUTsAJa6QVP+BTDDkJsfgIlBVpGcvtU1e0g="; }; - vendorSha256 = "sha256-Ieaf+Qp/7/6nv2ftHY3pbtOg+t7dYAuMv4BvhRaAZ9E="; + vendorSha256 = "sha256-Tx5RazLrNZ5GMRu4/jKhuNN7m1mQw4V7TBcIed/Gssg="; # Disable tests because it attempts to use a mongodb instance doCheck = false; + subPackages = [ + "cmd/juju" + ]; + meta = with lib; { description = "Open source modelling tool for operating software in the cloud"; homepage = "https://juju.is"; diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index b6dca7e70b6b5..43f4f5e2f214f 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "4.12.7"; + version = "4.14.0"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "42d0b49a2feba628f4845940ffd9607739bd5fcdbe6ba37e15f993c511d21e46"; + sha256 = "sha256-sahMEj9m10gsceTBnYk8wkWcQoM5s6s1ek1U6u3PTgw="; }; appimageContents = appimageTools.extract { inherit name src; }; @@ -24,6 +24,7 @@ in appimageTools.wrapType2 { extraPkgs = pkgs: with pkgs; [ libsecret + libappindicator-gtk3 ]; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index d678e3b517b3d..16e5508281d12 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.1"; + version = "3.44.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "LJNidefwnQtOtWgMVb/4Xw2A0lU4R2Gm0Z3XfOaU/oM="; + sha256 = "hcysooh6+FvwSORzx7bELF9WQasFpbxM/Oo04rb1vhc="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 1581790c3d4c3..6a571ffacf8fb 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.44.1"; + version = "3.44.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dEx+CK0R4bYQPO60u/2Jo7Yo4SbOOGe7AI80F8wEnqk="; + sha256 = "U2sR9BM99vIW8nr5okgaGe164Ivi1KE7EoBhwmKjZJk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index b522b51906397..539e69069f35d 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-6KHhkmHWhj/AgECYqNuJ0iSPEYyuBDac/3fW6J0fgTg="; + sha256 = "sha256-+H2KeaRBApveUG6Vz+Z8LWpmNpZ4lwyeX1LK0AKx/bw="; }; nativeBuildInputs = [ @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. Mailspring's sync engine runs locally, but its source is not open. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ toschmidt doronbehar ]; homepage = "https://getmailspring.com"; diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 160065effefd7..f998a4366b39e 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchgit , rustPlatform , pkg-config @@ -48,6 +49,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults"; homepage = "https://meli.delivery"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix index fe74e922230d4..50bbb0b0f6645 100644 --- a/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }: -let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e"; +{ lib, stdenv, fetchurl, fetchpatch, ncurses, autoreconfHook, flex }: +let rev = "b17ea39dc17e5514f33b3f5c34ede92bd16e208c"; in stdenv.mkDerivation rec { pname = "mmh"; - version = "unstable-2019-09-08"; + version = "unstable-2020-08-21"; src = fetchurl { url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz"; name = "mmh-${rev}.tgz"; - sha256 = "1q97p4g3f1q2m567i2dbx7mm7ixw3g91ww2rymwj42cxk9iyizhv"; + sha256 = "1bqfxafw4l2y46pnsxgy4ji1xlyifzw01k1ykbsjj9p61q3nv6l6"; }; postPatch = '' diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 5e9e17b47fd68..fd980893124f8 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Viewer for .msg files (MS Outlook)"; homepage = "https://www.washington.edu/alpine/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index c5ba0437efdc5..4d7f62bde9af3 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -14,45 +14,37 @@ , imapSupport ? true , withSidebar ? true , gssSupport ? true +, writeScript }: -assert headerCache -> gdbm != null; -assert sslSupport -> openssl != null; -assert saslSupport -> cyrus_sasl != null; -assert smimeSupport -> openssl != null; -assert gpgSupport -> gnupg != null; -assert gpgmeSupport -> gpgme != null && openssl != null; - -with lib; - stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.4"; + version = "2.2.6"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0q70qrsjvmkfns1qxc0il2rlmfjwzbmfg89zlch0iqghpyz7c9xq"; + sha256 = "/6LZNRfPxgb+Adr/xfEuQgYqHBNNO5r3hITrxUMIiNM="; }; - patches = optional smimeSupport (fetchpatch { + patches = lib.optional smimeSupport (fetchpatch { url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch"; sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi"; }); buildInputs = [ ncurses which perl ] - ++ optional headerCache gdbm - ++ optional sslSupport openssl - ++ optional gssSupport libkrb5 - ++ optional saslSupport cyrus_sasl - ++ optional gpgmeSupport gpgme; + ++ lib.optional headerCache gdbm + ++ lib.optional sslSupport openssl + ++ lib.optional gssSupport libkrb5 + ++ lib.optional saslSupport cyrus_sasl + ++ lib.optional gpgmeSupport gpgme; configureFlags = [ - (enableFeature headerCache "hcache") - (enableFeature gpgmeSupport "gpgme") - (enableFeature imapSupport "imap") - (enableFeature withSidebar "sidebar") + (lib.enableFeature headerCache "hcache") + (lib.enableFeature gpgmeSupport "gpgme") + (lib.enableFeature imapSupport "imap") + (lib.enableFeature withSidebar "sidebar") "--enable-smtp" "--enable-pop" "--with-mailpath=" @@ -67,27 +59,41 @@ stdenv.mkDerivation rec { # set by the installer, and removing the need for the group 'mail' # I set the value 'mailbox' because it is a default in the configure script "--with-homespool=mailbox" - ] ++ optional sslSupport "--with-ssl" - ++ optional gssSupport "--with-gss" - ++ optional saslSupport "--with-sasl"; + ] ++ lib.optional sslSupport "--with-ssl" + ++ lib.optional gssSupport "--with-gss" + ++ lib.optional saslSupport "--with-sasl"; - postPatch = optionalString (smimeSupport || gpgmeSupport) '' + postPatch = lib.optionalString (smimeSupport || gpgmeSupport) '' sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl ''; - postInstall = optionalString smimeSupport '' + postInstall = lib.optionalString smimeSupport '' # S/MIME setup cp contrib/smime.rc $out/etc/smime.rc sed -i 's#openssl#${openssl}/bin/openssl#' $out/etc/smime.rc echo "source $out/etc/smime.rc" >> $out/etc/Muttrc - '' + optionalString gpgSupport '' + '' + lib.optionalString gpgSupport '' # GnuPG setup cp contrib/gpg.rc $out/etc/gpg.rc sed -i 's#\(command="\)gpg #\1${gnupg}/bin/gpg #' $out/etc/gpg.rc echo "source $out/etc/gpg.rc" >> $out/etc/Muttrc ''; - meta = { + passthru = { + updateScript = writeScript "update-mutt" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -euo pipefail + + # Expect the text in format of "The current stable public release version is 2.2.6." + new_version="$(curl -s http://www.mutt.org/download.html | + pcregrep -o1 'The current stable public release version is ([0-9.]+).')" + update-source-version ${pname} "$new_version" + ''; + }; + + meta = with lib; { description = "A small but very powerful text-based mail client"; homepage = "http://www.mutt.org"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 2bcfd839e2854..9eb377f1b98e3 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postPatch = '' + substituteInPlace auto.def --replace /usr/sbin/sendmail sendmail substituteInPlace contrib/smime_keys \ --replace /usr/bin/openssl ${openssl}/bin/openssl @@ -60,8 +61,6 @@ stdenv.mkDerivation rec { # To make it not reference .dev outputs. See: # https://github.com/neomutt/neomutt/pull/2367 "--disable-include-path-in-cflags" - # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail - "ac_cv_path_SENDMAIL=sendmail" "--zlib" ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 06bbf293f1d64..bacf399fdb167 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.35"; + version = "0.36"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8"; + sha256 = "0h6f6mh9m9vrijm638x5sbsl321b74a25cdasbxhx67x62w320hk"; }; nativeBuildInputs = [ @@ -79,11 +79,6 @@ stdenv.mkDerivation rec { in '' mkdir -p test/test-databases ln -s ${test-database} test/test-databases/database-v1.tar.xz - '' - # TODO: restore after resolved upstream - # https://www.mail-archive.com/notmuch@notmuchmail.org/msg52808.html - + '' - rm test/T355-smime.sh ''; doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix new file mode 100644 index 0000000000000..30ea4090ac90f --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix @@ -0,0 +1,655 @@ +{ + version = "91.11.0"; + sources = [ + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/af/thunderbird-91.11.0.tar.bz2"; + locale = "af"; + arch = "linux-x86_64"; + sha256 = "6636029a5493af2bdc3bd4b66ab2ec6bdf3386784378c6e3663e0dacabf61341"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ar/thunderbird-91.11.0.tar.bz2"; + locale = "ar"; + arch = "linux-x86_64"; + sha256 = "4cbde6508c12b4f17268ecb76fac4724fd03be17637debd5e3b0f4ae9664cb38"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ast/thunderbird-91.11.0.tar.bz2"; + locale = "ast"; + arch = "linux-x86_64"; + sha256 = "501d71124a124168dda01442a94858ac8d1aada8dd7949d1e73f3c89464798ee"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/be/thunderbird-91.11.0.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha256 = "34337ba1e8b7209b7b7e7ac9924e6f8745916f87df30a2b8af9dcd201a40c7a9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/bg/thunderbird-91.11.0.tar.bz2"; + locale = "bg"; + arch = "linux-x86_64"; + sha256 = "3a13287699e97b160adf8008101f64f3f5078cb51f65cba7b076d5c62e8dc583"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/br/thunderbird-91.11.0.tar.bz2"; + locale = "br"; + arch = "linux-x86_64"; + sha256 = "6f67a0fc18d23e0ad0e3776d4039c218af0afac1d7e744215d0225763a33007f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ca/thunderbird-91.11.0.tar.bz2"; + locale = "ca"; + arch = "linux-x86_64"; + sha256 = "25f7848814c4f49d82f4fb305edc52068e0738fc02009f68f2a7822a4307e39a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cak/thunderbird-91.11.0.tar.bz2"; + locale = "cak"; + arch = "linux-x86_64"; + sha256 = "1e341a101e42b88ee2ab763694066598203a834d85ef3a5c4572a0950dec868a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cs/thunderbird-91.11.0.tar.bz2"; + locale = "cs"; + arch = "linux-x86_64"; + sha256 = "b36b25191dd6f70e03aee3a5238428e8cdad16192f173ca094356a9404b2a6a0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cy/thunderbird-91.11.0.tar.bz2"; + locale = "cy"; + arch = "linux-x86_64"; + sha256 = "604e262c8efb59e6250d26d964aba3e7c3fc9a3743137d67dda6011ad31a0331"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/da/thunderbird-91.11.0.tar.bz2"; + locale = "da"; + arch = "linux-x86_64"; + sha256 = "d9b1b3067ebbd2685c53a1787d3b6a496b54e0102e3c15e99539110765787ca0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/de/thunderbird-91.11.0.tar.bz2"; + locale = "de"; + arch = "linux-x86_64"; + sha256 = "03bb508c63f6e9d4ec0846d288113cee0c99ba81cfb82ed3ad96b60a4a04aae8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/dsb/thunderbird-91.11.0.tar.bz2"; + locale = "dsb"; + arch = "linux-x86_64"; + sha256 = "cd09f6ad9323c893284d752afe97e92800f4db579a78eb8d04e2ff0b60321cca"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/el/thunderbird-91.11.0.tar.bz2"; + locale = "el"; + arch = "linux-x86_64"; + sha256 = "1db218644eb596bb47c45405f8e1c6c0ff6d3b0f227fca34ceac7bcb35d19a25"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-CA/thunderbird-91.11.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha256 = "5833bf8ba7c5ece94abb082937937c531632831fe6eb6cb059f9f567663b4073"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-GB/thunderbird-91.11.0.tar.bz2"; + locale = "en-GB"; + arch = "linux-x86_64"; + sha256 = "fd779ea56324f157cf16587f29f46a8e102a42f951532d20d0d522f16b71de83"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-US/thunderbird-91.11.0.tar.bz2"; + locale = "en-US"; + arch = "linux-x86_64"; + sha256 = "5df888beee833cdc3316f82d22d4b87c67021b5433009a11d170c3d204a54752"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/es-AR/thunderbird-91.11.0.tar.bz2"; + locale = "es-AR"; + arch = "linux-x86_64"; + sha256 = "aa0235f0d9864aeba031589ec0983300cf1f3681ec724baf7c4e8325a678b093"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/es-ES/thunderbird-91.11.0.tar.bz2"; + locale = "es-ES"; + arch = "linux-x86_64"; + sha256 = "59fe5b24a8671b7d533099441f2154cbb2ae878421db861bdf63449d0ddea33a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/et/thunderbird-91.11.0.tar.bz2"; + locale = "et"; + arch = "linux-x86_64"; + sha256 = "5dfde219d3121da4bac10cd4bb0ebb7f01e0e268d6e0a5495617cbe8f101205e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/eu/thunderbird-91.11.0.tar.bz2"; + locale = "eu"; + arch = "linux-x86_64"; + sha256 = "0ef3e6dc4d906b59cc41814a01f2f9795cb0f68cedb2d42b3a6ae6f941e57866"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fi/thunderbird-91.11.0.tar.bz2"; + locale = "fi"; + arch = "linux-x86_64"; + sha256 = "41133551838ab598ca8ff8b414b5e59b100d90fd0d76d86efdbe0932f55ae183"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fr/thunderbird-91.11.0.tar.bz2"; + locale = "fr"; + arch = "linux-x86_64"; + sha256 = "2f9524eba48ce5584db51bdc70a6d2db9fe855b95bc0ea4886211cd9571fef1e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fy-NL/thunderbird-91.11.0.tar.bz2"; + locale = "fy-NL"; + arch = "linux-x86_64"; + sha256 = "90c205af710dc61817b385b937eb8f19785d26b7c706454d5e5eb2caa98a6f2f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ga-IE/thunderbird-91.11.0.tar.bz2"; + locale = "ga-IE"; + arch = "linux-x86_64"; + sha256 = "c58024054af2557b41cab9f6ffbcd35e23aeaef082c992a326d442a2d88f7d36"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/gd/thunderbird-91.11.0.tar.bz2"; + locale = "gd"; + arch = "linux-x86_64"; + sha256 = "3c5b3345a8ecb9a929ad4f257545ae21b7d7312d838303f2f45fb82801e3fe7d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/gl/thunderbird-91.11.0.tar.bz2"; + locale = "gl"; + arch = "linux-x86_64"; + sha256 = "9ab74394aa219e005347bb480da18d0640df11184fdf8bccaace8ae4fdfd2e61"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/he/thunderbird-91.11.0.tar.bz2"; + locale = "he"; + arch = "linux-x86_64"; + sha256 = "5b4997c947aeba88b4b67baa9ed70fdc8c5ab5dd4c2ba8faeb858bb572ef7262"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hr/thunderbird-91.11.0.tar.bz2"; + locale = "hr"; + arch = "linux-x86_64"; + sha256 = "028a0ac856f5eb24db1fbd6064554d39e097e681d2acd366eb500ae2a9f44d3e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hsb/thunderbird-91.11.0.tar.bz2"; + locale = "hsb"; + arch = "linux-x86_64"; + sha256 = "c7cf4a82322a80ef5c7587bc7ff1a68c89116ff3575a82d4fa0057484108b726"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hu/thunderbird-91.11.0.tar.bz2"; + locale = "hu"; + arch = "linux-x86_64"; + sha256 = "58e6060e7f104b9096ac521542b55d92cf88d409cb96f9a72705ac9e77b55cfa"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hy-AM/thunderbird-91.11.0.tar.bz2"; + locale = "hy-AM"; + arch = "linux-x86_64"; + sha256 = "0f4254ac57ce8c4db9c336c38c5d35b6260cf32a85b7bd72935f216d0a54851e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/id/thunderbird-91.11.0.tar.bz2"; + locale = "id"; + arch = "linux-x86_64"; + sha256 = "4476719d376d6dfa2b6a984b8c9dd1024a813da848acb7b4c76df5ba903a87a2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/is/thunderbird-91.11.0.tar.bz2"; + locale = "is"; + arch = "linux-x86_64"; + sha256 = "104420cb76394b8a4d243643e087b04be802152758cff256b09dbd1fd7c4bcf2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/it/thunderbird-91.11.0.tar.bz2"; + locale = "it"; + arch = "linux-x86_64"; + sha256 = "8dee7d28dfe512b5bde06cb8ff826c22c46b238b828c1f9f2df75728195cc6d9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ja/thunderbird-91.11.0.tar.bz2"; + locale = "ja"; + arch = "linux-x86_64"; + sha256 = "bd9a73ce7f363d530d23304036d17be5ba92c14ed809b15aeed021fdf940e060"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ka/thunderbird-91.11.0.tar.bz2"; + locale = "ka"; + arch = "linux-x86_64"; + sha256 = "b94f942fc2e0605b38c3fc89b2dfe07faaa812db1035563feb11fa2a20dff0d9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/kab/thunderbird-91.11.0.tar.bz2"; + locale = "kab"; + arch = "linux-x86_64"; + sha256 = "c9201067ae0cd3bb3fc013798b2f7b33daad96707f70d6dfea1e6ab010c6ad25"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/kk/thunderbird-91.11.0.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha256 = "1eca6541d09608cdc481f0f1031d6a6d0fc41b53b09e0f6e48bb4694d3be4b45"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ko/thunderbird-91.11.0.tar.bz2"; + locale = "ko"; + arch = "linux-x86_64"; + sha256 = "10b1a259373bba55b9de98d87949c13ded07d9c913d8491c2b9e07700b10420d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/lt/thunderbird-91.11.0.tar.bz2"; + locale = "lt"; + arch = "linux-x86_64"; + sha256 = "72a8496237b15de47a689d5546513cd0da77efa8ae365d538e4a89d4adf37d0a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/lv/thunderbird-91.11.0.tar.bz2"; + locale = "lv"; + arch = "linux-x86_64"; + sha256 = "7b537e57c6244cde41e6c1a3516124293eef9cf42cfcf26d733f69fc6ea8b446"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ms/thunderbird-91.11.0.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha256 = "f7382386f24d6f0c5134b60a7c4fc81956bbaeb716697cae9030bdbf3a8a7bc9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nb-NO/thunderbird-91.11.0.tar.bz2"; + locale = "nb-NO"; + arch = "linux-x86_64"; + sha256 = "cd5bbe73d36900ea4b964b5362e93ca631198eef1f5b790ac8e5fbd3ba2fd851"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nl/thunderbird-91.11.0.tar.bz2"; + locale = "nl"; + arch = "linux-x86_64"; + sha256 = "6202949156d0471da39f636d53954b2c3a3955f91da906444db8d17dc6b7d346"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nn-NO/thunderbird-91.11.0.tar.bz2"; + locale = "nn-NO"; + arch = "linux-x86_64"; + sha256 = "43d47e9766780a32ba5bfbe3006cba454189405bf8b019fcbb8a91d8eaa5734b"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pa-IN/thunderbird-91.11.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha256 = "49211576fb1637f285399c2b7e9c867633da8b53d5f862c9f46f587ab50ac960"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pl/thunderbird-91.11.0.tar.bz2"; + locale = "pl"; + arch = "linux-x86_64"; + sha256 = "54f7ec4a13681b0173909e28ce6d44ef642ccb208ff96ce53472e63a7d9500e0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pt-BR/thunderbird-91.11.0.tar.bz2"; + locale = "pt-BR"; + arch = "linux-x86_64"; + sha256 = "974781b88c324ef8d795ba602ebef9f3e34737ab7b17d753c9b9e81ac543895c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pt-PT/thunderbird-91.11.0.tar.bz2"; + locale = "pt-PT"; + arch = "linux-x86_64"; + sha256 = "b7fdf05204afcbedd5562f9f15a1d6b2179c67dd84c150aa36690b6c709c6237"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/rm/thunderbird-91.11.0.tar.bz2"; + locale = "rm"; + arch = "linux-x86_64"; + sha256 = "04994c9de996a609bdd3a17a75c82e3738c4bb4e7cec1cafb2f5284be665ffb4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ro/thunderbird-91.11.0.tar.bz2"; + locale = "ro"; + arch = "linux-x86_64"; + sha256 = "9373a55e1602f50af98c1949d43c4700e34f8ff43b5c1ddd9e7bad6651a6f8cb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ru/thunderbird-91.11.0.tar.bz2"; + locale = "ru"; + arch = "linux-x86_64"; + sha256 = "3e386ac2034b623eeb7cbc99ec9fcb543f7ee47cea9bd732c6fe62aa01cbeed8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sk/thunderbird-91.11.0.tar.bz2"; + locale = "sk"; + arch = "linux-x86_64"; + sha256 = "0aa6eb1ba0f714eec99151eb99ab08d862de57d3f3c6cd8086418cadcdea6447"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sl/thunderbird-91.11.0.tar.bz2"; + locale = "sl"; + arch = "linux-x86_64"; + sha256 = "5fbadaa8562c13478ccb4eec4707b683058a52a6a3edcdd60e94408e370c0a59"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sq/thunderbird-91.11.0.tar.bz2"; + locale = "sq"; + arch = "linux-x86_64"; + sha256 = "505158fd5eb28ff2eaa98e7be104551bda552ab6983191e1d86d39e33bb2108d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sr/thunderbird-91.11.0.tar.bz2"; + locale = "sr"; + arch = "linux-x86_64"; + sha256 = "607f65c325201d5751248c4877dcbea28a3d3f99905cbf0f8fbc2ece38bab819"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sv-SE/thunderbird-91.11.0.tar.bz2"; + locale = "sv-SE"; + arch = "linux-x86_64"; + sha256 = "d490bfac8742f29052a14f4973dbec326740610da348498f6ca0417035061c4d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/th/thunderbird-91.11.0.tar.bz2"; + locale = "th"; + arch = "linux-x86_64"; + sha256 = "e218e77576af8c552cd5fa06e6323970bf32681166206ddf42ee0ddbbefbeda5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/tr/thunderbird-91.11.0.tar.bz2"; + locale = "tr"; + arch = "linux-x86_64"; + sha256 = "14b0a4dddd9185896475e840e5953b6543ee0ccb3f8ee0b0a4a448e524726cbc"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/uk/thunderbird-91.11.0.tar.bz2"; + locale = "uk"; + arch = "linux-x86_64"; + sha256 = "a194835b5361faf5b0dd05c26a747d36b761de676e19f54dc3fd5354f4fae12c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/uz/thunderbird-91.11.0.tar.bz2"; + locale = "uz"; + arch = "linux-x86_64"; + sha256 = "457f3040bc017c7cf525b44c5a503385561fe072e8fcc6cc7877c6e070fdd937"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/vi/thunderbird-91.11.0.tar.bz2"; + locale = "vi"; + arch = "linux-x86_64"; + sha256 = "64b81087215b52b8a5780c9955fa9b0e94dbfeb005bf39feea85d838dec01b51"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/zh-CN/thunderbird-91.11.0.tar.bz2"; + locale = "zh-CN"; + arch = "linux-x86_64"; + sha256 = "5187404d29307a0e931663a3f1c8f85b9198869468b9541043988d7ab692bb09"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/zh-TW/thunderbird-91.11.0.tar.bz2"; + locale = "zh-TW"; + arch = "linux-x86_64"; + sha256 = "69e52c2281548034169063b1e9b3c77354aa81c616ba407135d148d04f3c39b1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/af/thunderbird-91.11.0.tar.bz2"; + locale = "af"; + arch = "linux-i686"; + sha256 = "fab1aaabdf672e2e30c11f7b6c884ea84da0e2d4dd1f6e7ea73561f45758972a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ar/thunderbird-91.11.0.tar.bz2"; + locale = "ar"; + arch = "linux-i686"; + sha256 = "7e3e89f1f7fd59e11323397cea81a01da5a2025f8a4eb5bd5e22a8ae7558ad16"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ast/thunderbird-91.11.0.tar.bz2"; + locale = "ast"; + arch = "linux-i686"; + sha256 = "e25ef39a6b91c414d2f748fbe94552be106c0be37ac3ba1bb69ec79731d7c8b1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/be/thunderbird-91.11.0.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha256 = "2cdf39bf05d2f090a120b6285e74cf77199849b0b22dcaef10506ee94dfb6949"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/bg/thunderbird-91.11.0.tar.bz2"; + locale = "bg"; + arch = "linux-i686"; + sha256 = "524766c780d086fd4335bdbf09e3b006176ae514cc5940e08b8729462b69cf21"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/br/thunderbird-91.11.0.tar.bz2"; + locale = "br"; + arch = "linux-i686"; + sha256 = "88967dfc29888cb310d667a786605c60b99836c4d96c9d80bbe0d3e1ffc4fc4d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ca/thunderbird-91.11.0.tar.bz2"; + locale = "ca"; + arch = "linux-i686"; + sha256 = "bcc7fec068db74291c4e7fae965ed0d59c690011c0b102ae52fc35355a37c2d3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cak/thunderbird-91.11.0.tar.bz2"; + locale = "cak"; + arch = "linux-i686"; + sha256 = "92557a0bfce5c70a7112cce28059cb7e5f36ea6de25837cc9e84f29dd4f437d3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cs/thunderbird-91.11.0.tar.bz2"; + locale = "cs"; + arch = "linux-i686"; + sha256 = "85df534c707dfdf1029c653b8402e0ff8fbb5a76bd6881a03e49422576c50a7b"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cy/thunderbird-91.11.0.tar.bz2"; + locale = "cy"; + arch = "linux-i686"; + sha256 = "6acc4efd7a7eaa9cb1630a1830d8e13a59da59f7cb9c6430c42a6ab0947cb924"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/da/thunderbird-91.11.0.tar.bz2"; + locale = "da"; + arch = "linux-i686"; + sha256 = "b6a9bd2852f7076466bf369b793a480023ef2b025a83765a80b5e996f213ca02"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/de/thunderbird-91.11.0.tar.bz2"; + locale = "de"; + arch = "linux-i686"; + sha256 = "b6524641f5dd509467fcc0fe3eb2ee44df177d07da8ea77aa706714efa6e34dd"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/dsb/thunderbird-91.11.0.tar.bz2"; + locale = "dsb"; + arch = "linux-i686"; + sha256 = "7d9aedca49c87841e2535aa0d7e89b893c6b91042c8c54b3d8a123c36cd21508"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/el/thunderbird-91.11.0.tar.bz2"; + locale = "el"; + arch = "linux-i686"; + sha256 = "840ede568df0cf197039f4ccb4d0ac86b617bdb705bf0bfc13d5ea46f327f43a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-CA/thunderbird-91.11.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha256 = "9410f138179876e844042b7386d3b1bf857ac65ebc45039bb97d4d199983151f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-GB/thunderbird-91.11.0.tar.bz2"; + locale = "en-GB"; + arch = "linux-i686"; + sha256 = "7e5a91a64f72c7a01028833ced6cd7b997630d54967e0e2938875645d0868f27"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-US/thunderbird-91.11.0.tar.bz2"; + locale = "en-US"; + arch = "linux-i686"; + sha256 = "0afacc2ccee154819e6289992c9daaa9f6dc977ecffc59cd548d5facf7bc118b"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/es-AR/thunderbird-91.11.0.tar.bz2"; + locale = "es-AR"; + arch = "linux-i686"; + sha256 = "f8488581fd4dc90e036e58436bb82838d6ae5f386fa73e40b3706d8137d63feb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/es-ES/thunderbird-91.11.0.tar.bz2"; + locale = "es-ES"; + arch = "linux-i686"; + sha256 = "8bb3607d710e25c3c981bfada12be85a9b32dff38bb5d5fe3b045c63494789a5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/et/thunderbird-91.11.0.tar.bz2"; + locale = "et"; + arch = "linux-i686"; + sha256 = "a204822cf3af0d14412bc585ddbcd794f0bff40233f3022709978fa79a3544b3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/eu/thunderbird-91.11.0.tar.bz2"; + locale = "eu"; + arch = "linux-i686"; + sha256 = "b7e71ce61437008e4006712dc08d72fb3355c5114ddce4841c6bfac4420d13a8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fi/thunderbird-91.11.0.tar.bz2"; + locale = "fi"; + arch = "linux-i686"; + sha256 = "aa1a2c83786985e5b5afb9ae62de7644880675c401313ad2ebd8cff6759b1652"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fr/thunderbird-91.11.0.tar.bz2"; + locale = "fr"; + arch = "linux-i686"; + sha256 = "49e02176f56e9bcbe2ae22a2f26ee1c4e1c18abc0e5622ac3cd3e1cf36feef35"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fy-NL/thunderbird-91.11.0.tar.bz2"; + locale = "fy-NL"; + arch = "linux-i686"; + sha256 = "41417c3d07809919e639f8124ac1f3a12e150ec9f2a48e4ff5461b11a49fff79"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ga-IE/thunderbird-91.11.0.tar.bz2"; + locale = "ga-IE"; + arch = "linux-i686"; + sha256 = "3bda30e7d860fdc0fa92f56451d36e96cf7444aa186b936c8a8b75cab10c1256"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/gd/thunderbird-91.11.0.tar.bz2"; + locale = "gd"; + arch = "linux-i686"; + sha256 = "89f0ab5eb0df82611fe5abbaf9f626c00a47e80b49f9b3bfacbe49588a5d15a5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/gl/thunderbird-91.11.0.tar.bz2"; + locale = "gl"; + arch = "linux-i686"; + sha256 = "d1da56e2ed418a30c225857cee00c6feac62e02ac64279d340265602faea30d9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/he/thunderbird-91.11.0.tar.bz2"; + locale = "he"; + arch = "linux-i686"; + sha256 = "644508c044d0b9de9c226005c9a6a9a88eb179da56fccb4abe012e905bbfaaaa"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hr/thunderbird-91.11.0.tar.bz2"; + locale = "hr"; + arch = "linux-i686"; + sha256 = "ceb9ef728f0413525c93949c4960e97e4b887965cfd94211b1ec349165368864"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hsb/thunderbird-91.11.0.tar.bz2"; + locale = "hsb"; + arch = "linux-i686"; + sha256 = "81fadd0d89c48bf2a3df279ba24e48490bdbe8913ceb5fb53738f32c1cc61211"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hu/thunderbird-91.11.0.tar.bz2"; + locale = "hu"; + arch = "linux-i686"; + sha256 = "57c6223d5dbd0221742b51df296a8ea74739ec601ba0cbbc8de9c27dc3a09226"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hy-AM/thunderbird-91.11.0.tar.bz2"; + locale = "hy-AM"; + arch = "linux-i686"; + sha256 = "b33ad866c009c85793a2e2ee8e837de49bebbbc98c069e8e6735aa2041208642"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/id/thunderbird-91.11.0.tar.bz2"; + locale = "id"; + arch = "linux-i686"; + sha256 = "6c9da73ca1706a35496a5e298f3c1308a0a0e56a03826c41bd84e7ef0a54341b"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/is/thunderbird-91.11.0.tar.bz2"; + locale = "is"; + arch = "linux-i686"; + sha256 = "bc2dedfe32f7f82ee485c39bd21919bad3ab706c82fe04ab6b13198628f03b43"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/it/thunderbird-91.11.0.tar.bz2"; + locale = "it"; + arch = "linux-i686"; + sha256 = "15a69c14973def0f7ad062a8a3a9f5c72b8358f46ed89fba0dce0bb614164cbb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ja/thunderbird-91.11.0.tar.bz2"; + locale = "ja"; + arch = "linux-i686"; + sha256 = "49f9b81962a2bc38d1c465a347a871b377cfe5110fe44761fba88779e1cf6c16"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ka/thunderbird-91.11.0.tar.bz2"; + locale = "ka"; + arch = "linux-i686"; + sha256 = "3d57cd918664d17208bb877561807c1c6c7fd0b3d72b77592fd1eba1e36e3c0e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/kab/thunderbird-91.11.0.tar.bz2"; + locale = "kab"; + arch = "linux-i686"; + sha256 = "cfa2dcd465a6e877253e029733d32f2040f6145d5bd34dbaf6ce2cbfe4d83df2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/kk/thunderbird-91.11.0.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha256 = "cd60db4921fefaf47dbfe2e681a0f5c4c1054cc6fe9ca4ea36abf3b2ff8d89a5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ko/thunderbird-91.11.0.tar.bz2"; + locale = "ko"; + arch = "linux-i686"; + sha256 = "48ff8d98abd69d377f3964d8d278e79554e3ec31973ff4baf7773236fc635fa7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/lt/thunderbird-91.11.0.tar.bz2"; + locale = "lt"; + arch = "linux-i686"; + sha256 = "cde6ca3288571470ae836fc3b1584ef2e5413548e2180a58b5e8755e6ece3912"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/lv/thunderbird-91.11.0.tar.bz2"; + locale = "lv"; + arch = "linux-i686"; + sha256 = "e54b05e69f07c191658b5fe86aefef21f8dd2ea28c4fd5518876ca00dadc7ee1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ms/thunderbird-91.11.0.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha256 = "481c849a5347befe0204e090e457617278a598a20411f07379bcebf997752089"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nb-NO/thunderbird-91.11.0.tar.bz2"; + locale = "nb-NO"; + arch = "linux-i686"; + sha256 = "d239864212742c86b2a83246acb22523be4097f438ebb1fdaa3776cb7274d68e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nl/thunderbird-91.11.0.tar.bz2"; + locale = "nl"; + arch = "linux-i686"; + sha256 = "6d50d645030e2672cda90d56b795c5de2813e82101839f821ef5345c0bac3e1d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nn-NO/thunderbird-91.11.0.tar.bz2"; + locale = "nn-NO"; + arch = "linux-i686"; + sha256 = "87f5d8da66fc1bc224777a1db400d73f792ecec257ebe4ca7b857a29eb1b46f2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pa-IN/thunderbird-91.11.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha256 = "1b9315e847a7b40f8f984facd3bb24d5291199ba974e0391f1088c8623e2ac10"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pl/thunderbird-91.11.0.tar.bz2"; + locale = "pl"; + arch = "linux-i686"; + sha256 = "22c0be8d666e5a7e7fc2ef0e44558e0a7fad299a5946f55850652d25ff1f3e24"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pt-BR/thunderbird-91.11.0.tar.bz2"; + locale = "pt-BR"; + arch = "linux-i686"; + sha256 = "e9ff705ff4d1513060f3142590bdbff2e66c84875bf683fd5196c464ce45d23a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pt-PT/thunderbird-91.11.0.tar.bz2"; + locale = "pt-PT"; + arch = "linux-i686"; + sha256 = "a446fab64e1b49d5463e5966a0a3399314bf893cf9e2687d9c88dc810e3c50d6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/rm/thunderbird-91.11.0.tar.bz2"; + locale = "rm"; + arch = "linux-i686"; + sha256 = "a533be1dbc69a4821039b969050253b40c5c96926e61f79b186a7a61452f01be"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ro/thunderbird-91.11.0.tar.bz2"; + locale = "ro"; + arch = "linux-i686"; + sha256 = "1cfd9675f82e3a6262946a0fd40fae143abc0bd896f74a1afa1bb5fce72c8a31"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ru/thunderbird-91.11.0.tar.bz2"; + locale = "ru"; + arch = "linux-i686"; + sha256 = "177641bee951eb96f56b4f2551014e648be8e62766258a7e25ff6e3d6aef465f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sk/thunderbird-91.11.0.tar.bz2"; + locale = "sk"; + arch = "linux-i686"; + sha256 = "f30a2a1afc23f790908efb04e5a90552ecd33b0a61eac0f8e51c66e2745befb3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sl/thunderbird-91.11.0.tar.bz2"; + locale = "sl"; + arch = "linux-i686"; + sha256 = "deb684209fd7a773e5679daea7b20d62c9a2ad885a33f9bafb2596aa44465d8d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sq/thunderbird-91.11.0.tar.bz2"; + locale = "sq"; + arch = "linux-i686"; + sha256 = "efd8462f8886c0396d71e89adbcefdec0c7d8bd60d319df833b3cff3aae7e5ea"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sr/thunderbird-91.11.0.tar.bz2"; + locale = "sr"; + arch = "linux-i686"; + sha256 = "c120fd6dcf72da105190c46781fffb8d5ba310a3bf9febd8d9090024953ab2eb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sv-SE/thunderbird-91.11.0.tar.bz2"; + locale = "sv-SE"; + arch = "linux-i686"; + sha256 = "09f2bf230701dd26c6b72a1b053c743bd6fe79fafd43fed18154dcd20d466ed6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/th/thunderbird-91.11.0.tar.bz2"; + locale = "th"; + arch = "linux-i686"; + sha256 = "121cceee1a3eb123a2e23c7c440beacda0deaffd651153d176b2a9b4678146c6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/tr/thunderbird-91.11.0.tar.bz2"; + locale = "tr"; + arch = "linux-i686"; + sha256 = "41626b2bb506dca9929ce3a5f44b6d1f1a763ab34caa1dbbf1b4d25f49573b88"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/uk/thunderbird-91.11.0.tar.bz2"; + locale = "uk"; + arch = "linux-i686"; + sha256 = "05373f8f2e23c0551b025b89a2ab116635e49ffdf469dfaaaeddff96db77a1db"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/uz/thunderbird-91.11.0.tar.bz2"; + locale = "uz"; + arch = "linux-i686"; + sha256 = "ef50609a5a0382aed53c0af6bd4de6143db508442b104eba10832967ad540018"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/vi/thunderbird-91.11.0.tar.bz2"; + locale = "vi"; + arch = "linux-i686"; + sha256 = "dabf2c94a148504308b281de70b2dc37aa7b12fe67a83bae1b6df4be7e864a3d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/zh-CN/thunderbird-91.11.0.tar.bz2"; + locale = "zh-CN"; + arch = "linux-i686"; + sha256 = "adce5e780010b7f81e53e727627df3db6a2fbc50ee7789dc980b06af93b1e1fe"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/zh-TW/thunderbird-91.11.0.tar.bz2"; + locale = "zh-TW"; + arch = "linux-i686"; + sha256 = "d08f81345272c130c2050b6a89605f4e714b9320ca7242fba95e320d4f69097a"; + } + ]; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index e4e5332e07f33..1630a8612bb1c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -56,10 +56,11 @@ , runtimeShell , mesa # thunderbird wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en_US" +, generated }: let - inherit (import ./release_sources.nix) version sources; + inherit (generated) version sources; mozillaPlatforms = { i686-linux = "linux-i686"; @@ -206,6 +207,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = "http://www.mozilla.org/thunderbird/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with lib.maintainers; [ lovesegfault ]; platforms = builtins.attrNames mozillaPlatforms; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index e400592733abb..47cabe1b2034b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,665 @@ { - version = "91.9.1"; + version = "102.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/af/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/af/thunderbird-102.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f06c5e87bc9dcbb0d4aa374e262a8bd4b7bb94d5b2aa71e1ba5a61794a07af4d"; + sha256 = "454de70b44e21806b6854beb2f9313360b56c19ffcebec76ffff35a31c1c5280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ar/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ar/thunderbird-102.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "67178dac2f315ba13806c8056f041f083952b4ebab1054a8eb66d97b4d1c5fd2"; + sha256 = "f3a54d1ddb506900da8bea7e6d3a9c340b226d66be4af6f63d83f485d8f525a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ast/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ast/thunderbird-102.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2858ddc2d594d12a1def62c05bb23c3f91633a866004a9a184b4ad06e294c761"; + sha256 = "130c458c0832cc83c508539c9980b9ae4654011311d269ea07f0b6d8dee20694"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/be/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/be/thunderbird-102.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e5fbb0bcc2066dabf1a6d1dcfbf92d1ad4af606aaddce00c2820d84b2bb2005b"; + sha256 = "c86b351adfd2104234e1b89e5943b298f7131f5e40c0f5b254e9630e7c99cffc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/bg/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/bg/thunderbird-102.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "de456b442aac187d49573572c45609b0e0b5f17e9e30a253ff803f9691c4fcc8"; + sha256 = "c86d41cec6adf1f2d15d2b5ece051dee9fdc242fc9e78780baad23dd190f9d9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/br/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/br/thunderbird-102.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9139317b57b529a3151571274aa37c72790b68c2e310c302b87a490f6e6a2512"; + sha256 = "954958eb30962697291000cf0d20538a4a6f442f849528217de0c5fd62d9a76c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ca/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ca/thunderbird-102.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bfdef191af0ab0622847a751be29449e3ed5b3ad5abd801aa466370a621fa457"; + sha256 = "94a92262c541ca7d7b9505e455acf44c1fc1d4df64b9e69396548ebb64cc3925"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/cak/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/cak/thunderbird-102.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "59fbda2666b1fca61f222fc5394742ce1b712390a6452bd6bd4317254a83ee90"; + sha256 = "552471f2fa1baf4220ae94817b0056d427521e635d062e21787569f3bb4659de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/cs/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/cs/thunderbird-102.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "cec215709a2ebc17b25658a640c119a3475409ab4c89d1eae92f24d612bfd07c"; + sha256 = "8bd171e6d4940f22198c5515e74490cc0e94f1499385172a0139aaf0fb4897ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/cy/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/cy/thunderbird-102.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "7685a6e54ec1b9f79c92230da7c6f9b102fda697e833d465c212fe53008c20e3"; + sha256 = "af1ac6ed62fbb6ed3eee4bba31a9c304793ae658e3706211dff313b817f34efa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/da/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/da/thunderbird-102.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dc8ebeb29651025c19ae876b3a500ccd35e137b0ddc862467ba667bac2417426"; + sha256 = "3ae39c9665f420c5b62a29112e88ffc5148fab63b51b08ebf4af3cd135069772"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/de/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/de/thunderbird-102.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "3750041376f16133da7c8452427acd8d4414eab1f0af84b7349dd2341f679493"; + sha256 = "46ace85f7a8c0c158380b6b04427aebc0eccf4158835719fb75463eea1e7d6d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/dsb/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/dsb/thunderbird-102.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b052464be29215c315ade6793233b2f16bb5874f34890e0a93002c0dc389a677"; + sha256 = "a98b0e8efeedcaf0baa7bca97b7363d180fe0367498577b80d743c366d48a37a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/el/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/el/thunderbird-102.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "cd7a84a8d8c3f11d121abe46174fc5c49328007a27397b945549bf942a54fdce"; + sha256 = "975d73dcd530d608db7553debbedff96e36ccc2ab370f71d67196f705eccf3ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/en-CA/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/en-CA/thunderbird-102.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "087fa8164027256f86f162205292004e9e4f15dc87f35e49d23876e8b8ce23ad"; + sha256 = "82ab4ada8ac96c06cf17238386e6f149df8b29b4ba3680106845d4944f4d7d6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/en-GB/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/en-GB/thunderbird-102.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "83bf95ac23c269e00dcbd5f4322bdf9adcb2b83bb4ab10e18e4bae435f36878d"; + sha256 = "277111b433009d09df7a9184862f30c226237fcfc3dbf179053978606d81a581"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/en-US/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/en-US/thunderbird-102.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "de2fa8b336e485205f578442fb64fa37c45e6f7d6263648b9dea1556de696df8"; + sha256 = "b80be6cc016c735df935fe65f08a96a89e83186e644cde31b1637cc88febb868"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/es-AR/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/es-AR/thunderbird-102.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "178bf7bafe1f1f2056a5d301107bad4f69fb6e82417544d6ac4afaa541c6b6ac"; + sha256 = "86b445d53bce5b27fafb24a2efa0da2e8f8f6aae7f9a38b93c8e4b4a5f6bcb82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/es-ES/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/es-ES/thunderbird-102.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "269fe6cde594cb429c69e8a7209874b973259feb954856b30193fab0eb6b9cbf"; + sha256 = "f02084c767981fe54e4250c1c62f73534e615b5dac793d1d8b311ca5c8f30f42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/et/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/es-MX/thunderbird-102.0.1.tar.bz2"; + locale = "es-MX"; + arch = "linux-x86_64"; + sha256 = "2b65f1bfff33534b9524c3adab09d82e67bae16b296a9294627f15974f04eab9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/et/thunderbird-102.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "05bc8d02b11bafa75dffb15e14636bd8ec7080be71b0e94d1106bc2802cc571d"; + sha256 = "2ab7d95ea3f450808e0f38261292b887aa408cf084293ae7c98ba42a86451ed2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/eu/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/eu/thunderbird-102.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b6e26cf5fa4b02f6559f1e631b88118a422fd6d957742e2a29269a6a7c5a439a"; + sha256 = "6925c89f39573d7d1cca563f1470821e9edfa65fd2567369fdc3d6100af107ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/fi/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/fi/thunderbird-102.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b4e63104dacef2de6bb1e3fd81765aab27d2c14c0f22a6fa25e7566251fe2a86"; + sha256 = "b18d727c75fb116bdcdaf89d5100ece3cb61924f4bc9729a23b019c515b41a53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/fr/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/fr/thunderbird-102.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "60aa0128fcd364f1c2aa9b5523a47a97fbdd0786dd530ae47a1c2524e105e2f4"; + sha256 = "955c988742b8bf9905091492c8d236196f732ebf5bb8681c41bfc133ed89b27b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/fy-NL/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/fy-NL/thunderbird-102.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "fe0e864e069dd2a3839bd57aa12fe6bdede11413d0c6d3427682b778d656384a"; + sha256 = "6827fb58aa391e9b5fb4c3582833e433b1e8401ead98929efc1fa3b59a38f307"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ga-IE/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ga-IE/thunderbird-102.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f7732439d4f11dc6b04a8b6c49677cb00b02cb1d5ee3029d494b101f8d8854c5"; + sha256 = "83f1b874a3eedbd2fb23af44a03b10db94de9c6b28def83519cae6e47cd0e19b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/gd/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/gd/thunderbird-102.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e7350fe4363bc840bf2cb782838951eb26809fbfce1ff7d79bf62e5b227b6229"; + sha256 = "fe4b91f0afcc5b8055148c30a7eb269fed838902fe00c596ef3e985a6f0e40dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/gl/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/gl/thunderbird-102.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "e17f22daf65a19fa89e98f6af699339deb3f908c475e15c6dfc20bc23d6054d8"; + sha256 = "f0968870549b314002a437ec15ab9d967eacb70b928da1e941b9e8997ae68b28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/he/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/he/thunderbird-102.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "1a3896d479ff72a68af9a03349bf34bd4fec68e643888f5546c87406e4939d74"; + sha256 = "8acd12edccf719579e29b9907aa46e57a261ac9718d7d441b6036d06d2fd6b23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/hr/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/hr/thunderbird-102.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "8bcd244d7d51495b794d65617be5dfb372c7736f484aa3172465d2c88d670b48"; + sha256 = "95b340f7b2dc6edc51f8b4cdbe8774f3ab4738fcab5661949c30018ada3495af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/hsb/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/hsb/thunderbird-102.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "d79b7265f0f43116f716d0e0038fee6260179edd9c3dc638ba749a719958c876"; + sha256 = "2a8640dea2b7787045e66e2c8d12350a38ccc0d762f570f85c4d7c22533d103c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/hu/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/hu/thunderbird-102.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "c7834d0c25dc031b5e6fdda930779eeb022c048f66982c1fc389f5857da2d16e"; + sha256 = "c5e80fa639e9f31d1edf0f52d034b596af7ed8a364ab20592b9624e403c4e5aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/hy-AM/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/hy-AM/thunderbird-102.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4b40f15014d95cf48ec88a9023d9b265b3b8718cbaebff19fc502d79219e2511"; + sha256 = "f79caf36c6e20726953f48b7aa3c96c78e96d252758265fd5aa5a26c37259bb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/id/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/id/thunderbird-102.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "71d5a4f1f97f99b3d6237bec1fe1d22506e30322b9afed3f0a57a285c93ce0f6"; + sha256 = "c1808206a1423f4cdadcac3479464b99372c52f8d64070010c38be45f89c06a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/is/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/is/thunderbird-102.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "dd041da805c3ad9b64ac99a18170b48b2cbee88eeafc4317f3675732699193a5"; + sha256 = "a686c4747605022fda0b1b1710e204c348ebbe62dd7e32def972ebf34d5d14db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/it/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/it/thunderbird-102.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2d7ec87d3cc0bb5a37d989c54770d7faeeb3c142bc108c86e222b2e61883be88"; + sha256 = "c3394587c80a3270329ca4c0ecea0c2e353c0b51b75b6d932ad3214939d1874a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ja/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ja/thunderbird-102.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "06fa0ec26eee35b483e056e94f851f052ebec7b8bce7768ced573a4e74c19032"; + sha256 = "f50de906192c67cc1ea264b8d698dc438195185c7820efdd1063ab1d4b0e764e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ka/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ka/thunderbird-102.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "af56172d4f9cab608e286e5955a6faeda694a9bb27206c527dd07e3ce0f0c1ff"; + sha256 = "626caf1b5ddfc7dddadb789fd6d63f2dcbf0d471b948ae682bbffd8e46178e6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/kab/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/kab/thunderbird-102.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "98ab11719e9830691fb258174b73bfb3ef496f7654ab87115718326b451187f3"; + sha256 = "de3af9ce4a383c141eda103e4284f9a7c8ac148f11ff2a273ae704e3b5c840b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/kk/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/kk/thunderbird-102.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "75b98581fdbbb0d5292e1d9658b84652702d973d57fd0aa262a60741a60b489d"; + sha256 = "3591faca0222ac7cf631ecebcd3258bbbebe6ba5355935005c6549053cd41bf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ko/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ko/thunderbird-102.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "79a7d5557420e452e605283766aebb1c474e171f8890c1606a94364f422bff2f"; + sha256 = "47e93aae87cb1b3baf83eed8c4893cbff9f9569055388c72e0f0cfa9d21a06ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/lt/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/lt/thunderbird-102.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e8b544082d722ed2913264d7f19508e3ba4cf4f3af801fea74f75e790e558d9c"; + sha256 = "64d8916baf88e605d5116835ccb2ed08691437e6360447634c01fa536a28001a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/lv/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/lv/thunderbird-102.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "210ac6d6a4cc603aad294a81821c160051b81cf5078e1db637c908f4b1d326a8"; + sha256 = "4e420206e45dc31966139a89228c725333c366da7bdb53e44bc67f93e8a8cde0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ms/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ms/thunderbird-102.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8f068734975c03df942cf9d77e9e6479ab8a4e05f1520fcd377eb7579fec9e3d"; + sha256 = "449f76d08e8c7e2c07a73df948baf10ecbcc1555c4b7d77fd559183512e84976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/nb-NO/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/nb-NO/thunderbird-102.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d8dd4e72ace1ec1ee377e845a51d6621da8f79ba231c8de9c1b5c0adc2f00e8c"; + sha256 = "498b193017d191b4fa05a392de73ea5debabdeb21c5bdc4f64a4f211b5fe7744"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/nl/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/nl/thunderbird-102.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e31679930f2e74c70d9d474481976f6d633dba8265c368bb1bcea9cbdfa2a674"; + sha256 = "29ee15c75fd3a479f5bf353d4937c89eefbdb9e32300c144adca203039bed613"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/nn-NO/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/nn-NO/thunderbird-102.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "cfcaf1584954c3c8b97c8a18905129273c6dd028fffb168f9f614bc519d724d7"; + sha256 = "76dcb30575d1de2270c9ec57abef7724ea75663a4bc2bb84e9f45a6d0069eb3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/pa-IN/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/pa-IN/thunderbird-102.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "b5ebabb96c4cc6df5f7804b62540b9a823089c65e13f3475e16e2e75582dbfe4"; + sha256 = "80ec69da063f10d786693d1f3de4eea036caca93b3c01410c39f8665b240830c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/pl/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/pl/thunderbird-102.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d8ec7636ade35f3128e5076d95a49ff194fe749d8eb8705669894fa91c3743ca"; + sha256 = "0df38d8212c4099a7cc4db574184cb5b9b06cdae87572588989bf758173f3556"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/pt-BR/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/pt-BR/thunderbird-102.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "92ed3cd78c2845116dc04d06a4bb1b5f3eb41c01256fdbbe0db83ad51c3fe617"; + sha256 = "55815e0ead146617c8984f286292fcafa32f61252e22562853669ef7310df4c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/pt-PT/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/pt-PT/thunderbird-102.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "010cd55542a6564e7df0d720deb1f3fea2094ca6cb0a202448145b25c166b2e7"; + sha256 = "d5f69cfaeabd786fad1073b7df7707cfd31e9a3a6bb247e946d4083938e45092"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/rm/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/rm/thunderbird-102.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c4e6c659a9668c88f049cbe2c47bf9f70604a23ad40f4b6b52d6b8891ad09a2c"; + sha256 = "a41c65976b903516210a7fe414c64eb342b393d5e1f13efac21aaffc98f63ea7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ro/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ro/thunderbird-102.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "09a9a803b6a25dc429bef4f9f1e81cc7500b8493307c8462b855c0045fd32ef1"; + sha256 = "017ff03aee6d036a7d2fcf5de6b982eb632a8b1dcc3c9cfc0b69119fc3e3c35d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/ru/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ru/thunderbird-102.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "332ee8695f3fa74ae952ce55a4d91e26c789e8f95d13d05a5eadfff149d2e36c"; + sha256 = "0a6dcc5a9497aaf0baf6aa5f2c965bf089c7bda014e46ed001cab0d204f1b456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/sk/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sk/thunderbird-102.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "788a802d157cba9957b6724431143e69519b7d02ef1537c89b9a32220a35045c"; + sha256 = "d0480749c04000abb83c03723f213ffd022c73759a64a919693085c376c26d62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/sl/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sl/thunderbird-102.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4a2d9398e4944cb658d2b5ef16b4521123e6a0146b5eb70ebd45c20edb53edfc"; + sha256 = "283f66e365428f6856a355526f783baf5cf5dc60a2f869875012f8fbb383b8c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/sq/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sq/thunderbird-102.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a587c265f6ccde0e1acfef1f196a1a0a81041c9ef58dd829f189508af167727c"; + sha256 = "9459d097e66bc7cdcdcf475eb7909137b840c88807f8f194016c8c952161b20f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/sr/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sr/thunderbird-102.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e9f7dd607472504762f568d544b6a34a0e1ffe58c012f7116214fcdeb9c350e6"; + sha256 = "d6ec958e4e6de1509a0c8bed35f0e89850d4ba185fee218e67496b4cf7b6f63f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/sv-SE/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sv-SE/thunderbird-102.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c8fe1447f93e4eed8c3da48efc53de313b86558b4fe6f83f8fc49a87da15385a"; + sha256 = "7a3fbf4da06d5ac236558c441611159e0ff3e2f663c4f818d41868b0ae546e85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/th/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/th/thunderbird-102.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "cde4dfc3593003fb4c2e10bb9b8b532079766a19b21598f48be55c1e374b12bd"; + sha256 = "2bee3eb44e010b8b6e68ff749a5961b153b1d7c01b1957683453bd5e22ca54c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/tr/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/tr/thunderbird-102.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f8279a10c110e85f2ad5da42a0fb7597261137fffe1a6b3fc885cd7b9b4fb7f9"; + sha256 = "43f1e8bcf72e14c4d58f4c941762ba1196ecbf7b7e15b04ee7dccf37f9c0101e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/uk/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/uk/thunderbird-102.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "13f6d38d8e12d031988e01affc8bacff6e9b747ea0b84c7b3cecff0a981f2d25"; + sha256 = "6e9e6d4f0c452e452612aaaafde3dace4dea7fc9615cfeffd4764e7961cbeaf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/uz/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/uz/thunderbird-102.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c0f39cf07b4f7ba6c327a1d00d28c2f67d7b84311ee8e7d95f9c69c7040e9b7f"; + sha256 = "e38f1318db70ac3bf9baec33bf34a1b22037c0fa547255f8f25497f73ccd02e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/vi/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/vi/thunderbird-102.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "faf7e817bcea9415b7e4ab90d0db710c83524db188dd61e46c8d9698fd2b66ad"; + sha256 = "c086167af3cd9aa8d377bca005dd0c174de941ed9f579d8647daf0912874559f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/zh-CN/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/zh-CN/thunderbird-102.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "0ac8f96c7f47c64019e2b3df1c0eadfbc91e4ad118bf758498918225638a8563"; + sha256 = "41fba211d58537791450ace7f026f965c131c7ac4bb8ca0b52c4dae5faa71ff7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/zh-TW/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/zh-TW/thunderbird-102.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9a91601a9dd0bae489dd8f8654413cdc2cbd5655ed19bb7f8c73082ea00274ff"; + sha256 = "330bc05195617ad6206e54a27dd568cd36e77ac1bc9a2af542db1f368aadbcc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/af/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/af/thunderbird-102.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bb9fdc595c8744910d5f15a1a15b5428adf33b50ccccb60286267497b435bbdf"; + sha256 = "ff93121ae975054cf1a1cdd4f9aff514a920ab368215e7f52a3b297b1427d34e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ar/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ar/thunderbird-102.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3e368cd81a31f381c1297ee795589a0965b411b7244342f77a528defa68aa38d"; + sha256 = "325433620ace7a8dc63a57460baa16e0d42c22863b6478ef2cdb6f6a8e401183"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ast/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ast/thunderbird-102.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "475b32d53927258e065fde96aba88eda57f5a24c55fa1ed5b5a95e3f8cad0fbe"; + sha256 = "73f0e83d15263559b5b2d71ec77e425ac19ab9c8c3dd7537a03a1c2d696088be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/be/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/be/thunderbird-102.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7b5e4571043d3118147f52db032d123be071528e80742bf2b8ce55879df83e9c"; + sha256 = "44a142daae26b47847a763478a774539b6d98f1ffefabd4aa8f32f9f41017493"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/bg/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/bg/thunderbird-102.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2b6ac5a76ff80a09a7888150c9a99e2844c5b88bcace220a0422799774e90bab"; + sha256 = "b9fbe8c6dd69b7899af85ca4dea24a41cad5f9bcdd9a08d3960b7cf8193423be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/br/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/br/thunderbird-102.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "16ed5fbe1963ce35d8c81e47509cc57b8ca9dae57203bc951563e1b56d8ff50a"; + sha256 = "2ec9e4e767a0189495b2142680189051a32330d41517593b77dcdf2d6cca6c43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ca/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ca/thunderbird-102.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e9e3dea7f36ceb031f0cc3aa200c1dd5c0ef1794b52744ab67ba620b1b547d8b"; + sha256 = "93365a27dfda0857379c105364aa758ee160e8aabfa4c10408499a414496bdd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/cak/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/cak/thunderbird-102.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c149d046e0170c81a206664117fe3c6b80c33a8f1197077fc7509f14abc9cfb4"; + sha256 = "716235bdce0c09bf6f4cc989491d76f8a20e7d9a52dcf745e5a1c95d43378c09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/cs/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/cs/thunderbird-102.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "459cc60f8154379365f5cf5c7404bbc05336fe896306c4449a96867f4a75632d"; + sha256 = "1ad4813a05cb78bb89fdb0ba744f7078303d785a912b1bd94124d18b018699a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/cy/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/cy/thunderbird-102.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "275c63bb06a93328b5463c57d1c58d58bf6c44b8b8eccac6721a16151081862f"; + sha256 = "e21e387f62801511a72f48adf4738eef9aa8b51f3fe67d6014a023745b6720fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/da/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/da/thunderbird-102.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "81ed21119de61e828bfec4edebfb01033d650710318bb06f82d873c647a1f692"; + sha256 = "056b5dd2d75eb30fac31113456086e553e19a99625abc7d8956b4a05f017b9b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/de/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/de/thunderbird-102.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9bd615839704aade1dc694d83884ef5b30ba55245bb2d3a4be6117684652da95"; + sha256 = "fc89ec2ba04a09f39645f6be9517ab159872229c79e60959743c1e4c9cfda2f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/dsb/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/dsb/thunderbird-102.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a308bfba61442aa857dbe118e202fba0b8087af7835e61b8913ad31dce53d9db"; + sha256 = "c98fa2a8462d3ab251c8b8e3f7440ed4187b5d1e4f75f6c5fbd48ad634757cf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/el/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/el/thunderbird-102.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "052c90e718185132c939453e397344b6e3c096cca136d12e8b2d9f93055ca8f2"; + sha256 = "a322ed85be837a0311aa39b5222125ad69de3c3617bf9983399918800e5090a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/en-CA/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/en-CA/thunderbird-102.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "000b5958418f22cf0daf32b67842f8a0f05ba679e502b4b8df2dba08cbe51319"; + sha256 = "de4d5feca4c217f2a544f2c851cdce560b609e773234a166faa0e25fe3573b27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/en-GB/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/en-GB/thunderbird-102.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c39adcf0ad4eb94d95b703b1fd369ee0d6d0037492c0ad9441b2c07190ce6bec"; + sha256 = "299f791ec2b19abc8168e58149117ae8e23880e0976727323c1ad17c5033c341"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/en-US/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/en-US/thunderbird-102.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7f7658da73a125074822bf560bbc17220adc7d5e0f636e55f62aab48332bdc64"; + sha256 = "edba2d157fbdb9eb552059d265436647563ec8490b2e5997650e5780d53b3915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/es-AR/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/es-AR/thunderbird-102.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f4ce57dc193ceca6b5b37686e1b2584555b9a9ebb44ac9120434fc424ea7e94f"; + sha256 = "5837cd1f2d31af7a5eb6bae4123eb15cbed390f033c1bb9de2fdb277a3413835"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/es-ES/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/es-ES/thunderbird-102.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "bcf930f5a54abd8b0776bfdf435ec7ed680c15ecce5196eea22abdbdb80db88e"; + sha256 = "5185a024317336ea998f1d2365bdc3eabe6c9a71ca99806a972cb3190d5bcc93"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/es-MX/thunderbird-102.0.1.tar.bz2"; + locale = "es-MX"; + arch = "linux-i686"; + sha256 = "2f8bb364cba43373cf1eebefed79e5ad2bdef4d02410a7730f34f0f5053e7eed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/et/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/et/thunderbird-102.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f1ea30df791704f46ccbac71eba1c78004ad7e2a334bfd730519f046b3a5d7cb"; + sha256 = "2c7abf7a5daff6f0851110a3a33f101d2703311d102bc388263ce4154a3c3c17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/eu/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/eu/thunderbird-102.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e97be105f43e7489ba439a8b32c0e27756270a6a2b8cb1961fc153050163b76e"; + sha256 = "8b5e8498d1d895ad57e22e8ad9c55797c8a0ecf2cf5fd2577ff0ec3f9a530601"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/fi/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/fi/thunderbird-102.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ddaaee356e7ae031f6727eba22b3d5d2773133a5e5bdac18a4bcc98277a2b729"; + sha256 = "67b0266bab2c9a07b7978c6aaa15f3eef1782774c233802dca75f38200114cd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/fr/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/fr/thunderbird-102.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ff68f1262723449204431790abbc287112457aa44c5cd7eb8364c067fdc74f60"; + sha256 = "a1d3973fa54cf28543f7337e1efdd8233de97fcaaa252ce9467a10b49cc86119"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/fy-NL/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/fy-NL/thunderbird-102.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "01cabd0e2f9d342781104d7621f8d40ee66abe1c6f1068c47af6cc8915a39c69"; + sha256 = "6ec8a9bc391f796ce342f08e008515f2e4425ed97eb17c26570eed1b124bebe3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ga-IE/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ga-IE/thunderbird-102.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c456e890575932351e0a62279c3e4bf512968963251ed653569db42d6ef1db88"; + sha256 = "cec26fd13cc1cb90f217096d26aac69c08faa96e1e15bcfb937532e72cb0ca4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/gd/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/gd/thunderbird-102.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "eedc9c0f3787504e93e0c38527f47784ee088bc2d9fcc7ed804b52138bc3d774"; + sha256 = "607b856cb3da90e29370aff516b1f68dd2b1761ce708477b8e73e1c991fe65b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/gl/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/gl/thunderbird-102.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "ce75d1222c1050820c7a43c930c58a71cc8bf8123a5868fb6dd438f23eb1a9a7"; + sha256 = "a66a49b55521e67a1ba5b617cbcae407445fe96163f5ee82172bb71ad6488dfc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/he/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/he/thunderbird-102.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "645cd8cd584a2c3d610ca2659a1ae320352d296f2cfe55fd8d612cbeb38abe9a"; + sha256 = "50928b757128d3843fcc46d5f1dcd802413339f0cbb67076a4e8fd2ea831969e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/hr/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/hr/thunderbird-102.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "17191b00917692eba111da1a01284c52e28cfe22690f6632616b8e304db81e5a"; + sha256 = "30c2c448d20550708564675039889be52031cef837c3b7e5f83050b5f33dff4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/hsb/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/hsb/thunderbird-102.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f402328a7e331760de91f1eb7acaa7a445cbc50e7f5e00b6c0f02497fc571e4d"; + sha256 = "38c12bab7912d56fb5eec9d5206e93d3738244488544f3da6ab7fd4d1efcd81e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/hu/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/hu/thunderbird-102.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ce8b189d0afd1f9a1276cdc1c54b4ff0fbaf0ea14645538a39a40eb6c5a26baa"; + sha256 = "8775fabcafb17eed9edd224cb148fd4b50f2716f6ea7221f1cb7d7c578a99662"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/hy-AM/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/hy-AM/thunderbird-102.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "3dba03a75431f7f054a46a610337518e93a7cfb9a8bde7bfe0f3c2aef0df46fe"; + sha256 = "85c5f40ae8eba422d18ad1fe67bb8841c1cfb283aafb87a92d001c6d54828cca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/id/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/id/thunderbird-102.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e3269270781a76ff3ccb013d40e4b18f22a733048016ca9dfd7b82bd6e98e39d"; + sha256 = "ef40632b6058d5818c38800e9a62364b2d014afcae1352a069214fd0bbd7ec5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/is/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/is/thunderbird-102.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0db05ecd5d192868743fdc534f76b3d96e1484bf4d196ee459ba2d53fd5ac4a3"; + sha256 = "373ce7e5e97355bc21149bd68d16576a24b8edbc35839989d048ff0ca34076de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/it/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/it/thunderbird-102.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "99acc3cd6a1c81885a565ea09c6668aea1a946b0fced9db475655fba7d0473c4"; + sha256 = "1e2901dbb9c85e90c26394c8dc10701f551365638868b3f69e2113a8091cac3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ja/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ja/thunderbird-102.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "5ca41905a895b8ad236fc667a5bb01d1ddde37381a65374feb2549f2f21f501d"; + sha256 = "bc4781a58fc62db1c20b8383369b101c079a3bd90c05768d369f508cb1d5625a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ka/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ka/thunderbird-102.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "460434b2096ddbcd58abccdde445a8e06963e5bddc45bb88442781fbcd7b92ae"; + sha256 = "35eeaffc00156d4831b3e2b83406c6aff4abbe936f88a508c2646022aa5beae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/kab/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/kab/thunderbird-102.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8d3877852ebbf78bf637dccc29c9e075757376cc0f0eac8109d0909a7a84531b"; + sha256 = "1c833ea6368f7927dc4c421bfa7f3636b4ff23a0be61966c40761f281fa70ff5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/kk/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/kk/thunderbird-102.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7d51c30a43e3b56ae467fb81704323902d852e2ec98d0551aec500ddfe79829a"; + sha256 = "f322e97b61ce78cdb7745ccc835c8b66f92becc5d8ec76dde25fa58960234ef4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ko/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ko/thunderbird-102.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a61eaaeb6fab5a40b7a3ec25c9aef82364c3de7b6132bf1a0201afca7279ff79"; + sha256 = "5ec704f7bfe5e1cf2ce4d0c43b8b9144c8fc9a174359f5464215042ae25d8e43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/lt/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/lt/thunderbird-102.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c09b1b265f0c214eaaa864e09584c8b18270b3e1c22101dfaaf8ff0bca930f04"; + sha256 = "d5bb7833ab24c59b22b3724b0b8e19e4a64cd4c4ba3be507c8e6d419702f45bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/lv/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/lv/thunderbird-102.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7579ec4f5a58f716bc94eb3333672350361d1a3ac11e2434eb7a2026f13d90e5"; + sha256 = "29a78baf23df55224c5433b32a7811ec07c33a6ef4024681761f74a737803bf5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ms/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ms/thunderbird-102.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e5dc0ae6d2d0c99a14fa811030b11b90b5b53b6b9b329d6d642d5c4ab18e550a"; + sha256 = "f5f3619d9df419ef4198822c1c23a2a702eb24a36a54e7d589aab684f1abba91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/nb-NO/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/nb-NO/thunderbird-102.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "dc4838ccdfe5c59ac7438fbeea01ff675801b14c216c6f1342206f7826bfa846"; + sha256 = "d92f72fe78c788e8ef665b7bafec33b38095929ed8de47e07aa9e778fb2327e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/nl/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/nl/thunderbird-102.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d82604da582c5d3980eda14c488575810ccf20713024e0e0845dbf224cc6e61b"; + sha256 = "2aa07aeb1addc342554ee83d2891edc06920559a59effc44670f5c6a6e7f860d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/nn-NO/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/nn-NO/thunderbird-102.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d47e71a9c2ee42d9f379aa44100a403d89929c1b668a286aa189a5a087898f58"; + sha256 = "91c87d6e439a86132e187412e4a259ee2826802edfdefc134cf5819387bc5de7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/pa-IN/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/pa-IN/thunderbird-102.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5aa634d92d4937f628e50ab796ffb65123db63b2392918481eb8a63d14ca5bc5"; + sha256 = "ee081d6c7573bf1f264bbe20f9632b8c402b5e3467e600e3add06b8d31ce27b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/pl/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/pl/thunderbird-102.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "56b80fc669ed97371706a1eb13e151362f0b312df531d9832835fb12611e9310"; + sha256 = "3bff1bdcd3a8f0edc053f74cdbd240d1938c4f2daa93e807ccb7294e1e5f290a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/pt-BR/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/pt-BR/thunderbird-102.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "801d998fc5544c1cdf68b5b7269638dcd8cf0a7c2d4c8e9fc2cd5f78fa19a9b1"; + sha256 = "72f0dacc8c03d229a8fc4ec2e638d5fbaa703f09e5803a53a42265805658c028"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/pt-PT/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/pt-PT/thunderbird-102.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "35839a406cb8656ed4625f74e9711419ac91c76952975892fab99b8d175dd768"; + sha256 = "153af8a3ebcc3662ceed7067872aff9b592aeb1364349bc36ed9384fc6164cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/rm/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/rm/thunderbird-102.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "86fc3237284821f4f9ca16b7d8aeca3b843b5c9269e42422dd451e39cec6ceef"; + sha256 = "831be41ea92e5c51a85a0d3e2cab4d1e4c9750250dda91bedd77600ad34f9d64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ro/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ro/thunderbird-102.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "ad3dcceec9d00c964b6b5529eb049c8130fdc8c945eced774e6cbf49c6cd2702"; + sha256 = "c8d220b2daebd9435702c3dfb5b140a69ebcbb185c43fdc1ad39bc4861f27692"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/ru/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ru/thunderbird-102.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "21d61b1b417263236134a8c666103dd1a0dbcf9db23af2ca0fede2710541fc30"; + sha256 = "3ccb3843d22911efc3245b4f5b93fd4cbae804788723e1c8da7ef39a5ba254ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/sk/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sk/thunderbird-102.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c0c9ce86af798fa0693a382b9df0c3b5d9067c917af16afc46c7e85ee8e96a24"; + sha256 = "a2a80498b2ca10d5fcc3298f25545c0422850ecd685b9d48f7045d00ef5eddc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/sl/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sl/thunderbird-102.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "df974a11f9b1cbcec5252443c53cc653080b1ed5dec80e76461585ee355302de"; + sha256 = "726b3573a42d94bb9953e19762c02cfe4f974d0aee7767c8844890ffc3ecad9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/sq/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sq/thunderbird-102.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9c837fec2ad71217761eaa90ab009230eb32a45f8e7eda46a98df57dc623e4f8"; + sha256 = "fa3981a4244f63c85fb41da164186631f7c613c750d3041dc7546ad63bb57661"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/sr/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sr/thunderbird-102.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9c952da9ffed908873231c34048eac64f1213cbf7ba322da7cff3dddc33d8859"; + sha256 = "8ff5186165c3fee05d74ab331e54e8d84a820170e5247171472d7ffbced7e20c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/sv-SE/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sv-SE/thunderbird-102.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3ebdbe94b678e306e84967d6ab627eb0a5256dd4eb0b80b0c1ead10663679c7a"; + sha256 = "a80b833326045d6624ed5de30496801bdef37e197dc9667882bff41ec3735d42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/th/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/th/thunderbird-102.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "96651e467785e0a56662b98aff11b08db1a1ff4ac93af52b797e2617b286db06"; + sha256 = "cab27baf78d86a8161f81b9333e9175b418ac28e2885fda64f18a9926363b13c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/tr/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/tr/thunderbird-102.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5b5df531ca83c13f317ec88a1cdb643c915dc5d14ef5e7b03c7dd68c1f21ad0d"; + sha256 = "f66125a35d2f453ac614c5aac0f0bd42de3f0ddeb71c03e2145bfc90f2c09fcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/uk/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/uk/thunderbird-102.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "058fc28badd07216bc892c3318c021871d8d7937e2bda126a3f390a7ddca7bb0"; + sha256 = "f2c05d4e9a772f12a6ad1a698e3b700371c5fc8a2e379333aa3ffd38ecabd11e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/uz/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/uz/thunderbird-102.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "0bb4706398f75ec0704da00c0a9d8e0cff6e7d8105927799898d04b2a7d3b53f"; + sha256 = "aa747105858af3cd3e5f255d75b9a41d6427d86d0c7950582d8688bb227d112d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/vi/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/vi/thunderbird-102.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8e10bd3577f736c41823203fbbb7738c2f1c9849ba0437a3bf58c06c168abc52"; + sha256 = "954b804a671c0d820d07a47b80fb8bc43a6d7a931702f5feb3e5904986265a2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/zh-CN/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/zh-CN/thunderbird-102.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "94c9f500b85b9276057cfa24bf9f3650b461c002d083e87b5ab0b567cf7a292e"; + sha256 = "c03f7ab97a7f0fd0f13ae849a0c13f147ec32e4b26a7f878ef6d248f9d4172b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-i686/zh-TW/thunderbird-91.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/zh-TW/thunderbird-102.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1d5e6bd0689e51af1a162d4a599d560631df32f867d34ea451e39348b89ec4cd"; + sha256 = "2ca14ce31ec75ae61eacebd6022154a1b6d8c476eb90a860f2084115932511b9"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 363b5863569a7..b56d798285db5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,15 +1,50 @@ { stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests }: rec { - thunderbird = (buildMozillaMach rec { + thunderbird = thunderbird-102; + thunderbird-91 = (buildMozillaMach rec { pname = "thunderbird"; - version = "91.9.1"; + version = "91.11.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "997751056ad44367a128aef13ddd55f80798f262644253f814e6e607b3bfc3e33070ed072fa7062586378234cabc7ad106efa26befc3ecb843c5dd02c1498f0f"; + sha512 = "26b9242259b71eb14ddadffb34a59d07d515bbbc0cb806eed965a73b001ee81b3b1128d06cfdf3e50d5da4ef97be21d11193be34a582d3c9f27f27d2f97d90d2"; + }; + extraPatches = [ + # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. + ./no-buildconfig.patch + ]; + + meta = with lib; { + description = "A full-featured e-mail client"; + homepage = "https://thunderbird.net/"; + maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "thunderbird-91-unwrapped"; + }; + }).override { + geolocationSupport = false; + webrtcSupport = false; + + pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" + }; + thunderbird-102 = (buildMozillaMach rec { + pname = "thunderbird"; + version = "102.0.1"; + application = "comm/mail"; + applicationName = "Mozilla Thunderbird"; + binaryName = pname; + src = fetchurl { + url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = "72e6ac7946d8bdcee1a46a321c1226fb88facc299cf01f63b139e7e84a4692284cb20e615c5f9a6da12c974a17e2deb548dde48a77d56b1850f71bdcedb137d8"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 0eb0a02ed01f9..841c733a2f1dd 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/meson0.61.patch"; sha256 = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ="; }) + # Fix segfault on launch: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004258 + # Segmentation fault at address: 0x20 + (fetchpatch { + url = "https://salsa.debian.org/debian/modem-manager-gui/-/commit/8ccffd6dd6b42625d09d5408f37f155d91411116.patch"; + sha256 = "sha256-q+B+Bcm3uitJ2IfkCiMo3reFV1C06ekmy1vXWC0oHnw="; + }) ]; postPatch = '' diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 3bcbdf0cf02ba..418a74a62a37f 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.19"; + version = "1.8.20"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-NKHhmBF2h02+TuZu4NkQPJCYmqTc3Ehh5N4Fzn5EUms="; + sha256 = "sha256-2TriqvwPSK99ydCzlN8buABYi4tOjQltizzyJTROsRE="; }; patches = [ diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch index 707163bff0c99..26ee6976d505c 100644 --- a/pkgs/applications/networking/msmtp/paths.patch +++ b/pkgs/applications/networking/msmtp/paths.patch @@ -21,15 +21,16 @@ index bdb4fb8..1363a67 100755 #[ -x "$MSMTP" ] || \ # log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit ## -@@ -70,9 +70,8 @@ MSMTP=msmtp +@@ -70,9 +70,9 @@ MSMTP=msmtp ## ( chmod 0700 msmtp.queue ) ## ## the queue dir - modify this to reflect where you'd like it to be (no quotes !!) -Q=~/.msmtp.queue --[ -d "$Q" ] || \ -- err '' "msmtpq : can't find msmtp queue directory [ $Q ]" '' # if not present - complain ; quit +-[ -d "$Q" ] || mkdir -m 0700 "$Q" || \ +- err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit +Q=${MSMTP_QUEUE:-~/.msmtp.queue} -+test -d "$Q" || mkdir -p "$Q" ++[ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \ ++ err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit ## ## set the queue log file var to the location of the msmtp queue log file ## where it is or where you'd like it to be diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix index 247a8d589547b..60f49163be73b 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -8,23 +8,23 @@ rustPlatform.buildRustPackage rec { pname = "mujmap"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "elizagamedev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O5CbLgs+MkATPtess0gocgPB9kwD8FMR/urwm6jo2rA="; + sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E="; }; - cargoSha256 = "sha256-nOZ+HnzXhVp+tLrNMZO1NmZIhIqlWz0fRMbHVIQkOxI="; + cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU="; buildInputs = [ notmuch ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { - description = "Bridge for synchronizing email and tags between JMAP and notmuch"; + description = "JMAP integration for notmuch mail"; homepage = "https://github.com/elizagamedev/mujmap/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ elizagamedev ]; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index cf22d8804068d..d1091068c6b47 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2022.1"; + version = "2022.2"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "0s12y9j75k59kqkcvfflb1v5p3ny7xgc1m5bd635lvql1bv46c3i"; + sha256 = "sha256-h/c4aPH6E2TzbXGROpLJgF9uHYcjvKiW5upIobpJM9o="; }; nativeBuildInputs = [ @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mullvad/mullvadvpn-app"; description = "Client for Mullvad VPN"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Br1ght0ne ymarkus flexagoon ]; diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 801e8602cc95c..49f4a44702a82 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -13,29 +13,18 @@ , openvpn-mullvad , shadowsocks-rust }: -let - # result of running address_cache as of 02 Mar 2022 - bootstrap-address-cache = writeText "api-ip-address.txt" '' - 193.138.218.78:443 - 193.138.218.71:444 - 185.65.134.66:444 - 185.65.135.117:444 - 217.138.254.130:444 - 91.90.44.10:444 - ''; -in rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2022.1"; + version = "2022.2"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-bLwuM3Qy2iStbXIvDEWp31vuiihSQThOej297XKo5Xc="; + hash = "sha256-ZtQKzbFrkacrfPIkMz/UOfIwQBXQUoVVlFla//jmMwY="; }; - cargoHash = "sha256-CBbm8cJHTjyvvzCFQfKmsE5d9N7azEm8nI6KeWLVaa8="; + cargoHash = "sha256-J6h3KY1RDCnAc/tQHNGEyOlVQoQNhRqjWbmimPitydQ="; nativeBuildInputs = [ pkg-config @@ -59,26 +48,14 @@ rustPlatform.buildRustPackage rec { postFixup = # Place all binaries in the 'mullvad-' namespace, even though these # specific binaries aren't used in the lifetime of the program. - # `address_cache` is used to generate the `api-ip-address.txt` file, which - # contains list of Mullvad API servers -- though we provide a "backup" of - # the output of this command, it could change at any time, so we want - # users to be able to regenerate the list at any time. (The daemon will - # refuse to start without this file.) '' - for bin in address_cache relay_list translations-converter; do + for bin in relay_list translations-converter; do mv "$out/bin/$bin" "$out/bin/mullvad-$bin" done '' + - # Put distributed assets in-place -- specifically, the - # bootstrap-address-cache is necessary; otherwise, the user will have to run - # the `address_cache` binary and move the contents into place at - # `/var/cache/mullvad-vpn/api-ip-address.txt` manually. - '' - mkdir -p $out/share/mullvad - ln -s ${bootstrap-address-cache} $out/share/mullvad/api-ip-address.txt - '' + # Files necessary for OpenVPN tunnels to work. '' + mkdir -p $out/share/mullvad cp dist-assets/ca.crt $out/share/mullvad ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fefa884c2a628..1604188773d17 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -40,7 +40,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ petabyteboy infinisil felixsinger ]; + maintainers = with maintainers; [ infinisil felixsinger ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 60190f703aa12..6a187a09e0637 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -4,6 +4,60 @@ let sources = { + "@apidevtools/json-schema-ref-parser-8.0.0" = { + name = "_at_apidevtools_slash_json-schema-ref-parser"; + packageName = "@apidevtools/json-schema-ref-parser"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-8.0.0.tgz"; + sha512 = "n4YBtwQhdpLto1BaUCyAeflizmIbaloGShsPyRtFf5qdFJxfssj+GgLavczgKJFa3Bq+3St2CKcpRJdjtB4EBw=="; + }; + }; + "@apidevtools/json-schema-ref-parser-9.0.9" = { + name = "_at_apidevtools_slash_json-schema-ref-parser"; + packageName = "@apidevtools/json-schema-ref-parser"; + version = "9.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; + sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; + }; + }; + "@apidevtools/openapi-schemas-2.1.0" = { + name = "_at_apidevtools_slash_openapi-schemas"; + packageName = "@apidevtools/openapi-schemas"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.1.0.tgz"; + sha512 = "Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ=="; + }; + }; + "@apidevtools/swagger-cli-4.0.0" = { + name = "_at_apidevtools_slash_swagger-cli"; + packageName = "@apidevtools/swagger-cli"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/swagger-cli/-/swagger-cli-4.0.0.tgz"; + sha512 = "8jDHtZxEkxFNMfqeNhyHjxiS9P3BlSj1WpetsMExs4N+PIa3d0vSNch4Fk9OlgT/2oClCK0YSc+dmmdVpHh0hg=="; + }; + }; + "@apidevtools/swagger-methods-3.0.2" = { + name = "_at_apidevtools_slash_swagger-methods"; + packageName = "@apidevtools/swagger-methods"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz"; + sha512 = "QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg=="; + }; + }; + "@apidevtools/swagger-parser-9.0.1" = { + name = "_at_apidevtools_slash_swagger-parser"; + packageName = "@apidevtools/swagger-parser"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-9.0.1.tgz"; + sha512 = "Irqybg4dQrcHhZcxJc/UM4vO7Ksoj1Id5e+K94XUOzllqX1n47HEA50EKiXTCQbykxuJ4cYGIivjx/MRSTC5OA=="; + }; + }; "@azure/abort-controller-1.1.0" = { name = "_at_azure_slash_abort-controller"; packageName = "@azure/abort-controller"; @@ -13,15 +67,6 @@ let sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw=="; }; }; - "@azure/core-asynciterator-polyfill-1.0.2" = { - name = "_at_azure_slash_core-asynciterator-polyfill"; - packageName = "@azure/core-asynciterator-polyfill"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.2.tgz"; - sha512 = "3rkP4LnnlWawl0LZptJOdXNrT/fHp2eQMadoasa6afspXdpGrtPZuAQc2PD0cpgyuoXtUWyC3tv7xfntjGS5Dw=="; - }; - }; "@azure/core-auth-1.3.2" = { name = "_at_azure_slash_core-auth"; packageName = "@azure/core-auth"; @@ -31,6 +76,15 @@ let sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA=="; }; }; + "@azure/core-client-1.6.0" = { + name = "_at_azure_slash_core-client"; + packageName = "@azure/core-client"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.0.tgz"; + sha512 = "YhSf4cb61ApSjItscp9XoaLq8KRnacPDAhmjAZSMnn/gs6FhFbZNfOBOErG2dDj7JRknVtCmJ5mLmfR2sLa11A=="; + }; + }; "@azure/core-http-2.2.5" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; @@ -49,13 +103,22 @@ let sha512 = "e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ=="; }; }; - "@azure/core-paging-1.2.1" = { + "@azure/core-paging-1.3.0" = { name = "_at_azure_slash_core-paging"; packageName = "@azure/core-paging"; - version = "1.2.1"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.3.0.tgz"; + sha512 = "H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg=="; + }; + }; + "@azure/core-rest-pipeline-1.9.0" = { + name = "_at_azure_slash_core-rest-pipeline"; + packageName = "@azure/core-rest-pipeline"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.2.1.tgz"; - sha512 = "UtH5iMlYsvg+nQYIl4UHlvvSrsBjOlRF4fs0j7mxd3rWdAStrKYrh2durOpHs5C9yZbVhsVDaisoyaf/lL1EVA=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.0.tgz"; + sha512 = "uvM3mY+Vegk0F2r4Eh0yPdsXTUyafTQkeX0USnz1Eyangxm2Bib0w0wkJVZW8fpks7Lcv0ztIdCFTrN7H8uptg=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -67,6 +130,42 @@ let sha512 = "KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ=="; }; }; + "@azure/core-tracing-1.0.1" = { + name = "_at_azure_slash_core-tracing"; + packageName = "@azure/core-tracing"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.1.tgz"; + sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; + }; + }; + "@azure/core-util-1.0.0" = { + name = "_at_azure_slash_core-util"; + packageName = "@azure/core-util"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.0.0.tgz"; + sha512 = "yWshY9cdPthlebnb3Zuz/j0Lv4kjU6u7PR5sW7A9FF7EX+0irMRJAtyTq5TPiDHJfjH8gTSlnIYFj9m7Ed76IQ=="; + }; + }; + "@azure/identity-2.0.5" = { + name = "_at_azure_slash_identity"; + packageName = "@azure/identity"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/identity/-/identity-2.0.5.tgz"; + sha512 = "fSQTu9dS0P+lw1Gfct6t7TuRYybULL/E3wJjXLc1xr6RQXpmenJspi0lKzq3XFjLP5MzBlToKY3ZkYoAXPz1zA=="; + }; + }; + "@azure/keyvault-keys-4.4.0" = { + name = "_at_azure_slash_keyvault-keys"; + packageName = "@azure/keyvault-keys"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.4.0.tgz"; + sha512 = "W9sPZebXYa3aar7BGIA+fAsq/sy1nf2TZAETbkv7DRawzVLrWv8QoVVceqNHjy3cigT4HNxXjaPYCI49ez5CUA=="; + }; + }; "@azure/logger-1.0.3" = { name = "_at_azure_slash_logger"; packageName = "@azure/logger"; @@ -76,31 +175,40 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/ms-rest-azure-env-2.0.0" = { - name = "_at_azure_slash_ms-rest-azure-env"; - packageName = "@azure/ms-rest-azure-env"; - version = "2.0.0"; + "@azure/msal-browser-2.26.0" = { + name = "_at_azure_slash_msal-browser"; + packageName = "@azure/msal-browser"; + version = "2.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz"; - sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.26.0.tgz"; + sha512 = "mSyZORSgeMEWz5Wo5alUqjxP/HKt/XcViZqc3dnKFM9347qYPIWsAlzHkEmmafNr1VGUo7MeqB0emZCOQrl04w=="; }; }; - "@azure/ms-rest-js-2.6.1" = { - name = "_at_azure_slash_ms-rest-js"; - packageName = "@azure/ms-rest-js"; - version = "2.6.1"; + "@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/ms-rest-js/-/ms-rest-js-2.6.1.tgz"; - sha512 = "LLi4jRe/qy5IM8U2CkoDgSZp2OH+MgDe2wePmhz8uY84Svc53EhHaamVyoU6BjjHBxvCRh1vcD1urJDccrxqIw=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-4.5.1.tgz"; + sha512 = "/i5dXM+QAtO+6atYd5oHGBAx48EGSISkXNXViheliOQe+SIFMDo3gSq3lL54W0suOSAsVPws3XnTaIHlla0PIQ=="; }; }; - "@azure/ms-rest-nodeauth-3.1.1" = { - name = "_at_azure_slash_ms-rest-nodeauth"; - packageName = "@azure/ms-rest-nodeauth"; - version = "3.1.1"; + "@azure/msal-common-7.0.0" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.0.0.tgz"; + sha512 = "EkaHGjv0kw1RljhboeffM91b+v9d5VtmyG+0a/gvdqjbLu3kDzEfoaS5BNM9QqMzbxgZylsjAjQDtxdHLX/ziA=="; + }; + }; + "@azure/msal-node-1.10.0" = { + name = "_at_azure_slash_msal-node"; + packageName = "@azure/msal-node"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.1.tgz"; - sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.10.0.tgz"; + sha512 = "oSv9mg199FpRTe+fZ3o9NDYpKShOHqeceaNcCHJcKUaAaCojAbfbxD1Cvsti8BEsLKE6x0HcnjilnM1MKmZekA=="; }; }; "@azure/storage-blob-12.10.0" = { @@ -112,13 +220,22 @@ let sha512 = "FBEPKGnvtQJS8V8Tg1P9obgmVD9AodrIfwtwhBpsjenClhFyugMp3HPJY0tF7rInUB/CivKBCbnQKrUnKxqxzw=="; }; }; - "@babel/runtime-7.17.9" = { + "@babel/parser-7.18.6" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz"; + sha512 = "uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw=="; + }; + }; + "@babel/runtime-7.18.6" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.17.9"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz"; - sha512 = "lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz"; + sha512 = "t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ=="; }; }; "@colors/colors-1.5.0" = { @@ -175,6 +292,24 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; + "@js-joda/core-5.2.0" = { + name = "_at_js-joda_slash_core"; + packageName = "@js-joda/core"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.2.0.tgz"; + sha512 = "0OriPYIaMLB3XiLQMe0BXKVIqeriTn3H7JMOzTsHEtt7Zqq+TetCu97KnAhU3ckiQZKBxfZshft+H1OC4D1lXw=="; + }; + }; + "@jsdevtools/ono-7.1.3" = { + name = "_at_jsdevtools_slash_ono"; + packageName = "@jsdevtools/ono"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz"; + sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; + }; + }; "@kafkajs/confluent-schema-registry-1.0.6" = { name = "_at_kafkajs_slash_confluent-schema-registry"; packageName = "@kafkajs/confluent-schema-registry"; @@ -211,6 +346,15 @@ let sha512 = "aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw=="; }; }; + "@n8n_io/riot-tmpl-1.0.1" = { + name = "_at_n8n_io_slash_riot-tmpl"; + packageName = "@n8n_io/riot-tmpl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@n8n_io/riot-tmpl/-/riot-tmpl-1.0.1.tgz"; + sha512 = "+ig7/rafN3LGthGEi8fs1N5XxPndmRq5YAX92DWOar9mrMDrYyIjK5XAQaTnTMDQgmKKllrAl+bVRmQXKcLFuw=="; + }; + }; "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -265,6 +409,15 @@ let sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; }; }; + "@oclif/core-1.9.5" = { + name = "_at_oclif_slash_core"; + packageName = "@oclif/core"; + version = "1.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/core/-/core-1.9.5.tgz"; + sha512 = "C605Cr4RhHTMXYApLxdVt/PL6IA5cguN6MPvsMjxkvBppk2Fvcsj05dtRdDqShskRpZzHtu65emG1tHy8TWPWQ=="; + }; + }; "@oclif/errors-1.3.5" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -301,6 +454,15 @@ let sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; }; }; + "@oclif/screen-3.0.2" = { + name = "_at_oclif_slash_screen"; + packageName = "@oclif/screen"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.2.tgz"; + sha512 = "S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ=="; + }; + }; "@opentelemetry/api-1.1.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; @@ -346,13 +508,13 @@ let sha512 = "sBSO19KzdrJCM3gdx6eIxV8M9Gxfgg6iDQmH5TIAGaUu+X9VDdsINXJOnoiZ1Kx3TrHdH4bt5UVglkjsEGBcvw=="; }; }; - "@sqltools/formatter-1.2.2" = { + "@sqltools/formatter-1.2.3" = { name = "_at_sqltools_slash_formatter"; packageName = "@sqltools/formatter"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.2.tgz"; - sha512 = "/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q=="; + url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.3.tgz"; + sha512 = "O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -364,6 +526,15 @@ let sha512 = "lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog=="; }; }; + "@tediousjs/connection-string-0.3.0" = { + name = "_at_tediousjs_slash_connection-string"; + packageName = "@tediousjs/connection-string"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.3.0.tgz"; + sha512 = "d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ=="; + }; + }; "@tokenizer/token-0.1.1" = { name = "_at_tokenizer_slash_token"; packageName = "@tokenizer/token"; @@ -418,6 +589,15 @@ let sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; + "@types/es-aggregate-error-1.0.2" = { + name = "_at_types_slash_es-aggregate-error"; + packageName = "@types/es-aggregate-error"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.2.tgz"; + sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; + }; + }; "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -436,13 +616,13 @@ let sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; }; }; - "@types/express-serve-static-core-4.17.28" = { + "@types/express-serve-static-core-4.17.29" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.28"; + version = "4.17.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; - sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz"; + sha512 = "uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q=="; }; }; "@types/express-unless-0.5.3" = { @@ -463,13 +643,22 @@ let sha512 = "L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ=="; }; }; - "@types/generic-pool-3.1.10" = { + "@types/generic-pool-3.1.11" = { name = "_at_types_slash_generic-pool"; packageName = "@types/generic-pool"; - version = "3.1.10"; + version = "3.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/generic-pool/-/generic-pool-3.1.11.tgz"; + sha512 = "3mcD3ewmaKPbiAZglGj8We4ohlSMfw/xS+bbYUhTv/ALgqrrtJjyL4Ju9IgapXooBCTFEew5LAKQqzZV6/43xg=="; + }; + }; + "@types/glob-7.2.0" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/generic-pool/-/generic-pool-3.1.10.tgz"; - sha512 = "WRT/9taXh9XJRA9yvrbC02IqGZhK9GbFE/vuP2LeSLrqmDzz5wdXsH0Ige/F+3+rbbZfwH3LEazDsU0JiSV3vA=="; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; "@types/json-diff-0.5.2" = { @@ -481,6 +670,15 @@ let sha512 = "2oqXStJYYLDHCciNAClY277Ti3kXT+JLvPD7lLm/490i+B7g0GR6M4qiW+bd2V5vpB+yMKY8IelbsHMAYX1D0A=="; }; }; + "@types/json-schema-7.0.11" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"; + sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; + }; + }; "@types/jsonwebtoken-8.5.8" = { name = "_at_types_slash_jsonwebtoken"; packageName = "@types/jsonwebtoken"; @@ -517,31 +715,40 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.52" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "12.20.52"; + "@types/minimatch-3.0.5" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; + }; + }; + "@types/multer-1.4.7" = { + name = "_at_types_slash_multer"; + packageName = "@types/multer"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.52.tgz"; - sha512 = "cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw=="; + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz"; + sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-17.0.33" = { + "@types/node-18.0.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.33"; + version = "18.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz"; - sha512 = "miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.0.1.tgz"; + sha512 = "CmR8+Tsy95hhwtZBKJBs0/FFq4XX7sDZHlGGf+0q+BRZfMbOTkzkj0AFAuTyXbObDIoanaBBW0+KEW+m3N16Wg=="; }; }; - "@types/node-fetch-2.6.1" = { + "@types/node-fetch-2.6.2" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz"; - sha512 = "oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz"; + sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; "@types/promise-ftp-1.3.4" = { @@ -580,15 +787,6 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/readable-stream-2.3.13" = { - name = "_at_types_slash_readable-stream"; - packageName = "@types/readable-stream"; - version = "2.3.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.13.tgz"; - sha512 = "4JSCx8EUzaW9Idevt+9lsRAt1lcSccoQfE+AouM1gk8sFxnnytKNIO3wTl9Dy+4m6jRJ1yXhboLHHT/LXBQiEw=="; - }; - }; "@types/serve-static-1.13.10" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; @@ -598,13 +796,31 @@ let sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; - "@types/snowflake-sdk-1.6.4" = { + "@types/shelljs-0.8.11" = { + name = "_at_types_slash_shelljs"; + packageName = "@types/shelljs"; + version = "0.8.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.11.tgz"; + sha512 = "x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw=="; + }; + }; + "@types/snowflake-sdk-1.6.7" = { name = "_at_types_slash_snowflake-sdk"; packageName = "@types/snowflake-sdk"; - version = "1.6.4"; + version = "1.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.7.tgz"; + sha512 = "qFObD4B02XTgVX1LsAdehdoxzhvJIn2WB5I7oJBr53JC+1X/0AzaUXm7tenuf53FWg6wyVuBgG79yxxBIJpKFA=="; + }; + }; + "@types/swagger-ui-express-4.1.3" = { + name = "_at_types_slash_swagger-ui-express"; + packageName = "@types/swagger-ui-express"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.4.tgz"; - sha512 = "v3QjPbvd2dhyI5fPU5whxgUjhf9O19acIGiL65aUPCnkLIla5Z0ZqOiP3Jw5eyghunZHWohKfvtV+UdesCi29g=="; + url = "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.3.tgz"; + sha512 = "jqCjGU/tGEaqIplPy3WyQg+Nrp6y80DCFnDEAvVKWkJyv0VivSSDCChkppHRHAablvInZe6pijDFMnavtN0vqA=="; }; }; "@types/tough-cookie-2.3.8" = { @@ -625,13 +841,22 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@xmldom/xmldom-0.7.5" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.7.5"; + "@types/yamljs-0.2.31" = { + name = "_at_types_slash_yamljs"; + packageName = "@types/yamljs"; + version = "0.2.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yamljs/-/yamljs-0.2.31.tgz"; + sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ=="; + }; + }; + "@vue/compiler-sfc-2.7.2" = { + name = "_at_vue_slash_compiler-sfc"; + packageName = "@vue/compiler-sfc"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; - sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.2.tgz"; + sha512 = "khG5m63A4DSeHEOe5yyjHQY2TAE0pUXqKqxgauNUcFaa8M4+J55OWhagy8Bk8O6cO4GhKbQf2NDYzceijmOy8A=="; }; }; "abbrev-1.1.1" = { @@ -643,15 +868,6 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "abort-controller-3.0.0" = { - name = "abort-controller"; - packageName = "abort-controller"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; - sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; - }; - }; "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; @@ -688,15 +904,6 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; - "adal-node-0.2.3" = { - name = "adal-node"; - packageName = "adal-node"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz"; - sha512 = "gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ=="; - }; - }; "adler-32-1.2.0" = { name = "adler-32"; packageName = "adler-32"; @@ -742,6 +949,15 @@ let sha512 = "icU+a4kkq4Y1PS4NNi+YPDMwdlbFcZ1EZTQT2nigW3fvOb6AOgUQ9+Mk4ue0Zu5cBg/XpDzB40oH10ysrk2dmA=="; }; }; + "ansi-escapes-3.2.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; + }; + }; "ansi-escapes-4.3.2" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -751,15 +967,6 @@ let sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; - }; - }; "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -769,15 +976,6 @@ let sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="; - }; - }; "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -787,6 +985,15 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; + "ansicolors-0.3.2" = { + name = "ansicolors"; + packageName = "ansicolors"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + sha512 = "QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="; + }; + }; "any-promise-1.3.0" = { name = "any-promise"; packageName = "any-promise"; @@ -814,6 +1021,15 @@ let sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; }; }; + "append-field-1.0.0" = { + name = "append-field"; + packageName = "append-field"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz"; + sha512 = "klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="; + }; + }; "aproba-2.0.0" = { name = "aproba"; packageName = "aproba"; @@ -841,6 +1057,15 @@ let sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; + "argparse-2.0.1" = { + name = "argparse"; + packageName = "argparse"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -877,6 +1102,15 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; + "array.prototype.reduce-1.0.4" = { + name = "array.prototype.reduce"; + packageName = "array.prototype.reduce"; + version = "1.0.4"; + 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=="; + }; + }; "asn1-0.2.6" = { name = "asn1"; packageName = "asn1"; @@ -931,22 +1165,13 @@ let sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; }; - "async-2.6.4" = { - name = "async"; - packageName = "async"; - version = "2.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; - sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; - }; - }; - "async-3.2.3" = { + "async-3.2.4" = { name = "async"; packageName = "async"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; - sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; + url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; }; }; "async-validator-1.8.5" = { @@ -967,6 +1192,15 @@ let sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; }; }; + "at-least-node-1.0.0" = { + name = "at-least-node"; + packageName = "at-least-node"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; + }; + }; "auto-changelog-1.16.4" = { name = "auto-changelog"; packageName = "auto-changelog"; @@ -985,13 +1219,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1135.0" = { + "aws-sdk-2.1167.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1135.0"; + version = "2.1167.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1135.0.tgz"; - sha512 = "bl9n4QgrEh52hmQ+Jo76BgJXM/p+PwfVZvImEQHFeel/33H/PDLcTJquEw5bzxM1HRNI24iH+FNPwyWLMrttTw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1167.0.tgz"; + sha512 = "hUJzAqWVfNYpct1S+GjyPIc2s+GZcAhbWVqIG4qbLYZ3+sBTcjv3lLH5zx7K+qcTGINDU0g4EsMi6hIrAU+blg=="; }; }; "aws-sign2-0.7.0" = { @@ -1021,13 +1255,22 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-retry-3.2.5" = { + "axios-0.27.2" = { + name = "axios"; + packageName = "axios"; + version = "0.27.2"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; + sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; + }; + }; + "axios-retry-3.3.1" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.2.5"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.5.tgz"; - sha512 = "a8umkKbfIkTiYJQLx3v3TzKM85TGKB8ZQYz4zwykt2fpO64TsRlUhjaPaAb3fqMWCXFm2YhWcd8V5FHDKO9bSA=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.3.1.tgz"; + sha512 = "RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q=="; }; }; "babel-helper-vue-jsx-merge-props-2.0.3" = { @@ -1129,13 +1372,13 @@ let sha512 = "rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA=="; }; }; - "bintrees-1.0.1" = { + "bintrees-1.0.2" = { name = "bintrees"; packageName = "bintrees"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz"; - sha512 = "tbaUB1QpTIj4cKY8c1rvNAvEQXA+ekzHmbe4jzNfW3QWsF9GnnP/BRWyl6/qqS53heoYJ93naaFcm/jooONH8g=="; + url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz"; + sha512 = "VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="; }; }; "bitsyntax-0.1.0" = { @@ -1156,22 +1399,22 @@ let sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; }; }; - "bl-3.0.1" = { + "bl-4.1.0" = { name = "bl"; packageName = "bl"; - version = "3.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz"; - sha512 = "jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ=="; + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; - "bl-4.1.0" = { + "bl-5.0.0" = { name = "bl"; packageName = "bl"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + url = "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz"; + sha512 = "8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ=="; }; }; "bluebird-2.11.0" = { @@ -1237,6 +1480,15 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "brace-expansion-2.0.1" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; + }; + }; "braces-3.0.2" = { name = "braces"; packageName = "braces"; @@ -1282,6 +1534,15 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; + "buffer-6.0.3" = { + name = "buffer"; + packageName = "buffer"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz"; + sha512 = "FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="; + }; + }; "buffer-equal-constant-time-1.0.1" = { name = "buffer-equal-constant-time"; packageName = "buffer-equal-constant-time"; @@ -1327,6 +1588,15 @@ let sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; }; }; + "busboy-1.6.0" = { + name = "busboy"; + packageName = "busboy"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"; + sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; + }; + }; "byte-length-1.0.2" = { name = "byte-length"; packageName = "byte-length"; @@ -1363,6 +1633,15 @@ let sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha512 = "wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw=="; + }; + }; "callback-stream-1.1.0" = { name = "callback-stream"; packageName = "callback-stream"; @@ -1390,6 +1669,15 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; "capital-case-1.0.4" = { name = "capital-case"; packageName = "capital-case"; @@ -1399,6 +1687,15 @@ let sha512 = "ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A=="; }; }; + "cardinal-2.1.1" = { + name = "cardinal"; + packageName = "cardinal"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz"; + sha512 = "JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw=="; + }; + }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -1417,13 +1714,13 @@ let sha512 = "KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA=="; }; }; - "chalk-1.1.3" = { + "chalk-3.0.0" = { name = "chalk"; packageName = "chalk"; - version = "1.1.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; }; "chalk-4.1.2" = { @@ -1552,6 +1849,15 @@ let sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; }; }; + "cli-progress-3.11.2" = { + name = "cli-progress"; + packageName = "cli-progress"; + version = "3.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.2.tgz"; + sha512 = "lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA=="; + }; + }; "cli-width-3.0.0" = { name = "cli-width"; packageName = "cli-width"; @@ -1570,6 +1876,15 @@ let sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q=="; }; }; + "cliui-6.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; + }; + }; "cliui-7.0.4" = { name = "cliui"; packageName = "cliui"; @@ -1630,7 +1945,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; }; "color-name-1.1.4" = { @@ -1666,7 +1981,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; + sha512 = "/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="; }; }; "colorspace-1.1.4" = { @@ -1705,13 +2020,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-9.2.0" = { + "commander-9.3.0" = { name = "commander"; packageName = "commander"; - version = "9.2.0"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.2.0.tgz"; - sha512 = "e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w=="; + url = "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz"; + sha512 = "hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw=="; }; }; "commist-1.1.0" = { @@ -1729,7 +2044,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"; - sha1 = "8a47901700238e4fc32269771230226f24b415a9"; + sha512 = "Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg=="; }; }; "compressible-2.0.18" = { @@ -1756,7 +2071,16 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; + }; + }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; "concat-stream-2.0.0" = { @@ -1783,7 +2107,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; }; "constant-case-3.0.4" = { @@ -1855,7 +2179,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; "core-js-2.6.12" = { @@ -1867,13 +2191,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.22.5" = { + "core-js-3.23.3" = { name = "core-js"; packageName = "core-js"; - version = "3.22.5"; + version = "3.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz"; - sha512 = "VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.23.3.tgz"; + sha512 = "oAKwkj9xcWNBAvGbT//WiCdOMpb9XQG92/Fe3ABFM/R16BsHgePG00mFOgKf7IsCtfj8tA1kHtf/VwErhriz5Q=="; }; }; "core-util-is-1.0.2" = { @@ -1882,7 +2206,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; + }; + }; + "core-util-is-1.0.3" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; }; "crc-32-1.2.2" = { @@ -1918,7 +2251,16 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; - sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + sha512 = "yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA=="; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; "crypt-0.0.2" = { @@ -1927,7 +2269,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + sha512 = "mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="; }; }; "crypto-js-4.1.1" = { @@ -1972,7 +2314,16 @@ let version = "0.0.10"; src = fetchurl { url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; - sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae"; + sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="; + }; + }; + "csstype-3.1.0" = { + name = "csstype"; + packageName = "csstype"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz"; + sha512 = "uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="; }; }; "dashdash-1.14.1" = { @@ -1981,16 +2332,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "date-utils-1.2.21" = { - name = "date-utils"; - packageName = "date-utils"; - version = "1.2.21"; - src = fetchurl { - url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; - sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; + sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; "debug-2.6.9" = { @@ -2035,7 +2377,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; - sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; + sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; "deepmerge-1.5.2" = { @@ -2056,6 +2407,15 @@ let sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; }; + "define-lazy-prop-2.0.0" = { + name = "define-lazy-prop"; + packageName = "define-lazy-prop"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; + sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; + }; + }; "define-properties-1.1.4" = { name = "define-properties"; packageName = "define-properties"; @@ -2071,7 +2431,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; }; }; "delegates-1.0.0" = { @@ -2080,7 +2440,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; }; "denque-1.5.1" = { @@ -2143,7 +2503,7 @@ let version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; - sha1 = "b5e30361a6db023176d562892db85940a718f47e"; + sha512 = "9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w=="; }; }; "dir-glob-3.0.1" = { @@ -2161,7 +2521,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; - sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; + sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; }; }; "dom-serializer-1.4.1" = { @@ -2224,7 +2584,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"; - sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b"; + sha512 = "KRJa47iBEK0y6ZtgCgy2ykuvMT8c9gj3ua9Dv7vCkclFJJeH2FjhGY2xO5qBoWGahsjCGMlk4Cq9wJYeWxuYhQ=="; }; }; "duplexify-3.7.1" = { @@ -2242,7 +2602,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; }; }; "ecdsa-sig-formatter-1.0.11" = { @@ -2260,16 +2620,25 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; + }; + }; + "ejs-3.1.8" = { + name = "ejs"; + packageName = "ejs"; + version = "3.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz"; + sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "element-ui-2.15.8" = { + "element-ui-2.15.9" = { name = "element-ui"; packageName = "element-ui"; - version = "2.15.8"; + version = "2.15.9"; src = fetchurl { - url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz"; - sha512 = "N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A=="; + url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.9.tgz"; + sha512 = "dx45nQLt4Hn87/Z9eRr3ex6KFZbxlFAwEU3QoW3wA5EsYftvHTyL9Pq7VnXXD7hu1Eiaup2jcs6kp+/VSFmXuA=="; }; }; "emoji-regex-8.0.0" = { @@ -2287,7 +2656,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + sha512 = "nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA=="; }; }; "enabled-2.0.0" = { @@ -2305,7 +2674,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; "encoding-japanese-2.0.0" = { @@ -2353,13 +2722,31 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.20.0" = { + "es-abstract-1.20.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.0"; + version = "1.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"; + sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; + }; + }; + "es-aggregate-error-1.0.8" = { + name = "es-aggregate-error"; + packageName = "es-aggregate-error"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz"; - sha512 = "URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA=="; + url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.8.tgz"; + sha512 = "AKUb5MKLWMozPlFRHOKqWD7yta5uaEhH21qwtnf6FlKjNjTJOoqFi0/G14+FfSkIQhhu6X68Af4xgRC6y8qG4A=="; + }; + }; + "es-array-method-boxes-properly-1.0.0" = { + name = "es-array-method-boxes-properly"; + packageName = "es-array-method-boxes-properly"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; + sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; "es-to-primitive-1.2.1" = { @@ -2377,7 +2764,7 @@ let version = "0.8.2"; src = fetchurl { url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz"; - sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; + sha512 = "H19ompyhnKiBdjHR1DPHvf5RHgHPmJaY9JNzFGbMbPgdsUkvnUCN1Ke8J4Y0IMyTwFM2M9l4h2GoHwzwpSmXbA=="; }; }; "escalade-3.1.1" = { @@ -2395,7 +2782,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; }; }; "escape-string-regexp-1.0.5" = { @@ -2404,7 +2791,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; "escape-string-regexp-4.0.0" = { @@ -2422,7 +2809,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/eslint-config-riot/-/eslint-config-riot-1.0.0.tgz"; - sha1 = "fbd65386980b30fbcd0e1305d4c3fb8614ef2119"; + sha512 = "NB/L/1Y30qyJcG5xZxCJKW/+bqyj+llbcCwo9DEz8bESIP0SLTOQ8T1DWCCFc+wJ61AMEstj4511PSScqMMfCw=="; }; }; "esprima-4.0.1" = { @@ -2440,16 +2827,7 @@ let version = "1.8.1"; src = fetchurl { url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; - }; - }; - "event-target-shim-5.0.1" = { - name = "event-target-shim"; - packageName = "event-target-shim"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; - sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; + sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; "events-1.1.1" = { @@ -2458,7 +2836,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; - sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + sha512 = "kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw=="; }; }; "events-3.3.0" = { @@ -2494,7 +2872,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + sha512 = "A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw=="; }; }; "express-4.18.1" = { @@ -2506,6 +2884,15 @@ let sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; + "express-openapi-validator-4.13.8" = { + name = "express-openapi-validator"; + packageName = "express-openapi-validator"; + version = "4.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/express-openapi-validator/-/express-openapi-validator-4.13.8.tgz"; + sha512 = "89/sdkq+BKBuIyykaMl/vR9grFc3WFUPTjFo0THHbu+5g+q8rA7fKeoMfz+h84yOQIBcztmJ5ZJdk5uhEls31A=="; + }; + }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -2530,7 +2917,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; }; }; "fast-deep-equal-3.1.3" = { @@ -2587,15 +2974,6 @@ let sha512 = "0Zz1jOzJWERhyhsimS54VTqOteCNwRtIlh8isdL0AXLo0g7xNTfTL7oWrkmCnPhZGocKIkWHBistBrrpoNH3aw=="; }; }; - "figlet-1.5.2" = { - name = "figlet"; - packageName = "figlet"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz"; - sha512 = "WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="; - }; - }; "figures-3.2.0" = { name = "figures"; packageName = "figures"; @@ -2614,6 +2992,15 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; + "filelist-1.0.4" = { + name = "filelist"; + packageName = "filelist"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz"; + sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; + }; + }; "fill-range-7.0.1" = { name = "fill-range"; packageName = "fill-range"; @@ -2632,13 +3019,22 @@ let sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; - "flatted-3.2.5" = { + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; + "flatted-3.2.6" = { name = "flatted"; packageName = "flatted"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz"; + sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="; }; }; "fn.name-1.1.0" = { @@ -2650,13 +3046,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.15.0" = { + "follow-redirects-1.15.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz"; - sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"; + sha512 = "yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="; }; }; "for-each-0.3.3" = { @@ -2674,7 +3070,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; }; }; "form-data-2.3.3" = { @@ -2686,15 +3082,6 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "form-data-2.5.1" = { - name = "form-data"; - packageName = "form-data"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; - sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; - }; - }; "form-data-3.0.1" = { name = "form-data"; packageName = "form-data"; @@ -2746,7 +3133,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; }; }; "fs-extra-8.1.0" = { @@ -2758,6 +3145,15 @@ let sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; + "fs-extra-9.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; + }; + }; "fs-minipass-2.1.0" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -2773,7 +3169,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; "function-bind-1.1.1" = { @@ -2848,13 +3244,22 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.1.1" = { + "get-intrinsic-1.1.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.1"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; + sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; + }; + }; + "get-package-type-0.1.0" = { + name = "get-package-type"; + packageName = "get-package-type"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + url = "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"; + sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; }; "get-port-5.1.1" = { @@ -2890,7 +3295,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; "glob-7.2.3" = { @@ -2908,7 +3313,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; - sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + sha512 = "E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA=="; }; }; "glob-parent-5.1.2" = { @@ -2926,7 +3331,16 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; - sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + sha512 = "uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw=="; + }; + }; + "globalthis-1.0.3" = { + name = "globalthis"; + packageName = "globalthis"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; + sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; "globby-11.1.0" = { @@ -2944,7 +3358,7 @@ let version = "1.23.1"; src = fetchurl { url = "https://registry.npmjs.org/gm/-/gm-1.23.1.tgz"; - sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; + sha512 = "wYGVAa8/sh9ggF5qWoOs6eArcAgwEPkDNvf637jHRHkMUznvs7m/Q2vrc0KLN6B8px3nnRJqJcXK4mTK6lLFmg=="; }; }; "google-timezones-json-1.0.2" = { @@ -2980,7 +3394,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; }; }; "har-validator-5.1.5" = { @@ -3001,15 +3415,6 @@ let sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; "has-bigints-1.0.2" = { name = "has-bigints"; packageName = "has-bigints"; @@ -3061,7 +3466,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; }; "he-1.2.0" = { @@ -3097,7 +3502,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; - sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; + sha512 = "P/IZ8yOMne3SCTHbVY429NZ67B/2bVQlcYGZh2iPPbdLrEQ/qY5aGChn0YTDmt7Sb4IKRI51fypItav+lNl76w=="; }; }; "highlight.js-10.7.3" = { @@ -3160,7 +3565,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; }; }; "https-proxy-agent-5.0.1" = { @@ -3172,6 +3577,15 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; + "hyperlinker-1.0.0" = { + name = "hyperlinker"; + packageName = "hyperlinker"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz"; + sha512 = "Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ=="; + }; + }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -3181,15 +3595,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"; @@ -3241,7 +3646,7 @@ let version = "0.8.19"; src = fetchurl { url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; - sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5"; + sha512 = "z5DxEA1uRnZG73UcPA4ES5NSCGnPuuouUx43OPX7KZx1yzq3N8/vx2mtXEShT5inxB3pRgnfG1hijfu7XN2YMw=="; }; }; "imap-simple-4.3.0" = { @@ -3268,7 +3673,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; "inherits-2.0.4" = { @@ -3298,6 +3703,15 @@ let sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; }; + "interpret-1.4.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"; + sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; + }; + }; "ioredis-4.28.5" = { name = "ioredis"; packageName = "ioredis"; @@ -3313,7 +3727,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + sha512 = "58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="; }; }; "ipaddr.js-1.9.1" = { @@ -3388,6 +3802,15 @@ let sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; + "is-core-module-2.9.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; + }; + }; "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; @@ -3412,7 +3835,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; }; "is-fullwidth-code-point-3.0.0" = { @@ -3430,7 +3853,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + sha512 = "UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw=="; }; }; "is-glob-4.0.3" = { @@ -3457,7 +3880,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; - sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + sha512 = "czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug=="; }; }; "is-negative-zero-2.0.2" = { @@ -3502,7 +3925,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; - sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; + sha512 = "mjWH5XxnhMA8cFnDchr6qRP9S/kLntKuEfIYku+PaN1CnS8v+OG9O/BKpRCVRJvpIkgAZm0Pf5Is3iSSOILlcg=="; }; }; "is-property-1.0.2" = { @@ -3511,7 +3934,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + sha512 = "Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g=="; }; }; "is-regex-1.1.4" = { @@ -3583,7 +4006,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; }; }; "is-unc-path-1.0.0" = { @@ -3628,7 +4051,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + sha512 = "D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="; }; }; "isarray-1.0.0" = { @@ -3637,16 +4060,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isbot-3.4.7" = { + "isbot-3.5.0" = { name = "isbot"; packageName = "isbot"; - version = "3.4.7"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.4.7.tgz"; - sha512 = "huiRPlUf/je4GfR/pms78bOnUYRmwo2Dg/d9aRQCPXIIK3uX6u+iRFuTLsq969X40JcCunHrbS4SFlXIcEIoUw=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.5.0.tgz"; + sha512 = "QOFF7IE7hUdzo8pbhCubeiMzKdLZt+W/UwRZWwg+zghmnqXoMwh2V0bi5UT+oIvoD0IWCWjzAtp30ZrrRwJVCg=="; }; }; "isexe-2.0.0" = { @@ -3655,16 +4078,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; - "iso-639-1-2.1.13" = { + "iso-639-1-2.1.15" = { name = "iso-639-1"; packageName = "iso-639-1"; - version = "2.1.13"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.13.tgz"; - sha512 = "stYt3u6OnVDNcK4IWARGXmTOOY5Wa5g4bUmBsttZp/55ZiEjDUibR3C59ZnorKoSS0tfJmFuGMST3ksnY1zu7Q=="; + url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz"; + sha512 = "7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg=="; }; }; "isstream-0.1.2" = { @@ -3673,7 +4096,16 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; + }; + }; + "jake-10.8.5" = { + name = "jake"; + packageName = "jake"; + version = "10.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz"; + sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; }; }; "jmespath-0.16.0" = { @@ -3691,7 +4123,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"; - sha1 = "b8417b750661a392bee2c2537c68b2a9d4977cd5"; + sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; + }; + }; + "js-md4-0.3.2" = { + name = "js-md4"; + packageName = "js-md4"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-md4/-/js-md4-0.3.2.tgz"; + sha512 = "/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA=="; }; }; "js-yaml-3.14.1" = { @@ -3703,13 +4144,22 @@ let sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; - "jsbi-3.2.5" = { + "js-yaml-4.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; + }; + }; + "jsbi-4.3.0" = { name = "jsbi"; packageName = "jsbi"; - version = "3.2.5"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsbi/-/jsbi-3.2.5.tgz"; - sha512 = "aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ=="; + url = "https://registry.npmjs.org/jsbi/-/jsbi-4.3.0.tgz"; + sha512 = "SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g=="; }; }; "jsbn-0.1.1" = { @@ -3718,7 +4168,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; "json-diff-0.5.5" = { @@ -3739,6 +4189,15 @@ let sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; + "json-schema-ref-parser-9.0.9" = { + name = "json-schema-ref-parser"; + packageName = "json-schema-ref-parser"; + version = "9.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; + sha512 = "qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q=="; + }; + }; "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -3754,7 +4213,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; "json-stringify-safe-5.0.1" = { @@ -3763,7 +4222,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; "jsonfile-4.0.0" = { @@ -3772,7 +4231,25 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; + }; + }; + "jsonfile-6.1.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + }; + "jsonschema-1.4.1" = { + name = "jsonschema"; + packageName = "jsonschema"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz"; + sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; }; }; "jsonwebtoken-8.5.1" = { @@ -3802,6 +4279,15 @@ let sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; }; }; + "jwa-2.0.0" = { + name = "jwa"; + packageName = "jwa"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz"; + sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; + }; + }; "jwks-rsa-1.12.3" = { name = "jwks-rsa"; packageName = "jwks-rsa"; @@ -3820,6 +4306,15 @@ let sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; }; }; + "jws-4.0.0" = { + name = "jws"; + packageName = "jws"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz"; + sha512 = "KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg=="; + }; + }; "kafkajs-1.16.0" = { name = "kafkajs"; packageName = "kafkajs"; @@ -3853,7 +4348,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + sha512 = "nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="; }; }; "libbase64-1.2.1" = { @@ -3874,13 +4369,13 @@ let sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; - "libphonenumber-js-1.9.53" = { + "libphonenumber-js-1.10.7" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.9.53"; + version = "1.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.53.tgz"; - sha512 = "3cuMrA2CY3TbKVC0wKye5dXYgxmVVi4g13gzotprQSguFHMqf0pIrMM2Z6ZtMsSWqvtIqi5TuQhGjMhxz0O9Mw=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.7.tgz"; + sha512 = "jZXLCCWMe1b/HXkjiLeYt2JsytZMcqH26jLFIdzFDFF0xvSUWrYKyvPlyPG+XJzEyKUFbcZxLdWGMwQsWaHDxQ=="; }; }; "libqp-1.1.0" = { @@ -3889,7 +4384,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; - sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; + sha512 = "4Rgfa0hZpG++t1Vi2IiqXG9Ad1ig4QTmtuZF946QJP4bPqOYC78ixUXgz5TW/wE7lNaNKlplSYTxQ+fR2KZ0EA=="; }; }; "limiter-1.1.5" = { @@ -3919,6 +4414,15 @@ let sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; }; }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; @@ -3943,7 +4447,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="; }; }; "lodash.defaults-4.2.0" = { @@ -3952,7 +4456,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + sha512 = "qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="; }; }; "lodash.flatten-4.4.0" = { @@ -3961,7 +4465,7 @@ let version = "4.4.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; }; }; "lodash.get-4.4.2" = { @@ -3970,7 +4474,7 @@ let version = "4.4.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; "lodash.includes-4.3.0" = { @@ -3979,7 +4483,7 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; - sha1 = "60bb98a87cb923c68ca1e51325483314849f553f"; + sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; }; }; "lodash.isarguments-3.1.0" = { @@ -3988,7 +4492,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; + sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; }; }; "lodash.isboolean-3.0.3" = { @@ -3997,7 +4501,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; + sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; }; }; "lodash.isequal-4.5.0" = { @@ -4006,7 +4510,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; - sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + sha512 = "pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="; }; }; "lodash.isinteger-4.0.4" = { @@ -4015,7 +4519,7 @@ let version = "4.0.4"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; - sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; + sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; }; }; "lodash.isnumber-3.0.3" = { @@ -4024,7 +4528,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; - sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc"; + sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; }; }; "lodash.isplainobject-4.0.6" = { @@ -4033,7 +4537,7 @@ let version = "4.0.6"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; }; }; "lodash.isstring-4.0.1" = { @@ -4042,7 +4546,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; }; }; "lodash.merge-4.6.2" = { @@ -4060,7 +4564,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; + sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; "lodash.set-4.3.2" = { @@ -4069,7 +4573,7 @@ let version = "4.3.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz"; - sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; + sha512 = "4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="; }; }; "lodash.throttle-4.1.1" = { @@ -4078,7 +4582,16 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; - sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; + sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; + }; + }; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; }; }; "lodash.uniqby-4.7.0" = { @@ -4087,7 +4600,7 @@ let version = "4.7.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; - sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + sha512 = "e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww=="; }; }; "lodash.unset-4.5.2" = { @@ -4096,16 +4609,25 @@ let version = "4.5.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.unset/-/lodash.unset-4.5.2.tgz"; - sha1 = "370d1d3e85b72a7e1b0cdf2d272121306f23e4ed"; + sha512 = "bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg=="; }; }; - "logform-2.4.0" = { + "lodash.zipobject-4.1.3" = { + name = "lodash.zipobject"; + packageName = "lodash.zipobject"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz"; + sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ=="; + }; + }; + "logform-2.4.1" = { name = "logform"; packageName = "logform"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz"; - sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; + url = "https://registry.npmjs.org/logform/-/logform-2.4.1.tgz"; + sha512 = "7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A=="; }; }; "long-4.0.0" = { @@ -4141,7 +4663,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; - sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; + sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw=="; }; }; "lru-cache-4.1.5" = { @@ -4225,13 +4747,13 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; - "mappersmith-2.38.1" = { + "mappersmith-2.39.1" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.38.1"; + version = "2.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.1.tgz"; - sha512 = "ecZ+YyzBK7r3tC8MTaGo5tySHPhB6f9jdxN706Tux6dMlcE2fgwiBM/bf/+Sz5m2yKlTq5ntiahz7xSPgurD6w=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.39.1.tgz"; + sha512 = "f0QbIwG7CrwhIu7CZts2BsXyMhhZvmEeEtlHC+At23h4//mFVk0cRNZI+v21lzvvWAIBeE55AwEER7koi8iz/A=="; }; }; "material-colors-1.2.6" = { @@ -4258,7 +4780,16 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; + }; + }; + "media-typer-1.1.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz"; + sha512 = "aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="; }; }; "merge-descriptors-1.0.1" = { @@ -4267,7 +4798,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; "merge2-1.4.1" = { @@ -4285,7 +4816,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; }; }; "micromatch-4.0.5" = { @@ -4303,7 +4834,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/millisecond/-/millisecond-0.1.2.tgz"; - sha1 = "6cc5ad386241cab8e78aff964f87028eec92dac5"; + sha512 = "BJ8XtxY+woL+5TkP6uS6XvOArm0JVrX2otkgtWZseHpIax0oOOPW3cnwhOjRqbEJg7YRO/BDF7fO/PTWNT3T9Q=="; }; }; "mime-1.6.0" = { @@ -4360,6 +4891,15 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; + "minimatch-5.1.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; + sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + }; + }; "minimist-1.2.6" = { name = "minimist"; packageName = "minimist"; @@ -4369,13 +4909,13 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; - "minipass-3.1.6" = { + "minipass-3.3.4" = { name = "minipass"; packageName = "minipass"; - version = "3.1.6"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz"; - sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; + sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; }; }; "minizlib-2.1.2" = { @@ -4387,6 +4927,15 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; + "mkdirp-0.5.6" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; + }; + }; "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; @@ -4423,13 +4972,13 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; - "monaco-editor-0.29.1" = { + "monaco-editor-0.30.1" = { name = "monaco-editor"; packageName = "monaco-editor"; - version = "0.29.1"; + version = "0.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.29.1.tgz"; - sha512 = "rguaEG/zrPQSaKzQB7IfX/PpNa0qxF1FY8ZXRkN4WIl8qZdTQRSRJCtRto7IMcSgrU6H53RXI+fTcywOBC4aVw=="; + url = "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz"; + sha512 = "B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg=="; }; }; "mongodb-3.7.3" = { @@ -4474,7 +5023,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; }; }; "ms-2.1.2" = { @@ -4495,13 +5044,22 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-6.4.1" = { + "mssql-8.1.2" = { name = "mssql"; packageName = "mssql"; - version = "6.4.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz"; - sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; + url = "https://registry.npmjs.org/mssql/-/mssql-8.1.2.tgz"; + sha512 = "xkTw3Sp1Jpq2f7CG3rFQn6YK4XZbnL8HfZhaB/KRC/hjDZlJB3pSWYN2Cp/WwxIeA1iUJkdFa6GTfdMY8+DAjg=="; + }; + }; + "multer-1.4.5-lts.1" = { + name = "multer"; + packageName = "multer"; + version = "1.4.5-lts.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz"; + sha512 = "ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ=="; }; }; "mute-stream-0.0.8" = { @@ -4531,49 +5089,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.117.0" = { + "n8n-core-0.125.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.117.0"; + version = "0.125.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.117.0.tgz"; - sha512 = "GEU8qBS/Gt+2FHNNb8txDkerzG7vlfDdeiy56lPF+oZJyEZzqgSJ8fNRUcv2b2kd5XjU9zTDcmjARclDC6SNmA=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.125.0.tgz"; + sha512 = "xywzkbtSkhxMzCQNZacklxdqAxl6sVgIJLJ8IUuHtfdcS7E6VJNJ5SIT/Ypl+E3UAsfH1kiHHdlkDgLGyB20tA=="; }; }; - "n8n-design-system-0.20.0" = { + "n8n-design-system-0.25.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.20.0"; + version = "0.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.20.0.tgz"; - sha512 = "uqcrm+fRtTd7A6+ai48GFcjpU4nIV+UmPld8p/8hoUpwCY265AojGaSKCWHzt8TceLCJXx5rlmLliE+v69d/sA=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.25.0.tgz"; + sha512 = "vS1dIW6n3/MxrKFJ8EpIt4oMNnvYmoweL2kncDja7CpvOO3Zqsa0ElqUvhbbxypk0DcfSQMonNWfSonGrNIgeg=="; }; }; - "n8n-editor-ui-0.143.0" = { + "n8n-editor-ui-0.151.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.143.0"; + version = "0.151.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.143.0.tgz"; - sha512 = "deb5c30jpLw4YKetmTeLNIyki7td2R24uVzsZ3BDGElybR+0DaJbMBRIZ6+bjq8IS750gaTeumKrH8ZBq9BSkg=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.151.0.tgz"; + sha512 = "3VbZm2jfOC4BXUDzhdBvtx3L+XPnr2LdLVLQ2yrx6HvDFUpMExuxmoQ3I8/aDTo5asVDEHgi7TKkISqY8LKi8A=="; }; }; - "n8n-nodes-base-0.175.0" = { + "n8n-nodes-base-0.183.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.175.0"; + version = "0.183.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.175.0.tgz"; - sha512 = "KfyEbhK4T0sULZ75jcjU0U1IqXm/MNzL7GpRhBjDumDE1WRfpKSBdtYGFsHCbUEXroHnJjF2/L+ADJ9CV0g5MQ=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.183.0.tgz"; + sha512 = "JH7FodkX+RtvmyqxMyro9hskhLNSigYUOcnX/6568dipH3ZiOgk+GDQD0VApBoOFpV1GHuWF85onkMoEiEJ3HA=="; }; }; - "n8n-workflow-0.99.0" = { + "n8n-workflow-0.107.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.99.0"; + version = "0.107.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.99.0.tgz"; - sha512 = "JVZQnncjVphY73jcPY2oW4fZ0WoKDDwC1Xzf509KAu362psOJ5Xrz4mAJwuj7Qv1H88UGhEOojvt/5gbRLi4zA=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.107.0.tgz"; + sha512 = "+SuZ+5aA+sEovnkkobdZNEGFW/0oCTItCpXaL2+umI0TFrqgL8NGGVKwYLIkX6YATa5W3LVgbEszKDECg2sPJA=="; }; }; "named-placeholders-1.1.2" = { @@ -4609,7 +5167,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/native-duplexpair/-/native-duplexpair-1.0.0.tgz"; - sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0"; + sha512 = "E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA=="; + }; + }; + "natural-orderby-2.0.3" = { + name = "natural-orderby"; + packageName = "natural-orderby"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz"; + sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; "nearley-2.20.1" = { @@ -4639,6 +5206,15 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; "no-case-3.0.4" = { name = "no-case"; packageName = "no-case"; @@ -4648,6 +5224,15 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; + "node-abort-controller-3.0.1" = { + name = "node-abort-controller"; + packageName = "node-abort-controller"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz"; + sha512 = "/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="; + }; + }; "node-addon-api-4.3.0" = { name = "node-addon-api"; packageName = "node-addon-api"; @@ -4663,7 +5248,7 @@ let version = "0.0.0"; src = fetchurl { url = "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz"; - sha1 = "ecae764150de99861ec5c810fd5d096b183932a7"; + sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw=="; }; }; "node-fetch-2.6.7" = { @@ -4708,7 +5293,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz"; - sha1 = "64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d"; + sha512 = "n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw=="; }; }; "nodemailer-6.7.3" = { @@ -4720,13 +5305,13 @@ let sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; - "nodemailer-6.7.5" = { + "nodemailer-6.7.6" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.5"; + version = "6.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz"; - sha512 = "6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.6.tgz"; + sha512 = "/6KF/umU7r7X21Y648/yiRLrgkfz0dmpyuo4BfgYWIpnT/jCbkPTvegMfxCsDAu+O810p2L1BGXieMTPp3nJVA=="; }; }; "nopt-5.0.0" = { @@ -4744,7 +5329,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + sha512 = "3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="; }; }; "normalize-path-3.0.0" = { @@ -4762,7 +5347,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz"; - sha1 = "aec886affdb045070d856447df62ecf86146ec45"; + sha512 = "1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="; }; }; "npmlog-5.0.1" = { @@ -4774,13 +5359,13 @@ let sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; - "nth-check-2.0.1" = { + "nth-check-2.1.1" = { name = "nth-check"; packageName = "nth-check"; - version = "2.0.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz"; - sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; + url = "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"; + sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; }; }; "oauth-1.0a-2.2.6" = { @@ -4807,16 +5392,16 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; }; - "object-inspect-1.12.0" = { + "object-inspect-1.12.2" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.12.0"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; - sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; + sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; }; }; "object-keys-1.1.1" = { @@ -4828,6 +5413,15 @@ let sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; + "object-treeify-1.1.33" = { + name = "object-treeify"; + packageName = "object-treeify"; + version = "1.1.33"; + src = fetchurl { + url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.33.tgz"; + sha512 = "EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A=="; + }; + }; "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; @@ -4837,13 +5431,13 @@ let sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; - "object.getownpropertydescriptors-2.1.3" = { + "object.getownpropertydescriptors-2.1.4" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"; - sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz"; + sha512 = "sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ=="; }; }; "on-finished-2.4.1" = { @@ -4870,7 +5464,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "one-time-1.0.0" = { @@ -4891,6 +5485,15 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; + "ono-7.1.3" = { + name = "ono"; + packageName = "ono"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ono/-/ono-7.1.3.tgz"; + sha512 = "9jnfVriq7uJM4o5ganUY54ntUm+5EK21EGaQ5NWnkWg3zz5ywbbonlBguRcnmF1/HDiIe3zxNxXcO1YPBmPcQQ=="; + }; + }; "open-7.4.2" = { name = "open"; packageName = "open"; @@ -4900,13 +5503,40 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; + "open-8.4.0" = { + name = "open"; + packageName = "open"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; + sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; + }; + }; + "openapi-types-1.3.5" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz"; + sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; + }; + }; + "openapi-types-10.0.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-10.0.0.tgz"; + sha512 = "Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ=="; + }; + }; "openurl-1.1.1" = { name = "openurl"; packageName = "openurl"; version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; - sha1 = "3875b4b0ef7a52c156f0db41d4609dbb0f94b387"; + sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; }; }; "optional-require-1.1.8" = { @@ -4924,7 +5554,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; - sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; + sha512 = "Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw=="; }; }; "os-tmpdir-1.0.2" = { @@ -4933,7 +5563,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; }; "p-cancelable-2.1.1" = { @@ -4951,7 +5581,25 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; + }; + }; + "p-limit-2.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; "p-map-2.1.0" = { @@ -4972,6 +5620,15 @@ let sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; "packet-reader-1.0.0" = { name = "packet-reader"; packageName = "packet-reader"; @@ -4990,15 +5647,6 @@ let sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; }; }; - "parent-require-1.0.0" = { - name = "parent-require"; - packageName = "parent-require"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz"; - sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; - }; - }; "parse-github-url-1.0.2" = { name = "parse-github-url"; packageName = "parse-github-url"; @@ -5014,7 +5662,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + sha512 = "1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="; }; }; "parse-srcset-1.0.2" = { @@ -5023,7 +5671,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; - sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; + sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; }; }; "parse5-5.1.1" = { @@ -5113,7 +5761,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; - sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + sha512 = "CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA=="; + }; + }; + "password-prompt-1.1.2" = { + name = "password-prompt"; + packageName = "password-prompt"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz"; + sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA=="; }; }; "path-case-3.0.4" = { @@ -5131,7 +5788,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; - sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + sha512 = "ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; }; "path-is-absolute-1.0.1" = { @@ -5140,7 +5806,25 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; + }; + }; + "path-parse-1.0.7" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-0.1.7" = { @@ -5149,7 +5833,16 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; + }; + }; + "path-to-regexp-6.2.1" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz"; + sha512 = "JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="; }; }; "path-type-4.0.0" = { @@ -5167,7 +5860,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + sha512 = "KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="; }; }; "pdf-parse-1.1.1" = { @@ -5194,7 +5887,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; "pg-8.7.1" = { @@ -5368,13 +6061,13 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; - "postcss-8.4.13" = { + "postcss-8.4.14" = { name = "postcss"; packageName = "postcss"; - version = "8.4.13"; + version = "8.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; - sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; + sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; }; }; "postgres-array-2.0.0" = { @@ -5392,7 +6085,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + sha512 = "xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w=="; }; }; "postgres-date-1.0.7" = { @@ -5428,7 +6121,7 @@ let version = "0.11.10"; src = fetchurl { url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; }; }; "process-nextick-args-2.0.1" = { @@ -5455,7 +6148,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz"; - sha1 = "e5cc9a4c8278e4664ffedc01c7da84842b040175"; + sha512 = "R9WrbTF3EPkVtWjp7B7umQGVndpsi+rsDAfrR4xAALQpFLa/+2OriecLhawxzvii2gd9+DZFwROWDuUUaqS5yA=="; }; }; "promise-ftp-1.3.5" = { @@ -5473,7 +6166,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz"; - sha1 = "b4f8082a74035647703506763edb14230d9865da"; + sha512 = "a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg=="; }; }; "promise-retry-2.0.1" = { @@ -5527,16 +6220,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; }; }; - "psl-1.8.0" = { + "psl-1.9.0" = { name = "psl"; packageName = "psl"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; "pump-2.0.1" = { @@ -5572,7 +6265,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; }; "punycode-2.1.1" = { @@ -5617,7 +6310,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; + sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; }; }; "querystringify-2.2.0" = { @@ -5644,7 +6337,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/quoted-printable/-/quoted-printable-1.0.1.tgz"; - sha1 = "9eebf5eb3d11eef022b264fd2d2b6b2bb3b84cc3"; + sha512 = "cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g=="; }; }; "railroad-diagrams-1.0.0" = { @@ -5653,7 +6346,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e"; + sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; }; }; "randexp-0.4.6" = { @@ -5671,7 +6364,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; - sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + sha512 = "iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ=="; }; }; "randombytes-2.1.0" = { @@ -5707,7 +6400,7 @@ let version = "1.1.14"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; }; "readable-stream-2.3.7" = { @@ -5746,6 +6439,24 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha512 = "HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw=="; + }; + }; + "redeyed-2.1.1" = { + name = "redeyed"; + packageName = "redeyed"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz"; + sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ=="; + }; + }; "redis-3.1.2" = { name = "redis"; packageName = "redis"; @@ -5770,7 +6481,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"; - sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; + sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w=="; }; }; "redis-parser-3.0.0" = { @@ -5779,7 +6490,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"; - sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; + sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A=="; }; }; "reflect-metadata-0.1.13" = { @@ -5824,7 +6535,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; - sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; + sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ=="; }; }; "remove-trailing-separator-1.1.0" = { @@ -5833,7 +6544,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; }; }; "remove-trailing-slash-0.1.1" = { @@ -5896,7 +6607,16 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; "requires-port-1.0.0" = { @@ -5905,7 +6625,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; "resize-observer-polyfill-1.5.1" = { @@ -5917,6 +6637,15 @@ let sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; }; }; + "resolve-1.22.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.22.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; + }; + }; "restore-cursor-3.1.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -5941,7 +6670,7 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; - sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; }; "reusify-1.0.4" = { @@ -5953,6 +6682,15 @@ let sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; }; }; + "rfdc-1.3.0" = { + name = "rfdc"; + packageName = "rfdc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"; + sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; + }; + }; "rhea-1.0.24" = { name = "rhea"; packageName = "rhea"; @@ -5971,22 +6709,13 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; - "riot-tmpl-3.0.8" = { - name = "riot-tmpl"; - packageName = "riot-tmpl"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/riot-tmpl/-/riot-tmpl-3.0.8.tgz"; - sha1 = "dd654e72a3a1520cb009cbef70c73856ded584a6"; - }; - }; "rndm-1.2.0" = { name = "rndm"; packageName = "rndm"; version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; - sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + sha512 = "fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw=="; }; }; "rss-parser-3.12.0" = { @@ -6076,7 +6805,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + sha512 = "8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="; }; }; "sax-1.2.4" = { @@ -6121,7 +6850,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + sha512 = "mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="; }; }; "semver-5.7.1" = { @@ -6175,7 +6904,7 @@ let version = "0.0.5"; src = fetchurl { url = "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz"; - sha1 = "d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"; + sha512 = "hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="; }; }; "serialize-javascript-5.0.1" = { @@ -6211,7 +6940,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; "setheader-1.0.2" = { @@ -6241,13 +6970,40 @@ let sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; + }; + }; "shell-escape-0.2.0" = { name = "shell-escape"; packageName = "shell-escape"; version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/shell-escape/-/shell-escape-0.2.0.tgz"; - sha1 = "68fd025eb0490b4f567a027f0bf22480b5f84133"; + sha512 = "uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw=="; + }; + }; + "shelljs-0.8.5" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz"; + sha512 = "TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow=="; }; }; "showdown-2.1.0" = { @@ -6277,13 +7033,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.7.1" = { + "simple-git-3.10.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.7.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.7.1.tgz"; - sha512 = "+Osjtsumbtew2y9to0pOYjNzSIr4NkKGBg7Po5SUtjQhaJf2QBmiTX/9E9cv9rmc7oUiSGFIB9e7ys5ibnT9+A=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.10.0.tgz"; + sha512 = "2w35xrS5rVtAW0g67LqtxCZN5cdddz/woQRfS0OJXaljXEoTychZ4jnE+CQgra/wX4ZvHeiChTUMenCwfIYEYw=="; }; }; "simple-lru-cache-0.0.2" = { @@ -6292,7 +7048,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + sha512 = "uEv/AFO0ADI7d99OHDmh1QfYzQk/izT1vCmu/riQfh7qjBVUUgRT87E5s5h7CxWCA/+YoZerykpEthzVrW3LIw=="; }; }; "simple-swizzle-0.2.2" = { @@ -6301,7 +7057,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; }; "slash-3.0.0" = { @@ -6322,13 +7078,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.9" = { + "snowflake-sdk-1.6.11" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.9"; + version = "1.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.9.tgz"; - sha512 = "Rt16zh5t++mZH+CXUBq3sYUUaEQnEMKT86mFtzfgIUk8MnZFJ4qBOwdheSWYU7OI9QnLqLmy8nZN40o9CFgm5A=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.11.tgz"; + sha512 = "w4oCXjNQ1peAJjhnrwihr+epYw1pSxbe5/+PdxexYb2rzowyOn0RA5PFbir90q/dx0jzM2gvPiHDjnSBEZ1/zA=="; }; }; "source-map-0.6.1" = { @@ -6382,7 +7138,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; "sprintf-js-1.1.2" = { @@ -6430,13 +7186,13 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.10.0" = { + "ssh2-1.11.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.10.0.tgz"; - sha512 = "OnKAAmf4j8wCRrXXZv3Tp5lCZkLJZtgZbn45ELiShCg27djDQ3XFGvIzuGsIsf4hdHslP+VdhA9BhUQdTdfd9w=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz"; + sha512 = "nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw=="; }; }; "ssh2-sftp-client-7.2.3" = { @@ -6463,7 +7219,7 @@ let version = "0.0.10"; src = fetchurl { url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="; }; }; "standard-as-callback-2.1.0" = { @@ -6490,7 +7246,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; + }; + }; + "stoppable-1.1.0" = { + name = "stoppable"; + packageName = "stoppable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz"; + sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; }; }; "stream-shift-1.0.1" = { @@ -6502,6 +7267,15 @@ let sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; + "streamsearch-1.1.0" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"; + sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; + }; + }; "string-similarity-4.0.4" = { name = "string-similarity"; packageName = "string-similarity"; @@ -6544,7 +7318,7 @@ let version = "0.10.31"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="; }; }; "string_decoder-1.1.1" = { @@ -6556,24 +7330,6 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "string_decoder-1.3.0" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -6592,22 +7348,58 @@ let sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; - "supports-color-2.0.0" = { + "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; - version = "2.0.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "supports-color-7.2.0" = { + "supports-color-8.1.1" = { name = "supports-color"; packageName = "supports-color"; - version = "7.2.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; + "supports-hyperlinks-2.2.0" = { + name = "supports-hyperlinks"; + packageName = "supports-hyperlinks"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; + sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; + }; + }; + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; + "swagger-ui-dist-4.12.0" = { + name = "swagger-ui-dist"; + packageName = "swagger-ui-dist"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.12.0.tgz"; + sha512 = "B0Iy2ueXtbByE6OOyHTi3lFQkpPi/L7kFOKFeKTr44za7dJIELa9kzaca6GkndCgpK1QTjArnoXG+aUy0XQp1w=="; + }; + }; + "swagger-ui-express-4.4.0" = { + name = "swagger-ui-express"; + packageName = "swagger-ui-express"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.4.0.tgz"; + sha512 = "1CzRkHG386VQMVZK406jcpgnW2a9A5A/NiAjKhsFTQqUBWRF+uGbXTU/mA7WSV3mTzyOQDvjBdWP/c2qd5lqKw=="; }; }; "tar-6.1.11" = { @@ -6619,31 +7411,31 @@ let sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; - "tarn-1.1.5" = { + "tarn-3.0.2" = { name = "tarn"; packageName = "tarn"; - version = "1.1.5"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz"; - sha512 = "PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g=="; + url = "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz"; + sha512 = "51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ=="; }; }; - "tdigest-0.1.1" = { + "tdigest-0.1.2" = { name = "tdigest"; packageName = "tdigest"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz"; - sha1 = "2e3cb2c39ea449e55d1e6cd91117accca4588021"; + url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz"; + sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; }; }; - "tedious-6.7.1" = { + "tedious-14.7.0" = { name = "tedious"; packageName = "tedious"; - version = "6.7.1"; + version = "14.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-6.7.1.tgz"; - sha512 = "61eg/mvUa5vIqZcRizcqw/82dY65kR2uTll1TaUFh0aJ45XOrgbc8axiVR48dva8BahIAlJByaHNfAJ/KmPV0g=="; + url = "https://registry.npmjs.org/tedious/-/tedious-14.7.0.tgz"; + sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w=="; }; }; "test-console-2.0.0" = { @@ -6679,7 +7471,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; }; }; "throttle-debounce-1.1.0" = { @@ -6697,7 +7489,7 @@ let version = "2.3.8"; src = fetchurl { url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; }; "through2-2.0.5" = { @@ -6787,7 +7579,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; - sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; + sha512 = "rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA=="; }; }; "to-regex-range-5.0.1" = { @@ -6823,7 +7615,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; - sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; + sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="; }; }; "tough-cookie-2.5.0" = { @@ -6859,7 +7651,7 @@ let version = "0.0.3"; src = fetchurl { url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; }; }; "triple-beam-1.3.0" = { @@ -6922,7 +7714,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; }; }; "tweetnacl-0.14.5" = { @@ -6931,7 +7723,7 @@ let version = "0.14.5"; src = fetchurl { url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; "type-fest-0.21.3" = { @@ -6958,7 +7750,7 @@ let version = "0.0.6"; src = fetchurl { url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; "typedarray-to-buffer-3.1.5" = { @@ -6970,13 +7762,13 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typeorm-0.2.30" = { + "typeorm-0.2.45" = { name = "typeorm"; packageName = "typeorm"; - version = "0.2.30"; + version = "0.2.45"; src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.30.tgz"; - sha512 = "qpr8AO3Phi6ZF7qMHOrRdNisVt8jE1KfmW0ooLFcXscA87aJ12aBPyB9cJfxGNjNwd7B3WIK9ZlBveWiqd74QA=="; + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.45.tgz"; + sha512 = "c0rCO8VMJ3ER7JQ73xfk0zDnVv0WDjpsP6Q1m6CVKul7DB9iVdWLRjPzc8v2eaeBuomsbZ2+gTaYr8k1gm3bYA=="; }; }; "uc.micro-1.0.6" = { @@ -7012,16 +7804,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; - }; - }; - "underscore-1.13.3" = { - name = "underscore"; - packageName = "underscore"; - version = "1.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.13.3.tgz"; - sha512 = "QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA=="; + sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; }; }; "unique-stream-2.3.1" = { @@ -7042,13 +7825,22 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; + "universalify-2.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + }; + }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; }; "upper-case-2.0.2" = { @@ -7084,7 +7876,7 @@ let version = "0.10.3"; src = fetchurl { url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; - sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + sha512 = "hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ=="; }; }; "url-parse-1.5.10" = { @@ -7102,7 +7894,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; - sha1 = "955f490aae653ba220b9456a0a8776c199360991"; + sha512 = "qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw=="; }; }; "utf8-2.1.2" = { @@ -7111,7 +7903,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz"; - sha1 = "1fa0d9270e9be850d9b05027f63519bf46457d96"; + sha512 = "QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg=="; }; }; "util-deprecate-1.0.2" = { @@ -7120,7 +7912,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; }; "util.promisify-1.1.1" = { @@ -7138,7 +7930,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; }; }; "uuencode-0.0.4" = { @@ -7147,25 +7939,25 @@ let version = "0.0.4"; src = fetchurl { url = "https://registry.npmjs.org/uuencode/-/uuencode-0.0.4.tgz"; - sha1 = "c8d50370885663879385ab37e333c7e8e3b0218c"; + sha512 = "yEEhCuCi5wRV7Z5ZVf9iV2gWMvUZqKJhAs1ecFdKJ0qzbyaVelmsE3QjYAamehfp9FKLiZbKldd+jklG3O0LfA=="; }; }; - "uuid-3.3.2" = { + "uuid-3.4.0" = { name = "uuid"; packageName = "uuid"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-3.4.0" = { + "uuid-8.0.0" = { name = "uuid"; packageName = "uuid"; - version = "3.4.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz"; + sha512 = "jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="; }; }; "uuid-8.3.2" = { @@ -7201,7 +7993,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; }; }; "verror-1.10.0" = { @@ -7210,7 +8002,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; "vm2-3.9.9" = { @@ -7222,13 +8014,13 @@ let sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; - "vue-2.6.14" = { + "vue-2.7.2" = { name = "vue"; packageName = "vue"; - version = "2.6.14"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; - sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.2.tgz"; + sha512 = "fQPKEfdiUP4bDlrGEjI5MOTkC5s/XIbnfKAx0B3MxJHI4qwh8FPLSo8/9tFkgFiRH3HwvcHjZQ1tCTifOUH0tg=="; }; }; "vue-color-2.8.1" = { @@ -7240,22 +8032,22 @@ let sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw=="; }; }; - "vue-fragment-1.5.2" = { + "vue-fragment-1.6.0" = { name = "vue-fragment"; packageName = "vue-fragment"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.5.2.tgz"; - sha512 = "KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA=="; + url = "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.6.0.tgz"; + sha512 = "a5T8ZZZK/EQzgVShEl374HbobUJ0a7v12BzOzS6Z/wd/5EE/5SffcyHC+7bf9hP3L7Yc0hhY/GhMdwFQ25O/8A=="; }; }; - "vue-i18n-8.27.1" = { + "vue-i18n-8.27.2" = { name = "vue-i18n"; packageName = "vue-i18n"; - version = "8.27.1"; + version = "8.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.1.tgz"; - sha512 = "lWrGm4F25qReJ7XxSnFVb2h3PfW54ldnM4C+YLBGGJ75+Myt/kj4hHSTKqsyDLamvNYpvINMicSOdW+7yuqgIQ=="; + url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.2.tgz"; + sha512 = "QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg=="; }; }; "vue2-boring-avatars-0.3.4" = { @@ -7273,7 +8065,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; }; }; "whatwg-url-5.0.0" = { @@ -7282,7 +8074,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; }; }; "which-1.3.1" = { @@ -7303,6 +8095,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; + }; + }; "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; @@ -7321,13 +8122,13 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "winston-3.7.2" = { + "winston-3.8.1" = { name = "winston"; packageName = "winston"; - version = "3.7.2"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz"; - sha512 = "QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng=="; + url = "https://registry.npmjs.org/winston/-/winston-3.8.1.tgz"; + sha512 = "r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w=="; }; }; "winston-transport-4.5.0" = { @@ -7363,7 +8164,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; }; "wrap-ansi-6.2.0" = { @@ -7390,16 +8191,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; - "ws-7.5.7" = { + "ws-7.5.8" = { name = "ws"; packageName = "ws"; - version = "7.5.7"; + version = "7.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; - sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz"; + sha512 = "ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw=="; }; }; "xlsx-0.17.5" = { @@ -7444,16 +8245,7 @@ let version = "9.0.7"; src = fetchurl { url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; - }; - }; - "xpath.js-1.1.0" = { - name = "xpath.js"; - packageName = "xpath.js"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz"; - sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="; + sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="; }; }; "xregexp-2.0.0" = { @@ -7462,16 +8254,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; - sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; + sha512 = "xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA=="; }; }; - "xss-1.0.11" = { + "xss-1.0.13" = { name = "xss"; packageName = "xss"; - version = "1.0.11"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz"; - sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.13.tgz"; + sha512 = "clu7dxTm1e8Mo5fz3n/oW3UCXBfV89xZ72jM8yzo1vR/pIS0w3sgB3XV2H8Vm6zfGnHL0FzvLJPJEBhd86/z4Q=="; }; }; "xtend-4.0.2" = { @@ -7483,6 +8275,15 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; + "y18n-4.0.3" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; + sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; + }; + }; "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; @@ -7498,7 +8299,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; "yallist-4.0.0" = { @@ -7510,13 +8311,22 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; - "yargonaut-1.1.4" = { - name = "yargonaut"; - packageName = "yargonaut"; - version = "1.1.4"; + "yamljs-0.3.0" = { + name = "yamljs"; + packageName = "yamljs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz"; + sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; + }; + }; + "yargs-15.4.1" = { + name = "yargs"; + packageName = "yargs"; + version = "15.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz"; - sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; + sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; }; }; "yargs-16.2.0" = { @@ -7537,6 +8347,24 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; + "yargs-17.5.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"; + sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; + }; + }; + "yargs-parser-18.1.3" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; + }; + }; "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -7546,6 +8374,15 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; + "yargs-parser-21.0.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "21.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; + }; + }; "yup-0.32.11" = { name = "yup"; packageName = "yup"; @@ -7555,33 +8392,80 @@ let sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg=="; }; }; + "z-schema-4.2.4" = { + name = "z-schema"; + packageName = "z-schema"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/z-schema/-/z-schema-4.2.4.tgz"; + sha512 = "YvBeW5RGNeNzKOUJs3rTL4+9rpcvHXt5I051FJbOcitV8bl40pEfcG0Q+dWSwS0/BIYrMZ/9HHoqLllMkFhD0w=="; + }; + }; + "zen-observable-0.8.15" = { + name = "zen-observable"; + packageName = "zen-observable"; + version = "0.8.15"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz"; + sha512 = "PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="; + }; + }; + "zen-observable-ts-1.2.5" = { + name = "zen-observable-ts"; + packageName = "zen-observable-ts"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz"; + sha512 = "QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg=="; + }; + }; }; in { n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.177.0"; + version = "0.185.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.177.0.tgz"; - sha512 = "13x/zsHa64Dw/0BhjmlZEGvABJxkZeKTG0oKXzRf1Vq/zoctxofapx188ccJzYQ+tZnOHdX0arjf2baQDTNIGw=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.185.0.tgz"; + sha512 = "S3NBZkON4drha+QMTSmRlFq81F5ENW4Swe6lIsosdTQJziSoHmXb2gKogLYfTYAXSq4BasfVmcgYHDFB/fGQMg=="; }; dependencies = [ + sources."@apidevtools/json-schema-ref-parser-8.0.0" + sources."@apidevtools/openapi-schemas-2.1.0" + (sources."@apidevtools/swagger-cli-4.0.0" // { + dependencies = [ + sources."chalk-3.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."@apidevtools/swagger-methods-3.0.2" + (sources."@apidevtools/swagger-parser-9.0.1" // { + dependencies = [ + sources."openapi-types-1.3.5" + ]; + }) (sources."@azure/abort-controller-1.1.0" // { dependencies = [ sources."tslib-2.4.0" ]; }) - sources."@azure/core-asynciterator-polyfill-1.0.2" (sources."@azure/core-auth-1.3.2" // { dependencies = [ sources."tslib-2.4.0" ]; }) + (sources."@azure/core-client-1.6.0" // { + dependencies = [ + sources."@azure/core-tracing-1.0.1" + sources."tslib-2.4.0" + ]; + }) (sources."@azure/core-http-2.2.5" // { dependencies = [ sources."tough-cookie-4.0.0" sources."tslib-2.4.0" + sources."universalify-0.1.2" ]; }) (sources."@azure/core-lro-2.2.4" // { @@ -7589,8 +8473,14 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/core-paging-1.2.1" // { + (sources."@azure/core-paging-1.3.0" // { + dependencies = [ + sources."tslib-2.4.0" + ]; + }) + (sources."@azure/core-rest-pipeline-1.9.0" // { dependencies = [ + sources."@azure/core-tracing-1.0.1" sources."tslib-2.4.0" ]; }) @@ -7599,24 +8489,47 @@ in sources."tslib-2.4.0" ]; }) + (sources."@azure/core-util-1.0.0" // { + dependencies = [ + sources."tslib-2.4.0" + ]; + }) + (sources."@azure/identity-2.0.5" // { + dependencies = [ + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."open-8.4.0" + sources."tslib-2.4.0" + ]; + }) + (sources."@azure/keyvault-keys-4.4.0" // { + dependencies = [ + sources."tslib-2.4.0" + ]; + }) (sources."@azure/logger-1.0.3" // { dependencies = [ sources."tslib-2.4.0" ]; }) - sources."@azure/ms-rest-azure-env-2.0.0" - (sources."@azure/ms-rest-js-2.6.1" // { + (sources."@azure/msal-browser-2.26.0" // { dependencies = [ - sources."form-data-2.5.1" + sources."@azure/msal-common-7.0.0" + ]; + }) + sources."@azure/msal-common-4.5.1" + (sources."@azure/msal-node-1.10.0" // { + dependencies = [ + sources."@azure/msal-common-7.0.0" ]; }) - sources."@azure/ms-rest-nodeauth-3.1.1" (sources."@azure/storage-blob-12.10.0" // { dependencies = [ sources."tslib-2.4.0" ]; }) - sources."@babel/runtime-7.17.9" + sources."@babel/parser-7.18.6" + sources."@babel/runtime-7.18.6" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ @@ -7627,11 +8540,20 @@ in sources."@fontsource/open-sans-4.5.10" sources."@fortawesome/fontawesome-common-types-6.1.1" sources."@fortawesome/free-regular-svg-icons-6.1.1" - sources."@icetee/ftp-0.3.15" + (sources."@icetee/ftp-0.3.15" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."@js-joda/core-5.2.0" + 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."@mapbox/node-pre-gyp-1.0.9" + sources."@n8n_io/riot-tmpl-1.0.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -7641,15 +8563,23 @@ in sources."tslib-2.4.0" ]; }) + (sources."@oclif/core-1.9.5" // { + dependencies = [ + sources."tslib-2.4.0" + ]; + }) (sources."@oclif/errors-1.3.5" // { dependencies = [ - sources."wrap-ansi-7.0.0" + sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" ]; }) (sources."@oclif/help-1.0.1" // { dependencies = [ sources."@oclif/config-1.18.2" sources."tslib-2.4.0" + sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -7658,35 +8588,38 @@ in sources."tslib-2.4.0" ]; }) + sources."@oclif/screen-3.0.2" sources."@opentelemetry/api-1.1.0" sources."@rudderstack/rudder-sdk-node-1.0.6" sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.6.0" sources."@servie/events-1.0.0" - sources."@sqltools/formatter-1.2.2" - (sources."@techteamer/ocsp-1.0.0" // { - dependencies = [ - sources."async-3.2.3" - ]; - }) + sources."@sqltools/formatter-1.2.3" + 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."@types/bluebird-3.5.36" sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" + sources."@types/es-aggregate-error-1.0.2" sources."@types/express-4.17.13" sources."@types/express-jwt-0.0.42" - sources."@types/express-serve-static-core-4.17.28" + sources."@types/express-serve-static-core-4.17.29" sources."@types/express-unless-0.5.3" sources."@types/ftp-0.3.33" - sources."@types/generic-pool-3.1.10" + sources."@types/generic-pool-3.1.11" + sources."@types/glob-7.2.0" sources."@types/json-diff-0.5.2" + sources."@types/json-schema-7.0.11" sources."@types/jsonwebtoken-8.5.8" sources."@types/lodash-4.14.182" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.33" - (sources."@types/node-fetch-2.6.1" // { + sources."@types/minimatch-3.0.5" + sources."@types/multer-1.4.7" + sources."@types/node-18.0.1" + (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" ]; @@ -7695,72 +8628,72 @@ in sources."@types/promise-ftp-common-1.1.0" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/readable-stream-2.3.13" sources."@types/serve-static-1.13.10" - sources."@types/snowflake-sdk-1.6.4" + sources."@types/shelljs-0.8.11" + sources."@types/snowflake-sdk-1.6.7" + sources."@types/swagger-ui-express-4.1.3" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" - sources."@xmldom/xmldom-0.7.5" + sources."@types/yamljs-0.2.31" + sources."@vue/compiler-sfc-2.7.2" 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.7.1" sources."acorn-walk-8.2.0" - (sources."adal-node-0.2.3" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) sources."adler-32-1.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."amqplib-0.8.0" + (sources."amqplib-0.8.0" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" sources."any-promise-1.3.0" sources."anymatch-3.1.2" sources."app-root-path-3.0.0" + sources."append-field-1.0.0" sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" - ]; - }) - (sources."argparse-1.0.10" // { - dependencies = [ - sources."sprintf-js-1.0.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."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-plus-1.0.0" - sources."async-2.6.4" + sources."async-3.2.4" sources."async-validator-1.8.5" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" (sources."auto-changelog-1.16.4" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."avsc-5.7.4" - (sources."aws-sdk-2.1135.0" // { + (sources."aws-sdk-2.1167.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" sources."ieee754-1.1.13" - sources."isarray-1.0.0" sources."sax-1.2.1" - sources."uuid-3.3.2" + sources."uuid-8.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" ]; @@ -7768,7 +8701,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.4" - sources."axios-retry-3.2.5" + sources."axios-retry-3.3.1" sources."babel-helper-vue-jsx-merge-props-2.0.3" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -7789,7 +8722,7 @@ in sources."bignumber.js-2.4.0" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" - sources."bintrees-1.0.1" + sources."bintrees-1.0.2" (sources."bitsyntax-0.1.0" // { dependencies = [ sources."debug-2.6.9" @@ -7797,21 +8730,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."bl-2.2.1" // { - dependencies = [ - sources."isarray-1.0.0" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - ]; - }) + sources."bl-2.2.1" sources."bluebird-3.7.2" sources."bn.js-4.12.0" (sources."body-parser-1.20.0" // { @@ -7822,7 +8741,7 @@ in }) sources."body-parser-xml-2.0.3" sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-request-0.3.3" sources."bson-1.1.6" @@ -7832,9 +8751,11 @@ in sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."bull-3.29.3" + sources."busboy-1.6.0" sources."byte-length-1.0.2" sources."bytes-3.1.2" sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" sources."callback-stream-1.1.0" sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { @@ -7842,18 +8763,24 @@ in sources."tslib-2.4.0" ]; }) + sources."camelcase-5.3.1" (sources."capital-case-1.0.4" // { dependencies = [ sources."tslib-2.4.0" ]; }) + sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."cfb-1.2.2" // { dependencies = [ sources."adler-32-1.3.1" ]; }) - sources."chalk-4.1.2" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."supports-color-7.2.0" + ]; + }) (sources."change-case-4.1.2" // { dependencies = [ sources."tslib-2.4.0" @@ -7872,15 +8799,19 @@ in sources."cli-cursor-3.1.0" (sources."cli-highlight-2.1.11" // { dependencies = [ + sources."cliui-7.0.4" sources."parse5-5.1.1" + sources."y18n-5.0.8" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) + sources."cli-progress-3.11.2" sources."cli-width-3.0.0" sources."client-oauth2-4.3.3" - (sources."cliui-7.0.4" // { + (sources."cliui-6.0.0" // { dependencies = [ - sources."wrap-ansi-7.0.0" + sources."wrap-ansi-6.2.0" ]; }) sources."cluster-key-slot-1.1.0" @@ -7911,12 +8842,7 @@ in ]; }) sources."concat-map-0.0.1" - (sources."concat-stream-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" - ]; - }) + sources."concat-stream-1.6.2" sources."connect-history-api-fallback-1.6.0" sources."console-control-strings-1.1.0" (sources."constant-case-3.0.4" // { @@ -7926,19 +8852,22 @@ in }) sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."convict-6.2.3" + (sources."convict-6.2.3" // { + dependencies = [ + sources."yargs-parser-20.2.9" + ]; + }) sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.22.5" - sources."core-util-is-1.0.2" + sources."core-js-3.23.3" + sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."cron-1.7.2" sources."cron-parser-2.18.0" - (sources."cross-spawn-4.0.2" // { + (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" + sources."semver-5.7.1" ]; }) sources."crypt-0.0.2" @@ -7947,11 +8876,13 @@ in sources."css-select-4.3.0" sources."css-what-6.1.0" sources."cssfilter-0.0.10" + sources."csstype-3.1.0" sources."dashdash-1.14.1" - sources."date-utils-1.2.21" sources."debug-4.3.4" sources."debuglog-1.0.1" + sources."decamelize-1.2.0" sources."deepmerge-1.5.2" + sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -7974,18 +8905,12 @@ in }) sources."dotenv-8.6.0" sources."dreamopt-0.6.0" - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."element-ui-2.15.8" + sources."ejs-3.1.8" + sources."element-ui-2.15.9" sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."encodeurl-1.0.2" @@ -7994,7 +8919,9 @@ in sources."entities-2.2.0" sources."env-variable-0.0.6" sources."err-code-2.0.3" - sources."es-abstract-1.20.0" + sources."es-abstract-1.20.1" + sources."es-aggregate-error-1.0.8" + sources."es-array-method-boxes-properly-1.0.0" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" sources."escalade-3.1.1" @@ -8003,7 +8930,6 @@ in sources."eslint-config-riot-1.0.0" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."event-target-shim-5.0.1" sources."events-3.3.0" sources."eventsource-2.0.2" sources."exit-on-epipe-1.0.1" @@ -8015,6 +8941,12 @@ in sources."ms-2.0.0" ]; }) + (sources."express-openapi-validator-4.13.8" // { + dependencies = [ + sources."media-typer-1.1.0" + sources."path-to-regexp-6.2.1" + ]; + }) sources."extend-3.0.2" sources."external-editor-3.1.0" sources."extsprintf-1.3.0" @@ -8024,13 +8956,17 @@ in sources."fastq-1.13.0" sources."fecha-4.2.3" sources."fflate-0.7.3" - sources."figlet-1.5.2" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" ]; }) sources."file-type-14.7.1" + (sources."filelist-1.0.4" // { + dependencies = [ + sources."minimatch-5.1.0" + ]; + }) sources."fill-range-7.0.1" (sources."finalhandler-1.2.0" // { dependencies = [ @@ -8038,9 +8974,10 @@ in sources."ms-2.0.0" ]; }) - sources."flatted-3.2.5" + sources."find-up-4.1.0" + sources."flatted-3.2.6" sources."fn.name-1.1.0" - sources."follow-redirects-1.15.0" + sources."follow-redirects-1.15.1" sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-4.0.0" @@ -8048,7 +8985,7 @@ in sources."forwarded-0.2.0" sources."frac-1.1.2" sources."fresh-0.5.2" - sources."fs-extra-8.1.0" + sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -8058,7 +8995,8 @@ in sources."generate-function-2.3.1" sources."generic-pool-3.8.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.1" + sources."get-intrinsic-1.1.2" + sources."get-package-type-0.1.0" sources."get-port-5.1.1" sources."get-symbol-description-1.0.0" sources."get-system-fonts-2.0.2" @@ -8069,16 +9007,16 @@ in dependencies = [ sources."glob-parent-3.1.0" sources."is-glob-3.1.0" - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) + sources."globalthis-1.0.3" sources."globby-11.1.0" (sources."gm-1.23.1" // { 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-timezones-json-1.0.2" @@ -8087,11 +9025,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) sources."has-bigints-1.0.2" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" @@ -8118,17 +9051,25 @@ in sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" + sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ics-2.35.0" sources."ieee754-1.2.1" sources."ignore-5.2.0" - sources."imap-0.8.19" + (sources."imap-0.8.19" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) sources."imap-simple-4.3.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inquirer-7.3.3" sources."internal-slot-1.0.3" + sources."interpret-1.4.0" sources."ioredis-4.28.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" @@ -8139,6 +9080,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" + sources."is-core-module-2.9.0" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -8164,22 +9106,32 @@ in sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" - sources."isarray-0.0.1" - sources."isbot-3.4.7" + sources."isarray-1.0.0" + sources."isbot-3.5.0" sources."isexe-2.0.0" - sources."iso-639-1-2.1.13" + 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."js-md4-0.3.2" sources."js-yaml-3.14.1" - sources."jsbi-3.2.5" + sources."jsbi-4.3.0" sources."jsbn-0.1.1" sources."json-diff-0.5.5" sources."json-schema-0.4.0" + (sources."json-schema-ref-parser-9.0.9" // { + dependencies = [ + sources."@apidevtools/json-schema-ref-parser-9.0.9" + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" + ]; + }) sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" + sources."jsonfile-6.1.0" + sources."jsonschema-1.4.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."semver-5.7.1" @@ -8198,15 +9150,20 @@ in sources."iconv-lite-0.6.3" ]; }) - sources."libphonenumber-js-1.9.53" + sources."libphonenumber-js-1.10.7" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-4.0.0" (sources."localtunnel-2.0.2" // { dependencies = [ + sources."cliui-7.0.4" sources."debug-4.3.2" + sources."y18n-5.0.8" + sources."yargs-17.1.1" + sources."yargs-parser-20.2.9" ]; }) + sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash-es-4.17.21" sources."lodash.clonedeep-4.5.0" @@ -8225,9 +9182,11 @@ in sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" sources."lodash.throttle-4.1.1" + sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" - sources."logform-2.4.0" + sources."lodash.zipobject-4.1.3" + sources."logform-2.4.1" sources."long-4.0.0" sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { @@ -8257,7 +9216,7 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" - sources."mappersmith-2.38.1" + sources."mappersmith-2.39.1" sources."material-colors-1.2.6" sources."md5-2.3.0" sources."media-typer-0.3.0" @@ -8271,11 +9230,15 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.1.2" + (sources."minimatch-3.1.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + ]; + }) sources."minimist-1.2.6" - sources."minipass-3.1.6" + sources."minipass-3.3.4" sources."minizlib-2.1.2" - sources."mkdirp-1.0.4" + sources."mkdirp-0.5.6" (sources."mock-require-3.0.3" // { dependencies = [ sources."get-caller-file-1.0.3" @@ -8284,24 +9247,28 @@ in }) sources."moment-2.29.3" sources."moment-timezone-0.5.34" - sources."monaco-editor-0.29.1" + sources."monaco-editor-0.30.1" sources."mongodb-3.7.3" sources."moo-0.5.1" (sources."mqtt-4.2.6" // { dependencies = [ + sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) (sources."mqtt-packet-6.10.0" // { dependencies = [ sources."bl-4.1.0" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) sources."ms-2.1.2" - sources."mssql-6.4.1" + (sources."mssql-8.1.2" // { + dependencies = [ + sources."commander-9.3.0" + ]; + }) + sources."multer-1.4.5-lts.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { dependencies = [ @@ -8310,15 +9277,15 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.117.0" - sources."n8n-design-system-0.20.0" - sources."n8n-editor-ui-0.143.0" - (sources."n8n-nodes-base-0.175.0" // { + sources."n8n-core-0.125.0" + sources."n8n-design-system-0.25.0" + sources."n8n-editor-ui-0.151.0" + (sources."n8n-nodes-base-0.183.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.99.0" + sources."n8n-workflow-0.107.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8328,6 +9295,7 @@ in sources."nanoclone-0.2.1" sources."nanoid-3.3.4" sources."native-duplexpair-1.0.0" + sources."natural-orderby-2.0.3" (sources."nearley-2.20.1" // { dependencies = [ sources."commander-2.20.3" @@ -8335,11 +9303,13 @@ in }) sources."negotiator-0.6.3" sources."neo-async-2.6.2" + sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ sources."tslib-2.4.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" @@ -8347,47 +9317,45 @@ in sources."node-html-parser-5.3.3" sources."node-ssh-12.0.4" sources."nodeify-1.0.1" - sources."nodemailer-6.7.5" + sources."nodemailer-6.7.6" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" sources."npmlog-5.0.1" - sources."nth-check-2.0.1" + sources."nth-check-2.1.1" sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.0" + sources."object-inspect-1.12.2" sources."object-keys-1.1.1" + sources."object-treeify-1.1.33" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.3" + sources."object.getownpropertydescriptors-2.1.4" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" + sources."ono-7.1.3" sources."open-7.4.2" + sources."openapi-types-10.0.0" sources."openurl-1.1.1" sources."optional-require-1.1.8" - (sources."ordered-read-streams-1.0.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."ordered-read-streams-1.0.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-2.1.0" sources."p-timeout-3.2.0" + sources."p-try-2.2.0" sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ sources."tslib-2.4.0" ]; }) - sources."parent-require-1.0.0" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" @@ -8404,13 +9372,21 @@ in sources."passport-cookie-1.0.9" sources."passport-jwt-4.0.0" sources."passport-strategy-1.0.0" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + ]; + }) (sources."path-case-3.0.4" // { dependencies = [ sources."tslib-2.4.0" ]; }) sources."path-dirname-1.0.2" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pause-0.0.1" @@ -8447,7 +9423,7 @@ 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.13" + sources."postcss-8.4.14" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -8469,7 +9445,7 @@ in sources."proxy-addr-2.0.7" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -8489,9 +9465,15 @@ in sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" - sources."readable-stream-1.1.14" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readable-web-to-node-stream-2.0.0" sources."readdirp-3.6.0" + sources."rechoir-0.6.2" + sources."redeyed-2.1.1" sources."redis-3.1.2" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" @@ -8519,19 +9501,21 @@ in sources."requestretry-7.1.0" sources."require-at-1.0.6" sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" 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."reusify-1.0.4" + sources."rfdc-1.3.0" (sources."rhea-1.0.24" // { dependencies = [ sources."debug-3.2.7" ]; }) sources."rimraf-3.0.2" - sources."riot-tmpl-3.0.8" sources."rndm-1.2.0" sources."rss-parser-3.12.0" sources."run-async-2.4.1" @@ -8573,15 +9557,18 @@ in sources."setheader-1.0.2" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shell-escape-0.2.0" + sources."shelljs-0.8.5" (sources."showdown-2.1.0" // { dependencies = [ - sources."commander-9.2.0" + sources."commander-9.3.0" ]; }) sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.7.1" + sources."simple-git-3.10.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" @@ -8590,9 +9577,11 @@ in sources."tslib-2.4.0" ]; }) - (sources."snowflake-sdk-1.6.9" // { + (sources."snowflake-sdk-1.6.11" // { dependencies = [ + sources."axios-0.27.2" sources."debug-3.2.7" + sources."mkdirp-1.0.4" sources."tmp-0.2.1" sources."uuid-3.4.0" ]; @@ -8603,40 +9592,62 @@ in (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.0.3" sources."sqlite3-5.0.8" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.10.0" - sources."ssh2-sftp-client-7.2.3" + sources."ssh2-1.11.0" + (sources."ssh2-sftp-client-7.2.3" // { + dependencies = [ + sources."concat-stream-2.0.0" + sources."readable-stream-3.6.0" + ]; + }) sources."sshpk-1.17.0" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" sources."statuses-2.0.1" sources."stealthy-require-1.1.1" + sources."stoppable-1.1.0" sources."stream-shift-1.0.1" + sources."streamsearch-1.1.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" sources."string.prototype.trimend-1.0.5" sources."string.prototype.trimstart-1.0.5" - sources."string_decoder-0.10.31" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.1" sources."strtok3-6.3.0" - sources."supports-color-7.2.0" - sources."tar-6.1.11" - sources."tarn-1.1.5" - sources."tdigest-0.1.1" - (sources."tedious-6.7.1" // { + sources."supports-color-8.1.1" + (sources."supports-hyperlinks-2.2.0" // { + dependencies = [ + sources."supports-color-7.2.0" + ]; + }) + sources."supports-preserve-symlinks-flag-1.0.0" + sources."swagger-ui-dist-4.12.0" + sources."swagger-ui-express-4.4.0" + (sources."tar-6.1.11" // { dependencies = [ - sources."@types/node-12.20.52" - sources."bl-3.0.1" - sources."iconv-lite-0.5.2" + sources."mkdirp-1.0.4" + ]; + }) + sources."tarn-3.0.2" + sources."tdigest-0.1.2" + (sources."tedious-14.7.0" // { + dependencies = [ + sources."bl-5.0.0" + sources."buffer-6.0.3" + sources."iconv-lite-0.6.3" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" + sources."sprintf-js-1.1.2" ]; }) sources."test-console-2.0.0" @@ -8645,14 +9656,7 @@ in sources."thenify-all-1.6.0" sources."throttle-debounce-1.1.0" sources."through-2.3.8" - (sources."through2-2.0.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."through2-2.0.5" sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" @@ -8686,18 +9690,25 @@ in sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - (sources."typeorm-0.2.30" // { + (sources."typeorm-0.2.45" // { dependencies = [ - sources."yargs-16.2.0" + sources."argparse-2.0.1" + sources."buffer-6.0.3" + sources."cliui-7.0.4" + sources."js-yaml-4.1.0" + sources."mkdirp-1.0.4" + sources."tslib-2.4.0" + sources."y18n-5.0.8" + sources."yargs-17.5.1" + sources."yargs-parser-21.0.1" ]; }) sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" - sources."underscore-1.13.3" sources."unique-stream-2.3.1" - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."unpipe-1.0.0" (sources."upper-case-2.0.2" // { dependencies = [ @@ -8730,64 +9741,59 @@ in sources."v-click-outside-3.2.0" sources."validator-13.7.0" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."vm2-3.9.9" - sources."vue-2.6.14" + sources."vue-2.7.2" sources."vue-color-2.8.1" - sources."vue-fragment-1.5.2" - sources."vue-i18n-8.27.1" + sources."vue-fragment-1.6.0" + sources."vue-i18n-8.27.2" sources."vue2-boring-avatars-0.3.4" 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-module-2.0.0" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."winston-3.7.2" // { + (sources."winston-3.8.1" // { dependencies = [ - sources."async-3.2.3" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) sources."wmf-1.0.2" sources."word-0.3.0" sources."wordwrap-1.0.0" - sources."wrap-ansi-6.2.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.7" + sources."ws-7.5.8" sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xpath.js-1.1.0" sources."xregexp-2.0.0" - (sources."xss-1.0.11" // { + (sources."xss-1.0.13" // { dependencies = [ sources."commander-2.20.3" ]; }) sources."xtend-4.0.2" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" - (sources."yargonaut-1.1.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."yargs-17.1.1" - sources."yargs-parser-20.2.9" + sources."yamljs-0.3.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" sources."yup-0.32.11" + sources."z-schema-4.2.4" + sources."zen-observable-0.8.15" + sources."zen-observable-ts-1.2.5" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 39a07d9d4ab09..f90ec3644c7ca 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "nali"; - version = "0.3.2"; + version = "0.4.2"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-iRLoUBA+Kzv1/LZQ8HCvR79K1riYErxEWhB0OmvFy2g="; + sha256 = "sha256-7NUUX4hDwvMBBQvxiB7P/lNHKgxwOFObdD6DUd0vX5c="; }; - vendorSha256 = "sha256-0u6n53hL2+GvqbYpAKN54n7uiTHSsgyjedt20nT1yRc="; + vendorSha256 = "sha256-Ld5HehK5MnPwl6KtIl0b4nQRiXO4DjKVPL1iti/WBIQ="; subPackages = [ "." ]; meta = with lib; { description = "An offline tool for querying IP geographic information and CDN provider"; homepage = "https://github.com/zu1k/nali"; license = licenses.mit; - maintainers = with maintainers; [ diffumist ]; + maintainers = with maintainers; [ diffumist xyenon ]; }; } diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 880ebdd2d4ef7..7722ab479c569 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,4 +1,4 @@ -{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub }: +{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { pname = "netperf"; @@ -11,6 +11,16 @@ stdenv.mkDerivation { sha256 = "s4G1ZN+6LERdEMDkc+12ZQgTi6K+ppUYUCGn4faCS9c="; }; + patches = [ + # Pul fix pending upstream inclusion for -fno-common toolchains: + # https://github.com/HewlettPackard/netperf/pull/46 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/HewlettPackard/netperf/commit/c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3.patch"; + sha256 = "P/lRa6EakSalKWDTgZ7bWeGleaTLLa5UhzulxKd1xE4="; + }) + ]; + buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix index 0858b4690bb81..f458efd92ebda 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.72"; + version = "1.0.73"; src = fetchurl { url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; - sha256 = "sha256-Sx02VMAgmncT9f5Hvs0LugzhD6Z8cWXHx4kn8IG9seU="; + sha256 = "sha256-wU99+nDXHGMad94qszw5uThKckk1ToUvjNrIf/yTeTM="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d2850b176f47e..0a5f465946afa 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.5.1"; + version = "3.5.2"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-/Bz3vkV4+ZFlGBNtkLIGsBk51a3wxy32U1KYcA3awcw="; + sha256 = "sha256-lNsAdYErd3m1bNhvSDVJ5Rfqt8lutNJ1+2DCmntL6pM="; }; patches = [ @@ -97,5 +97,6 @@ mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ kranzes SuperSandro2000 ]; platforms = platforms.linux; + mainProgram = "nextcloud"; }; } diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 19dba8d5fae77..cad7339fe081f 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo ++ lib.optional (!stdenv.isLinux) libiconv; + # Workaround build failure on -fno-common toolchains: + # ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path'; + # offrss.o:offrss.h:75: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + configurePhase = '' substituteInPlace Makefile \ --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)' diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix index 7e7cd47dbd0ab..2089408d09bab 100644 --- a/pkgs/applications/networking/omping/default.nix +++ b/pkgs/applications/networking/omping/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin; description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index e7b661ae6ae74..8452d3c26f651 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -14,6 +14,7 @@ , pycrypto , pynacl , pyside2 +, pysocks , pytestCheckHook , qrcode , qt5 @@ -132,6 +133,7 @@ rec { pyside2 psutil qrcode + pysocks ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 45307504d7318..b3ff51ab7c190 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -1,6 +1,7 @@ { lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem , qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk , libnl +, copyDesktopItems }: mkDerivation rec { @@ -21,31 +22,34 @@ mkDerivation rec { buildInputs = [ qtbase protobuf libpcap qtscript libnl ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + copyDesktopItems + qmake + ]; patches = [ ./drone_ini.patch ]; prePatch = '' sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro ''; - desktopItem = makeDesktopItem { + desktopItems = lib.singleton (makeDesktopItem { name = "ostinato"; desktopName = "Ostinato"; genericName = "Packet/Traffic Generator and Analyzer"; comment = "Network packet and traffic generator and analyzer with a friendly GUI"; categories = [ "Network" ]; startupNotify = true; - exec = "$out/bin/ostinato"; + exec = "@out@/bin/ostinato"; icon = ostinatoIcon; extraConfig = { "GenericName[it]" = "Generatore ed Analizzatore di pacchetti di rete"; "Comment[it]" = "Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole"; }; - }; + }); - postInstall = '' - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ + preFixup = '' + substituteInPlace $out/share/applications/ostinato.desktop \ + --subst-var out cat > $out/bin/ostinato.ini <<EOF WiresharkPath=${wireshark}/bin/wireshark @@ -62,8 +66,8 @@ mkDerivation rec { meta = with lib; { description = "A packet traffic generator and analyzer"; - homepage = "https://ostinato.org"; - license = licenses.gpl3; + homepage = "https://ostinato.org/"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ rick68 ]; platforms = with platforms; linux ++ darwin ++ cygwin; }; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index ad791f46d739e..a08ea4b8bbc2e 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -73,6 +73,7 @@ in stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; homepage = "https://freenetproject.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index cd6ae563aa0b6..05fb734d7bf21 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -87,6 +87,10 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl2; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index cfee9d91c9308..fd5424cee3424 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.7"; + version = "6.9.8"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; + sha256 = "sha256-gslNdvxA4rGKg0bjf2KWw7w9NMp3zqrii144AfKsV4s="; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 541570a3ada7b..3b88ffb11d8b8 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.16.3"; + version = "0.17.1"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-MjkFLxNTepqrqqZuxCh12+4vaDjF8Ys674VOa1Mew4o="; + sha256 = "sha256-dd4KcV4+lpKGSD7GrkslqHNlZk1CzftgbfjnRqFfEmU="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index a760a0f96c35c..df314b6591c20 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/lokinet/default.nix b/pkgs/applications/networking/p2p/lokinet/default.nix new file mode 100644 index 0000000000000..e3e2c8e588313 --- /dev/null +++ b/pkgs/applications/networking/p2p/lokinet/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libevent +, libsodium +, libuv +, nlohmann_json +, pkg-config +, sqlite +, systemd +, unbound +, zeromq +}: + +stdenv.mkDerivation rec { + pname = "lokinet"; + version = "0.9.9"; + + src = fetchFromGitHub { + owner = "oxen-io"; + repo = "lokinet"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-AaGsRg9S9Cng9emI/mN09QSOIRbE+x3916clWAwLnRs="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libevent + libuv + libsodium + nlohmann_json + sqlite + systemd + unbound + zeromq + ]; + + cmakeFlags = [ + "-DGIT_VERSION=v${version}" + "-DWITH_BOOTSTRAP=OFF" # we provide bootstrap files manually + "-DWITH_SETCAP=OFF" + ]; + + # copy bootstrap files + # see https://github.com/oxen-io/lokinet/issues/1765#issuecomment-938208774 + postInstall = '' + mkdir -p $out/share/testnet + cp $src/contrib/bootstrap/mainnet.signed $out/share/bootstrap.signed + cp $src/contrib/bootstrap/testnet.signed $out/share/testnet/bootstrap.signed + ''; + + meta = with lib; { + description = "Anonymous, decentralized and IP based overlay network for the internet"; + homepage = "https://lokinet.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wyndon ]; + }; +} diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 374f2419b96d4..6c5ebdb913352 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ]; meta = { + broken = stdenv.isDarwin; description = "Client for many p2p networks, with multiple frontends"; homepage = "http://mldonkey.sourceforge.net/"; license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 053f1d67882b4..bea7fad805e27 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,25 +1,19 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config +, glib, gnutls, perl, libmaxminddb }: stdenv.mkDerivation rec { pname = "ncdc"; - version = "1.22.1"; + version = "1.23"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; - sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi"; + hash = "sha256-gEq65B/MqWnof2UEg65+OiN0Gdq70yCJfiX+iFHwoss="; }; - patches = [ - # Upstream fix for ncurses-6.3 support: - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://g.blicky.net/ncdc.git/patch/?id=4126dd51e90deb9e22dfd139cc4518a7812fcad6"; - sha256 = "13hqkmhmbazj6cllb5b2ccgf51vsn5lri7jqkqc5xwivgcisfrij"; - }) - ]; + nativeBuildInputs = [ perl pkg-config ]; + buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls libmaxminddb ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; + configureFlags = [ "--with-geoip" ]; meta = with lib; { description = "Modern and lightweight direct connect client with a friendly ncurses interface"; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index e00af5fdc8055..3fb48dd6a53f6 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkg-config +{ mkDerivation, lib, fetchFromGitHub, pkg-config , boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -12,19 +12,19 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-xBNN9YYKMDcoL1wvERjlAjV8vb2GVgwwlHtb5y0+f+8="; + sha256 = "sha256-Gcjs7Yueuw76/4is4ZyvlVr6xZ8D+So1+PjZGg6Curk="; }; enableParallelBuilding = true; # NOTE: 2018-05-31: CMake is working but it is not officially supported - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support @@ -40,11 +40,7 @@ mkDerivation rec { ++ optional (!webuiSupport) "--disable-webui" ++ optional debugSupport "--enable-debug"; - postInstall = "wrapProgram $out/bin/${ - if guiSupport - then "qbittorrent" - else "qbittorrent-nox" - } --prefix PATH : ${makeBinPath [ python3 ]}"; + qtWrapperArgs = optional trackerSearch "--prefix PATH : ${makeBinPath [ python3 ]}"; meta = { description = "Featureful free software BitTorrent client"; diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index f166f6d0e29f2..fa459137f1994 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ autoconf-archive autoreconfHook diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix index 6d037e56ea44f..40f6f1ed4edb3 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/applications/networking/p2p/rqbit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - sha256 = "sha256-ovg+oMlt3XzOxG9w/5Li3awMyRdIt1/JnIFfZktftkw="; + sha256 = "sha256-PkU3QJvAK2b1KQC1o5md35iucjq+SYoKAGxqiojf4rw="; }; - cargoSha256 = "sha256-0CA0HwFI86VfSyBNn0nlC1n4BVgOc9BLh1it7ReT8+Y="; + cargoSha256 = "sha256-Jj2CK3nwktv2MU+EHXzQ/lKDUlC+4HkaItMTtoGF1Pw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 0d2fc0fd833cd..c281756bed357 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -52,6 +52,7 @@ mkDerivation rec { meta = with lib; { description = "Official Qt SoulSeek client"; homepage = "https://www.slsknet.org"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 9a0cc70c1999e..ed88546129fb8 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Torrent client"; homepage = "http://www.tixati.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index c89e539770670..6c6cc99f5a1a2 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,40 +1,30 @@ -{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkg-config -, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }: - +{ lib, stdenv, wrapGAppsHook, fetchFromGitHub, pkg-config, gtk3, json-glib, curl +, glib, appstream-glib, desktop-file-utils, meson, ninja, geoip, gettext +, libappindicator, libmrss, libproxy }: stdenv.mkDerivation rec { pname = "transmission-remote-gtk"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "transmission-remote-gtk"; repo = "transmission-remote-gtk"; rev = version; - sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk"; + sha256 = "4/ID12JukDDvJzWupc76r7W8Us5erwv8oXZhDnB6VDk="; }; - patches = [ - (fetchpatch { - url = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/0f5cc8a9942e220ea0f7d0b17db4a78d094e3b65.patch"; - sha256 = "195rsjpbc0gzmr9bycvq4mra7abp3hd9by3a5vvcmxsh5ipikycf"; - }) - ]; - - preConfigure = "./autogen.sh"; - - nativeBuildInputs= [ - autoconf automake libtool wrapGAppsHook - pkg-config intltool autoconf-archive - appstream-glib - ]; + nativeBuildInputs = + [ desktop-file-utils wrapGAppsHook meson ninja pkg-config appstream-glib ]; - buildInputs = [ gtk3 json-glib curl glib ]; + buildInputs = + [ gtk3 json-glib curl glib gettext libmrss geoip libproxy libappindicator ]; - doCheck = false; # fails with style validation error + doCheck = false; # Requires network access meta = with lib; { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = "https://github.com/ajf8/transmission-remote-gtk"; + homepage = + "https://github.com/transmission-remote-gtk/transmission-remote-gtk"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index fe8743ee1cd1b..6dc00cba9ee08 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "http://www.vuze.com"; license = licenses.unfree; platforms = platforms.all; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index a170906481cc9..951e42475e18e 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -1,18 +1,19 @@ { lib , fetchFromGitHub , python3Packages +, nixosTests }: python3Packages.buildPythonApplication rec { pname = "zeronet-conservancy"; - version = "0.7.5"; + version = "0.7.6"; format = "other"; src = fetchFromGitHub { owner = "zeronet-conservancy"; repo = "zeronet-conservancy"; rev = "v${version}"; - sha256 = "sha256-cq0q5hXEhazHPJODNJ8iL0qAB5DJW6ANST4r/rslvXk="; + sha256 = "sha256-tWNU7UJVWB+aRLam6WKV/HaRRTIQvlEgxe4xJYKpXJY="; }; propagatedBuildInputs = with python3Packages; [ @@ -35,6 +36,10 @@ python3Packages.buildPythonApplication rec { --set PATH ${python3Packages.python}/bin ''; + passthru.tests = { + nixos-test = nixosTests.zeronet-conservancy; + }; + meta = with lib; { description = "A fork/continuation of the ZeroNet project"; longDescription = '' diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 50a26ef50f6a3..4cb3a43640cca 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -104,6 +104,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition"; homepage = "https://www.pcloud.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ patryk27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index ba9081e25aad4..612c6bd0bc3e6 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = with lib; { + broken = stdenv.isDarwin; description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = "https://pjsip.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 82d011281fe6a..81195c4e212b2 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,27 +1,16 @@ { lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }: let - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ngoduykhanh"; repo = "PowerDNS-Admin"; rev = "v${version}"; - sha256 = "sha256-xJ0NNnDVwGl+t9q1INPhCxcTmQayYBYdjEG0PbPCI9E="; + hash = "sha256-e11u0jdJr+2TDXvBAPlDfnuuDwSfBq+JtvnDUTNKp/c="; }; python = python3.override { packageOverrides = self: super: { - dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec { - version = "1.16.0"; - src = oldAttrs.src.override { - inherit version; - extension = "zip"; - sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; - }; - # Needs networking for some tests - doCheck = false; - }); - # The bravado-core dependency is incompatible with jschonschema 4.0: # https://github.com/Yelp/bravado-core/pull/385 jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { @@ -43,8 +32,8 @@ let flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify mysqlclient psycopg2 sqlalchemy cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython - gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core - lima pytimeparse pyyaml + gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core + lima pytimeparse pyyaml jinja2 itsdangerous werkzeug ]; assets = mkYarnPackage { diff --git a/pkgs/applications/networking/powerdns-admin/package.json b/pkgs/applications/networking/powerdns-admin/package.json index 84f495920744e..21119525d4343 100644 --- a/pkgs/applications/networking/powerdns-admin/package.json +++ b/pkgs/applications/networking/powerdns-admin/package.json @@ -2,6 +2,7 @@ "dependencies": { "admin-lte": "2.4.9", "bootstrap": "^3.4.1", + "bootstrap-datepicker": "^1.8.0", "bootstrap-validator": "^0.11.9", "datatables.net-plugins": "^1.10.19", "icheck": "^1.0.2", @@ -12,5 +13,5 @@ "multiselect": "^0.9.12" }, "name": "powerdns-admin-assets", - "version": "0.2.4" + "version": "0.3.0" } diff --git a/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/pkgs/applications/networking/powerdns-admin/yarndeps.nix index 7dcd54b53c214..7181d9e741e51 100644 --- a/pkgs/applications/networking/powerdns-admin/yarndeps.nix +++ b/pkgs/applications/networking/powerdns-admin/yarndeps.nix @@ -38,7 +38,7 @@ path = fetchurl { name = "admin_lte___admin_lte_2.4.9.tgz"; url = "https://registry.yarnpkg.com/admin-lte/-/admin-lte-2.4.9.tgz"; - sha1 = "effc04dbb587ccb7d674d4cf663cc141f925ed73"; + sha512 = "+u3zt5sWPPT8HmBvRg4F8IGZPaE5wD0K10+IjXoynfe/jEUrMMj+4eA1LGH9fMK6QulmFr1NCtc1Tk+mTgC24A=="; }; } { @@ -50,30 +50,6 @@ }; } { - name = "array_filter___array_filter_0.0.1.tgz"; - path = fetchurl { - name = "array_filter___array_filter_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; - }; - } - { - name = "array_map___array_map_0.0.0.tgz"; - path = fetchurl { - name = "array_map___array_map_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; - }; - } - { - name = "array_reduce___array_reduce_0.0.0.tgz"; - path = fetchurl { - name = "array_reduce___array_reduce_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; - }; - } - { name = "asn1.js___asn1.js_4.10.1.tgz"; path = fetchurl { name = "asn1.js___asn1.js_4.10.1.tgz"; @@ -118,7 +94,7 @@ path = fetchurl { name = "bn.js___bn.js_4.12.0.tgz"; url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; - sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; + sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; } { @@ -126,7 +102,7 @@ path = fetchurl { name = "bootstrap_colorpicker___bootstrap_colorpicker_2.5.3.tgz"; url = "https://registry.yarnpkg.com/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.3.tgz"; - sha1 = "b50aff8590fbaa6b5aa63a5624e4213f1659a49d"; + sha512 = "xdllX8LSMvKULs3b8JrgRXTvyvjkSMHHHVuHjjN5FNMqr6kRe5NPiMHFmeAFjlgDF73MspikudLuEwR28LbzLw=="; }; } { @@ -134,7 +110,7 @@ path = fetchurl { name = "bootstrap_datepicker___bootstrap_datepicker_1.8.0.tgz"; url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.8.0.tgz"; - sha1 = "c63513931e6f09f16ae9f11b62f32d950df3958e"; + sha512 = "213St/G8KT3mjs4qu4qwww74KWysMaIeqgq5OhrboZjIjemIpyuxlSo9FNNI5+KzpkkxkRRba+oewiRGV42B1A=="; }; } { @@ -174,7 +150,7 @@ path = fetchurl { name = "bootstrap___bootstrap_3.4.1.tgz"; url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz"; - sha1 = "c3a347d419e289ad11f4033e3c4132b87c081d72"; + sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; } { @@ -190,7 +166,7 @@ path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8="; }; } { @@ -298,11 +274,11 @@ }; } { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; path = fetchurl { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; - sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db"; + name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz"; + sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="; }; } { @@ -334,7 +310,7 @@ path = fetchurl { name = "ckeditor___ckeditor_4.11.3.tgz"; url = "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.3.tgz"; - sha1 = "91f66d7ddb5bff3874514fe539779686874ed655"; + sha512 = "v6G+v16WAcukKuQH6m+trA9RCOQntFM2nxPO/GFiLYsdD/5IbZAZ2n7GwMxQmxDXpx4AixpnMWF+yAE1t9wq6Q=="; }; } { @@ -438,7 +414,7 @@ path = fetchurl { name = "datatables.net_bs___datatables.net_bs_1.10.19.tgz"; url = "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.10.19.tgz"; - sha1 = "08763b4e4d0cef1a427d019dc15e717c7ed67a4d"; + sha512 = "5gxoI2n+duZP06+4xVC2TtH6zcY369/TRKTZ1DdSgDcDUl4OYQsrXCuaLJmbVzna/5Y5lrMmK7CxgvYgIynICA=="; }; } { @@ -446,7 +422,7 @@ path = fetchurl { name = "datatables.net_plugins___datatables.net_plugins_1.10.20.tgz"; url = "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.10.20.tgz"; - sha1 = "c89f6bed3fa7e6605cbeaa35d60f223659e84c8c"; + sha512 = "rnhNmRHe9UEzvM7gtjBay1QodkWUmxLUhHNbmJMYhhUggjtm+BRSlE0PRilkeUkwckpNWzq+0fPd7/i0fpQgzA=="; }; } { @@ -454,7 +430,7 @@ path = fetchurl { name = "datatables.net___datatables.net_1.10.19.tgz"; url = "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.19.tgz"; - sha1 = "97a1ed41c85e62d61040603481b59790a172dd1f"; + sha512 = "+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA=="; }; } { @@ -534,7 +510,7 @@ path = fetchurl { name = "elliptic___elliptic_6.5.4.tgz"; url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; - sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; } { @@ -574,7 +550,7 @@ path = fetchurl { name = "flot___flot_0.8.3.tgz"; url = "https://registry.yarnpkg.com/flot/-/flot-0.8.3.tgz"; - sha1 = "6d9b93c7aa2cfb30dfa1af9c1ec4c94070b1217f"; + sha512 = "xg2otcTJDvS+ERK+my4wxG/ASq90QURXtoM4LhacCq0jQW2jbyjdttbRNqU2cPykrpMvJ6b2uSp6SAgYAzj9tQ=="; }; } { @@ -598,7 +574,7 @@ path = fetchurl { name = "fullcalendar___fullcalendar_3.10.0.tgz"; url = "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-3.10.0.tgz"; - sha1 = "cc5e87d518fd6550e142816a31dd191664847919"; + sha512 = "0OtsHhmdYhtFmQwXzyo8VqHzYgamg+zVOoytv5N13gI+iF6CGjevpCi/yBaQs0O4wY3OAp8I688IxdNYe0iAvw=="; }; } { @@ -638,7 +614,7 @@ path = fetchurl { name = "hash.js___hash.js_1.1.7.tgz"; url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; - sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; } { @@ -646,7 +622,7 @@ path = fetchurl { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE="; }; } { @@ -694,7 +670,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -742,7 +718,7 @@ path = fetchurl { name = "ion_rangeslider___ion_rangeslider_2.3.0.tgz"; url = "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.0.tgz"; - sha1 = "7957ce2e78acfc956b8c43009373da91f743347e"; + sha512 = "7TtH9/X4Aq/xCzboWxjwlv20gVqR90Ysc3aehMlTuH2/ULaSxpB80hq+yvD1N0FwWbPDtxQpjQrz/iX+LWXKmg=="; }; } { @@ -818,11 +794,11 @@ }; } { - name = "jquery_ui___jquery_ui_1.12.1.tgz"; + name = "jquery_ui___jquery_ui_1.13.0.tgz"; path = fetchurl { - name = "jquery_ui___jquery_ui_1.12.1.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz"; - sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + name = "jquery_ui___jquery_ui_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz"; + sha512 = "Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw=="; }; } { @@ -830,15 +806,15 @@ path = fetchurl { name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; url = "https://registry.yarnpkg.com/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz"; - sha1 = "240c9f435e936c63bf8fbba355144ffdddf9ea26"; + sha512 = "20FJSCW3kTawO6Jvy/6MtUCURvgUZFqRUOAGTxH/VaPlwLG4kba82sKaM3ghTi1DsmSZrM2BvrwLUwNWmwDXiw=="; }; } { - name = "jquery___jquery_3.3.1.tgz"; + name = "jquery___jquery_3.6.0.tgz"; path = fetchurl { - name = "jquery___jquery_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz"; - sha1 = "958ce29e81c9790f31be7792df5d4d95fc57fbca"; + name = "jquery___jquery_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz"; + sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; }; } { @@ -870,7 +846,7 @@ path = fetchurl { name = "jtimeout___jtimeout_3.1.0.tgz"; url = "https://registry.yarnpkg.com/jtimeout/-/jtimeout-3.1.0.tgz"; - sha1 = "4cd65b28eff8b9f8c61d08889a9ac3abdf5d9893"; + sha512 = "xA2TlImMGj4c0yAiM9BUq+8aAFVYVYUX2tkcC8u8das9qoZSs13SxhVcfWqI4cHOsv3huj2D0VRNHeVCLO3mVQ=="; }; } { @@ -926,7 +902,7 @@ path = fetchurl { name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; } { @@ -934,7 +910,7 @@ path = fetchurl { name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo="; }; } { @@ -978,19 +954,11 @@ }; } { - name = "moment___moment_2.24.0.tgz"; - path = fetchurl { - name = "moment___moment_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; - sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; - }; - } - { - name = "moment___moment_2.22.2.tgz"; + name = "moment___moment_2.29.2.tgz"; path = fetchurl { - name = "moment___moment_2.22.2.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz"; - sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + name = "moment___moment_2.29.2.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz"; + sha512 = "UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="; }; } { @@ -1074,11 +1042,11 @@ }; } { - name = "path_parse___path_parse_1.0.5.tgz"; + name = "path_parse___path_parse_1.0.7.tgz"; path = fetchurl { - name = "path_parse___path_parse_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; } { @@ -1250,11 +1218,11 @@ }; } { - name = "shell_quote___shell_quote_1.6.1.tgz"; + name = "shell_quote___shell_quote_1.7.3.tgz"; path = fetchurl { - name = "shell_quote___shell_quote_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + name = "shell_quote___shell_quote_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz"; + sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; } { diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index 5182b5c256f37..f247b5d148249 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "protonvpn-cli"; - version = "3.11.1"; + version = "3.12.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonApplication rec { owner = "protonvpn"; repo = "linux-cli"; rev = version; - sha256 = "sha256-u+POtUz7NoGS23aOmvDCZPUp2HW1xXGtfbZR88cWCBc="; + sha256 = "sha256-z0ewAqf8hjyExqBN8KBsDwJ+SA/pIBYZhKtXF9M65HE="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 032d9e3d5b83c..ef128932f7c0a 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -2,9 +2,11 @@ , buildPythonApplication , fetchFromGitHub , wrapGAppsHook +, gdk-pixbuf +, glib-networking , gobject-introspection , imagemagick -, networkmanager +, librsvg , pango , webkitgtk # Python libs @@ -16,22 +18,24 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "linux-app"; rev = "refs/tags/${version}"; - sha256 = "sha256-Od12qHiyXHu2JnjYV7amZz5xxL+eiWUVbcG5Tbcrr28="; + sha256 = "sha256-6IRkJKtdQQ9Yixb9CkT3tGNY0MYFZyvz1/6buZo5eYU="; }; nativeBuildInputs = [ + gdk-pixbuf gobject-introspection imagemagick wrapGAppsHook ]; propagatedBuildInputs = [ + glib-networking # needed for the login captcha protonvpn-nm-lib psutil ]; @@ -39,7 +43,7 @@ buildPythonApplication rec { buildInputs = [ # To avoid enabling strictDeps = false (#56943) gobject-introspection - networkmanager + librsvg pango webkitgtk ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 54d7c5c6813aa..69276c229b3c2 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -18,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh"; + sha256 = "k85nQH2FWyEXDgB+Pd4yStfNCjkiIGE2vA/YTXLaK4o="; }; passthru = { @@ -85,6 +85,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit description; homepage = "https://www.anydesk.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ shyim ]; diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index 48b44656ff0af..4eea552810b51 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution"; homepage = "https://clients.amazonworkspaces.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; # TODO Mac support maintainers = [ maintainers.mausch ]; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index bfd9e402f956e..5051d2308f02c 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -206,8 +206,9 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.unfree; description = "Citrix Workspace"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; - maintainers = with maintainers; [ pmenke ]; + maintainers = with maintainers; [ pmenke michaeladler ]; inherit homepage; }; } diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 12bda3f98ad43..5e1b831f73b1a 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -13,61 +13,6 @@ let # # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "20.04.0" = { - major = "20"; - minor = "04"; - patch = "0"; - x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB"; - x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; - x64suffix = "21"; - x86suffix = "21"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html"; - }; - - "20.06.0" = { - major = "20"; - minor = "06"; - patch = "0"; - x64hash = "1kpfcfg95mpprlca6cccnjlsqbj3xvv77cn3fc5msd304nsi9x1v"; - x86hash = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194"; - x64suffix = "15"; - x86suffix = "15"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html"; - }; - - "20.09.0" = { - major = "20"; - minor = "9"; - patch = "0"; - x64hash = "15gjq1vk1y76c39p72xnam9h9rnr0632i4n11l6xbjnfnad8d4pr"; - x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4"; - x64suffix = "15"; - x86suffix = "15"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html"; - }; - - "20.10.0" = { - major = "20"; - minor = "10"; - patch = "0"; - x64hash = "13g7r92mhwqwqkm6a4k4yn232ighkmxifs7j8wdi1yva0dvklqdf"; - x86hash = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx"; - x64suffix = "6"; - x86suffix = "6"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html"; - }; - - "20.12.0" = { - major = "20"; - minor = "12"; - patch = "0"; - x64hash = "1268nriqjp27nxqqi4dvkv8r01yj3bhglxv21xd185761da2mzry"; - x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf"; - x64suffix = "12"; - x86suffix = "12"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html"; - }; - "21.01.0" = { major = "21"; minor = "1"; @@ -120,7 +65,7 @@ let x86hash = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51"; x64suffix = "25"; x86suffix = "25"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2109.html"; }; "21.12.0" = { @@ -131,6 +76,17 @@ let x86hash = "3746cdbe26727f7f6fb85fbe5f3e6df0322d79bb66e3a70158b22cb4f6b6b292"; x64suffix = "18"; x86suffix = "18"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2112.html"; + }; + + "22.05.0" = { + major = "22"; + minor = "5"; + patch = "0"; + x64hash = "49786fd3b5361b1f42b7bb0e36572a209e95acb1335737da5216345b6420f053"; + x86hash = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1"; + x64suffix = "16"; + x86suffix = "16"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 20b850328875b..23b2727d695d6 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "High-performance remote display protocol"; homepage = "https://aws.amazon.com/hpc/dcv/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ rmcgibbo ]; diff --git a/pkgs/applications/networking/remote/rustdesk/cargo.patch b/pkgs/applications/networking/remote/rustdesk/cargo.patch index ecf2f4af5bebd..e2124f2617137 100644 --- a/pkgs/applications/networking/remote/rustdesk/cargo.patch +++ b/pkgs/applications/networking/remote/rustdesk/cargo.patch @@ -1,26 +1,24 @@ diff --git a/Cargo.lock b/Cargo.lock -index c3e139e..b77d8bd 100644 +index fb17c7e..ef157e5 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1761,11 +1761,11 @@ dependencies = [ - +@@ -2332,10 +2332,10 @@ dependencies = [ [[package]] name = "magnum-opus" --version = "0.3.4-2" --source = "git+https://github.com/open-trade/magnum-opus#ad0836164abf4a4df69009b1ee08eabe3a13b33f" -+version = "0.4.0" + version = "0.4.0" +-source = "git+https://github.com/open-trade/magnum-opus#3c3d0b86ae95c84930bebffe4bcb03b3bd83342b" +source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604" dependencies = [ -- "bindgen 0.59.1", +- "bindgen", - "target_build_utils", + "libc", + "opusic-sys", ] [[package]] -@@ -2188,6 +2188,16 @@ version = "0.1.4" +@@ -2796,6 +2796,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "opusic-sys" @@ -33,18 +31,18 @@ index c3e139e..b77d8bd 100644 +] + [[package]] - name = "parity-tokio-ipc" - version = "0.7.2" + name = "os_str_bytes" + version = "6.0.0" diff --git a/Cargo.toml b/Cargo.toml -index 75504a0..43e1624 100644 +index 1b715bd..960e8da 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -32,7 +32,7 @@ libc = "0.2" +@@ -35,7 +35,7 @@ libc = "0.2" parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" } - flexi_logger = "0.17" + flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset"] } runas = "0.2" -magnum-opus = { git = "https://github.com/open-trade/magnum-opus" } +magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" } dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true } - rubato = { version = "0.8", optional = true } + rubato = { version = "0.12", optional = true } samplerate = { version = "0.2", optional = true } diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix index 2850995bd13cb..341cc22976a98 100644 --- a/pkgs/applications/networking/remote/rustdesk/default.nix +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -24,20 +24,21 @@ , libsciter , llvmPackages , wrapGAppsHook +, writeText }: rustPlatform.buildRustPackage rec { pname = "rustdesk"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; - rev = "0325500ebf331b66220cec6e9078afb83b0e98a7"; - sha256 = "sha256-xglyyoiAjJx3y8+A2OYHZffjqjDkcTjIluPA/J42VVg="; + rev = version; + sha256 = "sha256-IlrfqwNyaSHE9Ct0mn7MUxEg7p1Ku34eOMYelEAYFW8="; }; - cargoSha256 = "sha256-4MQKa54f3X7IHGd29H6RY7v2toeHvTHInIpgXjdotjw="; + cargoSha256 = "sha256-1OMWEk+DerltF7kwdo4d04rbgIFLHBRq3vZaL7jtrdE="; LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; @@ -51,10 +52,29 @@ rustPlatform.buildRustPackage rec { # properly. postUnpack = let vcpkg_target = "x64-linux"; + + updates_vcpkg_file = writeText "update_vcpkg_rustdesk" + '' + Package : libyuv + Architecture : ${vcpkg_target} + Version : 1.0 + Status : is installed + + Package : libvpx + Architecture : ${vcpkg_target} + Version : 1.0 + Status : is installed + ''; in '' export VCPKG_ROOT="$TMP/vcpkg"; + mkdir -p $VCPKG_ROOT/.vcpkg-root mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib + mkdir -p $VCPKG_ROOT/installed/vcpkg/updates + ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status + mkdir -p $VCPKG_ROOT/installed/vcpkg/info + touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1.0_${vcpkg_target}.list + touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_1.0_${vcpkg_target}.list ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 7ee1cc9ab4fa3..44ce12aeeb48e 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,6 +6,8 @@ mkDerivation rec { pname = "teamviewer"; + # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime + outputs = [ "out" "dev" ]; version = "15.29.4"; src = fetchurl { @@ -94,9 +96,10 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.teamviewer.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga dasuxullebt jraygauthier ]; + maintainers = with maintainers; [ jagajaga jraygauthier ]; }; } diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index b8677a2683c0e..feb8252c7edae 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -98,7 +98,7 @@ let description = "An open source RDP server"; homepage = "https://github.com/neutrinolabs/xrdp"; license = licenses.asl20; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; platforms = platforms.linux; }; }; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index bbce0e1d350e3..35b4fa3aef43a 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Automatically sync files via secure, distributed technology"; homepage = "https://www.resilio.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 6dca196948d7a..1f340a703611b 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services"; homepage = "https://www.scaleft.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jloyet ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 742e6eab8580d..1b2d3053d9be1 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, libosip }: +{ lib, stdenv, fetchurl, libosip, sqlite }: stdenv.mkDerivation rec { pname = "siproxd"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { url = "mirror://sourceforge/siproxd/siproxd-${version}.tar.gz"; - sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j"; + sha256 = "0dkpl3myxz3gvj2n2qpqrd19dip9il0vf7qybdvn5wgznrmplvcs"; }; patches = [ ./cheaders.patch ]; - buildInputs = [ libosip ]; + buildInputs = [ libosip sqlite ]; meta = { homepage = "http://siproxd.sourceforge.net/"; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 401d6dfa32cdb..558c7ef864611 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.10"; + version = "1.5.0"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es="; + sha256 = "sha256-GxC9+O72GHE8Tc6FReO7EdpZTSaqn9mBpZCYaKybJls="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 0947686144e54..b74905586192d 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 = "3.6.3"; + version = "3.6.5"; 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-tgNkpMAGihCBGrP9B1ymwesOddRGACcbiKIO2Tou9jE="; + sha256 = "sha256-otdB1g/zUWE31LnzjNwH7uVKVuw2BG9MOv7mv7T26qE="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index 6652e7c986c38..7c8e3dfd93dc4 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: stdenv.mkDerivation rec { pname = "sniproxy"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm"; }; + patches = [ + # Pull upstream fix for -fno-common toolchain support: + # https://github.com/dlundquist/sniproxy/pull/349 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/dlundquist/sniproxy/commit/711dd14affd5d0d918cd5fd245328450e60c7111.patch"; + sha256 = "1vlszib2gzxnkl9zbbrf2jz632j1nhs4aanpw7qqnx826zmli0a6"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libev pcre udns ]; diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 6839b6be67291..f3c8301a69b61 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Most Advanced REST & SOAP Testing Tool in the World"; homepage = "https://www.soapui.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = "SoapUI End User License Agreement"; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index c38a01a49d5e3..4daf11595efae 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -1,29 +1,36 @@ -{ lib, fetchFromGitHub, python3Packages, gettext, gdk-pixbuf -, gobject-introspection, gtk3, wrapGAppsHook }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, wrapGAppsHook +, gdk-pixbuf +, gettext +, gobject-introspection +, gtk3 +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { - owner = "Nicotine-Plus"; + owner = "nicotine-plus"; repo = "nicotine-plus"; rev = version; - hash = "sha256-3NXlNd3Zy++efnvcnfIOUP83mdJ5h8BmE4a2uWn5CPQ="; + sha256 = "sha256-aD5LQ0l6bet/iQKiu1mta4fUeijfip9IdzbGnTkCNdQ="; }; nativeBuildInputs = [ gettext wrapGAppsHook ]; - propagatedBuildInputs = [ gtk3 gdk-pixbuf gobject-introspection ] - ++ (with python3Packages; [ pygobject3 ]); - + propagatedBuildInputs = [ + gdk-pixbuf + gobject-introspection + gtk3 + python3Packages.pygobject3 + ]; postInstall = '' ln -s $out/bin/nicotine $out/bin/nicotine-plus - test -e $out/share/applications/org.nicotine_plus.Nicotine.desktop && exit 1 - install -D data/org.nicotine_plus.Nicotine.desktop -t $out/share/applications ''; preFixup = '' @@ -34,11 +41,16 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with lib; { + broken = stdenv.isDarwin; description = "A graphical client for the SoulSeek peer-to-peer system"; + longDescription = '' + Nicotine+ aims to be a pleasant, free and open source (FOSS) alternative + to the official Soulseek client, providing additional functionality while + keeping current with the Soulseek protocol. + ''; homepage = "https://www.nicotine-plus.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry klntsky ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index edff4c78126ed..0bfc62ccfbb2b 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { rm -f $out/opt/SpiderOakONE/lib/libz* - patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 \ + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \ "$out/opt/SpiderOakONE/lib/SpiderOakONE" RPATH=$out/opt/SpiderOakONE/lib:${ldpath} @@ -53,6 +53,7 @@ in stdenv.mkDerivation { meta = { homepage = "https://spideroak.com"; description = "Secure online backup and sychronization"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ amorsillo ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 9409a3c5fcdda..f60bcf8b7bef5 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -36,6 +36,6 @@ in appimageTools.wrapType2 rec { homepage = "https://getstation.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ lattfein ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index a76be3d318c3c..7b6316631e89c 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.17"; + version = "2.4.19"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA="; + hash = "sha256-7kX7gC/1jSZGgV3ZhfebMIn/Y5gXkz22GDP2zpiwUZ4="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix deleted file mode 100644 index 39ce5d3a7ea53..0000000000000 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchurl, fetchpatch }: - -rec { - version = "3.2.3"; - src = fetchurl { - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "03p5dha9g9krq61mdbcrjkpz5nglri0009ks2vs9k97f9i83rk5y"; - }; - upstreamPatchTarball = fetchurl { - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; - sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; - }; - extraPatches = [ - (fetchpatch { - name = "CVE-2020-14387.patch"; - url = "https://git.samba.org/?p=rsync.git;a=patch;h=c3f7414;hp=4c4fce51072c9189cfb11b52aa54fed79f5741bd"; - sha256 = "000lyx48lns84p53nsdlr45mb9558lrvnsz3yic0y3z6h2izv82x"; - }) - ]; - - meta = with lib; { - description = "Fast incremental file transfer utility"; - homepage = "https://rsync.samba.org/"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index dc3e8b25e70a7..f47c9c75367de 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -20,20 +20,25 @@ , nixosTests }: -let - base = import ./base.nix { inherit lib fetchurl fetchpatch; }; -in stdenv.mkDerivation rec { pname = "rsync"; - version = base.version; + version = "3.2.4"; - mainSrc = base.src; + srcs = [ + (fetchurl { + # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 + url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; + sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE="; + }) + ] ++ lib.optional enableCopyDevicesPatch (fetchurl { + # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 + url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; + sha256 = "1wj21v57v135n6fnm2m2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; + }); - patchesSrc = base.upstreamPatchTarball; + patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; - srcs = [ mainSrc ] ++ lib.optional enableCopyDevicesPatch patchesSrc; - patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff" - ++ base.extraPatches; + nativeBuildInputs = [ perl ]; buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl @@ -41,7 +46,6 @@ stdenv.mkDerivation rec { ++ lib.optional enableLZ4 lz4 ++ lib.optional enableOpenSSL openssl ++ lib.optional enableXXHash xxHash; - nativeBuildInputs = [ perl ]; configureFlags = [ "--with-nobody-group=nogroup" @@ -56,13 +60,15 @@ stdenv.mkDerivation rec { # The following PR should fix the cross-compilation issue. # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" - ; + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no"; passthru.tests = { inherit (nixosTests) rsyncd; }; - meta = base.meta // { - description = "A fast incremental file transfer utility"; + meta = with lib; { + description = "Fast incremental file transfer utility"; + homepage = "https://rsync.samba.org/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; maintainers = with lib.maintainers; [ ehmry kampfschlaefer ]; }; } diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index e55f7fc1fba61..c18f454d87ce4 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchurl, perl, rsync, fetchpatch }: +{ stdenv, python3, rsync }: -let - base = import ./base.nix { inherit lib fetchurl fetchpatch; }; -in stdenv.mkDerivation { pname = "rrsync"; - version = base.version; - - src = base.src; - - buildInputs = [ rsync perl ]; + inherit (rsync) version srcs; + buildInputs = [ + rsync + (python3.withPackages (pythonPackages: with pythonPackages; [ braceexpand ])) + ]; # Skip configure and build phases. # We just want something from the support directory dontConfigure = true; dontBuild = true; - patches = base.extraPatches; + inherit (rsync) patches; postPatch = '' substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync @@ -28,8 +25,7 @@ stdenv.mkDerivation { chmod a+x $out/bin/rrsync ''; - meta = base.meta // { + meta = rsync.meta // { description = "A helper to run rsync-only environments from ssh-logins"; - maintainers = [ lib.maintainers.kampfschlaefer ]; }; } diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix deleted file mode 100644 index caa46942ca925..0000000000000 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall -, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook -, gnome, buildPythonApplication, python-dateutil, pyinotify, pygobject3 -, bcrypt, gobject-introspection, gsettings-desktop-schemas -, pango, gdk-pixbuf, atk }: - -buildPythonApplication rec { - version = "0.9.4.4"; - pname = "syncthing-gtk"; - - src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing-gtk"; - rev = "v${version}"; - sha256 = "0nc0wd7qvyri7841c3dd9in5d7367hys0isyw8znv5fj4c0a6v1f"; - }; - - nativeBuildInputs = [ - wrapGAppsHook - # For setup hook populating GI_TYPELIB_PATH - gobject-introspection - pango gdk-pixbuf atk libnotify - ]; - - buildInputs = [ - gtk3 librsvg libappindicator-gtk3 - libnotify gnome.adwaita-icon-theme - # Schemas with proxy configuration - gsettings-desktop-schemas - ]; - - propagatedBuildInputs = [ - python-dateutil pyinotify pygobject3 bcrypt - ]; - - patches = [ - (substituteAll { - src = ./paths.patch; - killall = "${killall}/bin/killall"; - syncthing = "${syncthing}/bin/syncthing"; - }) - ]; - - # repo doesn't have any tests - doCheck = false; - - setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ]; - - postPatch = '' - substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" - substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" - substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share" - substituteInPlace syncthing_gtk/uisettingsdialog.py --replace "/usr/share" "$out/share" - substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share" - substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" - ''; - - meta = with lib; { - description = "GTK3 & python based GUI for Syncthing"; - homepage = "https://github.com/syncthing/syncthing-gtk"; - license = licenses.gpl2; - broken = true; - maintainers = with maintainers; [ ]; - platforms = syncthing.meta.platforms; - }; -} diff --git a/pkgs/applications/networking/syncthing-gtk/paths.patch b/pkgs/applications/networking/syncthing-gtk/paths.patch deleted file mode 100644 index 0ba5a4f2db84e..0000000000000 --- a/pkgs/applications/networking/syncthing-gtk/paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/syncthing_gtk/configuration.py -+++ b/syncthing_gtk/configuration.py -@@ -30,7 +30,7 @@ - "autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask - "daemon_priority" : (int, 0), # uses nice values - "max_cpus" : (int, 0), # 0 for all cpus -- "syncthing_binary" : (str, "/usr/bin/syncthing"), -+ "syncthing_binary" : (str, "@syncthing@"), - "syncthing_arguments" : (str, ""), - "minimize_on_start" : (bool, False), - "folder_as_path" : (bool, True), ---- a/syncthing_gtk/tools.py -+++ b/syncthing_gtk/tools.py -@@ -303,7 +303,7 @@ - return False - # signal 0 doesn't kill anything, but killall exits with 1 if - # named process is not found -- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) -+ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) - p.communicate() - return p.returncode == 0 - else: diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index fc10b706bdce7..f09f9fb45ab3f 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.20.1"; + version = "1.20.3"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-QJevD/meVPEHnfwT1Eu3cwfVFU+ab/16eJBl6cuhGdA="; + hash = "sha256-8sxCTPFdf5VDysANUYqic6zq5gipTL6wmPXstJc+6bA="; }; - vendorSha256 = "sha256-NuiT2GytWaGkgSyl+qoe9DjCCL7wSHc6FU8C6rsy6Vc="; + vendorSha256 = "sha256-CJFKY69Iz8GrVpvUdDveMQQFj6RXApfgYjP7B1wfgfo="; doCheck = false; diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 3184c192b127f..69468c0a4df0d 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -7,6 +7,7 @@ let meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jcouyang MoritzBoehme ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index 06e389a69c805..c7ae7e40948af 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -14,6 +14,7 @@ let }; enableParallelBuilding = true; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Anonymous, taxable payment system."; homepage = "https://taler.net/"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 30a2570cada77..6a8960367be76 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "7.40.2"; + version = "7.42.1"; src = fetchurl { # find the latest version with @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_113.snap"; - sha512 = "33f8f367a9fe232cf359869dfa0aa55c9be6f6c0e1ebdf7d65ae4616afe0fe2b61c57697f6d67d5e71f5dffd163eb601d8f2d2757712b01d0d32eb027018c2d3"; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_117.snap"; + sha512 = "1e9a6e14a7046a8297c9f067211257cfbbe4dc121ddf4123271ddb96eccbfa504b6e0d05de2077326127ae1d0b2e571c232125e51bfaa1ef82d6cbf9355f13e6"; }; desktopItem = makeDesktopItem { @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { description = "A cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; downloadPage = "https://termius.com/linux/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ Br1ght0ne th0rgal ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/applications/networking/tetrd/default.nix index 937992a63d718..a9ccf1d2774ff 100644 --- a/pkgs/applications/networking/tetrd/default.nix +++ b/pkgs/applications/networking/tetrd/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Share your internet connection from your device to your PC and vice versa through a USB cable"; homepage = "https://tetrd.app"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Madouura ]; diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix new file mode 100644 index 0000000000000..4efec422ce315 --- /dev/null +++ b/pkgs/applications/networking/warp/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitLab +, appstream-glib +, desktop-file-utils +, itstool +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, wrapGAppsHook +, glib +, gtk4 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "warp"; + version = "0.2.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "warp"; + rev = "v${version}"; + hash = "sha256-ajz450ix68TDkhyAZd1IgZA/jUnXULrYZOSdcoOL+S0="; + }; + + postPatch = '' + patchShebangs build-aux + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-08xbd2YmJw2NTrxBrnJZMV2VvX6V0eX+fxbEEWFoC9c="; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + itstool + meson + ninja + pkg-config + python3 + wrapGAppsHook + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + meta = { + description = "Fast and secure file transfer"; + homepage = "https://apps.gnome.org/app/app.drey.Warp"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/applications/networking/wgcf/default.nix new file mode 100644 index 0000000000000..3487ad6395cf5 --- /dev/null +++ b/pkgs/applications/networking/wgcf/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wgcf"; + version = "2.2.14"; + + src = fetchFromGitHub { + owner = "ViRb3"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6V4fIoFB0fuCEu1Rj8QWGDNdgystrD/gefjbshvxVsw="; + }; + + subPackages = "."; + + vendorSha256 = "sha256-NGlV/qcnUlNLvt3uVRdfx+lUDgqAEBEowW9WIHBY+AI="; + + meta = with lib; { + description = "Cross-platform, unofficial CLI for Cloudflare Warp"; + homepage = "https://github.com/ViRb3/wgcf"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ yureien ]; + }; +} diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix index f313bdcded62b..e003c3a0e516c 100644 --- a/pkgs/applications/office/PageEdit/default.nix +++ b/pkgs/applications/office/PageEdit/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "PageEdit"; - version = "1.7.0"; + version = "1.9.10"; src = fetchFromGitHub { owner = "Sigil-Ebook"; repo = pname; rev = version; - hash = "sha256-/t08ZS2iYWIDkco0nhACBQs1X+X77SJ/g+ow7KemfRY="; + hash = "sha256-y2Z5enEptiOrwEGBKlo4H4I9ojIPG9KP3BlvTCj4PVY="; }; nativeBuildInputs = [ cmake qttranslations ]; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index abc8e33fd3701..82ae850065d89 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.3"; + version = "0.0.4"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ="; + sha256 = "sha256-ke3cuRi+ZlBSWawg66cGrV928dOBp0EniNakitmgUso="; }; nativeBuildInputs = [ @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open-source alternative to Notion"; homepage = "https://www.appflowy.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${version}"; maintainers = with maintainers; [ darkonion0 ]; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 63d38b0cc3fec..54a070596dc6e 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { description = "An integrated family of CLI’s for various Atlassian applications"; homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview"; license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ twey ]; inherit (jre.meta) platforms; }; diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index 4aef68ba0d065..0a00ac1463b5b 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { # Tests appear to be broken with import errors within the project structure doCheck = false; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ gobject-introspection @@ -38,19 +38,9 @@ python3Packages.buildPythonApplication rec { pygobject3 ]; - dontWrapGapps = true; - - pythonPath = with python3Packages; requiredPythonModules [ dbus-python xlib pygobject3 ]; - postInstall = '' - rm $out/bin/autokey-qt - buildPythonPath "$out $pythonPath" - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - # for autokey-shell ModuleNotFoundError: No module named 'autokey' - --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages" - --prefix "PYTHONPATH" ":" "$program_PYTHONPATH" - ) + # remove Qt version which we currently do not support + rm $out/bin/autokey-qt $out/share/applications/autokey-qt.desktop ''; meta = { diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index 07ce23a215e84..7e397bdb76b86 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -17,34 +17,17 @@ python3.pkgs.buildPythonApplication rec { pname = "banking"; - version = "0.4.0"; + version = "0.5.1"; format = "other"; src = fetchFromGitLab { owner = "tabos"; repo = "banking"; rev = version; - sha256 = "sha256-VGNCSirQslRfLIFeo375BNlHujoNXm+s55Ty+hB+ZRI="; + sha256 = "sha256-tZlBpDcwQ/aWroP2sFQBZcvmBD26PiY7q/8xFA8GnVc="; }; - patches = [ - # Fix build with meson 0.61 - # https://gitlab.com/tabos/banking/-/merge_requests/90 - (fetchpatch { - url = "https://gitlab.com/tabos/banking/-/commit/c3cc9afc380fe666ae6e331aa8a97659c60397a4.patch"; - sha256 = "r9n9l47XU4Tg4U5sfiFdGkbG8QB7O4ol9CB1ya06yOc="; - }) - # fix build with libadwaita 1.0.0 - (fetchpatch { - url = "https://gitlab.com/tabos/banking/-/commit/27ac4a89ba6047005d43de71a469ef30d1fda8b5.patch"; - hash = "sha256-dpDjdYf3gDsyFMTfGes+x27yUxKEnKjLulJxX2encG0="; - }) - ]; - postPatch = '' - substituteInPlace meson_post_install.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - patchShebangs meson_post_conf.py meson_post_install.py ''; @@ -70,12 +53,15 @@ python3.pkgs.buildPythonApplication rec { fints mt-940 pygobject3 + pysqlitecipher + schwifty ]; meta = with lib; { description = "Banking application for small screens"; homepage = "https://tabos.gitlab.io/projects/banking/"; license = licenses.gpl3Plus; + mainProgram = "org.tabos.banking"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/applications/office/bookletimposer/configdir.patch b/pkgs/applications/office/bookletimposer/configdir.patch new file mode 100644 index 0000000000000..5f7133f79a10c --- /dev/null +++ b/pkgs/applications/office/bookletimposer/configdir.patch @@ -0,0 +1,20 @@ +diff --git a/lib/bookletimposer/config.py b/lib/bookletimposer/config.py +index 8f107a4..d4d335d 100644 +--- a/lib/bookletimposer/config.py ++++ b/lib/bookletimposer/config.py +@@ -45,14 +41,7 @@ def debug(msg): + + + def get_sharedir(): +- if debug_enabled and os.path.exists(os.path.join("/", "usr", "local", +- "share", +- "bookletimposer")): +- return os.path.join("/", "usr", "local", "share") +- elif os.path.exists(os.path.join("/", "usr", "share", "bookletimposer")): +- return os.path.join("/", "usr", "share") +- else: +- return "" ++ return os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "share")) + + + def get_datadir(): diff --git a/pkgs/applications/office/bookletimposer/default.nix b/pkgs/applications/office/bookletimposer/default.nix new file mode 100644 index 0000000000000..806a9f76addf8 --- /dev/null +++ b/pkgs/applications/office/bookletimposer/default.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitLab +, python3 +, intltool +, pandoc +, gobject-introspection +, wrapGAppsHook +, gtk3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "bookletimposer"; + version = "0.3.1"; + + src = fetchFromGitLab { + domain = "git.codecoop.org"; + owner = "kjo"; + repo = "bookletimposer"; + rev = version; + sha256 = "sha256-AEpvsFBJfyqLucC0l4AN/nA2+aYBR50BEgAcNDJBSqg="; + }; + + patches = [ + ./i18n.patch + ./configdir.patch + ]; + + nativeBuildInputs = [ intltool pandoc wrapGAppsHook ]; + + buildInputs = [ gobject-introspection ]; + + propagatedBuildInputs = [ + gtk3 + (python3.withPackages (ps: with ps; [ distutils_extra pypdf2 pygobject3 ])) + ]; + + meta = { + homepage = "https://kjo.herbesfolles.org/bookletimposer/"; + description = "A utility to achieve some basic imposition on PDF documents, especially designed to work on booklets"; + platforms = lib.platforms.linux; + license = "GPL-3.0-or-later"; + maintainers = with lib.maintainers; [ afontain ]; + }; +} diff --git a/pkgs/applications/office/bookletimposer/i18n.patch b/pkgs/applications/office/bookletimposer/i18n.patch new file mode 100644 index 0000000000000..db53372d6ed2f --- /dev/null +++ b/pkgs/applications/office/bookletimposer/i18n.patch @@ -0,0 +1,19 @@ +--- a/setup.cfg 2022-06-04 17:10:10.477581502 +0200 ++++ b/setup.cfg 2022-06-04 17:10:15.185594382 +0200 +@@ -1,6 +1,3 @@ + [build] + icons=False + help=True +- +-[build_i18n] +-domain=bookletimposer +--- a/setup.py 2022-06-04 17:25:18.020872735 +0200 ++++ b/setup.py 2022-06-04 17:25:23.075884898 +0200 +@@ -115,7 +115,6 @@ It allows: + requires = ['gtk', 'PyPDF2'], + cmdclass = { "build" : build_extra.build_extra, + "build_uiheaders" : build_uiheaders, +- "build_i18n" : build_i18n.build_i18n, + "build_help" : build_help.build_help, + "build_icons" : build_icons.build_icons, + "build_man" : build_man, diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index a9d532a27c24a..1c6fe68480d72 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.9"; + version = "4.11"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-mlUcMMG3EhmfwiJ6EJr7mE177xjhOBcLvHIlxsH6ty0="; + hash = "sha256-+BTt4w174N7Ar7KujQNii5rjTISLaDEuTFre2UwQKxk="; }; nativeBuildInputs = [ @@ -206,7 +206,7 @@ stdenv.mkDerivation rec { - Financial Calculations ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar AndersonTorres ]; + maintainers = with maintainers; [ domenkozar AndersonTorres rski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 6d536ea60a3d0..16a498afcac00 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -7,33 +7,27 @@ , gtk3 , wrapGAppsHook , glib +, gtksourceview4 , itstool , gettext , pango , gdk-pixbuf +, libsecret , gobject-introspection , xvfb-run }: python3Packages.buildPythonApplication rec { pname = "gtg"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "getting-things-gnome"; repo = "gtg"; rev = "v${version}"; - sha256 = "0b2slm7kjq6q8c7v4m7aqc8m1ynjxn3bl7445srpv1xc0dilq403"; + sha256 = "sha256-O8qBD92P2g8QrBdMXa6j0Ozk+W80Ny5yk0KNTy7ekfE="; }; - patches = [ - # fix build with meson 0.60 (https://github.com/getting-things-gnome/gtg/pull/729) - (fetchpatch { - url = "https://github.com/getting-things-gnome/gtg/commit/1809d10663ae3d8f69c04138b66f9b4e66ee14f6.patch"; - sha256 = "sha256-bYr5PAsuvcSqTf0vaJj2APtuBrwHdhXJxtXoAb7CfGk="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -46,8 +40,10 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib gtk3 + gtksourceview4 pango gdk-pixbuf + libsecret ]; propagatedBuildInputs = with python3Packages; [ @@ -56,12 +52,14 @@ python3Packages.buildPythonApplication rec { lxml gst-python liblarch + caldav ]; checkInputs = with python3Packages; [ nose mock xvfb-run + pytest ]; preBuild = '' @@ -71,7 +69,7 @@ python3Packages.buildPythonApplication rec { format = "other"; strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) - checkPhase = "xvfb-run python3 ../run-tests"; + checkPhase = "xvfb-run pytest ../tests/"; meta = with lib; { description = " A personal tasks and TODO-list items organizer"; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 7e6910a3ab4b6..c7f1f605f2499 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.5.4"; + version = "5.5.5"; src = fetchurl { url = "http://homebank.free.fr/public/homebank-${version}.tar.gz"; - sha256 = "sha256-DQZpvKCZNArlwhPqE8srkyg7/IoOTPelkCwYKTZuV2U="; + sha256 = "sha256-vs4F7LUjkhR0JKoeWheTiXd7gr9Gir69c+twsq+cnmc="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index db0e3c5573792..6df00fc174ed7 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -156,8 +156,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Automation Controller for the Trader Work Station of Interactive Brokers"; homepage = "https://github.com/ib-controller/ib-controller"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index 403f675cb4ee3..24c8cafcdda56 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -89,8 +89,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Trader Work Station of Interactive Brokers"; homepage = "https://www.interactivebrokers.com"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 255dba62294e0..8d1f639622da9 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -63,8 +63,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 04d5108dc60de..55e24d80f2773 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -69,6 +69,10 @@ stdenv.mkDerivation rec { Runtime Environment for plugins like Hibiscus (HBCI Online Banking), SynTAX (accounting) and JVerein (club management). ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ flokli r3dl3g ]; diff --git a/pkgs/applications/office/libreoffice/darwin.nix b/pkgs/applications/office/libreoffice/darwin.nix deleted file mode 100644 index 765cbcd43024b..0000000000000 --- a/pkgs/applications/office/libreoffice/darwin.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv -, lib -, fetchurl -, undmg -}: - -let - appName = "LibreOffice.app"; - version = "7.2.5"; - dist = { - aarch64-darwin = { - arch = "aarch64"; - sha256 = "bdbcb9a98211f866ca089d440aebcd1d313aa99e8ab4104aae4e65ea3cee74ca"; - }; - - x86_64-darwin = { - arch = "x86_64"; - sha256 = "0b7ef18ed08341ac6c15339fe9a161ad17f6b469009d987cfc7d50c628d12a4e"; - }; - }."${stdenv.hostPlatform.system}"; -in -stdenv.mkDerivation { - inherit version; - pname = "libreoffice"; - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${dist.arch}/LibreOffice_${version}_MacOS_${dist.arch}.dmg"; - inherit (dist) sha256; - }; - - nativeBuildInputs = [ undmg ]; - sourceRoot = "${appName}"; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstallPhase - mkdir -p $out/{Applications/${appName},bin} - cp -R . $out/Applications/${appName} - ln -s $out/Applications/${appName}/Contents/MacOS/soffice $out/bin - runHook postInstallPhase - ''; - - meta = with lib; { - description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; - homepage = "https://libreoffice.org/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ tricktron ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" ]; - }; -} diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix new file mode 100644 index 0000000000000..ddfaf584021cb --- /dev/null +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -0,0 +1,80 @@ +{ stdenvNoCC +, lib +, fetchurl +, undmg +, writeScript +, callPackage +}: + +let + appName = "LibreOffice.app"; + scriptName = "soffice"; + version = "7.3.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"; + }; + + 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"; + }; + }; +in +stdenvNoCC.mkDerivation { + inherit version; + pname = "libreoffice"; + src = fetchurl { + inherit (dist.${stdenvNoCC.hostPlatform.system} or + (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}")) url sha256; + }; + + nativeBuildInputs = [ undmg ]; + sourceRoot = "${appName}"; + + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${appName},bin} + cp -R . $out/Applications/${appName} + cat > $out/bin/${scriptName} << EOF + #!${stdenvNoCC.shell} + open -na $out/Applications/${appName} --args "$@" + EOF + chmod +x $out/bin/${scriptName} + runHook postInstall + ''; + + passthru.updateScript = + let + defaultNixFile = builtins.toString ./default.nix; + updateNix = builtins.toString ./update.nix; + aarch64Url = dist."aarch64-darwin".url; + x86_64Url = dist."x86_64-darwin".url; + in + writeScript "update-libreoffice.sh" + '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash --argstr aarch64Url ${aarch64Url} --argstr x86_64Url ${x86_64Url} --argstr version ${version} ${updateNix} + set -eou pipefail + + # reset version first so that both platforms are always updated and in sync + update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${defaultNixFile} --system=aarch64-darwin + update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin + update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${defaultNixFile} --system=x86_64-darwin + update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin + ''; + + meta = with lib; { + description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; + homepage = "https://libreoffice.org/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ tricktron ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/pkgs/applications/office/libreoffice/darwin/update-test.nix b/pkgs/applications/office/libreoffice/darwin/update-test.nix new file mode 100644 index 0000000000000..994a923c556dc --- /dev/null +++ b/pkgs/applications/office/libreoffice/darwin/update-test.nix @@ -0,0 +1,50 @@ +# run the tests with nixt <absolutePath to parent dir> -v + +{ pkgs ? import <nixpkgs> { }, nixt }: +let + inherit (import ./update-utils.nix { inherit (pkgs) lib; }) + extractLatestVersionFromHtml + extractSha256FromHtml + getLatestStableVersion; +in +nixt.mkSuite "LibreOffice Updater" +{ + "should extract latest stable version from html" = + let + latestVersionHtmlMock = + '' + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title>Index of /libreoffice/stable</title> + <link rel="stylesheet" href="/mirrorbrain.css" type="text/css" /> + </head> + <body> + <h1>Index of /libreoffice/stable</h1> + <table><tr><th> </th><th><a href="?C=N;O=D">Name</a></th><th><a href="?C=M;O=A">Last modified</a></th><th><a href="?C=S;O=A">Size</a></th><th>Metadata</th></tr><tr><th colspan="5"><hr /></th></tr> + <tr><td valign="top"> </td><td><a href="/libreoffice/">Parent Directory</a></td><td> </td><td align="right"> - </td><td> </td></tr> + <tr><td valign="top"> </td><td><a href="7.2.7/">7.2.7/</a></td><td align="right">10-Mar-2022 11:12 </td><td align="right"> - </td><td> </td></tr> + <tr><td valign="top"> </td><td><a href="7.3.3/">7.3.3/</a></td><td align="right">12-May-2022 10:06 </td><td align="right"> - </td><td> </td></tr> + <tr><td valign="top"> </td><td><a href="7.2.6/">7.2.6/</a></td><td align="right">05-May-2022 07:57 </td><td align="right"> - </td><td> </td></tr> + <tr><th colspan="5"><hr /></th></tr> + </table> + <address>Apache Server at <a href="mailto:hostmaster@documentfoundation.org">download.documentfoundation.org</a> Port 80</address> + <br/><address><a href="http://mirrorbrain.org/">MirrorBrain</a> powered by <a href="http://httpd.apache.org/">Apache</a></address> + </body></html> + ''; + + actual = extractLatestVersionFromHtml latestVersionHtmlMock; + + in + "7.3.3" == actual; + + "should extract latest stable version from website" = (builtins.compareVersions getLatestStableVersion "7.3.3") >= 0; + + "should extract sha256 from html" = + let + sha256Html = "50ed3deb8d9c987516e2687ebb865bca15486c69da79f1b6d74381e43f2ec863 LibreOffice_7.3.3_MacOS_aarch64.dmg\n"; + actual = extractSha256FromHtml sha256Html; + in + "50ed3deb8d9c987516e2687ebb865bca15486c69da79f1b6d74381e43f2ec863" == actual; +} diff --git a/pkgs/applications/office/libreoffice/darwin/update-utils.nix b/pkgs/applications/office/libreoffice/darwin/update-utils.nix new file mode 100644 index 0000000000000..766e858e33e2c --- /dev/null +++ b/pkgs/applications/office/libreoffice/darwin/update-utils.nix @@ -0,0 +1,51 @@ +{ lib }: +let + # extractLatestVersionFromHtml :: String -> String + extractLatestVersionFromHtml = htmlString: + let + majorMinorPatchGroup = "([0-9]+\\.[0-9]+\\.[0-9]+)"; + splittedVersions = builtins.split "href=\"${majorMinorPatchGroup}" htmlString; + stableVersions = builtins.concatLists + (builtins.filter (e: builtins.isList e) + splittedVersions); + in + if stableVersions == [ ] + then abort "Failed to extract versions from html." + else lib.last (builtins.sort builtins.lessThan stableVersions); + + # getHtml :: String -> String + getHtml = url: + builtins.readFile (builtins.fetchurl url); + + # getLatestStableVersion :: String + getLatestStableVersion = + extractLatestVersionFromHtml + (getHtml "https://download.documentfoundation.org/libreoffice/stable/"); + + # extractSha256FromHtml :: String -> String + extractSha256FromHtml = htmlString: + let + sha256 = (builtins.match ".*([0-9a-fA-F]{64}).*" htmlString); + in + if sha256 == [ ] + then abort "Failed to extract sha256 from html." + else builtins.head sha256; + + # getSha256 :: String -> String + getSha256 = dmgUrl: oldVersion: newVersion: + extractSha256FromHtml (getHtml (getSha256Url dmgUrl oldVersion newVersion)); + + # getSha256Url :: String -> String -> String -> String + getSha256Url = dmgUrl: oldVersion: newVersion: + (builtins.replaceStrings [ oldVersion ] [ newVersion ] dmgUrl) + ".sha256"; + +in +{ + inherit + extractLatestVersionFromHtml + getHtml + getLatestStableVersion + extractSha256FromHtml + getSha256 + getSha256Url; +} diff --git a/pkgs/applications/office/libreoffice/darwin/update.nix b/pkgs/applications/office/libreoffice/darwin/update.nix new file mode 100644 index 0000000000000..b74cca802fcb1 --- /dev/null +++ b/pkgs/applications/office/libreoffice/darwin/update.nix @@ -0,0 +1,18 @@ +# Impure functions, for passthru.updateScript runtime only +{ aarch64Url +, x86_64Url +, version +, pkgs ? import ../../../../../default.nix { } +, +}: +let + inherit (import ./update-utils.nix { inherit (pkgs) lib; }) + getLatestStableVersion + getSha256; +in +pkgs.mkShell rec { + buildInputs = [ pkgs.common-updater-scripts ]; + newVersion = getLatestStableVersion; + newAarch64Sha256 = getSha256 aarch64Url version newVersion; + newX86_64Sha256 = getSha256 x86_64Url version newVersion; +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 74a4c156b8307..a75c094521352 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -121,7 +121,7 @@ let optional optionals optionalString; jre' = jre_minimal.override { - modules = [ "java.base" "java.desktop" "java.logging" ]; + modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; }; importVariant = f: import (./. + "/src-${variant}/${f}"); @@ -584,6 +584,8 @@ in meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = "https://libreoffice.org/"; + # at least one jar in dependencies + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix deleted file mode 100644 index c223fa40cc4b5..0000000000000 --- a/pkgs/applications/office/marp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }: - -stdenv.mkDerivation rec { - pname = "marp"; - version = "0.0.14"; - - src = fetchurl { - url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "0nklzxwdx5llzfwz1hl2jpp2kwz78w4y63h5l00fh6fv6zisw6j4"; - }; - - unpackPhase = '' - mkdir {locales,resources} - tar --delay-directory-restore -xf $src - chmod u+x {locales,resources} - ''; - - installPhase = '' - mkdir -p $out/lib/marp $out/bin - cp -r ./* $out/lib/marp - ln -s $out/lib/marp/Marp $out/bin - ''; - - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \ - $out/bin/Marp - ''; - - meta = with lib; { - description = "Markdown presentation writer, powered by Electron"; - homepage = "https://yhatt.github.io/marp/"; - license = licenses.mit; - maintainers = [ maintainers.puffnfresh ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 3b9963d8dbc7d..e204e04008ca8 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -139,6 +139,7 @@ mkDerivation { meta = with lib; { homepage = "https://www.mendeley.com"; description = "A reference manager and academic social network"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index a4ac00b3b6d0c..c6f0ae106e2c9 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -72,10 +72,7 @@ in ''; # Do not attempt generating a tarball for micropad again. - # note: `doDist = false;` does not work. - distPhase = '' - true - ''; + doDist = false; # The desktop item properties should be kept in sync with data from upstream: # https://github.com/MicroPad/MicroPad-Electron/blob/master/package.json diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 4038f5fd435a0..08d926a6d5e23 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -113,7 +113,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Moneyplex online banking software"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = licenses.unfree; downloadPage = "http://matrica.de/download/download.html"; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index e3390e54ee397..0e5332b953e59 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "All-in-one Calendars, Tasks and Scheduler"; homepage = "https://morgen.so/download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 214b8376d8d6b..7ca12b234271a 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -73,11 +73,11 @@ let in stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "6.3.1"; + version = "7.1.0"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-WCjCljA7yB7Zm/I4rDZnfgaUQpDUKwbUvL7hkIG8cVM="; + sha256 = "sha256-40IUAmg7PnfYrdTj7TVbfvb9ey0/zzswu+sJllAIktg="; }; nativeBuildInputs = [ @@ -171,6 +171,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Plus; maintainers = with maintainers; [ nh2 gtrunsec ]; }; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 358b66fb589a2..75bc494d3a879 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , nixosTests , python3 , ghostscript @@ -15,11 +14,16 @@ }: let + # Use specific package versions required by paperless-ngx py = python3.override { packageOverrides = self: super: { - django = super.django_3; + django = super.django_4; + + # django-extensions 3.1.5 is required, but its tests are incompatible with Django 4 + django-extensions = super.django-extensions.overridePythonAttrs (_: { + doCheck = false; + }); - # Incompatible with aioredis 2 aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { version = "1.3.1"; src = oldAttrs.src.override { @@ -34,11 +38,12 @@ let in py.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; - version = "1.6.0"; + version = "1.7.1"; + # Fetch the release tarball instead of a git ref because it contains the prebuilt fontend src = fetchurl { - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/ngx-${version}/${pname}-${version}.tar.xz"; - sha256 = "07mrxbwahkm00n9nvssd6d13p80w333g84cd38bzp0l34nzim5zl"; + url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; + hash = "sha256-8vx4hvbIqaChjPyS8Q0ar2bz/pLzEdxoF7P2gBEeFzc="; }; format = "other"; @@ -92,7 +97,8 @@ py.pkgs.pythonPackages.buildPythonApplication rec { numpy ocrmypdf pathvalidate - pdfminer + pdf2image + pdfminer-six pikepdf pillow pluggy @@ -109,6 +115,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { python-magic pytz pyyaml + pyzbar redis regex reportlab @@ -189,6 +196,6 @@ py.pkgs.pythonPackages.buildPythonApplication rec { description = "A supercharged version of paperless: scan, index, and archive all of your physical documents"; homepage = "https://paperless-ngx.readthedocs.io/en/latest/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lukegb ]; + maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; } diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 653e72a163eb3..30da3b3520459 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.57.2"; + version = "0.58.5"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-ftLKlNzr46iL/V+P3J1wtoUByGHHl7wrh4xctU4JYkM="; + sha256 = "sha256-7olUx0JmztNb6uFsxKwOkBqkbMEiy2vb+iHqBe5I1PM="; }; nativeBuildInputs = [ @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; maintainers = with maintainers; [ elohmeier oyren shawn8901 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 3fd9c3410693a..7df8a607f4dfa 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.5.0"; + version = "22.6.1"; 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 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd"; + sha256 = "c5b2075d42298d28f901ad2df8eb65f5a61aa59727fae9eeb1f92dac1b63d8ba"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/scribus/1_4.nix b/pkgs/applications/office/scribus/1_4.nix new file mode 100644 index 0000000000000..a6427d0f890b8 --- /dev/null +++ b/pkgs/applications/office/scribus/1_4.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 +, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg +, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: + +let + icon = fetchurl { + url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg"; + sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; + }; + + pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); +in stdenv.mkDerivation rec { + pname = "scribus"; + version = "1.4.8"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; + }; + + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = with xorg; + [ freetype lcms libtiff libxml2 libart_lgpl qt4 + pythonEnv cups fontconfig + libjpeg zlib libpng podofo hunspell cairo + boost # for internal 2geom library + libXaw libXext libX11 libXtst libXi libXinerama + libpthreadstubs libXau libXdmcp + imagemagick # To build the icon + ]; + + postPatch = '' + substituteInPlace scribus/util_ghostscript.cpp \ + --replace 'QString gsName("gs");' \ + 'QString gsName("${ghostscript}/bin/gs");' + ''; + + postInstall = '' + for i in 16 24 48 64 96 128 256 512; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png + done + ''; + + meta = { + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; + description = "Desktop Publishing (DTP) and Layout program for Linux"; + homepage = "https://www.scribus.net"; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index a6427d0f890b8..d40c96ef486ae 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,52 +1,117 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 -, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: +{ boost +, cairo +, cmake +, cups +, fetchurl +, fetchpatch +, fontconfig +, freetype +, harfbuzzFull +, hunspell +, lcms2 +, libjpeg +, libtiff +, libxml2 +, mkDerivation +, pixman +, pkg-config +, podofo +, poppler +, poppler_data +, python3 +, qtbase +, qtimageformats +, qttools +, lib +}: let - icon = fetchurl { - url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg"; - sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; - }; - - pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); -in stdenv.mkDerivation rec { + pythonEnv = python3.withPackages ( + ps: [ + ps.pillow + ps.tkinter + ] + ); +in +mkDerivation rec { pname = "scribus"; - version = "1.4.8"; + + version = "1.5.8"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; + url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; + hash = "sha256-R4Fuj89tBXiP8WqkSZ+X/yJDHHd6d4kUmwqItFHha3Q="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = with xorg; - [ freetype lcms libtiff libxml2 libart_lgpl qt4 - pythonEnv cups fontconfig - libjpeg zlib libpng podofo hunspell cairo - boost # for internal 2geom library - libXaw libXext libX11 libXtst libXi libXinerama - libpthreadstubs libXau libXdmcp - imagemagick # To build the icon - ]; + patches = [ + # For Poppler 22.02 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch"; + sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch"; + sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c="; + }) + # For Poppler 22.03 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch"; + sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds="; + }) + # For Poppler 22.04 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; + sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; - postPatch = '' - substituteInPlace scribus/util_ghostscript.cpp \ - --replace 'QString gsName("gs");' \ - 'QString gsName("${ghostscript}/bin/gs");' - ''; - - postInstall = '' - for i in 16 24 48 64 96 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png - done - ''; - - meta = { - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + buildInputs = [ + boost + cairo + cups + fontconfig + freetype + harfbuzzFull + hunspell + lcms2 + libjpeg + libtiff + libxml2 + pixman + podofo + poppler + poppler_data + pythonEnv + qtbase + qtimageformats + qttools + ]; + + cmakeFlags = [ + # poppler uses std::optional + "-DWANT_CPP17=ON" + ]; + + meta = with lib; { + maintainers = with maintainers; [ + erictapen + kiwi + ]; + platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = "https://www.scribus.net"; - license = lib.licenses.gpl2; + # There are a lot of licenses... + # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 + license = with licenses; [ + bsd3 + gpl2Plus + mit + publicDomain + ]; }; } diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix deleted file mode 100644 index d3f706bbf0549..0000000000000 --- a/pkgs/applications/office/scribus/unstable.nix +++ /dev/null @@ -1,143 +0,0 @@ -{ boost -, cairo -, cmake -, cups -, fetchurl -, fetchpatch -, fontconfig -, freetype -, harfbuzzFull -, hunspell -, lcms2 -, libjpeg -, libtiff -, libxml2 -, mkDerivation -, pixman -, pkg-config -, podofo -, poppler -, poppler_data -, python3 -, qtbase -, qtimageformats -, qttools -, lib -}: - -let - pythonEnv = python3.withPackages ( - ps: [ - ps.pillow - ps.tkinter - ] - ); -in -mkDerivation rec { - pname = "scribus"; - - version = "1.5.7"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; - sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4="; - }; - - patches = [ - # For harfbuzz >= 2.9.0 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch"; - sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4="; - }) - # For harfbuzz >= 3.0 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch"; - sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y="; - }) - # For Poppler 22.02 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch"; - sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch"; - sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c="; - }) - # For Poppler 22.03 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch"; - sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch"; - sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch"; - sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch"; - sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch"; - sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ="; - }) - # For Poppler 22.04 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; - sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - boost - cairo - cups - fontconfig - freetype - harfbuzzFull - hunspell - lcms2 - libjpeg - libtiff - libxml2 - pixman - podofo - poppler - poppler_data - pythonEnv - qtbase - qtimageformats - qttools - ]; - - cmakeFlags = [ - # poppler uses std::optional - "-DWANT_CPP17=ON" - ]; - - meta = with lib; { - maintainers = with maintainers; [ - erictapen - kiwi - ]; - platforms = platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "https://www.scribus.net"; - # There are a lot of licenses... - # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 - license = with licenses; [ - bsd3 - gpl2Plus - mit - publicDomain - ]; - }; -} diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index 41bf38fc4b476..5ceb37b411c1f 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -1,6 +1,8 @@ -{ lib +{ stdenv +, lib , mkDerivation , fetchFromGitLab +, fetchpatch , wafHook , pkg-config , cmake @@ -33,7 +35,14 @@ mkDerivation rec { sha256 = "sha256-aXOokji6fYTpaeI/IIV+5RnTE2Cm8X3WfADf4Uftkss="; }; - patches = [ ./qt5.patch ]; + patches = [ + (fetchpatch { + name = "fix-kdelibs4support.patch"; + url = "https://gitlab.com/ita1024/semantik/-/commit/a991265bd6e3ed6541f8ec099420bc08cc62e30c.patch"; + sha256 = "sha256-E4XjdWfUnqhmFJs9ORznHoXMDS9zHWNXvQIKKkN4AAo="; + }) + ./qt5.patch + ]; postPatch = '' echo "${lib.getDev qtwebengine}" @@ -81,6 +90,7 @@ mkDerivation rec { ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A mind-mapping application for KDE"; license = licenses.mit; homepage = "https://waf.io/semantik.html"; diff --git a/pkgs/applications/office/semantik/qt5.patch b/pkgs/applications/office/semantik/qt5.patch index 6d41babdff47e..c5d5f3f1306f5 100644 --- a/pkgs/applications/office/semantik/qt5.patch +++ b/pkgs/applications/office/semantik/qt5.patch @@ -40,14 +40,14 @@ diff --color -ur a/wscript b/wscript if not os.path.exists(specpath): raise ValueError('No spec path, cannot build') -@@ -196,17 +220,28 @@ +@@ -196,17 +220,29 @@ conf.env.append_value('INCLUDES_KDECORE', specpath) - libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets', - 'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui', - 'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore', -- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi'] +- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi', 'KF5AuthCore'] + libs = { + 'KF5KIOCore': '@KF5KIOCore_dev@', + 'KF5Auth': '@KF5Auth_dev@', @@ -61,6 +61,7 @@ diff --color -ur a/wscript b/wscript + 'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@', + 'KF5I18n': '@KF5I18n_dev@', + 'KF5SonnetUi': '@KF5SonnetUi_dev@', ++ 'KF5AuthCore': '@KF5Auth_dev@', + } - for lib in libs: @@ -73,6 +74,6 @@ diff --color -ur a/wscript b/wscript - p = '%s/qt_%s.pri' % (path, name) + p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name) + print("[log] path :",path,", name : ",name) - for line in Utils.readf(p).splitlines(): - lst = line.strip().split(' = ') - if lst[0].endswith('.name'): + try: + code = Utils.readf(p) + except EnvironmentError: diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 3c139e1eead73..6162aa2326062 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -122,6 +122,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "An office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index ccb4cea95ecb2..4095536082350 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.10.1"; + version = "7.11.5"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-jhCsC5G8epyclp2+DYpot1UMjo5mkMa0UO0bQZ1T0Ug="; + sha256 = "sha256-+RMQd2iQmvFfgBhpa5T5SQJsn9wZ3qocDkO9b0O+CsE="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 7869b54a5f047..7211d4f9e562c 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,16 +1,19 @@ -{ lib, stdenv, fetchurl, qt4, cmake, sqlite }: - -stdenv.mkDerivation rec { +{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: +mkDerivation rec { pname = "tagainijisho"; - version = "1.0.3"; + version = "1.2.0"; - src = fetchurl { + src = fetchzip { url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; - sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; + hash = "sha256-fLq4Wfpa7Wr62KvHztgLiXE8eopCq+wipgabFm2bq6w="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 sqlite ]; + buildInputs = [ qtbase qttools sqlite ]; + + cmakeFlags = [ + "-DEMBED_SQLITE=OFF" + ]; meta = with lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 639823dacd6a3..bc998f72a2dcd 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , python3 , glibcLocales , installShellFiles @@ -68,6 +69,8 @@ buildPythonApplication rec { "test_missing_cache_dir" "test_sorting_null_values" "test_xdg_existant" + ] ++ lib.optionals stdenv.isDarwin [ + "test_sorting_fields" ]; pythonImportsCheck = [ diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 9e2752e163f05..1410ab3205938 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -15,6 +15,7 @@ let inherit description; homepage = "https://github.com/zadam/trilium"; license = licenses.agpl3Plus; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ fliegendewurst ]; }; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index eb3f5496522e9..a1a6fd3330577 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, installShellFiles }: +{ lib, fetchFromGitHub, python3, installShellFiles, fetchpatch }: with python3.pkgs; @@ -13,6 +13,15 @@ buildPythonApplication rec { sha256 = "sha256-/AASYeMkt18KPJljAjNPRYOpg/T5xuM10LJq4LrFD0g="; }; + patches = [ + # https://github.com/TailorDev/Watson/pull/473 + (fetchpatch { + name = "fix-completion.patch"; + url = "https://github.com/TailorDev/Watson/commit/43ad061a981eb401c161266f497e34df891a5038.patch"; + sha256 = "sha256-v8/asP1wooHKjyy9XXB4Rtf6x+qmGDHpRoHEne/ZCxc="; + }) + ]; + postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 46f2569b13ab2..d909b26526a90 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://www.wps.com/"; platforms = [ "x86_64-linux" ]; hydraPlatforms = []; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mlatus th0rgal ]; }; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 7baac9f35fd6a..f8d94f86907b3 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.4"; + version = "6.0.9"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-KPvsyN3qpnG8/qRwTlWe2mZWnI9OfxlHu6OUubItJZc="; + sha256 = "sha256-yzMppbvdw7ShYtWdmE5HkqutgivwuJKPkAOGq6WkyuQ="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -149,6 +149,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ i077 ]; diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index 9b1e75c1040fb..db4efe4b1ef8d 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -1,38 +1,34 @@ { stdenv, lib, fetchFromGitHub -, autoreconfHook, pkg-config, fftwFloat, libsamplerate +, cmake, pkg-config, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { pname = "csdr"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "jketterl"; repo = pname; rev = version; - sha256 = "1vip5a3xgskcwba3xi66zfr986xrsch9na7my818cm8vw345y57b"; + sha256 = "sha256-4XO3QYF0yaMNFjBHulrlZvO0/A1fFscD98QxnC6Itmk="; }; - patchPhase = '' - substituteInPlace configure.ac \ - --replace -Wformat=0 "" - ''; - nativeBuildInputs = [ - autoreconfHook + cmake pkg-config ]; - buildInputs = [ + propagatedBuildInputs = [ fftwFloat libsamplerate ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://github.com/jketterl/csdr"; description = "A simple DSP library and command-line tool for Software Defined Radio"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ astro ]; + maintainers = teams.c3d2.members; }; } diff --git a/pkgs/applications/radio/digiham/default.nix b/pkgs/applications/radio/digiham/default.nix new file mode 100644 index 0000000000000..652c6c63cf597 --- /dev/null +++ b/pkgs/applications/radio/digiham/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub +, cmake, pkg-config, protobuf, icu, csdr, codecserver +}: + +stdenv.mkDerivation rec { + pname = "digiham"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "jketterl"; + repo = pname; + rev = version; + sha256 = "sha256-nKNA5xAhM/lyyvFJnajWwY0hwVZhLApbDkXoUYFjlt0="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + codecserver + protobuf + csdr + icu + ]; + + meta = with lib; { + homepage = "https://github.com/jketterl/digiham"; + description = "tools for decoding digital ham communication"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = teams.c3d2.members; + }; +} diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 63eab66db8ff7..7f42ddcf012b2 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "A simple Mode S decoder for RTLSDR devices"; homepage = "https://github.com/flightaware/dump1090"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 9e29249c06591..6900e1eb4ed25 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, libpulseaudio }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, libpulseaudio }: buildGoModule rec { pname = "flex-ndax"; @@ -16,6 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-u/5LiVo/ZOefprEKr/L1+3+OfYb0a4wq+CWoUjYNvzg="; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://github.com/kc2g-flex-tools/nDAX"; description = "FlexRadio digital audio transport (DAX) connector for PulseAudio"; license = licenses.mit; diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 989722fdc3ecd..d607823bfeec4 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "6"; + minor = "7"; patch = "0"; } }: let - sourceSha256 = "sha256-0JODgv9MNOkHDQYTVCZMzjr/G542+NvGP9wlH9iwLeg="; + sourceSha256 = "sha256-6HEvQsV2JCkgNvBYsy1jfSTUIwEnrKJTzXNIVcPeWFQ="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 14a4763259fa9..8a9ca156ec1a8 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "2"; + minor = "3"; patch = "0"; } }: let - sourceSha256 = "sha256-WcfmW39wHhFdpbdBSjOfuDkxL8/fuMjjJoLUyCUud/o="; + sourceSha256 = "sha256-pH0nvZBUto9jXSN6fXD5vP1lIBwCMuFAvF2qT5dYsHU="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index ea97864bc6155..acb13cc1e2a34 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -112,6 +112,7 @@ rec { doCheck = false; meta = with lib; { + broken = stdenv.isDarwin; description = "Software Defined Radio (SDR) software"; longDescription = '' GNU Radio is a free & open-source software development toolkit that diff --git a/pkgs/applications/radio/js8call/cmake.patch b/pkgs/applications/radio/js8call/cmake.patch new file mode 100644 index 0000000000000..04552eac40ecc --- /dev/null +++ b/pkgs/applications/radio/js8call/cmake.patch @@ -0,0 +1,69 @@ +diff --git a/CMake/Modules/Findhamlib.cmake b/CMake/Modules/Findhamlib.cmake +index 1590f05..e797851 100644 +--- a/CMake/Modules/Findhamlib.cmake ++++ b/CMake/Modules/Findhamlib.cmake +@@ -47,7 +47,7 @@ if (NOT PC_HAMLIB_FOUND) + + # libusb-1.0 has no pkg-config file on Windows so we have to find it + # ourselves +- find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll) ++ find_library (LIBUSB NAMES libusb-1.0 usb-1.0 PATH_SUFFIXES MinGW32/dll) + if (LIBUSB) + set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES}) + get_filename_component (hamlib_libusb_path ${LIBUSB} PATH) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 75b80b3..7c04265 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -558,7 +558,6 @@ find_package (FFTW3 COMPONENTS double single threads REQUIRED) + # + # libhamlib setup + # +-set (hamlib_STATIC 1) + find_package (hamlib 3 REQUIRED) + find_program (RIGCTL_EXE rigctl) + find_program (RIGCTLD_EXE rigctld) +@@ -576,6 +576,7 @@ message (STATUS "hamlib_LIBRARY_DIRS: ${hamlib_LIBRARY_DIRS}") + find_package (Qt5Widgets 5 REQUIRED) + find_package (Qt5Multimedia 5 REQUIRED) + find_package (Qt5PrintSupport 5 REQUIRED) ++find_package (Qt5SerialPort 5 REQUIRED) + + if (WIN32) + add_definitions (-DQT_NEEDS_QTMAIN) +@@ -849,7 +850,7 @@ target_link_libraries (qcp Qt5::Widgets Qt5::PrintSupport) + add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS}) + # set wsjtx_udp exports to static variants + target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE) +-target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network) ++target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network Qt5::SerialPort) + target_include_directories (wsjt_qt BEFORE PRIVATE ${hamlib_INCLUDE_DIRS}) + if (WIN32) + target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase) +@@ -959,7 +960,6 @@ else () + ) + endif () + endif () +-qt5_use_modules (js8call SerialPort) # not sure why the interface link library syntax above doesn't work + + # if (UNIX) + # if (NOT WSJT_SKIP_MANPAGES) +@@ -1292,3 +1292,5 @@ configure_file ("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in" + set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CMakeCPackOptions.cmake") + + include (CPack) ++ ++add_definitions (-DJS8_USE_HAMLIB_THREE) +diff --git a/Configuration.cpp b/Configuration.cpp +index 8258f97..63a29bb 100644 +--- a/Configuration.cpp ++++ b/Configuration.cpp +@@ -160,7 +160,7 @@ + #include <QFont> + #include <QFontDialog> + #include <QColorDialog> +-#include <QSerialPortInfo> ++#include <QtSerialPort/QSerialPortInfo> + #include <QScopedPointer> + #include <QDateTimeEdit> + #include <QProcess> diff --git a/pkgs/applications/radio/js8call/default.nix b/pkgs/applications/radio/js8call/default.nix new file mode 100644 index 0000000000000..e89d3445697f4 --- /dev/null +++ b/pkgs/applications/radio/js8call/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromBitbucket +, wrapQtAppsHook +, pkg-config +, hamlib +, libusb1 +, cmake +, gfortran +, fftw +, fftwFloat +, qtbase +, qtmultimedia +, qtserialport +}: + +stdenv.mkDerivation rec { + pname = "js8call"; + version = "2.2.0"; + + src = fetchFromBitbucket { + owner = "widefido"; + repo = pname; + rev = "v${version}-ga"; + sha256 = "sha256-mFPhiAAibCiAkLrysAmIQalVCGd9ips2lqbAsowYprY="; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + gfortran + pkg-config + cmake + ]; + + buildInputs = [ + hamlib + libusb1 + fftw + fftwFloat + qtbase + qtmultimedia + qtserialport + ]; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/share/applications" "$out/share/applications" \ + --replace "/usr/share/pixmaps" "$out/share/pixmaps" \ + --replace "/usr/bin/" "$out/bin" + ''; + + patches = [ ./cmake.patch ]; + + meta = with lib; { + description = "Weak-signal keyboard messaging for amateur radio"; + longDescription = '' + JS8Call is software using the JS8 Digital Mode providing weak signal + keyboard to keyboard messaging to Amateur Radio Operators. + ''; + homepage = "http://js8call.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/applications/radio/m17-cxx-demod/default.nix new file mode 100644 index 0000000000000..86c30686c706d --- /dev/null +++ b/pkgs/applications/radio/m17-cxx-demod/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, codec2 }: + +stdenv.mkDerivation rec { + pname = "m17-cxx-demod"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "mobilinkd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ codec2 boost ]; + + meta = with lib; { + description = "M17 Demodulator in C++"; + homepage = "https://github.com/mobilinkd/m17-cxx-demod"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = teams.c3d2.members; + }; +} diff --git a/pkgs/applications/radio/openwebrx/default.nix b/pkgs/applications/radio/openwebrx/default.nix index 928bc4168ebd0..4ca4d369d79c9 100644 --- a/pkgs/applications/radio/openwebrx/default.nix +++ b/pkgs/applications/radio/openwebrx/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, buildPythonPackage, buildPythonApplication, fetchFromGitHub , pkg-config, cmake, setuptools -, rtl-sdr, soapysdr-with-plugins, csdr, direwolf +, libsamplerate, fftwFloat +, rtl-sdr, soapysdr-with-plugins, csdr, pycsdr, pydigiham, direwolf, sox, wsjtx, codecserver }: let @@ -22,19 +23,19 @@ let homepage = "https://github.com/jketterl/js8py"; description = "A library to decode the output of the js8 binary of JS8Call"; license = licenses.gpl3Only; - maintainers = with maintainers; [ astro ]; + maintainers = teams.c3d2.members; }; }; owrx_connector = stdenv.mkDerivation rec { pname = "owrx_connector"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "jketterl"; repo = pname; rev = version; - sha256 = "0gz4nf2frrkx1mpjfjpz2j919fkc99g5lxd8lhva3lgqyisvf4yj"; + sha256 = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc="; }; nativeBuildInputs = [ @@ -43,6 +44,8 @@ let ]; buildInputs = [ + libsamplerate fftwFloat + csdr rtl-sdr soapysdr-with-plugins ]; @@ -52,29 +55,34 @@ let description = "A set of connectors that are used by OpenWebRX to interface with SDR hardware"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ astro ]; + maintainers = teams.c3d2.members; }; }; in buildPythonApplication rec { pname = "openwebrx"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jketterl"; repo = pname; rev = version; - sha256 = "0maxs07yx235xknvkbmhi2zds3vfkd66l6wz6kspz3jzl4c0v1f9"; + sha256 = "sha256-7gcgwa9vQT2u8PQusuXKted2Hk0K+Zk6ornSG1K/D4c="; }; propagatedBuildInputs = [ setuptools csdr + pycsdr + pydigiham js8py soapysdr-with-plugins owrx_connector direwolf + sox + wsjtx + codecserver ]; pythonImportsCheck = [ "csdr" "owrx" "test" ]; @@ -87,6 +95,6 @@ buildPythonApplication rec { homepage = "https://github.com/jketterl/openwebrx"; description = "A simple DSP library and command-line tool for Software Defined Radio"; license = licenses.gpl3Only; - maintainers = with maintainers; [ astro ]; + maintainers = teams.c3d2.members; }; } diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index 441ff1cf0f3d3..699389dd2d34b 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -44,6 +44,7 @@ in stdenv.mkDerivation rec { https://www.sdrplay.com/docs/SDRplay_API_Specification_v${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}.pdf ''; homepage = "https://www.sdrplay.com/downloads/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.pmenke ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/splat/default.nix b/pkgs/applications/radio/splat/default.nix index f48394def8197..59d0fc1fdeb0e 100644 --- a/pkgs/applications/radio/splat/default.nix +++ b/pkgs/applications/radio/splat/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz"; license = licenses.gpl2Only; diff --git a/pkgs/applications/radio/uhd/3.5.nix b/pkgs/applications/radio/uhd/3.5.nix index d913927a7b995..c0cb7b62aac44 100644 --- a/pkgs/applications/radio/uhd/3.5.nix +++ b/pkgs/applications/radio/uhd/3.5.nix @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "USRP Hardware Driver (for Software Defined Radio)"; longDescription = '' The USRP Hardware Driver (UHD) software is the hardware driver for all diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 3364cbf6f0c21..c58b09889772d 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib;{ homepage = "https://www.astrolabeproject.com"; description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = [ ]; mainProgram = "AstrolabeGenerator"; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index beb3bd92ea5e0..1c0b1eeefe699 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { ''; meta = { + broken = stdenv.isDarwin; description = "Radioastronomy data analysis software"; longDescription = '' GILDAS is a collection of state-of-the-art software diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 3f82ff7b52a87..1fd2d4ac2adce 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -14,6 +14,16 @@ in stdenv.mkDerivation { sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/csete/gpredict/issues/195 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; + sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; + }) + ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/applications/science/astronomy/gprojector/default.nix index 8ad7ef720c6b2..37d20b585a081 100644 --- a/pkgs/applications/science/astronomy/gprojector/default.nix +++ b/pkgs/applications/science/astronomy/gprojector/default.nix @@ -44,6 +44,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "G.Projector transforms an input map image into any of about 200 global and regional map projections"; homepage = "https://www.giss.nasa.gov/tools/gprojector/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ alyaeanyx ]; license = lib.licenses.unfree; inherit (jre.meta) platforms; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index fb5cce02bdb4d..a957bfc988bc2 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { pname = "gravit"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { hash = "sha256-JuqnLLD5+Ec8kQI0SK98V1O6TTbGM6+yKn5KCHe85eM="; }; + patches = [ + # Pull fix pending upstream inclusion for -fno-common toolchains: + # https://github.com/gak/gravit/pull/100 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/gak/gravit/commit/0f848834889212f16201fd404d2d5b9bb5b47d23.patch"; + hash = "sha256-k1aMIg7idMt53o6dFgIKJflOMp0Jp5NwgWEijcIwXrQ="; + }) + ]; + buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; nativeBuildInputs = [ autoconf automake ]; @@ -25,6 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://github.com/gak/gravit"; description = "Beautiful OpenGL-based gravity simulator"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index 9f58de432596e..0474e7de2c6b5 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.8"; + version = "3.5.9"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-Zg2QKDe3q/OBDW4k9y/YTwREopvX1D4YlrGf7OHIjD8="; + sha256 = "sha256-SO8W1juP+MkXvXyNCP45AauYTbDrurAUtw4Gp4AA6X4="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index df73df2ec284a..c2377d6bed204 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -29,6 +29,7 @@ mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Free open-source planetarium"; homepage = "http://stellarium.org/"; license = licenses.gpl2; diff --git a/pkgs/applications/science/biology/MACS2/default.nix b/pkgs/applications/science/biology/MACS2/default.nix index cc398608ce527..868479c48e550 100644 --- a/pkgs/applications/science/biology/MACS2/default.nix +++ b/pkgs/applications/science/biology/MACS2/default.nix @@ -9,6 +9,12 @@ python3.pkgs.buildPythonPackage rec { sha256 = "1rcxj943kgzs746f5jrb72x1cp4v50rk3qmad0m99a02vndscb5d"; }; + postPatch = '' + # remove version check which breaks on 3.10 + substituteInPlace setup.py \ + --replace 'if float(sys.version[:3])<3.6:' 'if False:' + ''; + propagatedBuildInputs = with python3.pkgs; [ numpy ]; # To prevent ERROR: diffpeak_cmd (unittest.loader._FailedTest) for obsolete @@ -21,5 +27,7 @@ python3.pkgs.buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ gschwartz ]; platforms = platforms.linux; + # error: ‘PyThreadState’ {aka ‘struct _ts’} has no member named ‘use_tracing’; did you mean ‘tracing’? + broken = true; }; } diff --git a/pkgs/applications/science/biology/astral/default.nix b/pkgs/applications/science/biology/astral/default.nix new file mode 100644 index 0000000000000..6a9513c6b8178 --- /dev/null +++ b/pkgs/applications/science/biology/astral/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, jdk8 +, makeWrapper +, jre8 +, zip +}: +let + jdk = jdk8; + jre = jre8; +in +stdenvNoCC.mkDerivation rec { + pname = "astral"; + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "smirarab"; + repo = "ASTRAL"; + rev = "v${version}"; + sha256 = "043w2z6gbrisqirdid022f4b8jps1pp5syi344krv2bis1gjq5sn"; + }; + + nativeBuildInputs = [ jdk makeWrapper jre zip ]; + + buildPhase = '' + patchShebangs ./make.sh + ./make.sh + ''; + + doCheck = true; + + checkPhase = '' + runHook preCheck + java -jar astral.${version}.jar -i main/test_data/song_primates.424.gene.tre + runHook postCheck + ''; + + installPhase = '' + mkdir -p $out/share/lib + mkdir -p $out/bin + mv astral.${version}.jar $out/share/ + mv lib/*.jar $out/share/lib + mv Astral.${version}.zip $out/share/ + cp -a main/test_data $out/share/ + makeWrapper ${jre}/bin/java $out/bin/astral \ + --add-flags "-jar $out/share/astral.${version}.jar" + ''; + + meta = with lib; { + homepage = "https://github.com/smirarab/ASTRAL"; + description = "Tool for estimating an unrooted species tree given a set of unrooted gene trees"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; + license = licenses.asl20; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix index 89ebdcee65b92..a8bb739bbed85 100644 --- a/pkgs/applications/science/biology/bftools/default.nix +++ b/pkgs/applications/science/biology/bftools/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A bundle of scripts for using Bio-Formats on the command line with bioformats_package.jar already included"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; platforms = platforms.all; homepage = "https://www.openmicroscopy.org/bio-formats/"; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 36db47ad168a7..42ce5f934e826 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Computational Morphometry Toolkit "; longDescription = ''A software toolkit for computational morphometry of biomedical images, CMTK comprises a set of command line tools and a diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 1221684f15c63..86b239c93843e 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { fullName = "University of Tuebingen, Benjamin Buchfink"; url = "https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING"; }; - maintainers = [ maintainers.metabar ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 4ed11857a30e5..4a6b093e1d0b2 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://git.metabarcoding.org/obitools/ecopcr/wikis/home"; license = licenses.cecill20; - maintainers = [ maintainers.metabar ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/applications/science/biology/flywheel-cli/default.nix index 7db8b0066263a..7d74b51f6066f 100644 --- a/pkgs/applications/science/biology/flywheel-cli/default.nix +++ b/pkgs/applications/science/biology/flywheel-cli/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library and command line interface for interacting with a Flywheel site"; homepage = "https://gitlab.com/flywheel-io/public/python-cli"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ rbreslow ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix index 2da7f627cb404..34d997252f5bb 100644 --- a/pkgs/applications/science/biology/kssd/default.nix +++ b/pkgs/applications/science/biology/kssd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, automake, autoconf, libtool }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, automake, autoconf, libtool }: stdenv.mkDerivation rec { pname = "kssd"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY="; }; + patches = [ + # Pull upstream patch for -fno-common toolchain support: + # https://github.com/yhg926/public_kssd/pull/9 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/yhg926/public_kssd/commit/cdd1e8aae256146f5913a3b4c723b638d53bdf27.patch"; + sha256 = "sha256-HhaTRqPfKR+ouh0PwEH6u22pbuqbX2OypRzw8BXm0W4="; + }) + ]; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ zlib libtool ]; diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/applications/science/biology/macse/default.nix index 66f4a1671d1c9..2ac09ca21ab6d 100644 --- a/pkgs/applications/science/biology/macse/default.nix +++ b/pkgs/applications/science/biology/macse/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multiple alignment of coding sequences"; homepage = "https://bioweb.supagro.inra.fr/macse/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index 36790b22b2285..31e4eb2fcb42b 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -1,4 +1,4 @@ -{ lib, gccStdenv, fetchurl, zlib, mpi }: +{ stdenv, lib, gccStdenv, fetchurl, zlib, mpi }: gccStdenv.mkDerivation rec { version = "3.7.2"; @@ -15,6 +15,7 @@ gccStdenv.mkDerivation rec { preInstall = "mkdir -p $out/man/man1"; meta = with lib; { + broken = stdenv.isDarwin; description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; homepage = "https://peterbeerli.com/migrate-html5/index.html"; license = licenses.mit; diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 10bfb633f4afc..99b6269737d1e 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://github.com/MRtrix3/mrtrix3"; description = "Suite of tools for diffusion imaging"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index f4f6d0c46e0f3..54ff58cce717a 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A multiple sequence alignment method with reduced time and space complexity"; license = licenses.publicDomain; homepage = "https://www.drive5.com/muscle/"; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 4dc850f50627e..36f1b4c699a82 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ readline ncurses which libtool ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; longDescription = "NEURON is a simulation environment for developing and exercising models of @@ -79,6 +80,11 @@ stdenv.mkDerivation rec { potential close to the membrane), and where cell membrane properties are complex, involving many ion-specific channels, ion accumulation, and second messengers"; + sourceProvenance = with sourceTypes; [ + fromSource + ] ++ lib.optionals (python != null) [ + binaryNativeCode # "geometry3d" bundled libraries + ]; license = licenses.bsd3; homepage = "http://www.neuron.yale.edu/neuron"; maintainers = [ maintainers.adev ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index ace2eea89305b..94dc8e62cd32b 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "Tools for high-throughput sequencing (HTS) data and formats such as SAM/BAM/CRAM and VCF"; license = licenses.mit; homepage = "https://broadinstitute.github.io/picard/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; mainProgram = "picard"; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index 26c3e7ba66b6d..b21ef2d71d6c2 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A comprehensive update to the PLINK association analysis toolset"; homepage = "https://www.cog-genomics.org/plink2"; license = lib.licenses.gpl3; diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index ed3fc116ddaba..0a33c97673196 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -49,6 +49,10 @@ pythonPackages.buildPythonApplication rec { meta = with lib ; { description = "Evaluates genome assemblies by computing various metrics"; homepage = "https://github.com/ablab/quast"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode # source bundles binary dependencies + ]; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index 4c32516b29f68..a47a107349da0 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { description = "Genetic variant annotation and effect prediction toolbox"; license = licenses.lgpl3; homepage = "http://snpeff.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 431bd3788e7d1..987433a3a6d5d 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "High-performance read alignment, quantification and mutation discovery"; license = licenses.gpl3; maintainers = with maintainers; [ jbedo ]; diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix index 1aed501919f9b..b1a174aaf882d 100644 --- a/pkgs/applications/science/biology/svaba/default.nix +++ b/pkgs/applications/science/biology/svaba/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 xz ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: ./libfml.a(rle.o):/build/source/SeqLib/fermi-lite/rle.h:33: multiple definition of + # `rle_auxtab'; ./libfml.a(misc.o):/build/source/SeqLib/fermi-lite/rle.h:33: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installPhase = '' runHook preInstall install -Dm555 src/svaba/svaba $out/bin/svaba @@ -21,6 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Structural variant and INDEL caller for DNA sequencing data, using genome-wide local assembly"; license = licenses.gpl3; homepage = "https://github.com/walaj/svaba"; diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 7b09f601ad68f..8b9b086b77b28 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { # University School of Medicine. license = licenses.unfree; homepage = "https://github.com/dkoboldt/varscan"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/applications/science/biology/whisper/default.nix index 8552eede170bc..4d74ea981098a 100644 --- a/pkgs/applications/science/biology/whisper/default.nix +++ b/pkgs/applications/science/biology/whisper/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Short read sequence mapper"; license = licenses.gpl3; homepage = "https://github.com/refresh-bio/whisper"; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index fe3e05b65627e..ba93e174e4050 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Java 3D viewer for chemical structures"; homepage = "https://sourceforge.net/projects/jmol"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ mounium ] ++ teams.sage.members; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index c5f60c395ae27..52dd025bf0273 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -15,14 +15,14 @@ let in stdenv.mkDerivation { pname = "openmolcas"; - version = "22.02"; + version = "22.06"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; # The tag keeps moving, fix a hash instead - rev = "f8df69cf87b241a15ebc82d72a8f9a031a385dd4"; # 2022-02-10 - sha256 = "0p2xj8kgqdk5kb1jv5k77acbiqkbl2sh971jnz9p00cmbh556r6a"; + rev = "17238da5c339c41ddf14ceb88f139d57143d7a14"; # 2022-06-17 + sha256 = "0g17x5fp27b57f7j284xl3b3i9c4b909q504wpz0ipb0mrcvcpdp"; }; patches = [ @@ -32,6 +32,12 @@ in stdenv.mkDerivation { ./MKL-MPICH.patch ]; + postPatch = '' + # Using env fails in the sandbox + substituteInPlace Tools/pymolcas/export.py --replace \ + "/usr/bin/env','python3" "python3" + ''; + nativeBuildInputs = [ perl gfortran diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 5f7c0c1f6be76..c281f63b3bf87 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchFromGitHub , makeDesktopItem , python3 @@ -67,6 +68,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { + broken = stdenv.isDarwin; inherit description; homepage = "https://www.pymol.org/"; license = licenses.mit; diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 8bceed08e1db6..631f44e806333 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "archimedes"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; }; + patches = [ + # Pull patch pending upstream inclusion to support c99 toolchains: + # https://savannah.gnu.org/bugs/index.php?62703 + (fetchpatch { + name = "c99.patch"; + url = "https://savannah.gnu.org/bugs/download.php?file_id=53393"; + sha256 = "1xmy1w4ln1gynldk3srdi2h0fxpx465dsa1yxc3rzrrjpxh6087f"; + }) + ]; + meta = { description = "GNU package for semiconductor device simulations"; homepage = "https://www.gnu.org/software/archimedes"; diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 49415ea048413..2018878773ef0 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -24,6 +24,7 @@ let meta = with lib; { homepage = "http://bitscope.com/software/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index ff4e3809fc2bf..8530e6927fe97 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://bancika.github.io/diy-layout-creator/"; changelog = "https://github.com/bancika/diy-layout-creator/releases"; license = licenses.gpl3Plus; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.linux; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 5b4c8eb790fe6..6302c2dbfa384 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -73,6 +73,7 @@ let meta = with lib; { description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)"; homepage = "https://www.autodesk.com/products/eagle/overview"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ ]; diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index f1c458f40d9f9..b1244b79a89f8 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation { sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7"; }; + # Workaround build failure on -fno-common toolchains: + # ld: postscript.o:postscript.h:29: multiple definition of + # `postscript_params'; fped.o:postscript.h:29: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + # This uses '/bin/bash', '/usr/local' and 'lex' by default makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/applications/science/electronics/gaw/default.nix index 7f0b5625e85a1..a54602de13f3e 100644 --- a/pkgs/applications/science/electronics/gaw/default.nix +++ b/pkgs/applications/science/electronics/gaw/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://gaw.tuxfamily.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fbeffa ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index cf98e6963e1f1..6b77f75b11bb4 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation { pname = "geda"; @@ -9,6 +9,20 @@ stdenv.mkDerivation { sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; }; + patches = [ + # Pull upstream patch for -fno-common toolchains + (fetchpatch { + name = "fno-common-p1.patch"; + url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6"; + sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq"; + }) + (fetchpatch { + name = "fno-common-p2.patch"; + url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158"; + sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k"; + }) + ]; + configureFlags = [ "--disable-update-xdg-database" ]; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index a16d5f32e27ab..f83cfa1bf04e1 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: +{ lib, stdenv, fetchgit, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation { pname = "gerbv"; @@ -10,6 +10,16 @@ stdenv.mkDerivation { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchains: + # https://sourceforge.net/p/gerbv/patches/84/ + (fetchpatch { + name = "fnoc-mmon.patch"; + url = "https://sourceforge.net/p/gerbv/patches/84/attachment/0001-gerbv-fix-build-on-gcc-10-fno-common.patch"; + sha256 = "1avfbkqhxl7wxn1z19y30ilkwvdgpdkzhzawrs5y3damxmqq8ggk"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ]; buildInputs = [ gettext libtool cairo gtk2 ]; diff --git a/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch b/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch new file mode 100644 index 0000000000000..b28e0b8e97203 --- /dev/null +++ b/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch @@ -0,0 +1,40 @@ +From 69a6ab80cf0908c2a44430c297932ef3659a1655 Mon Sep 17 00:00:00 2001 +From: Jiajie Chen <c@jia.je> +Date: Wed, 22 Jun 2022 16:24:10 +0800 +Subject: [PATCH 1/2] Fix detection of quartz in gdk-3.0 target + +The GTK+3 built by Nix targets ``broadway quartz`` instead of only `quartz`, +thus the target check is wrong. The script is modified to look up `quartz` in a +loop. The variable name is renamed to `targets` in `gdk-3.0.pc` as well. + +--- + configure | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index 628a80f..9cb88d5 100755 +--- a/configure ++++ b/configure +@@ -7361,7 +7361,10 @@ $as_echo "yes" >&6; } + fi + GTK_VER=`$PKG_CONFIG gtk+-3.0 --modversion` + +- _gdk_tgt=`$PKG_CONFIG --variable=target gdk-3.0` ++ # gdk-3.0 may have multiple targets e.g. "broadway quartz" ++ _gdk_tgts=`$PKG_CONFIG --variable=targets gdk-3.0` ++ for _gdk_tgt in $_gdk_tgts; ++ do + if test "x$_gdk_tgt" = xquartz; then + + pkg_failed=no +@@ -7466,6 +7469,7 @@ fi + COCOA_GTK_LDFLAGS="-framework Cocoa -framework ApplicationServices" + + fi ++ done + + if test x$with_gconf = xyes; then + +-- +2.36.1 + diff --git a/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch b/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch new file mode 100644 index 0000000000000..456f5fa278f33 --- /dev/null +++ b/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch @@ -0,0 +1,101 @@ +From 6045177a0d4753bb7a6a6ffc3f1a4a3e96129c6d Mon Sep 17 00:00:00 2001 +From: Jiajie Chen <c@jia.je> +Date: Wed, 22 Jun 2022 17:03:29 +0800 +Subject: [PATCH 2/2] Check GDK_WINDOWING_X11 macro when using GtkPlug + +--- + src/main.c | 5 +++++ + src/twinwave.c | 12 ++++++++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 81bf505..b89f629 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -2080,10 +2080,15 @@ if(!GLOBALS->socket_xid) + #ifdef WAVE_USE_XID + else + { ++#ifdef GDK_WINDOWING_X11 + GLOBALS->mainwindow = gtk_plug_new(GLOBALS->socket_xid); + gtk_widget_show(GLOBALS->mainwindow); + + g_signal_connect(XXX_GTK_OBJECT(GLOBALS->mainwindow), "destroy", /* formerly was "destroy" */G_CALLBACK(plug_destroy),"Plug destroy"); ++#else ++ fprintf(stderr, "GTKWAVE | GtkPlug widget is unavailable\n"); ++ exit(1); ++#endif + } + #endif + } +diff --git a/src/twinwave.c b/src/twinwave.c +index 590c7f6..d5c60f2 100644 +--- a/src/twinwave.c ++++ b/src/twinwave.c +@@ -143,15 +143,19 @@ if(GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) + use_embedded = 0; + } + #endif ++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11) + { + xsocket[0] = gtk_socket_new (); + xsocket[1] = gtk_socket_new (); + gtk_widget_show (xsocket[0]); + gtk_widget_show (xsocket[1]); + } ++#endif + ++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11) + if(!twinwayland) + g_signal_connect(XXX_GTK_OBJECT(xsocket[0]), "plug-removed", G_CALLBACK(plug_removed), NULL); ++#endif + + #if GTK_CHECK_VERSION(3,0,0) + main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); +@@ -208,7 +212,7 @@ if(hMapFile != NULL) + memset(&pi, 0, sizeof(PROCESS_INFORMATION)); + + sprintf(buf, "0+%08X", shmid); +-#ifdef MINGW_USE_XID ++#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11) + sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0]))); + #else + sprintf(buf2, "%x", 0); +@@ -279,7 +283,7 @@ if(hMapFile != NULL) + memset(&pi, 0, sizeof(PROCESS_INFORMATION)); + + sprintf(buf, "1+%08X", shmid); +-#ifdef MINGW_USE_XID ++#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11) + sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1]))); + #else + sprintf(buf2, "%x", 0); +@@ -429,10 +433,12 @@ if(shmid >=0) + sprintf(buf, "0+%08X", shmid); + if(use_embedded) + { ++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11) + #ifdef MAC_INTEGRATION + sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0]))); + #else + sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[0]))); ++#endif + #endif + } + else +@@ -467,10 +473,12 @@ if(shmid >=0) + sprintf(buf, "1+%08X", shmid); + if(use_embedded) + { ++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11) + #ifdef MAC_INTEGRATION + sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1]))); + #else + sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[1]))); ++#endif + #endif + } + else +-- +2.36.1 + diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index bb6af8a20fd11..10dcb2327c060 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -3,6 +3,7 @@ , glib , gperf , gtk3 +, gtk-mac-integration , judy , lib , pkg-config @@ -23,7 +24,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ]; + buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] + ++ lib.optional stdenv.isDarwin gtk-mac-integration; + + # fix compilation under Darwin + # remove these patches upon next release + # https://github.com/gtkwave/gtkwave/pull/136 + patches = [ + ./0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch + ./0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch + ]; configureFlags = [ "--with-tcl=${tcl}/lib" @@ -36,7 +46,7 @@ stdenv.mkDerivation rec { description = "VCD/Waveform viewer for Unix and Win32"; homepage = "http://gtkwave.sourceforge.net"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ thoughtpolice ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice jiegec ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index f18afb77587c1..d0c75152c427f 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "0lw5j1zqd2wdafgxl4ahcphaabs7vlw4kaa1c566hwfjxs46dmg9"; + sha256 = "1vvps44n9yrzdpircl98n4061lcmwksisnf3a8xkf3qbcnixnwlp"; }; buildInputs = [ diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 961519bad19bb..0fbd824008a56 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -157,9 +157,8 @@ stdenv.mkDerivation rec { ; # debug builds fail all but the python test - #doInstallCheck = !debug; - # temporarily disabled until upstream issue 9888 is resolved - doInstallCheck = false; + # stable release doesn't have the fix for upstream issue 9888 yet + doInstallCheck = !debug && !stable; installCheckTarget = "test"; dontStrip = debug; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 658223dc4ec66..7bd4d0d2bb467 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "6.0.5"; + version = "6.0.6"; src = { - rev = "a6ca702e916df70e499615d8613102e780e96a40"; - sha256 = "19mg672h1gjdvnkp13cpkhk67xpwms72y4gd6g8983fcsxr8nq23"; + rev = "3a73a7531170b37afa1eb22d5924ef8af7f9e71e"; + sha256 = "0cb9zba812dlmn2w27s1q38mjpfdwhv0nnbilwsxchpvwg8j4k2j"; }; }; libVersion = { - version = "6.0.5"; + version = "6.0.6"; libSources = { - symbols.rev = "c7f82c947ab3a1afec8d7b602ee7c6bfdfb24693"; - symbols.sha256 = "1dhgdp08ah08fc5nvwkqmgpl2any9vgy1gykmyzsd4dl8hhvznh5"; - templates.rev = "5ec65bfd3ecefaf85f79db02981f0568fe8b0eb8"; - templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "35e3d08f1ab23b5b08ba903572776aab6de7499f"; - footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai"; - packages3d.rev = "6ea94caf40c4bdccecb569e81ed82b902d4c104e"; - packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc"; + symbols.rev = "3df4c49795a65a051fafb1cf81d291be4c891f62"; + symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d"; + templates.rev = "17aca4385144bf872e69f41bf5012fd2018cec2c"; + templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; + footprints.rev = "64bae4c4a0d51afbc8129682ef0c2bf28b005c04"; + footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c"; + packages3d.rev = "6cb25bc10f8c94fbf71479fe9782aecfcc9952bd"; + packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2022-05-06"; + version = "2022-06-21"; src = { - rev = "dfdedfa605f58711d286d6e24e4ae9b5f75444e6"; - sha256 = "1bs7s2x0zh3wbk2hawg47v1s3nidmcl0xaardbpiafrrnh1qprf2"; + rev = "b54bb909755d39dcce38ef277c715d7f31ab8e00"; + sha256 = "0nzgrkkvc66hgqdrwfmh5fjw4ffr8gc3bw3n44sa6zjkkz5s6p48"; }; }; libVersion = { - version = "2022-05-06"; + version = "2022-06-21"; libSources = { - symbols.rev = "e1d70243a68a721a9f94a7df1d04c9c6ebc056ef"; - symbols.sha256 = "0gbl22g73cms9jrk9f6dlgd3ksnhiik39aywfm15m98jfglnlbg8"; - templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4"; - templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9"; - footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai"; - packages3d.rev = "ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e"; - packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc"; + symbols.rev = "a003b00f6f1056d726e32e911cd65b32946f5503"; + symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d"; + templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; + templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; + footprints.rev = "5df530ec44892407d6382d933ff9ad42dd19df0e"; + footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c"; + packages3d.rev = "6bfd8dfa3adc6ac316b9857977c87f22282c6e24"; + packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya"; }; }; }; diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index f4bf424f1090c..8de5cb311488f 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ngspice"; - version = "36"; + version = "37"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "sha256-T4GCh++6JFNBBGY1t1eugfh5VJsyakMWtfbml6pRf4w="; + sha256 = "1gpcic6b6xk3g4956jcsqljf33kj5g43cahmydq6m8rn39sadvlv"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix new file mode 100644 index 0000000000000..3def53dbd2e41 --- /dev/null +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, check +, flex +, pkg-config +, which +, elfutils +, libelf +, llvm +, zlib +}: + +stdenv.mkDerivation rec { + pname = "nvc"; + version = "1.6.2"; + + src = fetchFromGitHub { + owner = "nickg"; + repo = pname; + rev = "r${version}"; + sha256 = "sha256-BtUMpT1MKRFGRlIbCEGo4OBZ/r9es1VRmJdgmk1oZFQ="; + }; + + nativeBuildInputs = [ + autoreconfHook + check + flex + pkg-config + which + ]; + + buildInputs = [ + llvm + zlib + ] ++ [ + (if stdenv.isLinux then elfutils else libelf) + ]; + + # TODO: remove me on 1.7.0 + postPatch = '' + sed -i "/vests22/d;/vhpi4/d" test/regress/testlist.txt + ''; + + preConfigure = '' + mkdir build + cd build + ''; + + configureScript = "../configure"; + + configureFlags = [ + "--enable-vhpi" + "--disable-lto" + ]; + + doCheck = true; + + meta = with lib; { + description = "VHDL compiler and simulator"; + homepage = "https://www.nickg.me.uk/nvc/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 83c8e2c6dd33f..596f220242bb2 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -18,7 +18,7 @@ let shared_meta = lib: with lib; { homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with maintainers; [ expipiplus1 yorickvp wirew0rm ]; + maintainers = with maintainers; [ expipiplus1 wirew0rm ] ++ teams.lumiguide.members; platforms = [ "x86_64-linux" ]; license = licenses.unfree; }; @@ -41,6 +41,7 @@ let ''; meta = with lib; shared_meta lib // { + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "library for picotech oscilloscope software"; }; }) { }; @@ -132,6 +133,7 @@ in stdenv.mkDerivation rec { PicoScope for Linux, PicoScope for macOS and PicoScope for Windows users, or exported in text, CSV and MathWorks MATLAB 4 formats. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/applications/science/electronics/picoscope/sources.json b/pkgs/applications/science/electronics/picoscope/sources.json index aca5f8f4a0f28..15a748dc7ceec 100644 --- a/pkgs/applications/science/electronics/picoscope/sources.json +++ b/pkgs/applications/science/electronics/picoscope/sources.json @@ -1,69 +1,69 @@ { "x86_64-linux": { "libpicocv": { - "sha256": "c2e74c2b0679df0226993d063b38d0eda5b05ff59f29bbfa12ded5226df37024", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.27-1r153_amd64.deb", - "version": "1.1.27-1r153" + "sha256": "feddc1cb9082005e80c4e2c2732ee4c537915c463ea327aa53a642aab95b8691", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.33-beta2r167_amd64.deb", + "version": "1.1.33-beta2r167" }, "libpicoipp": { - "sha256": "0e414ad547f506a39ff11a64772baec923e54f8ca98b81fc9b9cbd19ed573b22", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.3.0-4r130_amd64.deb", - "version": "1.3.0-4r130" + "sha256": "2d749b8fd5dbd811c270e4aa78c5ee9cd33832b90d089ae386b0f85aed2d0204", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r136_amd64.deb", + "version": "1.4.0-4r136" }, "libps2000": { - "sha256": "d1e94148719a03b70f233cea9a686ed48be03224f2931c9cd282571819a780c7", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.76-3r2981_amd64.deb", - "version": "3.0.76-3r2981" + "sha256": "d306890d1e87651ae83ef00143c8e62b82fae2be39886b6884408751cb910fa4", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.89-3r3163_amd64.deb", + "version": "3.0.89-3r3163" }, "libps2000a": { - "sha256": "c665b70c04203c98bb1b509830ec522f58906b2f393f35c1b4f9c27217ac3572", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.76-5r2981_amd64.deb", - "version": "2.1.76-5r2981" + "sha256": "38391dfbe6c6c04ba5b5c99bd53404d5342e40c9eca703e3d95cbc6302114270", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.89-5r3163_amd64.deb", + "version": "2.1.89-5r3163" }, "libps3000": { - "sha256": "dbb9f9afdc694c4451e652f22a4c4c67ef609407f45229d26330ce7cfbb02b1c", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.76-3r2981_amd64.deb", - "version": "4.0.76-3r2981" + "sha256": "39b4b56a839eb5d7abcf1de2bab472c2de2d8aa5ffc3ba445e99d5aa8178ba07", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.89-3r3163_amd64.deb", + "version": "4.0.89-3r3163" }, "libps3000a": { - "sha256": "5ab3daadc5d804b224215d138ca94abecc3c311bb91624638e2758ac2a490d25", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.76-6r2981_amd64.deb", - "version": "2.1.76-6r2981" + "sha256": "ea96735b90d02c72c9c7b517413fed0d366ac634100e22467a39c780985669e4", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.89-6r3163_amd64.deb", + "version": "2.1.89-6r3163" }, "libps4000": { - "sha256": "13504936207f1a7410f726c93358bb21c0c0cd1bd8b473332308a345ff6692c7", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.76-2r2981_amd64.deb", - "version": "2.1.76-2r2981" + "sha256": "7177cd4debf811fa7d7105703a4fc546fe1a79fc3275e3f36326b014c1334f55", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.89-2r3163_amd64.deb", + "version": "2.1.89-2r3163" }, "libps4000a": { - "sha256": "196ccce96e8cf29f5168cda83748857172ae43dc2b990adbacb3327511784492", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.76-2r2981_amd64.deb", - "version": "2.1.76-2r2981" + "sha256": "ebe94d6d9f349e5082dcbed55d059ac77c0129b967467786d1cef3f662ebac99", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.89-2r3163_amd64.deb", + "version": "2.1.89-2r3163" }, "libps5000": { - "sha256": "1793180d4067df12080ba7b01cbdf38397c2931a7f4915f13dbdb9295cc77cb3", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.76-3r2981_amd64.deb", - "version": "2.1.76-3r2981" + "sha256": "732164658acb4bdfdbf3fc785419ea6a4944ed2892be9dde134b345a976c3318", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.89-3r3163_amd64.deb", + "version": "2.1.89-3r3163" }, "libps5000a": { - "sha256": "b08a73f43bdcfa2bc02d01f398147da9b8cf2599477144b5a2b2af924d0bf0e9", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.76-5r2981_amd64.deb", - "version": "2.1.76-5r2981" + "sha256": "3438f51c8646e3ac5a479c88aa7a89b3dfcce2090720317b4efb8db538372cdb", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.89-5r3163_amd64.deb", + "version": "2.1.89-5r3163" }, "libps6000": { - "sha256": "dda0fcb8b346f77a715053b52ad9e26b323991f8336001de7ff1bb6d04c716b4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.76-6r2981_amd64.deb", - "version": "2.1.76-6r2981" + "sha256": "fe4165ab0d323728b473347b61439b074486809d673e47f169d0062cf917191c", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.89-6r3163_amd64.deb", + "version": "2.1.89-6r3163" }, "libps6000a": { - "sha256": "786e5772055500e2e445ddfd5402fed359a9afa54177bd731912d24522729004", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.76-0r2981_amd64.deb", - "version": "1.0.76-0r2981" + "sha256": "0552811f92a015ef47b09947631f5f5d8c30b122425de083bea79df88957a9c7", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.89-0r3163_amd64.deb", + "version": "1.0.89-0r3163" }, "picoscope": { - "sha256": "12afae7992b9d60c93e5e39c7fe3f93955be3bdff554b52894064d5f320347f4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.86-1r9656_amd64.deb", - "version": "7.0.86-1r9656" + "sha256": "b060edb02bc2de5d10a45d31d4b7f9c767d18511e2f65a1ebdd70cc3e8780262", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.100-1r11387_amd64.deb", + "version": "7.0.100-1r11387" } } } diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 4cb8048df675e..0aa9091a86d27 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "Icarus Verilog compiler"; homepage = "http://iverilog.icarus.com/"; # https does not work license = with licenses; [ gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ winden thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix index 25fa0aca4677f..646f374ba48e7 100644 --- a/pkgs/applications/science/electronics/xschem/default.nix +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Schematic capture and netlisting EDA tool"; longDescription = '' Xschem is a schematic capture program, it allows creation of diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 8d9b02d909e95..40c6408b666bf 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -168,6 +168,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "High-performance analog circuit simulator"; longDescription = '' Xyce is a SPICE-compatible, high-performance analog circuit simulator, diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index b2226db460872..1e8c25098912b 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.17"; + version = "2.19"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-AyUjcYDUjAYI4p0vVDO7SGqhbO83Kesd+JUUgQf5GPU="; + sha256 = "sha256-OCyUcKkQzp1nz9lgGSR4MRrP7XBR1kpIfPEA7PdSA1I="; }; buildInputs = [ expat ]; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 4e808dd8f19e8..11121d1f5584e 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2022.03.22"; + version = "2022.05.06"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "00b674d5b3ccefc7f2abcbf5b650fc14298ac549"; - hash = "sha256-jQgHptARRuhlF+8R92so8PyBTI5t/q/rSGO5yce5WSs="; + rev = "09a7e6dac739133a927ae7064d319068ab927f90"; + hash = "sha256-+1UcYjK2mvhlTHl6lVCcj5q+1D8RUTquHaajSl5NuJg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 0767c58bdea1e..553f133c7f7cf 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, which, ocamlPackages }: +{ fetchFromGitHub, fetchpatch, lib, which, ocamlPackages }: let pname = "alt-ergo"; @@ -10,13 +10,11 @@ let rev = version; sha256 = "0hglj1p0753w2isds01h90knraxa42d2jghr35dpwf9g8a1sm9d3"; }; - - useDune2 = true; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src useDune2; + inherit version src; configureFlags = [ pname ]; nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; @@ -25,7 +23,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src useDune2; + inherit version src; configureFlags = [ pname ]; nativeBuildInputs = [ which ocamlPackages.menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -33,7 +31,13 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src useDune2; + inherit pname version src; + + # Ensure compatibility with Menhir ≥ 20211215 + patches = fetchpatch { + url = "https://github.com/OCamlPro/alt-ergo/commit/0f9c45af352657c3aec32fca63d11d44f5126df8.patch"; + sha256 = "sha256:0zaj3xbk2s8k8jl0id3nrhdfq9mv0n378cbawwx3sziiizq7djbg"; + }; configureFlags = [ pname ]; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index 02f6dba4dedb8..a9e39b3daf33e 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -47,5 +47,7 @@ stdenv.mkDerivation { homepage = "https://alviano.net/software/maxino/"; # See pkgs/applications/science/logic/glucose/default.nix badPlatforms = [ "aarch64-linux" ]; + # src/MaxSatSolver.cc:280:62: error: ordered comparison between pointer and zero ('unsigned int *' and 'int') + broken = (stdenv.isDarwin && stdenv.isx86_64); # broken since 2019-05-07 on hydra }; } diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 66cfd306128b8..9af0cd694b70b 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec { useDune2 = true; buildInputs = with ocamlPackages; [ - gen sedlex_2 ocaml_extlib dune-build-info linenoise + gen sedlex ocaml_extlib dune-build-info linenoise ]; postPatch = '' diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index c078287b85ee3..06d4a915c91d2 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -8,10 +8,10 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses -, buildIde ? true +, buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null -, version, coq-version ? null, +, version, coq-version ? null }@args: let lib' = lib; in let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in @@ -41,13 +41,15 @@ let "8.12.0".sha256 = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; "8.12.1".sha256 = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; "8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; - "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; - "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; - "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; - "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; - "8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl"; - "8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx"; - "8.15.1".sha256 = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6"; + "8.13.0".sha256 = "1l2c63vskp8kiyxiyi5rpgbmnv67ysn3y4lybd6nj0li5llibifi"; + "8.13.1".sha256 = "15drjcqhsgwqnv02bbidyhk316ypyhz1pxfz2gwsalci9svhkz0v"; + "8.13.2".sha256 = "14d4alp35hngvga9m7cfp5d1nl62xdj0nm4811f2jjblk86gxxk4"; + "8.14.0".sha256 = "0yxjx9kq9bfpk31dc1c6a0pz0827fz7jmrcwwd4n7dc07yi0arq8"; + "8.14.1".sha256 = "0xdqiabgm4lrm6d7lw544zd8xwb1cdcavsxvwwlqq6yid2rl2yli"; + "8.15.0".sha256 = "sha256:0q7jl3bn0d1v9cwdkxykw4frccww6wbh1p8hdrfqw489mkxmh5jh"; + "8.15.1".sha256 = "sha256:1janvmnk3czimp0j5qmnfwx6509vhpjc2q7lcza1bc6dm6kn8n42"; + "8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd"; + "8.16+rc1".sha256 = "sha256-hmZQ6rFIOZJwnAh23nKScJ3Nn+xqDRn5q2Tn82igpYE="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix @@ -57,6 +59,7 @@ let version = fetched.version; coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v; + buildIde = args.buildIde or (!coqAtLeast "8.14"); ideFlags = optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' @@ -70,9 +73,9 @@ let { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_12; - ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] - ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2; - ocamlBuildInputs = [] + ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ] + ++ optional (coqAtLeast "8.14") dune_2; + ocamlPropagatedBuildInputs = [ ] ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!coqAtLeast "8.13") ocamlPackages.num ++ optional (coqAtLeast "8.13") ocamlPackages.zarith; @@ -82,7 +85,8 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; - inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs; + inherit ocamlPackages ocamlNativeNuildInputs; + inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' @@ -136,13 +140,15 @@ self = stdenv.mkDerivation { ++ optional buildIde copyDesktopItems ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook ++ optional (!coqAtLeast "8.6") gnumake42; - buildInputs = [ ncurses ] ++ ocamlBuildInputs + buildInputs = [ ncurses ] ++ optionals buildIde (if coqAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; + propagatedBuildInputs = ocamlPropagatedBuildInputs; + postPatch = '' UNAME=$(type -tp uname) RM=$(type -tp rm) @@ -185,8 +191,9 @@ self = stdenv.mkDerivation { categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); - postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in '' + postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in optionalString (!coqAtLeast "8.17") '' cp bin/votour $out/bin/ + '' + '' ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} '' + optionalString (coqAtLeast "8.14") '' ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server @@ -210,4 +217,17 @@ self = stdenv.mkDerivation { platforms = platforms.unix; mainProgram = "coqide"; }; -}; in self +}; in +if coqAtLeast "8.17" then self.overrideAttrs(_: { + buildPhase = '' + runHook preBuild + make dunestrap + dune build -p coq-core,coq-stdlib,coq,coqide-server${if buildIde then ",coqide" else ""} -j $NIX_BUILD_CORES + runHook postBuild + ''; + installPhase = '' + runHook preInstall + dune install --prefix $out coq-core coq-stdlib coq coqide-server${if buildIde then " coqide" else ""} + runHook postInstall + ''; +}) else self diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index b0b3e5e610e64..873c3ca57c0c9 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; + buildInputs = [ gmp git python3.pkgs.toml readline swig libantlr3c antlr3_4 boost jdk python3 ] + ++ lib.optionals (!stdenv.isDarwin) [ cln ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" - "--with-cln" "--with-readline" "--with-boost=${boost.dev}" - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-cln" ]; prePatch = '' patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/applications/science/logic/formula/default.nix index 13c13713a72e0..f366003914a20 100644 --- a/pkgs/applications/science/logic/formula/default.nix +++ b/pkgs/applications/science/logic/formula/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages }: +{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, unstableGitUpdater }: buildDotnetModule rec { pname = "formula-dotnet"; @@ -7,8 +7,8 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "VUISIS"; repo = "formula-dotnet"; - rev = "e962438022350dca64335c0603c00d44cb10b528"; - sha256 = "sha256-hVtwV1MdsXaN6ZrGW4RG2HcNcv/hys/5VxGjH9vFdRE="; + rev = "8ee2e6abfd4ce038e1d9cb9c8602dec1ed6c0163"; + sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8="; }; nugetDeps = ./nuget.nix; @@ -17,12 +17,15 @@ buildDotnetModule rec { postFixup = if stdenv.isLinux then '' mv $out/bin/CommandLine $out/bin/formula '' else lib.optionalString stdenv.isDarwin '' - makeWrapper ${dotnetCorePackages.runtime_5_0}/bin/dotnet $out/bin/formula \ + makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native ''; + passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + meta = with lib; { + broken = stdenv.isLinux && stdenv.isAarch64; description = "Formal Specifications for Verification and Synthesis"; homepage = "https://github.com/VUISIS/formula-dotnet"; license = licenses.mspl; diff --git a/pkgs/applications/science/logic/formula/nuget.nix b/pkgs/applications/science/logic/formula/nuget.nix index e7ee3005e9737..40b9abe7fad92 100644 --- a/pkgs/applications/science/logic/formula/nuget.nix +++ b/pkgs/applications/science/logic/formula/nuget.nix @@ -1,18 +1,31 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Antlr4.Runtime.Standard"; version = "4.7.2"; sha256 = "1pmrpsgqjfj0nzr1zqzk1m2fm0ynd4nklwq3dhvww08yjg5s0586"; }) + (fetchNuGet { pname = "coverlet.collector"; version = "3.0.2"; sha256 = "1xf6z6izmsl4g8w3z1wbp4pa8f8qsf6sil4mf1c9fb22hq8c5hkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "16.3.0"; sha256 = "1fdgymp11qpv4h152km2wmbykq1rb4b05cyy6d06naw01l61gdz8"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "16.3.0"; sha256 = "17hqjzxqnx2hhp276kdlc6wnhd33dilk0bd41px37and2icl9shn"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) + (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.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Z3.x64"; version = "4.8.7"; sha256 = "1wxlw29xm5x8vwji2s7gwk39wb88dkbpg76l9s9gq0hqpghwlmdz"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (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.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (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"; }) @@ -23,41 +36,67 @@ (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (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.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (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.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (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.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.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (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.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (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"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (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.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.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.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.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (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.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (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.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.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (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"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (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"; }) @@ -65,13 +104,31 @@ (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.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (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"; }) + (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.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (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.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (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 = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) ] diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 8427249c4ce95..de47df098da13 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Interactive theorem prover based on Higher-Order Logic"; longDescription = '' HOL4 is the latest version of the HOL interactive proof diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 9e5d40be2c6d5..009af3463a25a 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -47,10 +47,15 @@ in stdenv.mkDerivation rec { sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; }; - buildInputs = [ polyml z3 veriT vampire eprover-ho ] - ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; + buildInputs = [ polyml z3 veriT vampire eprover-ho nettools ] + ++ lib.optionals (!stdenv.isDarwin) [ java ]; - sourceRoot = dirname; + sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; + + postUnpack = if stdenv.isDarwin then '' + mv $sourceRoot ${dirname} + sourceRoot=${dirname} + '' else null; postPatch = '' patchShebangs . @@ -112,6 +117,9 @@ in stdenv.mkDerivation rec { --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' rm -r heaps + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' + substituteInPlace lib/scripts/isabelle-platform \ + --replace 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do @@ -178,9 +186,13 @@ in stdenv.mkDerivation rec { formulas in a logical calculus. ''; homepage = "https://isabelle.in.tum.de/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode # source bundles binary dependencies + ]; license = licenses.bsd3; maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } // { withComponents = f: diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 612d9fd57c7cc..ae4b7ee36636f 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -1,10 +1,9 @@ { lib , callPackage , fetchFromGitHub -, fetchpatch , cmake -, llvmPackages_9 -, clang_9 +, llvmPackages_11 +, clang , python3 , zlib , z3 @@ -36,31 +35,43 @@ }: let + # Python used for KLEE tests. kleePython = python3.withPackages (ps: with ps; [ tabulate ]); # The klee-uclibc derivation. kleeuClibc = callPackage ./klee-uclibc.nix { - inherit clang_9 llvmPackages_9 extraKleeuClibcConfig debugRuntime runtimeAsserts; + inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts; }; + in -clang_9.stdenv.mkDerivation rec { +clang.stdenv.mkDerivation rec { + pname = "klee"; - version = "2.2"; + version = "2.3"; + src = fetchFromGitHub { owner = "klee"; repo = "klee"; rev = "v${version}"; - sha256 = "Ar3BKfADjJvvP0dI9+x/l3RDs8ncx4jmO7ol4MgOr4M="; + sha256 = "sha256-E1c6K6Q+LAWm342W8I00JI6+LMvqmULHZLkv9Kj5RmY="; }; + buildInputs = [ - llvmPackages_9.llvm - z3 stp cryptominisat - gperftools sqlite + cryptominisat + gperftools + lit # Configure phase checking for lit + llvmPackages_11.llvm + sqlite + stp + z3 ]; + nativeBuildInputs = [ - cmake clang_9 + clang + cmake ]; + checkInputs = [ gtest @@ -94,34 +105,7 @@ clang_9.stdenv.mkDerivation rec { patchShebangs . ''; - patches = map fetchpatch [ - /* This patch is currently necessary for the unit test suite to run correctly. - * See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html - * and https://github.com/klee/klee/pull/1458 for more information. - */ - { - name = "fix-gtest"; - sha256 = "F+/6videwJZz4sDF9lnV4B8lMx6W11KFJ0Q8t1qUDf4="; - url = "https://github.com/klee/klee/pull/1458.patch"; - } - - # This patch fixes test compile issues with glibc 2.33+. - { - name = "fix-glibc-2.33"; - sha256 = "PzxqtFyLy9KF1eA9AAKg1tu+ggRdvu7leuvXifayIcc="; - url = "https://github.com/klee/klee/pull/1385.patch"; - } - - # /etc/mtab doesn't exist in the Nix build sandbox. - { - name = "fix-etc-mtab-in-tests"; - sha256 = "2Yb/rJA791esNNqq8uAXV+MML4YXIjPKkHBOufvyRoQ="; - url = "https://github.com/klee/klee/pull/1471.patch"; - } - ]; - doCheck = true; - checkTarget = "check"; passthru = { # Let the user depend on `klee.uclibc` for klee-uclibc diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix index 2e3826c50c424..a794fe2eee8aa 100644 --- a/pkgs/applications/science/logic/klee/klee-uclibc.nix +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -3,9 +3,10 @@ , fetchFromGitHub , which , linuxHeaders -, clang_9 -, llvmPackages_9 +, clang +, llvmPackages_11 , python3 +, curl , debugRuntime ? true , runtimeAsserts ? false , extraKleeuClibcConfig ? {} @@ -23,18 +24,20 @@ let "DEVEL_PREFIX" = "/"; }); in -clang_9.stdenv.mkDerivation rec { +clang.stdenv.mkDerivation rec { pname = "klee-uclibc"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "klee"; repo = "klee-uclibc"; rev = "klee_uclibc_v${version}"; - sha256 = "qdrGMw+2XwpDsfxdv6swnoaoACcF5a/RWgUxUYbtPrI="; + sha256 = "sha256-xQ8GWa0Gmd3lbwKodJhrsZeuR4j7NT4zIUh+kNhVY/w="; }; + nativeBuildInputs = [ - clang_9 - llvmPackages_9.llvm + clang + curl + llvmPackages_11.llvm python3 which ]; @@ -44,7 +47,7 @@ clang_9.stdenv.mkDerivation rec { # HACK: needed for cross-compile. # See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03141.html - KLEE_CFLAGS = "-idirafter ${clang_9}/resource-root/include"; + KLEE_CFLAGS = "-idirafter ${clang}/resource-root/include"; prePatch = '' patchShebangs ./configure diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix new file mode 100644 index 0000000000000..e30b8af047350 --- /dev/null +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, gmp, mpfr, python3 +, jemalloc, ninja, makeWrapper }: + +stdenv.mkDerivation { + pname = "lean2"; + version = "2018-10-01"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean2"; + rev = "8072fdf9a0b31abb9d43ab894d7a858639e20ed7"; + sha256 = "12bscgihdgvaq5xi0hqf5r4w386zxm3nkx1n150lv5smhg8ga3gg"; + }; + + patches = [ + # https://github.com/leanprover/lean2/pull/13 + (fetchpatch { + name = "lean2-fix-compilation-error.patch"; + url = "https://github.com/collares/lean2/commit/09b316ce75fd330b3b140d138bcdae2b0e909234.patch"; + sha256 = "060mvqn9y8lsn4l20q9rhamkymzsgh0r1vzkjw78gnj8kjw67jl5"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper ninja ]; + buildInputs = [ gmp mpfr python3 jemalloc ]; + + preConfigure = '' + patchShebangs bin/leantags + cd src + ''; + + cmakeFlags = [ "-GNinja" ]; + + postInstall = '' + wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin + ''; + + meta = with lib; { + description = "Automatic and interactive theorem prover (version with HoTT support)"; + homepage = "http://leanprover.github.io"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice gebner ]; + broken = stdenv.isAarch64; + mainProgram = "lean"; + }; +} diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index 6196f64437029..332b28db5fb62 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An automated theorem prover for classical higher-order logic with choice"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; maintainers = [maintainers.raskin]; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 67e699bc63faa..9650d97814bf4 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/logisim-evolution/logisim-evolution"; description = "Digital logic designer and simulator"; maintainers = with maintainers; [ emilytrau ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index 06dc024e6d230..ea8a1416a77a4 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { homepage = "http://www.cburch.com/logisim/"; description = "Educational tool for designing and simulating digital logic circuits"; maintainers = with maintainers; [ emilytrau ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index da9231efb813e..a042bd6c751b8 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { + broken = stdenv.isDarwin; description = "A toolset for model-checking concurrent systems and protocols"; longDescription = '' A formal specification language with an associated toolset, diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix index 710cfdad39a8d..ad40902e92808 100644 --- a/pkgs/applications/science/logic/nuXmv/default.nix +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Symbolic model checker for analysis of finite and infinite state systems"; homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ siraben ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 193f603656dca..3677eb39de6aa 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "State-of-the-art MaxSAT and Pseudo-Boolean solver"; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 9f104ab80a633..e86a24ffa4cee 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A satisfiability modulo theory (SMT) solver"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index d7ec2e72433e3..2238e490a6034 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1g2xkz9nsgqnrw3fdf5jchl16f0skj5mm32va61scc2yrchll166"; }; + patches = [ + ./clingcon_limits.patch + ]; + postPatch = '' cp ${catch2}/include/catch2/catch.hpp libclingcon/tests/catch.hpp ''; diff --git a/pkgs/applications/science/logic/potassco/clingcon_limits.patch b/pkgs/applications/science/logic/potassco/clingcon_limits.patch new file mode 100644 index 0000000000000..0343e10e21125 --- /dev/null +++ b/pkgs/applications/science/logic/potassco/clingcon_limits.patch @@ -0,0 +1,24 @@ +diff --git i/libclingcon/clingcon/base.hh w/libclingcon/clingcon/base.hh +index 2d449fe..0b5fa17 100644 +--- i/libclingcon/clingcon/base.hh ++++ w/libclingcon/clingcon/base.hh +@@ -28,6 +28,7 @@ + #include <clingo.hh> + #include <optional> + #include <forward_list> ++#include <limits> + + //! @file clingcon/base.hh + //! Basic data types. +diff --git i/libclingcon/clingcon/util.hh w/libclingcon/clingcon/util.hh +index df4cddd..308259e 100644 +--- i/libclingcon/clingcon/util.hh ++++ w/libclingcon/clingcon/util.hh +@@ -30,6 +30,7 @@ + #include <map> + #include <cstdlib> + #include <stdexcept> ++#include <limits> + + //! @file clingcon/util.hh + //! Very general utility functions. diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index 754e12c03eea2..41c5eb5733e57 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clingo"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "potassco"; repo = "clingo"; rev = "v${version}"; - sha256 = "sha256-KBCwGNkz5HqbgXbDxPVcqxMXC8B2+wRI8eZVVXMVpLI="; + sha256 = "sha256-fBf7MRFkd5SfHDQ5OvWx4lP/N716SrF9uY4JF7SiWRk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index df99d067f08c8..b6291bfae3698 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { meta = { description = "Tools for software verification and analysis"; homepage = "https://saw.galois.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 08b8a681b2d59..02e60b398c38b 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -21,6 +21,7 @@ let homepage = "https://tamarin-prover.github.io"; description = "Security protocol verification in the symbolic model"; maintainers = [ lib.maintainers.thoughtpolice ]; + hydraPlatforms = lib.platforms.linux; # maude is broken on darwin }; # tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 8b9f64a8f5b94..4572a06d63378 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "An algorithm specification language with model checking tools"; homepage = "http://lamport.azurewebsites.net/tla/tla.html"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ florentc thoughtpolice ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 3c53e66c8bd9f..86c3db9942a1e 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation rec { ''; # http://lamport.azurewebsites.net/tla/license.html license = with lib.licenses; [ mit ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = [ ]; }; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 9c91eaddfc47e..5df511ebaa8e7 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { # Also, it is unclear what is covered by "verbatim" - we will edit configs hydraPlatforms = []; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; }; } diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 307c75b272bc1..92cad0c61e5a0 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://vprover.github.io/"; description = "The Vampire Theorem Prover"; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index c610256ccaef8..a1f5ec65a3be3 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 8917135b2c88c..ab5006e424e10 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { # WebIDE js_of_ocaml js_of_ocaml-ppx # S-expression output for why3pp - ppx_deriving ppx_sexp_conv + ppx_deriving ppx_sexp_conv ] + ++ # Coq Support - coqPackages.coq coqPackages.flocq - ]; + (with coqPackages; [ coq flocq ]) + ; propagatedBuildInputs = with ocamlPackages; [ camlzip menhirLib num re sexplib ]; diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix index a3d6c16fb7df2..857bbbdee5d00 100644 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/pkgs/applications/science/logic/z3/4.4.0.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { 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 diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index 9438cd972f95b..d96d71695e757 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -51,11 +51,12 @@ in stdenv.mkDerivation rec { meta = { platforms = lib.platforms.linux; description = "Starcraft II headless linux client for machine learning research"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = { fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE"; url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"; free = false; }; - maintainers = with lib.maintainers; [ danharaj ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d1b1199686f63..0d045c882864c 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "R"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-OOq3cZt60JU4jwaqCQxaKyAnkZRd5g0+K7DqsfUJdIg="; + sha256 = "sha256-TVLbSG0nhI5UYT1O6XetlS7AjOF4B+G1JbEM1ENsZD8="; }; dontUseImakeConfigure = true; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 068f9f0ea3c14..ddc950b30664b 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { let libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; in '' - interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + interpreter=${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide; do @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ bfortz ]; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index b7eb8b11ecdc8..43d1a3e2068b9 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -29,6 +29,10 @@ let homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ sikmir imsofi ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode # some jars include native binaries + ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; }; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 76d178b7e490d..e1b5bbaedc2b1 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -48,7 +48,7 @@ let }; darwinPkg = stdenv.mkDerivation { - inherit pname version meta; + inherit pname version; src = fetchurl { urls = [ @@ -66,6 +66,10 @@ let install -dm755 $out/Applications unzip $src -d $out/Applications ''; + + meta = meta // { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }; in if stdenv.isDarwin diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index d684865432d5c..434291861d674 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { rm src/mkjs substituteInPlace src/Makefile.am --replace "g++ mkjs.cc" \ "${buildPackages.stdenv.cc.targetPrefix}c++ mkjs.cc" + + # to open help + substituteInPlace src/global.cc --replace 'browser="mozilla"' 'browser="xdg-open"' ''; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 1fff1156c1a05..2e18801a88122 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-v811Gryviv3bg5WMKtInY6deokAyVT5QPumzjj6jtsM="; + sha256 = "sha256-d8caWGrfb8C12rVzQ08wz/FXkVPNd8broCKS4Xj3pJA="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 4306ae0915155..7e7b7a4752fd9 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.9.5"; + version = "4.10.4"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-/9ZJAIRCCHGciNkaZsKBiJAjEyt6nigsUVSMufbzrUQ="; + sha256 = "sha256-9H6SfyTzVPONROJsIaJJXEzb3D1eubiD1afjoic/vRM="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 399fa3a3c544a..536d520058a2d 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.gurobi.com"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix index f25a0f13c7fb0..1c0152b7bfc77 100644 --- a/pkgs/applications/science/math/hmetis/default.nix +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { patchPhase = '' for binaryfile in $binaryFiles; do patchelf \ - --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.glibc}/lib \ + --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 \ + --set-rpath ${stdenv.cc.libc}/lib \ $binaryfile done ''; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "hMETIS is a set of programs for partitioning hypergraphs"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 876222772e86d..f4c117267d568 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -1,7 +1,12 @@ -{ lib, stdenv, fetchurl, cctools, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchurl +, cctools +, fixDarwinDylibNames +, autoSignDarwinBinariesHook +}: stdenv.mkDerivation rec { - pname = "lp_solve"; version = "5.5.2.11"; @@ -13,20 +18,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools fixDarwinDylibNames + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ]; dontConfigure = true; - buildPhase = let - ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; - in '' - runHook preBuild + buildPhase = + let + ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; + in + '' + runHook preBuild - (cd lpsolve55 && bash -x -e ${ccc}) - (cd lp_solve && bash -x -e ${ccc}) + (cd lpsolve55 && bash -x -e ${ccc}) + (cd lp_solve && bash -x -e ${ccc}) - runHook postBuild - ''; + runHook postBuild + ''; installPhase = '' runHook preInstall @@ -44,9 +53,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Mixed Integer Linear Programming (MILP) solver"; - homepage = "http://lpsolve.sourceforge.net"; - license = licenses.gpl2Plus; + homepage = "http://lpsolve.sourceforge.net"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index e48af60cc2fb7..a3f6a83efab1b 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -47,6 +47,7 @@ callPackage real-drv { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ herberteuler ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 0f4819172cea9..b081640c97d5b 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -121,6 +121,8 @@ in stdenv.mkDerivation { "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" # Fix xkeyboard config path for Qt "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" + # wayland isn't supported + "--set QT_QPA_PLATFORM xcb" ] ++ lib.optionals cudaSupport [ "--set CUDA_PATH ${cudaEnv}" "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so" diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index c435c63ab2ef3..9fae8c31ea412 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -4,19 +4,24 @@ }: stdenv.mkDerivation rec { pname = "nauty"; - version = "27r1"; + version = "2.7r3"; + src = fetchurl { - url = "https://pallini.di.uniroma1.it/nauty${version}.tar.gz"; - sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn"; + url = "https://pallini.di.uniroma1.it/nauty${builtins.replaceStrings ["."] [""] version}.tar.gz"; + sha256 = "sha256-TwZltxalP3oU6irjAFnyPQZM4/5MEsATQE724e4LiMI="; }; + outputs = [ "out" "dev" ]; + configureFlags = [ # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA + "--enable-generic" # don't use -march=native "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt" "--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz" ]; + installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} @@ -28,7 +33,9 @@ stdenv.mkDerivation rec { cp "$i" "$dev/lib/lib$i"; done ''; + checkTarget = "checks"; + meta = with lib; { description = "Programs for computing automorphism groups of graphs and digraphs"; license = licenses.asl20; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index a9c002d210f2b..9f13914474c15 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -13,7 +13,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.13.3"; + version = "2.13.4"; src = fetchurl { urls = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-zLp/FgbGhU8UQ2N7tXrQlY1Bx/R1P4roRZ8dZMJnoco="; + hash = "sha256-vN6ezq4VkoFDgcFpfNtwY1Z7ZQQgGxvke7WJIPO84YU="; }; buildInputs = [ @@ -82,5 +82,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; + broken = stdenv.isDarwin && stdenv.isAarch64; + mainProgram = "gp"; }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 9571588040b33..fc4e822e208ad 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.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk="; + sha256 = "sha256-SphruQ/b8z5S/wKb9yhbEy9/pwiY+frZltdIYj0CJBM="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 44ae404112136..eced57706d276 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -113,6 +113,7 @@ let tkinter # optional, as a matplotlib backend (use with `%matplotlib tk`) scipy ipywidgets + notebook # for "sage -n" rpy2 sphinx pillow @@ -172,6 +173,6 @@ let in # A wrapper around sage that makes sure sage finds its docs (if they were build). callPackage ./sage.nix { - inherit sage-tests sage-with-env sagedoc jupyter-kernel-specs; + inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition jupyter-kernel-specs; inherit withDoc requireSageTests; } diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 78fd8d598d0b6..87f3e1137b190 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -2,6 +2,7 @@ , makeWrapper , sage-tests , sage-with-env +, jupyter-kernel-definition , jupyter-kernel-specs , sagedoc , withDoc @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m doc = sagedoc; lib = sage-with-env.env.lib; - kernelspec = jupyter-kernel-specs.definition.sagemath; + kernelspec = jupyter-kernel-definition; }; meta = with lib; { diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 65d8c145bef6f..327472e88c752 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.scilab.org/"; description = "Scientific software package for numerical computations (Matlab lookalike)"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # see http://www.scilab.org/legal_notice license = "Scilab"; }; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix deleted file mode 100644 index 4ce04340f3a16..0000000000000 --- a/pkgs/applications/science/math/scilab/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{stdenv, fetchurl, lib, gfortran -, ncurses -, withXaw3d ? false -#, withPVMlib ? false -, tcl, tk, withTk ? true -, gtk2, withGtk ? false # working ? -#, withF2c ? false -, ocaml, withOCaml ? true -#, withJava ? false -#, atlasMath, withAtlas ? false -, xlibsWrapper, withX ? true -}: - -stdenv.mkDerivation rec { - version = "4.1.2"; - pname = "scilab"; - src = fetchurl { - url = "https://www.scilab.org/download/${version}/${pname}-${version}-src.tar.gz"; - sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; - }; - - nativeBuildInputs = [ gfortran ]; - - buildInputs = [ ncurses ] - ++ lib.optionals withGtk [ gtk2 ] - ++ lib.optionals withOCaml [ ocaml ] - ++ lib.optional withX xlibsWrapper; - - -/* - --with-atlas-library=DIR Atlas library files are in DIR and we use Atlas -*/ - configureFlags = [ - # use gcc C compiler and gnu Fortran compiler (g77 or gfortran) - "--with-gcc" "--with-g77" - # do not compile with PVM library - "--without-pvm" - # compile with GTK - (lib.enableFeature withGtk "gtk") - (lib.enableFeature withGtk "gtk2") - # compile with ocaml - (lib.withFeature withOCaml "ocaml") - # do not compile Java interface - "--without-java" - # use the X Window System - (lib.withFeature withX "x") - # compile with TCL/TK - ] ++ lib.optionals withTk [ - "--with-tk" - "--with-tcl-library=${tcl}/lib" - "--with-tcl-include=${tcl}/include" - "--with-tk-library=${tk}/lib" - "--with-tk-include=${tk}/include" - ] # use Xaw3d widgets given with Scilab - ++ lib.optional (!withXaw3d) "--with-local-xaw" - ; - - makeFlags = [ "all" ]; - - meta = { - homepage = "http://www.scilab.org/"; - description = "Scientific software package for numerical computations (Matlab lookalike)"; - # see http://www.scilab.org/legal - license = "SciLab"; - broken = true; - }; -} diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index aad3eaf529a0a..c1ada27d581e7 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "singular"; - version = "4.3.0"; + version = "4.3.1"; # since the tarball does not contain tests, we fetch from GitHub. src = fetchFromGitHub { @@ -33,9 +33,8 @@ stdenv.mkDerivation rec { # if a release is tagged (which sometimes does not happen), it will # be in the format below. - # rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; - rev = "d895b0f1f543c61eb03adddad20f08655a419d4e"; - sha256 = "sha256-c5Qr6VUuPKjfw8fowjJJz3oGAyUwo/K0WeMvU5djzVA="; + rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; + sha256 = "sha256-3r3epwaVbyveyYtmfxuevO4Q52J6FbI6RRqiaHQGJIk="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index a4e15060fe3bd..239b5fd6d3671 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromBitbucket, cmake, qtbase, qttools }: +{ stdenv, mkDerivation, lib, fetchFromBitbucket, cmake, qtbase, qttools }: mkDerivation rec { pname = "speedcrunch"; @@ -32,6 +32,6 @@ mkDerivation rec { maintainers = with maintainers; [ gebner j0hax ]; inherit (qtbase.meta) platforms; # works with qt 5.6 and qt 5.8 - broken = builtins.compareVersions qtbase.version "5.7.0" == 0; + broken = builtins.compareVersions qtbase.version "5.7.0" == 0 || stdenv.isDarwin; }; } diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index cf9364ffac174..acb92766910d0 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -140,6 +140,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Wolfram Engine computational software system"; homepage = "https://www.wolfram.com/engine/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ fbeffa ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index f14fb489a9964..aea24b84d1d4c 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "22.03.0"; + version = "22.05.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-ynLx1HPfDjLbyFziWFbjpCeUBaA3hAFRFm5/1GeFKRE="; + sha256 = "sha256-pcKnEjJmvMXCBpjtOSLyl4I0x3fjh0os9Sdp39I2Re0="; }; buildInputs = [ diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index 0eb89b63e475f..b08acc77c640c 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation { meta = { description = "Medical imaging software with 2D, 3D and 4D capabilities"; homepage = "https://www.aliza-dicom-viewer.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index b6a9c161638a3..a1f4b455ce797 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { pname = "dcmtk"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "DCMTK"; repo = pname; rev = "DCMTK-${version}"; - sha256 = "sha256-bpvf2JJXikV/CqmXZb3w4Ua3VBEQcQk7PXw9ie0t8xo="; + sha256 = "sha256-Pw99R6oGcLX6Z7s8ZnpbBBqcIvY9Rl/nw2PVGjpD3gY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 8f840b2998db2..2304e9f77f4cb 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -10,14 +10,17 @@ , gnome , gobject-introspection , gtk4 +, gtksourceview5 +, libadwaita , libxml2 , pkg-config , python3Packages -, wrapGAppsHook4 }: +, wrapGAppsHook4 +}: python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.6.2"; + version = "0.7.2"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3dXtBwqEqiXLjntmqLYeuwLv0RDb774+yOXc7vdf8+Y="; + sha256 = "sha256-+b4Ko2srWZUs8zsH9jU+aiKQYZti3z2Bil8PogfpPlc="; }; nativeBuildInputs = [ @@ -42,6 +45,8 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib gtk4 + gtksourceview5 + libadwaita ]; checkInputs = [ diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 05304ef6a9e27..e3a301f6629b1 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -3,7 +3,7 @@ libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let - majorVersion = "7.18"; + majorVersion = "7.20"; minorVersion = "1"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "BOINC"; repo = "boinc"; rev = "client_release/${majorVersion}/${version}"; - sha256 = "sha256-ijkfWTFwwJXvh6f0P5hkzWODxU+Ugz6iQUK+5jEpWXQ="; + sha256 = "sha256-FRU5s/nvT3VKU78AXYlbzeru7XQwNSqDNMGrdQ3jd1w="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { homepage = "https://boinc.berkeley.edu/"; license = licenses.lgpl2Plus; platforms = platforms.linux; # arbitrary choice + # checking for gcc options needed to detect all undeclared functions... cannot detect + # configure: error: in `/build/boinc-7.18.1-src': + # configure: error: cannot make gcc report undeclared builtins + broken = stdenv.isAarch64; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index cc3d5445b594d..6ebc72cc7da41 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -52,6 +52,7 @@ buildFHSUserEnv { meta = { description = "Folding@home client"; homepage = "https://foldingathome.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index e5cc02edcfbe6..a64c973914c66 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -1,5 +1,4 @@ { lib, stdenv -, autoPatchelfHook , dpkg , fahviewer , fetchurl diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 75e900a0a72c5..7f28c8d1b1463 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "Folding@home viewer"; homepage = "https://foldingathome.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 95112fa9098e6..f945e909308bf 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation { meta = with lib; { description = "A platform for visualizing and manipulating large graphs"; homepage = "https://gephi.org"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3; maintainers = [ maintainers.taeer ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch new file mode 100644 index 0000000000000..6e90faf9f0373 --- /dev/null +++ b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch @@ -0,0 +1,13 @@ +diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c4099..499be0a986 100644 +--- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index 4f452c96b8e73..c397e19fcf0c2 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -1,22 +1,36 @@ -{ stdenv, lib, cmake, fetchFromGitHub -, wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects +{ stdenv +, lib +, cmake +, fetchFromGitHub +, wrapQtAppsHook +, qtbase +, qtquickcontrols2 +, qtgraphicaleffects }: stdenv.mkDerivation rec { pname = "graphia"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; rev = version; - sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w"; + sha256 = "sha256-9JIVMtu8wlux7vIapOQQIemE7ehIol2XZuIvwLfB8fY="; }; + patches = [ + # Fix for a breakpad incompatibility with glibc>2.33 + # https://github.com/pytorch/pytorch/issues/70297 + # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e + ./breakpad-sigstksz.patch + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ qtbase qtquickcontrols2 @@ -24,11 +38,12 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/graphia.x86_64-darwin + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A visualisation tool for the creation and analysis of graphs."; homepage = "https://graphia.app"; license = licenses.gpl3Only; maintainers = [ maintainers.bgamari ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/graphia.x86_64-darwin }; } diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index d32f4312047a3..db8f0a717aa1e 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { many tens of thousands of students, teachers and researchers worldwide. ''; homepage = "https://ccl.northwestern.edu/netlogo/index.shtml"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 585c5ac4f3983..81c377a91c78f 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); 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; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 4132bd0fa9641..fc6c9a086a0bb 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.7.0"; + version = "7.8.5"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KAnilLq7hZy5IU8d95D9sHSGfqibAvUAW3bRH/JwGnw="; + hash = "sha256-y1rjBp5O0aiVeFlCIw7IK4A3ehOhzy+NKa9/abhFrFo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 87a05f146e9e6..a2d3f3d9a2aac 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A visualization framework for the analysis and visualization of relational data"; longDescription = diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index b3a3eb2bd2a8e..8d253e0bcc7ab 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2022.1"; + version = "2022.2"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-hd2rUZfXlSSnAsSVnCxDvodeD8Rx3zo1Ikk53OhRJFA="; + sha256 = "1gq1bvscngsbf8231laam6z0v38lmy95nakxr5225ynjhkw08r35"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/physics/dawn/default.nix b/pkgs/applications/science/physics/dawn/default.nix new file mode 100644 index 0000000000000..609a0e1c4cd31 --- /dev/null +++ b/pkgs/applications/science/physics/dawn/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "dawn"; + version = "3.91a"; + + src = fetchurl { + url = "https://geant4.kek.jp/~tanaka/src/dawn_${builtins.replaceStrings ["."] ["_"] version}.tgz"; + hash = "sha256-gdhV6tERdoGxiCQt0L46JOAF2b1AY/0r2pp6eU689fQ="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'CC =' 'CC = $(CXX) #' \ + --replace 'INSTALL_DIR =' "INSTALL_DIR = $out/bin#" + ''; + + dontConfigure = true; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + meta = with lib; { + description = "A vectorized 3D PostScript processor with analytical hidden line/surface removal"; + license = licenses.unfree; + homepage = "https://geant4.kek.jp/~tanaka/DAWN/About_DAWN.html"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/applications/science/physics/nnpdf/default.nix index 8674132d84026..f71216278297c 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "An open-source machine learning framework for global analyses of parton distributions"; homepage = "https://docs.nnpdf.science/"; license = licenses.gpl3Only; diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix index 8c33a8ae6b1ae..4baa65201e0b2 100644 --- a/pkgs/applications/science/physics/quantomatic/default.nix +++ b/pkgs/applications/science/physics/quantomatic/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "A piece of software for reasoning about monoidal theories; in particular, quantum information processing"; license = licenses.gpl3; homepage = "https://quantomatic.github.io/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index bc67c30aa61cf..f7b12342a6659 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation { homepage = "https://cocotec.io/fdr/"; description = "The CSP refinement checker"; license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = with maintainers; [ nickhu ]; }; diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index f4c323defd6f2..e42aa253dbfe6 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -48,6 +48,7 @@ in stdenv.mkDerivation rec { description = "GRaphs for Object-Oriented VErification"; homepage = "http://groove.cs.utwente.nl/"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/applications/science/programming/jflap/default.nix b/pkgs/applications/science/programming/jflap/default.nix index 9a7922ba1205c..4a6193f1acb74 100644 --- a/pkgs/applications/science/programming/jflap/default.nix +++ b/pkgs/applications/science/programming/jflap/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { description = "GUI tool for experimenting with formal languages topics"; homepage = "https://www.jflap.org/"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = [ maintainers.grnnja ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index ca8e87a05533b..e4213fe7a8ffa 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { description = "Free cross-platform programming exerciser"; homepage = "http://people.irisa.fr/Martin.Quinson/Teaching/PLM/"; license = licenses.gpl3; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 5065723995245..271274126b754 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.7.2"; + version = "10.8.0"; src = fetchurl { - url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip"; - sha256 = "sha256-FDmtFRUupPKiHeF3Xvh/VagqMo+FJi8I7mhTz0VDs3o="; + url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip"; + sha256 = "sha256-Xn0ga2Z1UKd++TriL47ulV6idVTNBR8uiSW7FnL7r1g="; }; nativeBuildInputs = [ wrapGAppsHook unzip ]; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/betaflight/betaflight/wiki"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index ca486006fecba..112049d7c0169 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { The application allows you to configure the Emuflight software running on any supported Emuflight target. ''; homepage = "https://github.com/emuflight/EmuConfigurator"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ beezow ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix index ec605a3a97e95..a0b694f295415 100644 --- a/pkgs/applications/science/robotics/inav-configurator/default.nix +++ b/pkgs/applications/science/robotics/inav-configurator/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/iNavFlight/inav/wiki"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ tilcreator wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 8b69539d6bc61..14cc2d8b4c2b3 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.49"; + version = "1.8.50"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eJ/QxtMUq7DN/cH9qUHNIJv48r0NJrbZfML74DpYamQ="; + sha256 = "sha256-dTdXmhm6sWZphLhcoKRDQ2Ir0hcu0ev0xCul2O9hAXg="; }; postPatch = '' diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index b25065c5f1fff..dae9d5cd5195f 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.4.2"; + version = "3.2.6.4"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "0gql61lrav3f7wbsvgc1d6vf8r0xi5xs9rz9d3sqw3wj5m90w0vq"; + sha256 = "sha256-i88bz6AwfDbqC+7yvr7uDofAqBwQmnfoKbt3iJz4Ft8="; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 5de6e1165dc47..493b4525d2f8a 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, nix-update-script +, gitUpdater , meson , ninja , vala @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-qwx60cp3Q6PL1iwRP+M9Rtmxcis0EByi8fk13H4cXfc="; + sha256 = "sha256-dw1FR9nU8MY6LBL3sF942azeSgKmCntXCk4+nhMb4Wo="; fetchSubmodules = true; }; @@ -75,8 +75,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = gitUpdater { + inherit pname version; + ignoredVersions = "ci.*"; }; }; diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index d0def97e46f3c..a736e836cb62e 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -1,30 +1,101 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre, nixosTests }: +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, freetype +, fontconfig +, libGL +, pcre +, boost +, catch2 +, fmt +, microsoft_gsl +, range-v3 +, libyamlcpp +, ncurses +, file +, darwin +, nixosTests +}: +let + # Commits refs come from https://github.com/contour-terminal/contour/blob/master/scripts/install-deps.sh + libunicode-src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "libunicode"; + rev = "c2369b6380df1197476b08d3e2d0e96b6446f776"; + sha256 = "sha256-kq7GpFCkrJG7F9/YEGz3gMTgYzhp/QB8D5b9wwMaLvQ="; + }; + + termbench-pro-src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "termbench-pro"; + rev = "cd571e3cebb7c00de9168126b28852f32fb204ed"; + sha256 = "sha256-dNtOmBu63LFYfiGjXf34C2tiG8pMmsFT4yK3nBnK9WI="; + }; +in mkDerivation rec { pname = "contour"; - version = "0.1.1"; + version = "0.3.1.200"; src = fetchFromGitHub { - owner = "christianparpart"; + owner = "contour-terminal"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P7t+M75ZWjFcGWngcbaurdit6e+pb0ILljimhYqW0NI="; - fetchSubmodules = true; + sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ncurses + file + ]; + + buildInputs = [ + fontconfig + freetype + libGL + pcre + boost + catch2 + fmt + microsoft_gsl + range-v3 + libyamlcpp + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ]; + + preConfigure = '' + mkdir -p _deps/sources + + cat > _deps/sources/CMakeLists.txt <<EOF + macro(ContourThirdParties_Embed_libunicode) + add_subdirectory(\''${ContourThirdParties_SRCDIR}/libunicode EXCLUDE_FROM_ALL) + endmacro() + macro(ContourThirdParties_Embed_termbench_pro) + add_subdirectory(\''${ContourThirdParties_SRCDIR}/termbench_pro EXCLUDE_FROM_ALL) + endmacro() + EOF + + ln -s ${libunicode-src} _deps/sources/libunicode + ln -s ${termbench-pro-src} _deps/sources/termbench_pro - buildInputs = [ freetype libGL pcre ]; + # Don't fix Darwin app bundle + sed -i '/fixup_bundle/d' src/contour/CMakeLists.txt + ''; passthru.tests.test = nixosTests.terminal-emulators.contour; meta = with lib; { + # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/contour.x86_64-darwin + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Modern C++ Terminal Emulator"; - homepage = "https://github.com/christianparpart/contour"; - changelog = "https://github.com/christianparpart/contour/blob/HEAD/Changelog.md"; + homepage = "https://github.com/contour-terminal/contour"; + changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; license = licenses.asl20; maintainers = with maintainers; [ fortuneteller2k ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/contour.x86_64-darwin }; } diff --git a/pkgs/applications/terminal-emulators/dterm/default.nix b/pkgs/applications/terminal-emulators/dterm/default.nix new file mode 100644 index 0000000000000..69b1f67d629a9 --- /dev/null +++ b/pkgs/applications/terminal-emulators/dterm/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchurl +, readline +}: + +stdenv.mkDerivation rec { + pname = "dterm"; + version = "0.5"; + + src = fetchurl { + url = "http://www.knossos.net.nz/downloads/dterm-${version}.tgz"; + hash = "sha256-lFM7558e7JZeWYhtXwCjXLZ1xdsdiUGfJTu3LxQKvds="; + }; + + buildInputs = [ readline ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' + ''; + + preInstall = "mkdir -p $out/bin"; + + installFlags = [ "BIN=$(out)/bin/" ]; + + meta = with lib; { + homepage = "http://www.knossos.net.nz/resources/free-software/dterm/"; + description = "A simple terminal program"; + longDescription = '' + dterm is a simple terminal emulator, which doesn’t actually emulate any + particular terminal. Mainly, it is designed for use with xterm and + friends, which already do a perfectly good emulation, and therefore don’t + need any special help; dterm simply provides a means by which keystrokes + are forwarded to the serial line, and data forwarded from the serial line + appears on the terminal. + ''; + license = licenses.gpl2Only; + maintainers = with maintainers; [ auchter ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 2266e884454b2..031d49d2458d9 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { description = "A terminal built on web technologies"; homepage = "https://hyper.is/"; maintainers = with maintainers; [ puffnfresh fabiangd ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index efd853b82b421..e818f4a71faaa 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,21 +21,20 @@ , bashInteractive , zsh , fish -, fetchpatch , nixosTests }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.24.4"; + version = "0.25.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-c6XM/xeGZ68srf8xQJA1iYCUR3kXNceTMxsZAnbFmug="; + sha256 = "sha256-o/vVz1lPfsgkzbYjYhIrScCAROmVdiPsNwjW/m5n7Us="; }; buildInputs = [ @@ -78,21 +77,15 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ - (fetchpatch { - name = "fix-zsh-completion-test-1.patch"; - url = "https://github.com/kovidgoyal/kitty/commit/297592242c290a81ca4ba08802841f4c33a4de25.patch"; - sha256 = "sha256-/V6y/4AaJsZvx1KS5UFZ+0zyAoZuLgbgFORZ1dX/1qE="; - }) - (fetchpatch { - name = "fix-zsh-completion-test-2.patch"; - url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch"; - sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0="; - }) - (fetchpatch { - name = "fix-build-with-non-framework-python-on-darwin.patch"; - url = "https://github.com/kovidgoyal/kitty/commit/57cffc71b78244e6a9d49f4c9af24d1a88dbf537.patch"; - sha256 = "sha256-1IGONSVCVo5SmLKw90eqxaI5Mwc764O1ur+aMsc7h94="; - }) + # Needed on darwin + + # Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about + # permissions. + ./zsh-compinit.patch + + # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes: + # OSError: master_fd is in error condition + ./disable-test_ssh_bootstrap_with_different_launchers.patch ]; # Causes build failure due to warning @@ -117,6 +110,7 @@ buildPythonApplication rec { --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' \ + --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ ${commonOptions} ''} runHook postBuild @@ -141,6 +135,9 @@ buildPythonApplication rec { # Fontconfig error: Cannot load default config file: No such file: (null) export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + # Required for `test_ssh_shell_integration` to pass. + export TERM=kitty + env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py ''; @@ -180,6 +177,18 @@ buildPythonApplication rec { runHook postInstall ''; + # Patch shebangs that Nix can't automatically patch + preFixup = + let + pathComponent = if stdenv.isDarwin then "Applications/kitty.app/Contents/Resources" else "lib"; + in + '' + substituteInPlace $out/${pathComponent}/kitty/shell-integration/ssh/askpass.py \ + --replace '/usr/bin/env -S ' $out/bin/ + substituteInPlace $shell_integration/ssh/askpass.py \ + --replace '/usr/bin/env -S ' $out/bin/ + ''; + passthru.tests.test = nixosTests.terminal-emulators.kitty; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch b/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch new file mode 100644 index 0000000000000..584815b9e07a2 --- /dev/null +++ b/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch @@ -0,0 +1,13 @@ +diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py +index 1f424146..d3cc191b 100644 +--- a/kitty_tests/ssh.py ++++ b/kitty_tests/ssh.py +@@ -166,7 +166,7 @@ def test_ssh_bootstrap_with_different_launchers(self): + for sh in self.all_possible_sh: + if sh == 'sh' or 'python' in sh: + q = shutil.which(launcher) +- if q: ++ if q and not 'zsh' in q: + with self.subTest(sh=sh, launcher=q), tempfile.TemporaryDirectory() as tdir: + self.check_bootstrap(sh, tdir, test_script='env; exit 0', SHELL_INTEGRATION_VALUE='', launcher=q) + diff --git a/pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch b/pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch new file mode 100644 index 0000000000000..168f80cb67336 --- /dev/null +++ b/pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch @@ -0,0 +1,13 @@ +diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py +index 1f424146..d9a65d25 100644 +--- a/kitty_tests/ssh.py ++++ b/kitty_tests/ssh.py +@@ -268,6 +268,8 @@ def check_untar_or_fail(): + return 'UNTAR_DONE' in q + pty.wait_till(check_untar_or_fail) + self.assertTrue(os.path.exists(os.path.join(home_dir, '.terminfo/kitty.terminfo'))) ++ if login_shell == 'zsh': ++ pty.send_cmd_to_child('y') + if SHELL_INTEGRATION_VALUE != 'enabled': + pty.wait_till(lambda: len(pty.screen_contents().splitlines()) > 1) + self.assertEqual(pty.screen.cursor.shape, 0) diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/applications/terminal-emulators/syncterm/default.nix index d56db734a8855..e2b51614633df 100644 --- a/pkgs/applications/terminal-emulators/syncterm/default.nix +++ b/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -31,11 +31,12 @@ stdenv.mkDerivation rec { runtimeDependencies = [ ncurses SDL2 ]; # Both of these are dlopen()'ed at runtime. meta = with lib; { + # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin' + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://syncterm.bbsdev.net/"; description = "BBS terminal emulator"; maintainers = with maintainers; [ embr ]; platforms = platforms.unix; license = licenses.gpl2Plus; - broken = stdenv.isDarwin; # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin' }; } diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 8f15a38111c8f..4fed03db0dd08 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220408-101518-b908e2dd"; + version = "20220624-141144-bd1b7c5d"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-kuuoD+hqgj7QXFRIxa112oc4idtcK0ptFACDpI0bzGY="; + sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw="; }; postPatch = '' @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-iIb2zLUZpn23ooEiOP+yQMYUUmvef/KqvjzgLOFmjs0="; + cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 57adae69db037..bed85a37f544d 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -86,6 +86,7 @@ let You can then merge the changes, synchronize your files, and generate reports for your records. ''; homepage = "https://www.scootersoftware.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ktor arkivm ]; platforms = builtins.attrNames srcs; diff --git a/pkgs/applications/version-management/cz-cli/node-composition.nix b/pkgs/applications/version-management/cz-cli/node-composition.nix index 53bdef1f98646..4dfddf3e5bcaf 100644 --- a/pkgs/applications/version-management/cz-cli/node-composition.nix +++ b/pkgs/applications/version-management/cz-cli/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/applications/version-management/datalad/default.nix new file mode 100644 index 0000000000000..65561aded31fe --- /dev/null +++ b/pkgs/applications/version-management/datalad/default.nix @@ -0,0 +1,80 @@ +{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git }: + +python3.pkgs.buildPythonApplication rec { + pname = "datalad"; + version = "0.16.5"; + + src = fetchFromGitHub { + owner = "datalad"; + repo = pname; + rev = version; + hash = "sha256-6uWOKsYeNZJ64WqoGHL7AsoK4iZd24TQOJ1ECw+K28Y="; + }; + + nativeBuildInputs = [ installShellFiles git ]; + + propagatedBuildInputs = with python3.pkgs; [ + # core + platformdirs + chardet + iso8601 + humanize + fasteners + packaging + patool + tqdm + annexremote + + # downloaders-extra + # requests-ftp # not in nixpkgs yet + + # downloaders + boto + keyrings-alt + keyring + msgpack + requests + + # publish + python-gitlab + + # misc + argcomplete + pyperclip + python-dateutil + + # metadata + simplejson + whoosh + + # metadata-extra + pyyaml + mutagen + exifread + python-xmp-toolkit + pillow + + # duecredit + duecredit + + # python>=3.8 + distro + ] ++ lib.optional stdenv.hostPlatform.isWindows [ colorama ] + ++ lib.optional (python3.pythonOlder "3.10") [ importlib-metadata ]; + + postInstall = '' + installShellCompletion --cmd datalad \ + --bash <($out/bin/datalad shell-completion) \ + --zsh <($out/bin/datalad shell-completion) + ''; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Keep code, data, containers under control with git and git-annex"; + homepage = "https://www.datalad.org"; + license = licenses.mit; + maintainers = with maintainers; [ renesat ]; + }; +} diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 936661e4e105f..382f08f7afcbd 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -10,46 +10,24 @@ python3.pkgs.buildPythonApplication rec { pname = "dvc"; - version = "2.9.5"; + version = "2.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = version; - hash = "sha256-MviiA0ja1IaxMPlqu2dhIGBcdEXiEvBYnK9731dihMg="; + hash = "sha256-d1Tjqomr8Lcf+X+LZgi0wHlxXBUqHq/nAzDBbrxHAl4="; }; - # make the patch apply - prePatch = '' - substituteInPlace setup.cfg \ - --replace "scmrepo==0.0.7" "scmrepo==0.0.10" - ''; - - patches = [ - ./dvc-daemon.patch - (fetchpatch { - url = "https://github.com/iterative/dvc/commit/ab54b5bdfcef3576b455a17670b8df27beb504ce.patch"; - sha256 = "sha256-wzMK6Br7/+d3EEGpfPuQ6Trj8IPfehdUvOvX3HZlS+o="; - }) - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "grandalf==0.6" "grandalf>=0.6" \ - --replace "scmrepo==0.0.13" "scmrepo" - substituteInPlace dvc/daemon.py \ - --subst-var-by dvc "$out/bin/dcv" - ''; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm setuptools-scm-git-archive ]; propagatedBuildInputs = with python3.pkgs; [ - appdirs aiohttp-retry + appdirs colorama configobj configobj @@ -57,12 +35,16 @@ python3.pkgs.buildPythonApplication rec { diskcache distro dpath + dvclive + dvc-data + dvc-render flatten-dict flufl_lock funcy grandalf nanotime networkx + packaging pathspec ply psutil @@ -83,19 +65,33 @@ python3.pkgs.buildPythonApplication rec { voluptuous zc_lockfile ] ++ lib.optional enableGoogle [ + gcsfs google-cloud-storage ] ++ lib.optional enableAWS [ + aiobotocore boto3 + s3fs ] ++ lib.optional enableAzure [ - azure-storage-blob + azure-identity + knack ] ++ lib.optional enableSSH [ - paramiko + bcrypt ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "grandalf==0.6" "grandalf" \ + --replace "scmrepo==0.0.25" "scmrepo" \ + --replace "dvc-data==0.0.16" "dvc-data" \ + --replace "dvc-render==0.0.6" "dvc-render" + substituteInPlace dvc/daemon.py \ + --subst-var-by dvc "$out/bin/dcv" + ''; + # Tests require access to real cloud services doCheck = false; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index ea785bab49bfb..e1e1fe17547f2 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gerritcodereview.com/index.md"; license = licenses.asl20; description = "A web based code review and repository management for the git version control system"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ flokli jammerful zimbatm ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index ca47942a3f9a9..a759c1e860051 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { it's faster (10-720x), simpler (dedicated to just removing things), and beautiful (can use Scala instead of bash to script customizations). ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = [ maintainers.changlinli ]; mainProgram = "bfg"; diff --git a/pkgs/applications/version-management/git-and-tools/conform/default.nix b/pkgs/applications/version-management/git-and-tools/conform/default.nix new file mode 100644 index 0000000000000..23ed7dc1b486c --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/conform/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub, git }: + +buildGoModule rec { + pname = "conform"; + version = "0.1.0-alpha.25"; + + src = fetchFromGitHub { + owner = "siderolabs"; + repo = "conform"; + rev = "v${version}"; + sha256 = "sha256-WgWgigpqPoEBY4tLjbzK02WFwrCWPGQWJ5eakLv5IWw="; + }; + + vendorSha256 = "sha256-Oigt7tAK4jhBQtfG1wdLHqi11NWu6uJn5fmuqTmR76E="; + + ldflags = [ + "-s" + "-w" + "-X github.com/talos-systems/conform/internal/version.Tag=v${version}" + ]; + + checkInputs = [ git ]; + + meta = with lib; { + description = "Policy enforcement for your pipelines"; + homepage = "https://github.com/siderolabs/conform"; + license = licenses.mpl20; + maintainers = with maintainers; [ jmgilman jk ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/git-and-tools/gfold/default.nix index d3b960208fc92..88fa12ae12ade 100644 --- a/pkgs/applications/version-management/git-and-tools/gfold/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gfold/default.nix @@ -7,12 +7,12 @@ , rustPlatform , Security , stdenv -, testVersion +, testers }: let pname = "gfold"; - version = "4.0.0"; + version = "4.0.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,14 +21,14 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "1yh5173qhi9bd41zss9k21nm0xnr2sa918kvlyr5xvzhq47rrwz5"; + sha256 = "sha256-XOUXDuKLr8tESG2GJMl1kYsk2JRtQXzQyaO7d44Ajt8="; }; - cargoSha256 = "sha256-o2fMIlj+veTmhfqi7BVpxr3520SOwWLmVS2UU83EVjo="; + cargoSha256 = "sha256-jkktXVgHtqQeMU+rPiT4fz0kTIHW07RukxCnFABlzgw="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = gfold; command = "gfold --version"; inherit version; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 9c81e2f7fa674..46dc53d9fdd76 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.11.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-bDPcU898ceARV06AADNj08D1eKD6yp39D6Ahs70d+kU="; + sha256 = "sha256-1IpYy8d+Gmd2cWIAIMXv0lpDkSc8SflklQFu1mP72Yo="; }; - vendorSha256 = "sha256-soNQXtpQ217scP606UA05+r9WIrUAMOCDBsfLKrVD+Q="; + vendorSha256 = "sha256-yhUP6BaR2xloy3/g7pKhn5ljwTEm8XwPaOiZCIfIM7E="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index f991bccf0e288..2b2fde8ea27d0 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.7.13"; + version = "1.7.16"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-EQCu+2qMKu+e6G5iXAQn5cz0MZqHrF2wnKNO8Fkpp/Y="; + sha256 = "sha256-dQJ21QT3mDGS4nPB9o6033/Sn0+XV0P8Wjqvfcc5Loo="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index b2f5346bbfce0..26632abe4694b 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-86ZFKkzDAhx3UYWxreQI2OJJmqGnqaH2TgwQunuYhv4="; + sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY="; }; - vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI="; + vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM="; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 5115f37891abb..ca312188987e3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -1,28 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { - owner = "tummychow"; - repo = pname; - rev = "refs/tags/${version}"; - sha256 = "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9"; + owner = "tummychow"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "sha256-qhUw1wjXn1tyiH175+BadcoKoZ0wHxpMTKDIKOcJjQ0="; }; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0dax6wkbyk5p8p0mm406vfgmqfmfxzyzqps6yk8fachi61x12ja6"; + cargoSha256 = "sha256-Wh2kA12CggbgdofWJwPAy+587qfMUPSy9nQmO11+keY="; postInstall = '' installManPage Documentation/git-absorb.1 - for shell in bash zsh fish; do - $out/bin/git-absorb --gen-completions $shell > git-absorb.$shell - installShellCompletion git-absorb.$shell - done + installShellCompletion --cmd git-absorb \ + --bash <($out/bin/git-absorb --gen-completions bash) \ + --fish <($out/bin/git-absorb --gen-completions fish) \ + --zsh <($out/bin/git-absorb --gen-completions zsh) ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix deleted file mode 100644 index c32d29f2561a2..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "git-annex-remote-b2"; - version = "unstable-2015-12-12"; - - goPackagePath = "github.com/encryptio/git-annex-remote-b2"; - - src = fetchFromGitHub { - owner = "encryptio"; - repo = "git-annex-remote-b2"; - rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; - sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ="; - }; - - goDeps = ./deps.nix; -} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix deleted file mode 100644 index 479b3e7d63723..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/pquerna/ffjson"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/ffjson"; - rev = "674bc015b5b3f50f9bb2561179778586b9af68c5"; - sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"; - }; - } - { - goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/kothar/go-backblaze.v0"; - rev = "373819725fc560fa962c6cd883b533d2ebec4844"; - sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"; - }; - } -] diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index 33580712932c5..8b5844fb76ce9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -1,23 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "git-appraise-unstable"; - version = "2018-02-26"; - rev = "2414523905939525559e4b2498c5597f86193b61"; - - goPackagePath = "github.com/google/git-appraise"; +buildGoModule rec { + pname = "git-appraise"; + version = "unstable-2022-04-13"; src = fetchFromGitHub { - inherit rev; owner = "google"; repo = "git-appraise"; - sha256 = "04xkp1jpas1dfms6i9j09bgkydih0q10nhwn75w9ds8hi2qaa3sa"; + rev = "99aeb0e71544d3e1952e208c339b1aec70968cf3"; + sha256 = "sha256-TteTI8yGP2sckoJ5xuBB5S8xzm1upXmZPlcDLvXZrpc="; }; - meta = { + vendorSha256 = "sha256-Lzq4qpDAUjKFA2T685eW9NCfzEhDsn5UR1A1cIaZadE="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { description = "Distributed code review system for Git repos"; homepage = "https://github.com/google/git-appraise"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.vdemeester ]; + license = licenses.asl20; + maintainers = with maintainers; [ vdemeester ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f0932fde2d5e2..6e2377bbec4bb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, unixtools, which }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, unixtools +, which +}: stdenv.mkDerivation rec { pname = "git-extras"; @@ -11,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek="; }; + patches = [ + (fetchpatch { + url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch"; + sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc="; + }) + ]; + postPatch = '' patchShebangs check_dependencies.sh ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 070d9eab2b4da..1e2af3023c2fc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.10.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jZkc9YA4kE/Gr4/FRzgd0VvEjSrw5rk7DB5qH8Z5o6c="; + sha256 = "sha256-BhR1dE6+K7UKaCbLmWPtLMyq0oIj/xYenXp5s7kRINc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix index b8743b7ea9022..4b4319f8cd7cc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix @@ -10,15 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "git-quickfix"; - version = "0.0.5"; + version = "0.1.0"; src = fetchFromGitHub { owner = "siedentop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg="; + sha256 = "sha256-IAjet/bDG/Hf/whS+yrEQSquj8s5DEmFis+5ysLLuxs="; }; + doCheck = false; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security @@ -26,7 +28,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE="; + cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI="; meta = with lib; { description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 4c50836cfdb27..6293af4642a34 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-secret"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { repo = "git-secret"; owner = "sobolevn"; rev = "v${version}"; - sha256 = "sha256-Mtuj+e/yCDr4XkmYkWUFJB3cqOT5yOMOq9P/QJV1S80="; + sha256 = "sha256-Vdlv3H99BZcT1O66ZCpq5olENOaUSubx58B1PQ/OlMU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index c09de9968511a..6e33c013dc92f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -26,7 +26,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.36.0"; + version = "2.36.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -39,7 +39,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-r16/wWWEZPXQ1For/YhMk1+2B6EMwCHZW8gHeIYcwdM="; + sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index 75fea7bf871fc..0eb20db1462ab 100644 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, git }: buildGoModule rec { pname = "gitbatch"; @@ -15,7 +15,15 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkFlags = [ "-short" ]; + nativeBuildInputs = [ + git # required by unit tests + ]; + + preCheck = '' + HOME=$(mktemp -d) + # Disable tests requiring network access to gitlab.com + buildFlagsArray+=("-run" "[^(Test(Run|Start|(Fetch|Pull)With(Go|)Git))]") + ''; meta = with lib; { description = "Running git UI commands"; diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix deleted file mode 100644 index 7cfa5765df4cd..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline -, cmake }: -let - version = "0.3.2"; -in -buildGoPackage { - pname = "grv"; - inherit version; - - buildInputs = [ ncurses readline curl ]; - nativeBuildInputs = [ pkg-config cmake ]; - - goPackagePath = "github.com/rgburke/grv"; - - src = fetchFromGitHub { - owner = "rgburke"; - repo = "grv"; - rev = "v${version}"; - sha256 = "0bpjsk35rlp56z8149z890adnhmxyh743vsls3q86j4682b83kyf"; - fetchSubmodules = true; - }; - - postPatch = '' - rm util/update_latest_release.go - ''; - - postConfigure = '' - cd $NIX_BUILD_TOP/go/src/$goPackagePath - ''; - - buildPhase = '' - runHook preBuild - make build-only - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -D grv $out/bin/grv - runHook postInstall - ''; - - meta = with lib; { - description = "GRV is a terminal interface for viewing Git repositories"; - homepage = "https://github.com/rgburke/grv"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index bab5b5aa33dd9..75bf008d1ec7d 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "0.7.7"; + version = "1.0.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-XyuXegCTJSW4uO6fEaRKq/jZnE+JbrxZw0kcDvhpsVo="; + sha256 = "sha256-uaIZrxfzV2WPvnAPm6Q67yKx1EVmSMcChSxZG/Huw48="; }; - vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg="; + vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI="; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 0a6251548be2b..1ed773bd65b49 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchFromGitHub , installShellFiles , python3Packages diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix deleted file mode 100644 index f72f51907500b..0000000000000 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "git-lfs"; - version = "1.5.6"; - rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; - - goPackagePath = "github.com/git-lfs/git-lfs"; - - src = fetchFromGitHub { - inherit rev; - owner = "git-lfs"; - repo = "git-lfs"; - sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d"; - }; - - subPackages = [ "." ]; - - preBuild = '' - pushd go/src/github.com/git-lfs/git-lfs - go generate ./commands - popd - ''; - - meta = with lib; { - description = "Git extension for versioning large files"; - homepage = "https://git-lfs.github.com/"; - license = [ licenses.mit ]; - maintainers = [ maintainers.twey ]; - }; -} diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 8871ac2306efd..6740cb713f862 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,43 +1,56 @@ -{ lib, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, ronn, installShellFiles, git, testers, git-lfs }: -buildGoPackage rec { +buildGoModule rec { pname = "git-lfs"; - version = "3.1.4"; + version = "3.2.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "sha256-dGqb7gw7l2SPGwhHIFbEq6XqMB9QRw3+3Pfbk2S4kW4="; + rev = "v${version}"; + sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI="; + leaveDotGit = true; }; - goPackagePath = "github.com/git-lfs/git-lfs"; + vendorSha256 = null; nativeBuildInputs = [ ronn installShellFiles ]; - ldflags = [ "-s" "-w" "-X ${goPackagePath}/config.Vendor=${version}" "-X ${goPackagePath}/config.GitCommit=${src.rev}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/git-lfs/git-lfs/v${lib.versions.major version}/config.Vendor=${version}" + ]; subPackages = [ "." ]; preBuild = '' - pushd go/src/github.com/git-lfs/git-lfs - go generate ./commands - popd + GOARCH= go generate ./commands ''; postBuild = '' - make -C go/src/${goPackagePath} man + make man + ''; + + checkInputs = [ git ]; + + preCheck = '' + unset subPackages ''; postInstall = '' - installManPage go/src/${goPackagePath}/man/*.{1,5} + installManPage man/man*/* ''; + passthru.tests.version = testers.testVersion { + package = git-lfs; + }; + meta = with lib; { description = "Git extension for versioning large files"; - homepage = "https://git-lfs.github.com/"; - changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md"; - license = [ licenses.mit ]; - maintainers = [ maintainers.twey maintainers.marsam ]; + homepage = "https://git-lfs.github.com/"; + changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ twey marsam ]; }; } diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index fbf0138ce5aa7..2cddeea816204 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -12,8 +12,6 @@ , nixosTests }: -with lib; - buildGoPackage rec { pname = "gitea"; version = "1.16.8"; @@ -36,19 +34,18 @@ buildGoPackage rec { ]; postPatch = '' - patchShebangs . substituteInPlace modules/setting/setting.go --subst-var data ''; nativeBuildInputs = [ makeWrapper ]; - buildInputs = optional pamSupport pam; + buildInputs = lib.optional pamSupport pam; preBuild = let - tags = optional pamSupport "pam" - ++ optional sqliteSupport "sqlite sqlite_unlock_notify"; - tagsString = concatStringsSep " " tags; + tags = lib.optional pamSupport "pam" + ++ lib.optional sqliteSupport "sqlite sqlite_unlock_notify"; + tagsString = lib.concatStringsSep " " tags; in '' export buildFlagsArray=( @@ -66,14 +63,14 @@ buildGoPackage rec { cp -R ./go/src/${goPackagePath}/options/locale $out/locale wrapProgram $out/bin/gitea \ - --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; goPackagePath = "code.gitea.io/gitea"; passthru.tests.gitea = nixosTests.gitea; - meta = { + meta = with lib; { description = "Git with a cup of tea"; homepage = "https://gitea.io"; license = licenses.mit; diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 6017d105fed71..7c07dc17c2ee9 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI for managing Git and GitHub."; homepage = "https://desktop.github.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ dan4ik605743 ]; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 7ea16da243c0b..c8ca224a952b1 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsa-lib +{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curlWithGnuTls, alsa-lib , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus @@ -9,26 +9,25 @@ with lib; let - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.5.0"; + version = "8.6.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-2ox7SI5tjoXR2qrhE+S/K2GQfq0wuTduKHAEpIOoulQ="; + sha256 = "sha256-BBhKenEm1D680wJ1hmIOM/AdXN1DxoipLf9K4eHESzs="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-+F++2L1WYVem96y7R93aPWiWySnUrg+b1q1gIJX69yw="; + sha256 = "sha256-fyRhvaKDGYyKu6lAxHb5ve7Ix+7Tuu5JWXnqBF73ti4="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-7WD9drsE93SR53Xqz+cmrnsVd4l4SIoud/Agq32QM4M="; + sha256 = "sha256-qbu3gPTo5zY7OQyULY2iIUDQjwjlL4xZdkl68rE3VHA="; }; }; @@ -37,6 +36,7 @@ let meta = { homepage = "https://www.gitkraken.com/"; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ xnwdd evanjs arkivm ]; diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock index e5df89d660902..664080ccad8d4 100644 --- a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock @@ -1,36 +1,38 @@ GEM + specs: + +GEM remote: https://rubygems.org/ specs: - activesupport (5.2.6) + activesupport (7.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - concurrent-ruby (1.1.9) - gitlab-triage (1.20.0) - activesupport (~> 5.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + concurrent-ruby (1.1.10) + gitlab-triage (1.23.1) + activesupport (>= 5.1) globalid (~> 0.4) graphql-client (~> 0.16) httparty (~> 0.17) - globalid (0.5.2) + globalid (0.6.0) activesupport (>= 5.0) - graphql (1.12.14) - graphql-client (0.16.0) + graphql (2.0.11) + graphql-client (0.18.0) activesupport (>= 3.0) - graphql (~> 1.8) - httparty (0.18.1) + graphql + httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.8.10) + i18n (1.10.0) concurrent-ruby (~> 1.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0704) - minitest (5.14.4) + mime-types-data (3.2022.0105) + minitest (5.16.2) multi_xml (0.6.0) - thread_safe (0.3.6) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) PLATFORMS ruby @@ -40,4 +42,4 @@ DEPENDENCIES gitlab-triage! BUNDLED WITH - 2.1.4 + 2.3.9 diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/applications/version-management/gitlab-triage/default.nix index 09dfbcbc368b9..e49c7f35088c2 100644 --- a/pkgs/applications/version-management/gitlab-triage/default.nix +++ b/pkgs/applications/version-management/gitlab-triage/default.nix @@ -1,10 +1,12 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "gitlab-triage"; gemdir = ./.; exes = [ "gitlab-triage" ]; + passthru.updateScript = bundlerUpdateScript "gitlab-triage"; + meta = with lib; { description = "GitLab's issues and merge requests triage, automated!"; homepage = "https://gitlab.com/gitlab-org/gitlab-triage"; diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/applications/version-management/gitlab-triage/gemset.nix index 519ddc8bec0ba..34d328d9ee9a6 100644 --- a/pkgs/applications/version-management/gitlab-triage/gemset.nix +++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; + sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj"; type = "gem"; }; - version = "5.2.6"; + version = "7.0.3"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; gitlab-triage = { dependencies = ["activesupport" "globalid" "graphql-client" "httparty"]; @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-sg/YgRnp1+EcTcBqsm8vZrV0YuHTSJEFk/whhW8An6g="; + sha256 = "1vs120wyqm12xy66nv0723cy3m66g5lhhdd37izbc9qwyq03m729"; type = "gem"; }; - version = "1.20.0"; + version = "1.23.1"; }; globalid = { dependencies = ["activesupport"]; @@ -37,20 +37,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; + sha256 = "1xk28839pi36yzlqgh7k5wqmiphz7wg2c2r2wzfvs2s7g63hy3nv"; type = "gem"; }; - version = "0.5.2"; + version = "0.6.0"; }; graphql = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-iweRDvp7EWY02B52iwbebEpiwL7Mj9E9RyeHYMuqc/o="; + sha256 = "18k3wh73mb7rs469wfn4m10d1rlg2v9chd89nf7vy8z3yjbf9nl4"; type = "gem"; }; - version = "1.12.14"; + version = "2.0.11"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g971rccyrs3rk8812r6az54p28g66m4ngdcbszg31mvddjaqkr4"; + sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq"; type = "gem"; }; - version = "0.16.0"; + version = "0.18.0"; }; httparty = { dependencies = ["mime-types" "multi_xml"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17gpnbf2a7xkvsy20jig3ljvx8hl5520rqm9pffj2jrliq1yi3w7"; + sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9"; type = "gem"; }; - version = "0.18.1"; + version = "0.20.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -80,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.8.10"; + version = "1.10.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -91,30 +91,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; type = "gem"; }; - version = "3.3.1"; + version = "3.4.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.0704"; + version = "3.2022.0105"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.14.4"; + version = "5.16.2"; }; multi_xml = { groups = ["default"]; @@ -126,25 +126,15 @@ }; version = "0.6.0"; }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.9"; + version = "2.0.4"; }; } diff --git a/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch new file mode 100644 index 0000000000000..968e618f3121f --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch @@ -0,0 +1,69 @@ +From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001 +From: "M. A" <mak@nyantec.com> +Date: Sat, 25 Jun 2022 13:34:42 +0000 +Subject: [PATCH] Remove geo from database.yml + +--- + config/database.yml.postgresql | 28 ---------------------------- + 1 file changed, 28 deletions(-) + +diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql +index 5329a8e9fd7..a4daab1fd0c 100644 +--- a/config/database.yml.postgresql ++++ b/config/database.yml.postgresql +@@ -18,13 +18,6 @@ production: + # port: 8600 + # record: secondary.postgresql.service.consul + # interval: 300 +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_production +- username: git +- password: "secure password" +- host: localhost + + # + # Development specific +@@ -39,13 +32,6 @@ development: + host: localhost + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_development +- username: postgres +- password: "secure password" +- host: localhost + + # + # Staging specific +@@ -58,13 +44,6 @@ staging: + username: git + password: "secure password" + host: localhost +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_staging +- username: git +- password: "secure password" +- host: localhost + + # Warning: The database defined as "test" will be erased and + # re-generated from your development database when you run "rake". +@@ -80,10 +59,3 @@ test: &test + prepared_statements: false + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_test +- username: postgres +- password: +- host: localhost +-- +2.36.0 + diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 40d678bf7bbed..dce348e9f2d06 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.0.0", - "repo_hash": "sha256-+ZLHo35BhgWlopuwrVGiMvcWl8qUvHUV2kAEIXWazyY=", - "yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr", + "version": "15.1.2", + "repo_hash": "sha256-gZCKI2OXKQZzRe3T/nbnRC0qFHnOBVOAST+ky0qmJDc=", + "yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.0.0-ee", + "rev": "v15.1.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.0.0", - "GITLAB_PAGES_VERSION": "1.58.0", - "GITLAB_SHELL_VERSION": "14.3.0", - "GITLAB_WORKHORSE_VERSION": "15.0.0" + "GITALY_SERVER_VERSION": "15.1.2", + "GITLAB_PAGES_VERSION": "1.59.0", + "GITLAB_SHELL_VERSION": "14.7.4", + "GITLAB_WORKHORSE_VERSION": "15.1.2" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index e5765bb78423c..73a02673471f4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -59,9 +59,17 @@ let nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ]; - # Since version 12.6.0, the rake tasks need the location of git, - # so we have to apply the location patches here too. - patches = [ ./remove-hardcoded-locations.patch ]; + patches = [ + # Since version 12.6.0, the rake tasks need the location of git, + # so we have to apply the location patches here too. + ./remove-hardcoded-locations.patch + + # Gitlab edited the default database config since [1] and the + # installer complains about valid keywords only being "main" and "ci". + # + # [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028 + ./Remove-geo-from-database.yml.patch + ]; # One of the patches uses this variable - if it's unset, execution # of rake tasks fails. GITLAB_LOG_PATH = "log"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index cc5344f8e87af..3616864ad7e6d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -115,7 +115,7 @@ GEM minitest (5.15.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) @@ -249,4 +249,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.1.4 + 2.3.15 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index aa53fc5171c32..44068644cc6cd 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,8 +11,8 @@ let gemdir = ./.; }; - version = "15.0.0"; - package_version = "v14"; + version = "15.1.2"; + package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; in @@ -24,10 +24,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-ib/gGkXo6W6LZ6j92oUMhJWdDYZRnA1p+tsOK6ewemk="; + sha256 = "sha256-g/SlrE/NVMYqZaEgKncMLjsfI8jAE0xfyy6rpShsi2Q="; }; - vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw="; + vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index ccf444330af36..1697a9f90200c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -493,10 +493,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 3888b0ba1104b..37d66c3a7f656 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.3.0"; + version = "14.7.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-SFoNtWcY0iJREsA+vZRsVJHmNb2vNvOiBJnochxA/Us="; + sha256 = "sha256-kLIjlMwoK1AlhvP38OspXnIWbdOcaLl4r05PiUmqnWw="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-eSzJon8o7ktV3rFuTE1A4tzdkBzWBZf1JxnrcMj5s00="; + vendorSha256 = "sha256-f2IkdkTZhve/cYKSH+N2Y5bXFSHuQ8t4hjfReyKTPUU="; 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 d67e8bf4d445e..ec0a2f8e99ee3 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.0.0"; + version = "15.1.2"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-7hNwBCDMdiiOliZa/lkYLo8gyAksAU0HanCSyaAMYLs="; + vendorSha256 = "sha256-cF2wVii/uBqlUQvrbDyPlv4tnfKA45deb/sE0c9U7Tk="; 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 cbb4d6f90c0fb..9f5c0e4cbfd8d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'rails', '~> 6.1.4.7' -gem 'bootsnap', '~> 1.9.4', require: false +gem 'bootsnap', '~> 1.12.0', require: false # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -17,7 +17,7 @@ gem 'view_component', '~> 2.50.0' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.1' +gem 'pg', '~> 1.3.0' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.0' @@ -55,7 +55,7 @@ gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect' gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.16.0' +gem 'rack-oauth2', '~> 1.19.0' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only @@ -97,10 +97,10 @@ gem 'net-ldap', '~> 0.16.3' # API gem 'grape', '~> 1.5.2' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' +gem 'rack-cors', '~> 1.1.0', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.11.10' +gem 'graphql', '~> 1.13.12' gem 'graphiql-rails', '~> 1.8' gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] @@ -121,7 +121,7 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.12' +gem 'fog-aws', '~> 3.14' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' @@ -130,7 +130,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -167,10 +167,10 @@ gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false -gem 'rouge', '~> 3.27.0' +gem 'rouge', '~> 3.29.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.12' +gem 'nokogiri', '~> 1.13.6' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -181,9 +181,9 @@ gem 'diffy', '~> 3.3' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.3' -# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' +gem 'rack', '~> 2.2.3.0' +# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually +gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.6.2', require: false @@ -219,7 +219,7 @@ gem 'ruby-progressbar', '~> 1.10' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.2.0' +gem 're2', '~> 1.4.0' # Misc @@ -301,7 +301,7 @@ gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.1.0' # Protect against bruteforcing -gem 'rack-attack', '~> 6.3.0' +gem 'rack-attack', '~> 6.6.0' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -311,12 +311,12 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1' +gem 'pg_query', '~> 2.1.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.22.0' +gem 'gitlab-labkit', '~> 0.23.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -344,7 +344,7 @@ gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client' gem 'warning', '~> 1.2.0' group :development do - gem 'lefthook', '~> 0.7.0', require: false + gem 'lefthook', '~> 0.8.0', require: false gem 'rubocop' gem 'solargraph', '~> 0.44.3', require: false @@ -381,7 +381,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 7.0.0', require: false + gem 'gitlab-styles', '~> 7.1.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -402,10 +402,12 @@ group :development, :test do gem 'test_file_finder', '~> 0.1.3' gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' + + gem 'pact', '~> 1.12' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.0', require: false + gem 'gitlab-dangerfiles', '~> 3.4.0', require: false end group :development, :test, :coverage do @@ -477,13 +479,13 @@ gem 'sys-filesystem', '~> 1.4.3' gem 'net-ntp' # SSH keys support -gem 'ssh_data', '~> 1.2' +gem 'ssh_data', '~> 1.3' # Spamcheck GRPC protocol definitions gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.10.0-rc1' +gem 'gitaly', '~> 15.1.0-rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -503,7 +505,7 @@ gem 'gitlab-experiment', '~> 0.7.1' # Structured logging gem 'lograge', '~> 0.5' -gem 'grape_logging', '~> 1.7' +gem 'grape_logging', '~> 1.8' # DNS Lookup gem 'gitlab-net-dns', '~> 0.9.1' @@ -545,3 +547,5 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' gem 'ipynbdiff', '0.4.7' + +gem 'ed25519', '~> 1.3.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 4f5d0e36ab33e..535e470372c6d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -143,8 +143,8 @@ GEM rack (>= 0.9.0) bindata (2.4.10) binding_ninja (0.2.3) - bootsnap (1.9.4) - msgpack (~> 1.0) + bootsnap (1.12.0) + msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) @@ -214,10 +214,10 @@ GEM creole (0.5.0) crystalball (0.7.0) git - css_parser (1.7.0) + css_parser (1.11.0) addressable daemons (1.3.1) - danger (8.5.0) + danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -306,6 +306,7 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) + ed25519 (1.3.0) elasticsearch (7.13.3) elasticsearch-api (= 7.13.3) elasticsearch-transport (= 7.13.3) @@ -360,7 +361,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.2.0) + faraday-http-cache (2.4.0) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.3) @@ -387,6 +388,8 @@ GEM rake ffi-yajl (2.3.4) libyajl2 (~> 1.2) + filelock (1.1.1) + find_a_port (1.0.1) flipper (0.21.0) flipper-active_record (0.21.0) activerecord (>= 5.0, < 7) @@ -402,11 +405,10 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.12.0) + fog-aws (3.14.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (2.1.0) builder excon (~> 0.58) @@ -458,7 +460,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.10.0.pre.rc1) + gitaly (15.1.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -466,21 +468,21 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.0.0) + gitlab-dangerfiles (3.4.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.2.0) + gitlab-fog-azure-rm (1.3.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.22.0) + gitlab-labkit (0.23.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (>= 1.37) @@ -505,7 +507,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) - gitlab-styles (7.0.0) + gitlab-styles (7.1.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.10) @@ -564,7 +566,7 @@ GEM grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) - grape_logging (1.8.3) + grape_logging (1.8.4) grape rack graphiql-rails (1.8.0) @@ -574,7 +576,7 @@ GEM faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.11.10) + graphql (1.13.12) graphql-client (0.17.0) activesupport (>= 3.0) graphql (~> 1.10) @@ -715,7 +717,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (0.7.5) + lefthook (0.8.0) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -777,7 +779,7 @@ GEM faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) - msgpack (1.5.1) + msgpack (1.5.2) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -798,7 +800,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -852,8 +854,8 @@ GEM addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) omniauth (~> 1.2) - omniauth-dingtalk-oauth2 (1.0.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-dingtalk-oauth2 (1.0.1) + omniauth-oauth2 (~> 1.7) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.4.0) @@ -908,22 +910,45 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - parallel (1.20.1) - parser (3.0.3.2) + pact (1.59.0) + pact-mock_service (~> 3.0, >= 3.3.1) + pact-support (~> 1.15) + rack-test (>= 0.6.3, < 2.0.0) + rspec (~> 3.0) + term-ansicolor (~> 1.0) + thor (>= 0.20, < 2.0) + webrick (~> 1.3) + pact-mock_service (3.6.2) + filelock (~> 1.1) + find_a_port (~> 1.0.1) + json + pact-support (~> 1.12, >= 1.12.0) + rack (~> 2.0) + rspec (>= 2.14) + term-ansicolor (~> 1.0) + thor (>= 0.19, < 2.0) + webrick (~> 1.3) + pact-support (1.15.1) + awesome_print (~> 1.1) + randexp (~> 0.1.7) + rspec (>= 2.14) + term-ansicolor (~> 1.0) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.2.3) - pg_query (2.1.1) - google-protobuf (>= 3.17.1) + pg (1.3.5) + pg_query (2.1.3) + google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) - premailer (1.11.1) + premailer (1.16.0) addressable css_parser (>= 1.6.0) htmlentities (>= 4.0.0) @@ -947,7 +972,7 @@ GEM pry (~> 0.13.0) tty-markdown tty-prompt - public_suffix (4.0.6) + public_suffix (4.0.7) puma (5.6.2) nio4r (~> 2.0) puma_worker_killer (0.3.1) @@ -956,14 +981,14 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (6.3.0) + rack-attack (6.6.1) rack (>= 1.0, < 3) - rack-cors (1.0.6) - rack (>= 1.6.0) - rack-oauth2 (1.16.0) + rack-cors (1.1.1) + rack (>= 2.0.0) + rack-oauth2 (1.19.0) activesupport attr_required httpclient @@ -973,7 +998,7 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rack-timeout (0.5.2) + rack-timeout (0.6.0) rails (6.1.4.7) actioncable (= 6.1.4.7) actionmailbox (= 6.1.4.7) @@ -1007,8 +1032,9 @@ GEM method_source rake (>= 0.13) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) + randexp (0.1.7) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1019,7 +1045,7 @@ GEM rbtree (0.4.4) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.2.0) + re2 (1.4.0) recaptcha (4.13.1) json recursive-open-struct (1.1.3) @@ -1035,7 +1061,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.2.1) + regexp_parser (2.5.0) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) @@ -1057,7 +1083,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (3.27.0) + rouge (3.29.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1112,11 +1138,11 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.13.0) + rubocop-graphql (0.14.3) rubocop (>= 0.87, < 2) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) @@ -1253,7 +1279,7 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.2) - ssh_data (1.2.0) + ssh_data (1.3.0) ssrf_filter (1.0.7) stackprof (0.2.15) state_machines (0.5.0) @@ -1272,11 +1298,14 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) + sync (0.5.0) sys-filesystem (1.4.3) ffi (~> 1.1) sysexits (1.2.0) tanuki_emoji (0.6.0) 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) terser (1.0.2) @@ -1295,6 +1324,8 @@ GEM timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) + tins (1.31.0) + sync toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) @@ -1341,7 +1372,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) unleash (3.2.2) @@ -1403,7 +1434,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.1) yard (0.9.26) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby @@ -1435,7 +1466,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) - bootsnap (~> 1.9.4) + bootsnap (~> 1.12.0) bootstrap_form (~> 4.2.0) browser (~> 4.2) bullet (~> 6.1.3) @@ -1464,6 +1495,7 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) + ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) elasticsearch-rails (~> 7.2) @@ -1481,7 +1513,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.21.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.12) + fog-aws (~> 3.14) fog-core (= 2.1.0) fog-google (~> 1.15) fog-local (~> 0.6) @@ -1492,13 +1524,13 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.10.0.pre.rc1) + gitaly (~> 15.1.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.0) + gitlab-dangerfiles (~> 3.4.0) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.2.0) - gitlab-labkit (~> 0.22.0) + gitlab-fog-azure-rm (~> 1.3.0) + gitlab-labkit (~> 0.23.0) gitlab-license (~> 2.1.0) gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) @@ -1506,7 +1538,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.9.0) gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 7.0.0) + gitlab-styles (~> 7.1.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1516,10 +1548,10 @@ DEPENDENCIES grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.0) - grape_logging (~> 1.7) + grape_logging (~> 1.8) graphiql-rails (~> 1.8) graphlient (~> 0.5.0) - graphql (~> 1.11.10) + graphql (~> 1.13.12) graphql-docs (~> 1.6.0) grpc (~> 1.42.0) gssapi @@ -1547,7 +1579,7 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.2) - lefthook (~> 0.7.0) + lefthook (~> 0.8.0) letter_opener_web (~> 2.0.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) @@ -1563,7 +1595,7 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - nokogiri (~> 1.12) + nokogiri (~> 1.13.6) oauth2 (~> 1.4) octokit (~> 4.15) ohai (~> 16.10) @@ -1588,11 +1620,12 @@ DEPENDENCIES omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0) org-ruby (~> 0.9.12) + pact (~> 1.12) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.1) - pg_query (~> 2.1) + pg (~> 1.3.0) + pg_query (~> 2.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.15.0) @@ -1601,19 +1634,19 @@ DEPENDENCIES pry-shell (~> 0.5.0) puma (~> 5.6.2) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.3) - rack-attack (~> 6.3.0) - rack-cors (~> 1.0.6) - rack-oauth2 (~> 1.16.0) + rack (~> 2.2.3.0) + rack-attack (~> 6.6.0) + rack-cors (~> 1.1.0) + rack-oauth2 (~> 1.19.0) rack-proxy (~> 0.7.2) - rack-timeout (~> 0.5.1) + rack-timeout (~> 0.6.0) rails (~> 6.1.4.7) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.2.0) + re2 (~> 1.4.0) recaptcha (~> 4.11) redis (~> 4.4.0) redis-actionpack (~> 5.2.0) @@ -1622,7 +1655,7 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 3.27.0) + rouge (~> 3.29.0) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) rspec-parameterized @@ -1665,7 +1698,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) - ssh_data (~> 1.2) + ssh_data (~> 1.3) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 87791ff567532..5f11d60987854 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -577,10 +577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n"; + sha256 = "0yza43f42v0ys81y6jzbqfkdykf40h6l3yyvadwq32fswrbpwvbc"; type = "gem"; }; - version = "1.9.4"; + version = "1.12.0"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -930,10 +930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.7.0"; + version = "1.11.0"; }; daemons = { groups = ["default" "development"]; @@ -951,10 +951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg"; + sha256 = "1n6zbkkinlv2hp4ig5c170d1ckbbdf8rgxmykfm3m3gn865vapnr"; type = "gem"; }; - version = "8.5.0"; + version = "8.6.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1283,6 +1283,16 @@ }; version = "0.3.0"; }; + ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; + type = "gem"; + }; + version = "1.3.0"; + }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; groups = ["default"]; @@ -1537,14 +1547,14 @@ }; faraday-http-cache = { dependencies = ["faraday"]; - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; + sha256 = "143cpzdrnyqyfv1jasr0qjqgm57dhv46nsf5f2s06ndxccfr13rq"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; faraday-httpclient = { groups = ["danger" "default" "development" "test"]; @@ -1712,6 +1722,26 @@ }; version = "2.3.4"; }; + filelock = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "085vrb6wf243iqqnrrccwhjd4chphfdsybkvjbapa2ipfj1ja1sj"; + type = "gem"; + }; + version = "1.1.1"; + }; + find_a_port = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sswgpvn38yav4i21adrr7yy8c8299d7rj065gd3iwg6nn26lpb0"; + type = "gem"; + }; + version = "1.0.1"; + }; flipper = { groups = ["default"]; platforms = []; @@ -1767,15 +1797,15 @@ version = "0.3.3"; }; fog-aws = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + dependencies = ["fog-core" "fog-json" "fog-xml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl9b93mwhzm9fp0lmac1vzz359g3sq52k06kn0a0vnvxrxnhzjm"; + sha256 = "1gsb26a1jp0k7hclry0dai2a9m77a9h6ybc17x0i98z2ivzjsi07"; type = "gem"; }; - version = "3.12.0"; + version = "3.14.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1967,10 +1997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di"; + sha256 = "0ygf5di1sl8b3gs7ascn3r9carf6v8d9c3damc10sh81sm7bwc0z"; type = "gem"; }; - version = "14.10.0.pre.rc1"; + version = "15.1.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -2010,10 +2040,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i"; + sha256 = "13c7k36xq042fbf7d9jwgfc30zq9dfziwvqfi88h2199v9dkylix"; type = "gem"; }; - version = "3.0.0"; + version = "3.4.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2032,10 +2062,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi9v0zy863gnk17w0fp1ks2kr1s2z6q0bkx5wdbq6yawycjs94h"; + sha256 = "1d8plrl69q5mcsgz8ywhw7k9q0g31y3gm6h90gw9apsisqbm7vrg"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2043,10 +2073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj"; + sha256 = "0kiz2m3dw6ld2z6dsl8jh2ycw061wv8wiy34flymb5zqjiyyzw8l"; type = "gem"; }; - version = "0.22.0"; + version = "0.23.0"; }; gitlab-license = { groups = ["default"]; @@ -2127,10 +2157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10fmvx2vx2v0mbwv5d4wcpc2iyp5y8lwxn9hjpzkk5bvxkk4c493"; + sha256 = "0xp2f1bbx8i7a89xjwy6b5rhxr9g1vnms68chcnxdd95csxhxpzp"; type = "gem"; }; - version = "7.0.0"; + version = "7.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2280,10 +2310,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x6cmmj0wi1m689r8d4yhyhpl8dwj5skn8b29igm4xvw3swkg94x"; + sha256 = "1lcjqwal3wc2r41wsi01d09cyhxhglxp6y7hd0564pdx5lr3xk7g"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.4"; }; graphiql-rails = { dependencies = ["railties" "sprockets-rails"]; @@ -2312,10 +2342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qb6bk8gflwid4qrk2i9ndzs5fxycdjvxmhy9w547lglzb5jx19b"; + sha256 = "1hvsv6ig6d8syr4vasa8vcc090kbawwflk5m1j6kl681y9n6d0hx"; type = "gem"; }; - version = "1.11.10"; + version = "1.13.12"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2899,10 +2929,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07r76qlzxcz9y4dmkqf8k4khkfq7s2v22dcq6b0w0v4cfiwqva3h"; + sha256 = "05ykgpj6cka9vprvrk37ixyhj2pdw7a9m6bq645yai6ihghahlf0"; type = "gem"; }; - version = "0.7.5"; + version = "0.8.0"; }; letter_opener = { dependencies = ["launchy"]; @@ -3226,10 +3256,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; + sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; multi_json = { groups = ["default"]; @@ -3401,10 +3431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3574,10 +3604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8"; + sha256 = "16qkd51f1ab1hw4az27qj3vk958aal67by8djsplwd1q3h7nfib5"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; @@ -3803,15 +3833,48 @@ }; version = "1.1.1"; }; + pact = { + dependencies = ["pact-mock_service" "pact-support" "rack-test" "rspec" "term-ansicolor" "thor" "webrick"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ngwc4zrp6jxpb8s0y07xxic492a1n0akjxd7x4hks2fbsiwwwk2"; + type = "gem"; + }; + version = "1.59.0"; + }; + pact-mock_service = { + dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0izmf5h0n1mcrfk6qlz61rhzdjs6h0bkqrx6ndp8nhmfhja254fc"; + type = "gem"; + }; + version = "3.6.2"; + }; + pact-support = { + dependencies = ["awesome_print" "randexp" "rspec" "term-ansicolor"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07qxvxy48im9vlswqspsh2k6fy6rsmi3409863ww8y7yx5pmjr63"; + type = "gem"; + }; + version = "1.15.1"; + }; parallel = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.20.1"; + version = "1.22.1"; }; parser = { dependencies = ["ast"]; @@ -3819,10 +3882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di"; + sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; type = "gem"; }; - version = "3.0.3.2"; + version = "3.1.2.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3861,10 +3924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.5"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -3872,10 +3935,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r"; + sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.3"; }; plist = { groups = ["default"]; @@ -3914,10 +3977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h"; + sha256 = "11j7d6abxivj15yax47z3f751wz4pnl02qszzc9swswf8hn41r03"; type = "gem"; }; - version = "1.11.1"; + version = "1.16.0"; }; premailer-rails = { dependencies = ["actionmailer" "premailer"]; @@ -4000,14 +4063,14 @@ version = "0.5.0"; }; public_suffix = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puma = { dependencies = ["nio4r"]; @@ -4062,14 +4125,14 @@ version = "1.6.0"; }; rack = { - groups = ["default" "development" "kerberos" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.3.1"; }; rack-accept = { dependencies = ["rack"]; @@ -4088,10 +4151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15b8lk54j2abqhpn588b1wvbzwmxwa7iql6241kxpjc0gyb51p0z"; + sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; type = "gem"; }; - version = "6.3.0"; + version = "6.6.1"; }; rack-cors = { dependencies = ["rack"]; @@ -4099,10 +4162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07dppmm1ah1gs31sb5byrkkady9vqzwjmpd92c8425nc6yzwknik"; + sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.1"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -4110,10 +4173,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k"; + sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; rack-proxy = { dependencies = ["rack"]; @@ -4142,10 +4205,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d4dgbf8rgqx03lwsm8j6i20lzawk1bsvzfj5bhzrsycfyfk25aj"; + sha256 = "16ahj3qz3xhfrwvqb4nf6cfzvliigg0idfsp5jyr8qwk676d2f30"; type = "gem"; }; - version = "0.5.2"; + version = "0.6.0"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -4214,14 +4277,14 @@ version = "6.1.4.7"; }; rainbow = { - groups = ["default" "development" "test"]; + groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rake = { groups = ["default" "development" "test"]; @@ -4233,6 +4296,16 @@ }; version = "13.0.6"; }; + randexp = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j742j7g107jgkvpsfq2b10d5xhsni5s8vxrp518d3karw7529ih"; + type = "gem"; + }; + version = "0.1.7"; + }; rb-fsevent = { groups = ["default" "development" "test"]; platforms = []; @@ -4300,10 +4373,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16q71cc9wx342c697q18pkz19ym4ncjd97hcw4v6f1mgflkdv400"; + sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; recaptcha = { dependencies = ["json"]; @@ -4395,10 +4468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; type = "gem"; }; - version = "2.2.1"; + version = "2.5.0"; }; regexp_property_values = { groups = ["default"]; @@ -4510,10 +4583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; + sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r"; type = "gem"; }; - version = "3.27.0"; + version = "3.29.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4674,10 +4747,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; + sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl"; type = "gem"; }; - version = "1.4.1"; + version = "1.18.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4696,10 +4769,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18md69dkz0s5xm93c4psmvy4c0nx3a7yi61vfjn46cw6yk54fm7b"; + sha256 = "1yam7fdm77y0x6b6i7v14iiji9020mvdd9h1ainvv88zbv8yd4wq"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.3"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5330,10 +5403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs"; + sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; ssrf_filter = { groups = ["default"]; @@ -5419,6 +5492,16 @@ }; version = "1.3.0"; }; + sync = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; + type = "gem"; + }; + version = "0.5.0"; + }; sys-filesystem = { dependencies = ["ffi"]; groups = ["default"]; @@ -5460,6 +5543,17 @@ }; version = "0.8.2"; }; + term-ansicolor = { + dependencies = ["tins"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; + type = "gem"; + }; + version = "1.7.1"; + }; terminal-table = { dependencies = ["unicode-display_width"]; groups = ["default" "development"]; @@ -5584,6 +5678,17 @@ }; version = "0.8.3"; }; + tins = { + dependencies = ["sync"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153q7j2nj7y43iscbfcihmwlcydx6sbd65azs27kain0gncymd90"; + type = "gem"; + }; + version = "1.31.0"; + }; toml-rb = { dependencies = ["citrus"]; groups = ["default"]; @@ -5776,14 +5881,14 @@ version = "0.0.8"; }; unicode-display_width = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; unicode_utils = { groups = ["default"]; @@ -6084,9 +6189,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.4"; + version = "2.6.0"; }; } diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index e9712a859d74d..f5cf29fc4d0ec 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages }: +{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages, nixosTests }: stdenv.mkDerivation rec { pname = "gitolite"; @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { echo ${version} > $out/bin/VERSION ''; + passthru.tests = { + gitolite = nixosTests.gitolite; + }; + meta = with lib; { description = "Finely-grained git repository hosting"; homepage = "https://gitolite.com/gitolite/index.html"; diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix index 3737828ef720d..d8b4427364175 100644 --- a/pkgs/applications/version-management/gitqlient/default.nix +++ b/pkgs/applications/version-management/gitqlient/default.nix @@ -8,14 +8,46 @@ mkDerivation rec { pname = "gitqlient"; - version = "1.4.3"; + version = "1.5.0"; - src = fetchFromGitHub { - owner = "francescmm"; - repo = pname; - rev = "v${version}"; - sha256 = "018jz6b28zwr205jmgw13ddlfvlhxqf0cw1pfjiwsi6i8gay7w6s"; - }; + srcs = [ + (fetchFromGitHub { + owner = "francescmm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw="; + }) + (fetchFromGitHub rec { + owner = "francescmm"; + repo = "AuxiliarCustomWidgets"; + rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1"; + sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA="; + name = repo; + }) + (fetchFromGitHub rec { + owner = "francescmm"; + repo = "QLogger"; + rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f"; + sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4="; + name = repo; + }) + (fetchFromGitHub rec { + owner = "francescmm"; + repo = "QPinnableTabWidget"; + rev = "cc937794e910d0452f0c07b4961c6014a7358831"; + sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE="; + name = repo; + }) + (fetchFromGitHub rec { + owner = "francescmm"; + repo = "git"; + rev = "b62750f4da4b133faff49e6f53950d659b18c948"; + sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs="; + name = repo; + }) + ]; + + sourceRoot = "source"; nativeBuildInputs = [ qmake @@ -25,11 +57,21 @@ mkDerivation rec { qtwebengine ]; + postUnpack = '' + for dep in AuxiliarCustomWidgets QPinnableTabWidget QLogger git; do + rmdir "source/src/$dep" + ln -sf "../../$dep" "source/src/$dep" + done + ''; + qmakeFlags = [ "GitQlient.pro" ]; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; meta = with lib; { homepage = "https://github.com/francescmm/GitQlient"; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index f70034082caeb..91b33d0b1e04e 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -8,16 +8,16 @@ with lib; buildGoModule rec { pname = "gogs"; - version = "0.12.6"; + version = "0.12.9"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "sha256-nAMnsRYYS5bZhLDzPdC4sj3rv1kPjckFnLoORY1HqW8="; + sha256 = "sha256-oXIA0JY7+pfXk5RnHWCJEkU9bL+ZIc2oXQrLwa1XHMg="; }; - vendorSha256 = "sha256-U8rzYSLD9XeO5ai3p3OG74kPRI2IAlvOeZhU1Pa1BAI="; + vendorSha256 = "sha256-5AnQ7zF2UK1HNoyr6gwFdVv+KMJEGkjKPpDEpUXckUg="; subPackages = [ "." ]; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index f38bb042c435f..cc00794ba7ad4 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.69"; + version = "0.73"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "1cnl0yk866wzjwgas587kvb08njq7db71b5xqsdrwd1varp010vm"; + sha256 = "0x583h9f6jnqfwy48b43s1myrgbngn128m4ivmf9gcsvfiz3lxgh"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index f8f58cdcaba29..88af6b0ceae5e 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , gettext , itstool , python3 @@ -19,32 +18,15 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.21.1"; + version = "3.21.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; + sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4="; }; - patches = [ - # Pull upstream fix for meson-0.60: - # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78 - (fetchpatch { - name = "meson-0.60.patch"; - url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; - sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; - }) - - # Fix view not rendering with adwaita-icon-theme 42 due to removed icons. - # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch"; - sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 96dc830248857..98e415704cce8 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.1.2"; + version = "6.1.4"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-pSgQ/AFAmCjEl00Lwsu1yA6UjVtYTPsadpliPpJKLyo="; + sha256 = "sha256-82H5gCs241esAZzrcSyhHegzKwfere7Y36kE8Fv3yng="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-OSaeOp+SjQ5n61jV8UthtQQqkneBYJhESoQDCwRSTco="; + sha256 = "sha256-GEsRA8od2S9v5xipCwsCmkdLvKKpbbKJGNqPFmrZASQ="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -91,7 +91,7 @@ let homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lukegb pacien ]; + maintainers = with maintainers; [ eelco lukegb pacien techknowlogick ]; platforms = platforms.unix; }; }; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 7091f0fbc6f9c..4f61be6669aa1 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Command-Line Client"; homepage = "https://www.perforce.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ corngood ]; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 2e0e01e5c9862..9c804a7459b49 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -76,6 +76,7 @@ in stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; homepage = "https://www.perforce.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ nathyong nioncode ]; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index f4fa942a48430..1841e4ffe2241 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.1"; + version = "1.0.0-beta.2"; src = fetchCrate { inherit version pname; - sha256 = "sha256-XdbZFWtHKXjcGV1vYn7MYdevW+Vc/IKON1DOU49Kzlo="; + sha256 = "sha256-78nzCOR+AZuiAA1OpKKW4kfdUnlN8+qVaO3dknMck58="; }; - cargoSha256 = "sha256-9kPeJ0tOhA4oqFOdwGDkXMnNViklMlNO7VbbWXYrk3I="; + cargoSha256 = "sha256-IhjN0HjIIuP+P8yfZ3NmZpVZBAuetOr4OVZoI8Qfspo="; doCheck = false; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix deleted file mode 100644 index edb2825d49c3c..0000000000000 --- a/pkgs/applications/version-management/sit/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, - # Darwin - libiconv, CoreFoundation, Security }: - -rustPlatform.buildRustPackage rec { - pname = "sit"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "sit-fyi"; - repo = "sit"; - rev = "v${version}"; - sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libzip gnupg ] - ++ (lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - cargoSha256 = "1ghr01jcq12ddna5qadvjy6zbgqgma5nf0qv06ayxnra37d2l92l"; - - meta = with lib; { - description = "Serverless Information Tracker"; - homepage = "https://sit.fyi/"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir yrashk ]; - # Upstream has not had a release in several years, and dependencies no - # longer compile with the latest Rust compiler. - broken = true; - }; -} diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 350afd07fe196..b8f9a0f1522a3 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,7 +1,7 @@ { lib , fetchFromSourcehut -, buildPythonPackage , buildGoModule +, buildPythonPackage , srht , redis , celery @@ -9,21 +9,29 @@ , markdown , ansi2html , python +, unzip }: let - version = "0.75.2"; + version = "0.81.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - sha256 = "sha256-SwyxMzmp9baRQ0vceuEn/OpfIv7z7jwq/l67hdOHXjM="; + sha256 = "sha256-oUSzanRFZ2dQTgm/VuNhqUaUAPq7ffxR7OtBKtE61DE="; }; - buildWorker = src: buildGoModule { + buildsrht-api = buildGoModule ({ inherit src version; - pname = "builds-sr-ht-worker"; + pname = "buildsrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-roTwqtg4Y846PNtLdRN/LV3Jd0LVElqjFy3DJcrwoaI="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + buildsrht-worker = buildGoModule { + inherit src version; + sourceRoot = "source/worker"; + pname = "buildsrht-worker"; vendorSha256 = "sha256-Pf1M9a43eK4jr6QMi6kRHA8DodXQU0pqq9ua5VC3ER0="; }; in @@ -31,10 +39,10 @@ buildPythonPackage rec { inherit src version; pname = "buildsrht"; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch - ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api worker" "" + ''; nativeBuildInputs = srht.nativeBuildInputs; @@ -58,7 +66,8 @@ buildPythonPackage rec { cp -r images $out/lib cp contrib/submit_image_build $out/bin/builds.sr.ht - cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker + ln -s ${buildsrht-api}/bin/api $out/bin/buildsrht-api + ln -s ${buildsrht-worker}/bin/worker $out/bin/buildsrht-worker ''; pythonImportsCheck = [ "buildsrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 805da8c32821f..ff56c62c62e99 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,5 +1,5 @@ { lib -, fetchgit +, fetchFromSourcehut , fetchNodeModules , buildPythonPackage , pgpy @@ -29,12 +29,13 @@ buildPythonPackage rec { pname = "srht"; - version = "0.68.14"; + version = "0.69.0"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "core.sr.ht"; rev = version; - sha256 = "sha256-BY3W2rwrg0mhH3CltgUqg6Xv8Ve5VZNY/lI1cfbAjYM="; + sha256 = "sha256-s/I0wxtPggjTkkTZnhm77PxdQjiT0Vq2MIk7JMvdupc="; fetchSubmodules = true; }; @@ -47,6 +48,8 @@ buildPythonPackage rec { patches = [ # Disable check for npm ./disable-npm-install.patch + # Fix Unix socket support in RedisQueueCollector + patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch ]; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 00810f208cc57..aee65dee3bbb8 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -2,6 +2,7 @@ , openssl , callPackage , recurseIntoAttrs +, nixosTests }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -44,4 +45,7 @@ with python.pkgs; recurseIntoAttrs { pagessrht = pagessrht; pastesrht = toPythonApplication pastesrht; todosrht = toPythonApplication todosrht; + passthru.tests = { + nixos-sourcehut = nixosTests.sourcehut; + }; } diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix new file mode 100644 index 0000000000000..629d767a1caf8 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -0,0 +1,32 @@ +{ unzip +, gqlgenVersion ? "0.17.2" +}: +{ + overrideModAttrs = (_: { + # No need to workaround -trimpath: it's not used in go-modules, + # but do download `go generate`'s dependencies nonetheless. + preBuild = '' + go generate ./loaders + go generate ./graph + ''; + }); + + # Workaround this error: + # go: git.sr.ht/~emersion/go-emailthreads@v0.0.0-20220412093310-4fd792e343ba: module lookup disabled by GOPROXY=off + # tidy failed: go mod tidy failed: exit status 1 + # graph/generate.go:10: running "go": exit status 1 + proxyVendor = true; + + nativeBuildInputs = [ unzip ]; + + # Workaround -trimpath in the package derivation: + # https://github.com/99designs/gqlgen/issues/1537 + # This is to give `go generate ./graph` access to gqlgen's *.gotpl files + # If it fails, the gqlgenVersion may have to be updated. + preBuild = '' + unzip ''${GOPROXY#"file://"}/github.com/99designs/gqlgen/@v/v${gqlgenVersion}.zip + go generate ./loaders + go generate ./graph + rm -rf github.com + ''; +} diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 318bee4cf5177..1f76e5cb65f8f 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,57 +1,67 @@ { lib , fetchFromSourcehut -, buildPythonPackage , buildGoModule +, buildPythonPackage , python , srht , pygit2 , scmsrht +, unzip }: let - version = "0.77.3"; + version = "0.78.20"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - sha256 = "sha256-eJvXCcmdiUzTK0EqNJkLEZsAfr6toD/378HObnMbOWM="; + sha256 = "sha256-rZsTtHobsgRVmMOjPa1fiKrPsNyFu/gOsmO0cTl5MqQ="; }; - buildShell = src: buildGoModule { + gitApi = buildGoModule ({ inherit src version; - pname = "gitsrht-shell"; - vendorSha256 = "sha256-aqUFICp0C2reqb2p6JCPAUIRsxzSv0t9BHoNWrTYfqk="; - }; + pname = "gitsrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-cCs9FUBusaAou9w4TDOg8GKxhRcsPbSNcQpxvFH/+so="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); - buildDispatcher = src: buildGoModule { + gitDispatch = buildGoModule { inherit src version; - pname = "gitsrht-dispatcher"; + pname = "gitsrht-dispatch"; + modRoot = "gitsrht-dispatch"; vendorSha256 = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M="; }; - buildKeys = src: buildGoModule { + gitKeys = buildGoModule { inherit src version; pname = "gitsrht-keys"; + modRoot = "gitsrht-keys"; vendorSha256 = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4="; }; - buildUpdateHook = src: buildGoModule { + gitShell = buildGoModule { inherit src version; - pname = "gitsrht-update-hook"; - vendorSha256 = "sha256-sBlG7EFqdDm7CkAHVX50Mf4N3sl1rPNmWExG/bfbfGA="; + pname = "gitsrht-shell"; + modRoot = "gitsrht-shell"; + vendorSha256 = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI="; }; - updateHook = buildUpdateHook "${src}/gitsrht-update-hook"; + gitUpdateHook = buildGoModule { + inherit src version; + pname = "gitsrht-update-hook"; + modRoot = "gitsrht-update-hook"; + vendorSha256 = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc="; + }; in buildPythonPackage rec { inherit src version; pname = "gitsrht"; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch - ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" "" + ''; nativeBuildInputs = srht.nativeBuildInputs; @@ -68,14 +78,12 @@ buildPythonPackage rec { postInstall = '' mkdir -p $out/bin - cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell - cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch - cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys - cp ${updateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook + ln -s ${gitApi}/bin/api $out/bin/gitsrht-api + ln -s ${gitDispatch}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch + ln -s ${gitKeys}/bin/gitsrht-keys $out/bin/gitsrht-keys + ln -s ${gitShell}/bin/gitsrht-shell $out/bin/gitsrht-shell + ln -s ${gitUpdateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook ''; - passthru = { - inherit updateHook; - }; pythonImportsCheck = [ "gitsrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index f3e778b2f31bc..c1470c3fc5c6d 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,21 +1,44 @@ { lib -, fetchhg +, fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , hglib , scmsrht , unidiff , python +, unzip }: buildPythonPackage rec { pname = "hgsrht"; - version = "0.29.4"; + version = "0.31.3"; - src = fetchhg { - url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hg.sr.ht"; rev = version; - sha256 = "Jn9M/R5tJK/GeJDWGo3LWCK2nwsfI9zh+/yo2M+X6Sk="; + sha256 = "4Qe08gqsSTMQVQBchFPEUXuxM8ZAAQGJT1EOcDjkZa0="; + vc = "hg"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api hgsrht-keys" "" + ''; + + hgsrht-api = buildGoModule ({ + inherit src version; + pname = "hgsrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-uIP3W7UJkP68HJUF33kz5xfg/KBiaSwMozFYmQJQkys="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + + hgsrht-keys = buildGoModule { + inherit src version; + pname = "hgsrht-keys"; + modRoot = "hgsrht-keys"; + vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -32,6 +55,11 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + ln -s ${hgsrht-api}/bin/api $out/bin/hgsrht-api + ln -s ${hgsrht-keys}/bin/hgsrht-keys $out/bin/hgsrht-keys + ''; + pythonImportsCheck = [ "hgsrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 511ec359fc4b0..75d9efe5bd93d 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "hubsrht"; - version = "0.14.4"; + version = "0.14.14"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hub.sr.ht"; rev = version; - sha256 = "sha256-7HF+jykWGqzPWA0YtJZQZU7pnID1yexcqLkEf2HpnSs="; + sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 3ba6375a91380..d981598a7b19a 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,5 +1,6 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , asyncpg @@ -8,23 +9,31 @@ , emailthreads , redis , python +, unzip }: buildPythonPackage rec { pname = "listssrht"; - version = "0.51.7"; + version = "0.51.11"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "lists.sr.ht"; rev = version; - sha256 = "sha256-oNY5A98oVoL2JKO0fU/8YVl8u7ywmHb/RHD8A6z9yIM="; + sha256 = "sha256-Qb70oOazZfmHpC5r0oMYCFdvfAeKbq3mQA8+M56YYnY="; }; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch - ]; + listssrht-api = buildGoModule ({ + inherit src version; + pname = "listssrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip;}); + + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api" "" + ''; nativeBuildInputs = srht.nativeBuildInputs; @@ -42,6 +51,10 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + ln -s ${listssrht-api}/bin/api $out/bin/listssrht-api + ''; + pythonImportsCheck = [ "listssrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 8d43f297a4f88..530101d573520 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mansrht"; - version = "0.15.23"; + version = "0.15.26"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "man.sr.ht"; rev = version; - sha256 = "sha256-xrBptXdwMee+YkPup/BYL/iXBhCzSUQ5htSHIw/1Ncc="; + sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index ab19cc88d25ee..4572fc81b2889 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -16,32 +16,34 @@ , weasyprint , prometheus-client , python +, unzip }: let - version = "0.57.5"; + version = "0.58.18"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - sha256 = "sha256-qsCwZaCiqvY445U053OCWD98jlIUi9NB2jWVP2oW3Vk="; + sha256 = "sha256-OjbQHAzG2nZwpJUIvhKaCJWZbhZDC2R6C+SkbKUpk8o="; }; - buildApi = src: buildGoModule { + metasrht-api = buildGoModule ({ inherit src version; pname = "metasrht-api"; - vendorSha256 = "sha256-8Ubrr9qRlgW2wsLHrPHwulSWLz+gp4VPcTvOZpg8TYM="; - }; + modRoot = "api"; + vendorSha256 = "sha256-kiEuEYZFbwJ6SbKFtxH4SiRaZmqYriRHPoHdTX28+d0="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); in buildPythonPackage rec { pname = "metasrht"; inherit version src; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch - ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api" "" + ''; nativeBuildInputs = srht.nativeBuildInputs; @@ -68,7 +70,7 @@ buildPythonPackage rec { postInstall = '' mkdir -p $out/bin - cp ${buildApi "${src}/api/"}/bin/api $out/bin/metasrht-api + ln -s ${metasrht-api}/bin/api $out/bin/metasrht-api ''; pythonImportsCheck = [ "metasrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/applications/version-management/sourcehut/pages.nix index b6a18b5bda770..edb9379c6ded1 100644 --- a/pkgs/applications/version-management/sourcehut/pages.nix +++ b/pkgs/applications/version-management/sourcehut/pages.nix @@ -1,20 +1,26 @@ { lib , fetchFromSourcehut , buildGoModule +, unzip }: -buildGoModule rec { +buildGoModule (rec { pname = "pagessrht"; - version = "0.6.2"; + version = "0.7.4"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "pages.sr.ht"; rev = version; - sha256 = "sha256-ob0+t9V2o8lhVC6fXbi1rNm0Mnbs+GoyAmhBqVZ13PA="; + sha256 = "sha256-WM9T2LS8yIqaR0PQQRgMk/tiMYcw8DZVPMqMWkj/5RY="; }; - vendorSha256 = "sha256-b0sHSH0jkKoIVq045N96wszuLJDegkkj0v50nuDFleU="; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: server" "" + ''; + + vendorSha256 = "sha256-VOqY/nStqGyfWOXnJSZX8UYyp2kzcibQM2NRNysHYEc="; postInstall = '' mkdir -p $out/share/sql/ @@ -27,4 +33,6 @@ buildGoModule rec { license = licenses.agpl3Only; maintainers = with maintainers; [ eadwu ]; }; -} + # There is no ./loaders but this does not cause troubles + # to go generate +} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.9"; }) diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index c411f8e8c954a..e31473bd34361 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -8,15 +8,20 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.13.6"; + version = "0.13.8"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "paste.sr.ht"; rev = version; - sha256 = "sha256-Khcqk86iD9nxiKXN3+8mSLNoDau2qXNFOrLdkVu+rH8="; + sha256 = "sha256-Zji9FyYUtsklYz4qyLbtduusteC7WujLCMmvZKcqYis="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api" "" + ''; + nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch deleted file mode 100644 index ae8e95ddc0c2f..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 069b03f85847ed4a9223183b62ee53f420838911 Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Thu, 16 Dec 2021 04:54:24 +0100 -Subject: [PATCH builds.sr.ht] Revert "Add build submission and queue - monitoring" - -This reverts commit 690f1aa16c77e418dc40109cd5e8fdf4a7ed947a. - -This has broken Unix socket support for Redis -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - buildsrht/app.py | 3 --- - buildsrht/runner.py | 9 +-------- - 2 files changed, 1 insertion(+), 11 deletions(-) - -diff --git a/buildsrht/app.py b/buildsrht/app.py -index e5321a2..7c9977c 100644 ---- a/buildsrht/app.py -+++ b/buildsrht/app.py -@@ -36,9 +36,6 @@ class BuildApp(SrhtFlask): - self.register_blueprint(secrets) - self.register_blueprint(gql_blueprint) - -- from buildsrht.runner import builds_queue_metrics_collector -- self.metrics_registry.register(builds_queue_metrics_collector) -- - @self.context_processor - def inject(): - return { -diff --git a/buildsrht/runner.py b/buildsrht/runner.py -index 7773452..0389c8e 100644 ---- a/buildsrht/runner.py -+++ b/buildsrht/runner.py -@@ -5,13 +5,10 @@ from srht.config import cfg - from srht.database import db - from srht.email import send_email - from srht.oauth import UserType --from srht.metrics import RedisQueueCollector --from prometheus_client import Counter - - allow_free = cfg("builds.sr.ht", "allow-free", default="no") == "yes" - --builds_broker = cfg("builds.sr.ht", "redis") --runner = Celery('builds', broker=builds_broker, config_source={ -+runner = Celery('builds', broker=cfg("builds.sr.ht", "redis"), config_source={ - "CELERY_TASK_SERIALIZER": "json", - "CELERY_ACCEPT_CONTENT": ["json"], - "CELERY_RESULT_SERIALIZER": "json", -@@ -19,9 +16,6 @@ runner = Celery('builds', broker=builds_broker, config_source={ - "CELERY_TASK_PROTOCOL": 1 - }) - --builds_queue_metrics_collector = RedisQueueCollector(builds_broker, "buildsrht_builds", "Number of builds currently in queue") --builds_submitted = Counter("buildsrht_builds_submited", "Number of builds submitted") -- - def queue_build(job, manifest): - from buildsrht.types import JobStatus - job.status = JobStatus.queued -@@ -34,7 +28,6 @@ def queue_build(job, manifest): - cfg("sr.ht", "owner-email"), - "Cryptocurrency mining attempt on builds.sr.ht") - else: -- builds_submitted.inc() - run_build.delay(job.id, manifest.to_dict()) - - def requires_payment(user): --- -2.34.0 - diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch new file mode 100644 index 0000000000000..889331f3e07ff --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch @@ -0,0 +1,42 @@ +From 76dd636151735671be74ba9d55f773e190e22827 Mon Sep 17 00:00:00 2001 +From: Julien Moutinho <julm+srht@sourcephile.fr> +Date: Fri, 13 May 2022 22:40:46 +0200 +Subject: [PATCH core.sr.ht] Fix Unix socket support in RedisQueueCollector + +The broker URL is not necessarily in the format expected by Redis.from_url + +Especially, Redis.from_url supports this format for Unix sockets: + unix:///run/redis-sourcehut-metasrht/redis.sock?db=0 +See https://redis-py.readthedocs.io/en/stable/#redis.ConnectionPool.from_url + +Whereas Celery+Kombu support Redis but also other transports +and thus expect another scheme: + redis+socket:///run/redis-sourcehut-metasrht/redis.sock?virtual_host=1 +See https://docs.celeryproject.org/en/stable/userguide/configuration.html#redis-backend-settings +and https://github.com/celery/celery/blob/e5d99801e4b56a02af4a2e183879c767228d2817/celery/backends/redis.py#L299-L352 +and https://github.com/celery/kombu/blob/master/kombu/utils/url.py +--- + srht/metrics.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/srht/metrics.py b/srht/metrics.py +index 68caf8e..2df5777 100644 +--- a/srht/metrics.py ++++ b/srht/metrics.py +@@ -1,11 +1,12 @@ + import time ++from celery import Celery + from prometheus_client.metrics_core import GaugeMetricFamily + from redis import Redis, ResponseError + + + class RedisQueueCollector: + def __init__(self, broker, name, documentation, queue_name="celery"): +- self.redis = Redis.from_url(broker) ++ self.redis = Celery("collector", broker=broker).connection_for_read().channel().client + self.queue_name = queue_name + self.name = name + self.documentation = documentation +-- +2.35.1 + diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch deleted file mode 100644 index 4c526dd23e119..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5ccb5386304c26f25b0a9eb10ce9edb6da32f91a Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Sat, 12 Feb 2022 00:11:59 +0100 -Subject: [PATCH git.sr.ht] Revert "Add webhook queue monitoring" - -This reverts commit 7ea630b776947ab82438d0ffa263b0f9d33ebff3. - -Which has broken Unix socket support for Redis. -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - gitsrht/app.py | 3 --- - gitsrht/webhooks.py | 5 +---- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/gitsrht/app.py b/gitsrht/app.py -index e9ccb56..4928851 100644 ---- a/gitsrht/app.py -+++ b/gitsrht/app.py -@@ -48,9 +48,6 @@ class GitApp(ScmSrhtFlask): - self.add_template_filter(url_quote) - self.add_template_filter(commit_links) - -- from gitsrht.webhooks import webhook_metrics_collector -- self.metrics_registry.register(webhook_metrics_collector) -- - @self.context_processor - def inject(): - notice = session.get("notice") -diff --git a/gitsrht/webhooks.py b/gitsrht/webhooks.py -index 8a203fe..6240d50 100644 ---- a/gitsrht/webhooks.py -+++ b/gitsrht/webhooks.py -@@ -7,13 +7,10 @@ if not hasattr(db, "session"): - db.init() - from srht.webhook import Event - from srht.webhook.celery import CeleryWebhook, make_worker --from srht.metrics import RedisQueueCollector - from scmsrht.webhooks import UserWebhook - import sqlalchemy as sa - --webhook_broker = cfg("git.sr.ht", "webhooks") --worker = make_worker(broker=webhook_broker) --webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length") -+worker = make_worker(broker=cfg("git.sr.ht", "webhooks")) - - class RepoWebhook(CeleryWebhook): - events = [ --- -2.34.1 - diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch deleted file mode 100644 index 872d285b9bb07..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 730e090f31b150d42be4b4722751f8e4610835b0 Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Sat, 12 Feb 2022 00:38:12 +0100 -Subject: [PATCH lists.sr.ht] Revert "Add webhook queue monitoring" - -This reverts commit e74e344808e8d523a9786cefcbf64c9a247d7a0e. - -Which has broken Unix socket support for Redis. -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - listssrht/app.py | 3 --- - listssrht/webhooks.py | 5 +---- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/listssrht/app.py b/listssrht/app.py -index aec59f3..83a355d 100644 ---- a/listssrht/app.py -+++ b/listssrht/app.py -@@ -29,9 +29,6 @@ class ListsApp(SrhtFlask): - self.register_blueprint(user) - self.register_blueprint(gql_blueprint) - -- from listssrht.webhooks import webhook_metrics_collector -- self.metrics_registry.register(webhook_metrics_collector) -- - @self.context_processor - def inject(): - from listssrht.types import ListAccess -diff --git a/listssrht/webhooks.py b/listssrht/webhooks.py -index ae5b1cb..86421ba 100644 ---- a/listssrht/webhooks.py -+++ b/listssrht/webhooks.py -@@ -8,11 +8,8 @@ if not hasattr(db, "session"): - db.init() - from srht.webhook import Event - from srht.webhook.celery import CeleryWebhook, make_worker --from srht.metrics import RedisQueueCollector - --webhook_broker = cfg("lists.sr.ht", "webhooks") --worker = make_worker(broker=webhook_broker) --webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length") -+worker = make_worker(broker=cfg("lists.sr.ht", "webhooks")) - - class ListWebhook(CeleryWebhook): - events = [ --- -2.34.1 - diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch deleted file mode 100644 index 9ec37670b0600..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d88bee195797c6c294320617ff14798da94cd0f3 Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Thu, 16 Dec 2021 04:52:08 +0100 -Subject: [PATCH meta.sr.ht] Revert "Add webhook queue monitoring" - -This reverts commit 9931df3c23094af5179df9ef019ca732b8125dac. - -This has broken Unix socket support for Redis. -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - metasrht/app.py | 3 --- - metasrht/webhooks.py | 5 +---- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/metasrht/app.py b/metasrht/app.py -index b190875..89c59bc 100644 ---- a/metasrht/app.py -+++ b/metasrht/app.py -@@ -49,9 +49,6 @@ class MetaApp(SrhtFlask): - from metasrht.blueprints.billing import billing - self.register_blueprint(billing) - -- from metasrht.webhooks import webhook_metrics_collector -- self.metrics_registry.register(webhook_metrics_collector) -- - @self.context_processor - def inject(): - return { -diff --git a/metasrht/webhooks.py b/metasrht/webhooks.py -index 3e1149e..3f0ba01 100644 ---- a/metasrht/webhooks.py -+++ b/metasrht/webhooks.py -@@ -7,11 +7,8 @@ if not hasattr(db, "session"): - db.init() - from srht.webhook import Event - from srht.webhook.celery import CeleryWebhook, make_worker --from srht.metrics import RedisQueueCollector - --webhook_broker = cfg("meta.sr.ht", "webhooks", "redis://") --worker = make_worker(broker=webhook_broker) --webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length") -+worker = make_worker(broker=cfg("meta.sr.ht", "webhooks", "redis://")) - - class UserWebhook(CeleryWebhook): - events = [ --- -2.34.0 - diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch deleted file mode 100644 index 861608c11843e..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42a27ea60d8454552d54e1f51f1b976d1067fc32 Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Sat, 12 Feb 2022 00:30:29 +0100 -Subject: [PATCH todo.sr.ht] Revert "Add webhook queue monitoring" - -This reverts commit 320a5e8f7cd16ca43928c36f0320593f84d986fa. - -Which has broken Unix socket support for Redis. -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - todosrht/flask.py | 3 --- - todosrht/webhooks.py | 6 +----- - 2 files changed, 1 insertion(+), 8 deletions(-) - -diff --git a/todosrht/flask.py b/todosrht/flask.py -index 5e8ac66..9d0fd27 100644 ---- a/todosrht/flask.py -+++ b/todosrht/flask.py -@@ -43,9 +43,6 @@ class TodoApp(SrhtFlask): - self.add_template_filter(urls.tracker_url) - self.add_template_filter(urls.user_url) - -- from todosrht.webhooks import webhook_metrics_collector -- self.metrics_registry.register(webhook_metrics_collector) -- - @self.context_processor - def inject(): - return { -diff --git a/todosrht/webhooks.py b/todosrht/webhooks.py -index eb8e08a..950047f 100644 ---- a/todosrht/webhooks.py -+++ b/todosrht/webhooks.py -@@ -7,13 +7,9 @@ if not hasattr(db, "session"): - db.init() - from srht.webhook import Event - from srht.webhook.celery import CeleryWebhook, make_worker --from srht.metrics import RedisQueueCollector - import sqlalchemy as sa - -- --webhooks_broker = cfg("todo.sr.ht", "webhooks") --worker = make_worker(broker=webhooks_broker) --webhook_metrics_collector = RedisQueueCollector(webhooks_broker, "srht_webhooks", "Webhook queue length") -+worker = make_worker(broker=cfg("todo.sr.ht", "webhooks")) - - import todosrht.tracker_import - --- -2.34.1 - diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 10da3018843ae..49eea05a7a7a2 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.19"; # Untagged version + version = "0.22.22"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "scm.sr.ht"; rev = version; - sha256 = "sha256-/QryPjWJ2S0Ov9DTdrwbM81HYucHiYcLh0oKacflywI="; + sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 1446e68fa69dc..0278fb6bd1738 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,5 +1,6 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , redis @@ -8,23 +9,31 @@ , pytest , factory_boy , python +, unzip }: buildPythonPackage rec { pname = "todosrht"; - version = "0.67.2"; + version = "0.72.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "todo.sr.ht"; rev = version; - sha256 = "sha256-/QHsMlhzyah85ubZyx8j4GDUoITuWcLDJKosbZGeOZU="; + sha256 = "sha256-FLjVO8Y/9s2gFfMXwcY7Rj3WNzPEBYs1AEjiVZFWsT8="; }; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch - ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api" "" + ''; + + todosrht-api = buildGoModule ({ + inherit src version; + pname = "todosrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; + } // import ./fix-gqlgen-trimpath.nix {inherit unzip;}); nativeBuildInputs = srht.nativeBuildInputs; @@ -40,6 +49,10 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + ln -s ${todosrht-api}/bin/api $out/bin/todosrht-api + ''; + # pytest tests fail checkInputs = [ pytest diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index 97509397aef52..e13ce09da4c71 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -16,7 +16,7 @@ version() { } src_url() { - nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.url or src.meta.homepage" | tr -d '"' + nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.meta.homepage" | tr -d '"' } get_latest_version() { diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 28c7350ae39b5..17f36ab4161b4 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -121,6 +121,7 @@ in stdenv.mkDerivation (rec { description = "Git client from the makers of Sublime Text"; homepage = "https://www.sublimemerge.com"; maintainers = with maintainers; [ zookatron ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 6526fdb2d1bed..faf4ef773790f 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2071"; - sha256 = "xYVk5Fx6VdoHzf0cbmhwKyEr5HDEZgPgDoBWQg/tS0U="; + buildVersion = "2074"; + sha256 = "REo59Lpi0fmAOp0XJa4Iln3VKxR5kRiMpz2zfqz1MQs="; } {}; sublime-merge-dev = common { - buildVersion = "2070"; - sha256 = "2AA2HBF19g34ov6ytjL2caqS7Ro4eyj18vzwINm0CTw="; + buildVersion = "2073"; + sha256 = "AQ0ESdi45LHndRNJnkYS+o9L+dlRJkw3nzBfJo8FYPc="; dev = true; } {}; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 13bdc31f735df..5731ef59deb79 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,6 +6,7 @@ , javahlBindings ? false , saslSupport ? false , lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc +, CoreServices, Security , autoconf, libtool , apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null , sasl ? null, serf ? null @@ -38,7 +39,8 @@ let ++ lib.optional httpSupport serf ++ lib.optionals pythonBindings [ python3 py3c ] ++ lib.optional perlBindings perl - ++ lib.optional saslSupport sasl; + ++ lib.optional saslSupport sasl + ++ lib.optional stdenv.hostPlatform.isDarwin [ CoreServices Security ]; patches = [ ./apr-1.patch ] ++ extraPatches; @@ -57,7 +59,6 @@ let (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) (lib.withFeatureAs saslSupport "sasl" sasl) (lib.withFeatureAs httpSupport "serf" serf) - "--disable-keychain" "--with-zlib=${zlib.dev}" "--with-sqlite=${sqlite.dev}" ] ++ lib.optionals javahlBindings [ diff --git a/pkgs/applications/video/adl/default.nix b/pkgs/applications/video/adl/default.nix new file mode 100644 index 0000000000000..621f7246c8abf --- /dev/null +++ b/pkgs/applications/video/adl/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitHub, pkgs, makeWrapper, ... }: + +stdenv.mkDerivation rec { + pname = "adl"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "RaitaroH"; + repo = "adl"; + rev = "65f68e1dcae4c0caa52668d3a854269e7d226f7c"; + sha256 = "sha256-huGpDtkWrhZyKDNKXat8T3qtAyMjBaq8HFd1w1ThUVk="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # https://github.com/RaitaroH/adl#requirements + buildInputs = with pkgs; [ + anime-downloader + frece + fzf + mpv + perl + trackma + ueberzug + ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp $src/adl $out/bin + wrapProgram $out/bin/adl \ + --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + + meta = with lib; { + homepage = "https://github.com/RaitaroH/adl"; + description = "popcorn anime-downloader + trackma wrapper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ WeebSorceress ]; + }; +} diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 133840e066bb5..82d1adfeec083 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,14 +1,18 @@ { lib , config , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub , boost +, cmake +, expat +, harfbuzz , ffmpeg , ffms , fftw , fontconfig , freetype +, fribidi +, glib , icu , intltool , libGL @@ -16,16 +20,24 @@ , libX11 , libass , libiconv +, libuchardet +, luajit +, pcre , pkg-config +, which , wxGTK , zlib +, CoreText +, CoreFoundation +, AppKit +, Carbon +, IOKit +, Cocoa + , spellcheckSupport ? true , hunspell ? null -, automationSupport ? true -, lua ? null - , openalSupport ? false , openal ? null @@ -37,83 +49,70 @@ , portaudioSupport ? false , portaudio ? null + +, useBundledLuaJIT ? false }: assert spellcheckSupport -> (hunspell != null); -assert automationSupport -> (lua != null); assert openalSupport -> (openal != null); assert alsaSupport -> (alsa-lib != null); assert pulseaudioSupport -> (libpulseaudio != null); assert portaudioSupport -> (portaudio != null); let + luajit52 = luajit.override { enable52Compat = true; }; inherit (lib) optional; in stdenv.mkDerivation rec { pname = "aegisub"; - version = "3.2.2"; + version = "3.3.2-20220612"; - src = fetchurl { - url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz"; - hash = "sha256-xV4zlFuC2FE8AupueC8Ncscmrc03B+lbjAAi9hUeaIU="; + src = fetchFromGitHub { + owner = "wangqr"; + repo = pname; + rev = "91f8b5f91eb960bad19899c10af08aca34f9b697"; + sha256 = "sha256-lPkPWSsncsBKJHDnma9cUXsQJynruT9JpPkMTHdQ/e8="; }; - patches = [ - # Compatibility with ICU 59 - (fetchpatch { - url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch"; - sha256 = "sha256-R2rN7EiyA5cuBYIAMpa0eKZJ3QZahfnRp8R4HyejGB8="; - }) - - # Compatbility with Boost 1.69 - (fetchpatch { - url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch"; - sha256 = "sha256-7nlfojrb84A0DT82PqzxDaJfjIlg5BvWIBIgoqasHNk="; - }) - - # Compatbility with make 4.3 - (fetchpatch { - url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch"; - sha256 = "sha256-rG8RJokd4V4aSYOQw2utWnrWPVrkqSV3TAvnGXNhLOk="; - }) - - # Compatibility with ffms2 - (fetchpatch { - url = "https://github.com/Aegisub/Aegisub/commit/1aa9215e7fc360de05da9b7ec2cd68f1940af8b2.patch"; - sha256 = "sha256-JsuI4hQTcT0TEqHHoSsGbuiTg4hMCH3Cxp061oLk8Go="; - }) - - ./update-ffms2.patch - - # Compatibility with X11 - (fetchpatch { - url = "https://github.com/Aegisub/Aegisub/commit/7a6da26be6a830f4e1255091952cc0a1326a4520.patch"; - sha256 = "sha256-/aTcIjFlZY4N9+IyHL4nwR0hUR4HTJM7ibbdKmNxq0w="; - }) - ]; - nativeBuildInputs = [ intltool + luajit52 pkg-config + which + cmake ]; + buildInputs = [ boost + expat ffmpeg ffms fftw fontconfig freetype + fribidi + glib + harfbuzz icu libGL libGLU libX11 libass libiconv + libuchardet + pcre wxGTK zlib ] + ++ lib.optionals stdenv.isDarwin [ + CoreText + CoreFoundation + AppKit + Carbon + IOKit + Cocoa + ] ++ optional alsaSupport alsa-lib - ++ optional automationSupport lua ++ optional openalSupport openal ++ optional portaudioSupport portaudio ++ optional pulseaudioSupport libpulseaudio @@ -127,22 +126,23 @@ stdenv.mkDerivation rec { "relro" ]; - postPatch = '' - sed -i 's/-Wno-c++11-narrowing/-Wno-narrowing/' configure.ac src/Makefile - ''; - - # compat with icu61+ - # https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 - CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + patches = lib.optionals (!useBundledLuaJIT) [ + ./remove-bundled-luajit.patch + ]; - # this is fixed upstream though not yet in an officially released version, - # should be fine remove on next release (if one ever happens) - NIX_LDFLAGS = "-lpthread"; + NIX_CFLAGS_COMPILE = "-I${luajit52}/include"; + NIX_CFLAGS_LINK = "-L${luajit52}/lib"; - postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; + configurePhase = '' + export FORCE_GIT_VERSION=${version} + # Workaround for a Nixpkgs bug; remove when the fix arrives + mkdir build-dir + cd build-dir + cmake -DCMAKE_INSTALL_PREFIX=$out .. + ''; meta = with lib; { - homepage = "https://github.com/Aegisub/Aegisub"; + homepage = "https://github.com/wangqr/Aegisub"; description = "An advanced subtitle editor"; longDescription = '' Aegisub is a free, cross-platform open source tool for creating and @@ -154,7 +154,6 @@ stdenv.mkDerivation rec { # softwares - so the resulting program will be GPL license = licenses.bsd3; maintainers = [ maintainers.AndersonTorres ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.unix; }; } -# TODO [ AndersonTorres ]: update to fork release diff --git a/pkgs/applications/video/aegisub/remove-bundled-luajit.patch b/pkgs/applications/video/aegisub/remove-bundled-luajit.patch new file mode 100644 index 0000000000000..d2b7dd0b5755e --- /dev/null +++ b/pkgs/applications/video/aegisub/remove-bundled-luajit.patch @@ -0,0 +1,271 @@ +diff --git a/CMakeLists.test.txt b/CMakeLists.test.txt +index 4d1a03177..62fab05c9 100644 +--- a/CMakeLists.test.txt ++++ b/CMakeLists.test.txt +@@ -2,7 +2,7 @@ if(UNIX) + add_executable(aegisub-lua EXCLUDE_FROM_ALL + automation/tests/aegisub.cpp + ) +- target_link_libraries(aegisub-lua PRIVATE libaegisub luabins luajit "Boost::locale" "ICU::in") ++ target_link_libraries(aegisub-lua PRIVATE libaegisub luabins luajit-5.1 "Boost::locale" "ICU::in") + add_custom_target(test-automation + COMMAND sh -c "$(luarocks path); ${PROJECT_BINARY_DIR}/aegisub-lua tests/busted.lua -p moon tests/modules" + VERBATIM +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ce2e355ff..4d4396451 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,210 +13,6 @@ if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) + endif() + +-## Build bundled LuaJIT with aegisub specific patches +-add_executable(luajit-minilua vendor/luajit/src/host/minilua.c) +-if(NOT WIN32) +- target_link_libraries(luajit-minilua m) +-endif() +-if(WIN32) +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" +- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" +- COMMAND luajit-minilua ../dynasm/dynasm.lua -LN -D WIN -D JIT -D FFI -D P64 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +- ) +- else() +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" +- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" +- COMMAND luajit-minilua ../dynasm/dynasm.lua -LN -D WIN -D JIT -D FFI -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +- ) +- endif() +-elseif(APPLE) +- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64") +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" +- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" +- COMMAND luajit-minilua ../dynasm/dynasm.lua -D ENDIAN_LE -D P64 -D FFI -D DUALNUM -D FPU -D HFABI -D NO_UNWIND -D VER=80 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_arm64.dasc +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +- ) +- else() +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" +- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" +- COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x64.dasc +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +- ) +- endif() +-else() +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" +- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" +- COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +- ) +- else() +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" +- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" +- COMMAND luajit-minilua ../dynasm/dynasm.lua -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +- ) +- endif() +-endif() +- +-add_executable(luajit-buildvm +- vendor/luajit/src/host/buildvm.c +- vendor/luajit/src/host/buildvm_asm.c +- vendor/luajit/src/host/buildvm_peobj.c +- vendor/luajit/src/host/buildvm_lib.c +- vendor/luajit/src/host/buildvm_fold.c +- +- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" +-) +-target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_LUA52COMPAT) +-target_include_directories(luajit-buildvm PRIVATE vendor/luajit/src "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen") +- +-if(APPLE) +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" +- COMMAND luajit-buildvm -m machasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" +- ) +-elseif(UNIX) +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" +- COMMAND luajit-buildvm -m elfasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" +- ) +-elseif(MSVC) +- add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj" +- COMMAND luajit-buildvm -m peobj -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj" +- ) +-endif() +-add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h" +- COMMAND luajit-buildvm -m ffdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +-) +-add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h" +- COMMAND luajit-buildvm -m bcdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +-) +-add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h" +- COMMAND luajit-buildvm -m folddef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h" lj_opt_fold.c +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +-) +-add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h" +- COMMAND luajit-buildvm -m recdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +-) +-add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h" +- COMMAND luajit-buildvm -m libdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +-) +-add_custom_command( +- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua" +- COMMAND luajit-buildvm -m vmdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src +-) +- +-add_library(luajit STATIC +- vendor/luajit/src/lib_base.c +- vendor/luajit/src/lib_math.c +- vendor/luajit/src/lib_bit.c +- vendor/luajit/src/lib_string.c +- vendor/luajit/src/lib_table.c +- vendor/luajit/src/lib_io.c +- vendor/luajit/src/lib_os.c +- vendor/luajit/src/lib_package.c +- vendor/luajit/src/lib_debug.c +- vendor/luajit/src/lib_jit.c +- vendor/luajit/src/lib_ffi.c +- vendor/luajit/src/lj_gc.c +- vendor/luajit/src/lj_err.c +- vendor/luajit/src/lj_char.c +- vendor/luajit/src/lj_bc.c +- vendor/luajit/src/lj_obj.c +- vendor/luajit/src/lj_buf.c +- vendor/luajit/src/lj_str.c +- vendor/luajit/src/lj_tab.c +- vendor/luajit/src/lj_func.c +- vendor/luajit/src/lj_udata.c +- vendor/luajit/src/lj_meta.c +- vendor/luajit/src/lj_debug.c +- vendor/luajit/src/lj_state.c +- vendor/luajit/src/lj_dispatch.c +- vendor/luajit/src/lj_vmevent.c +- vendor/luajit/src/lj_vmmath.c +- vendor/luajit/src/lj_strscan.c +- vendor/luajit/src/lj_strfmt.c +- vendor/luajit/src/lj_strfmt_num.c +- vendor/luajit/src/lj_api.c +- vendor/luajit/src/lj_profile.c +- vendor/luajit/src/lj_lex.c +- vendor/luajit/src/lj_parse.c +- vendor/luajit/src/lj_bcread.c +- vendor/luajit/src/lj_bcwrite.c +- vendor/luajit/src/lj_load.c +- vendor/luajit/src/lj_ir.c +- vendor/luajit/src/lj_opt_mem.c +- vendor/luajit/src/lj_opt_fold.c +- vendor/luajit/src/lj_opt_narrow.c +- vendor/luajit/src/lj_opt_dce.c +- vendor/luajit/src/lj_opt_loop.c +- vendor/luajit/src/lj_opt_split.c +- vendor/luajit/src/lj_opt_sink.c +- vendor/luajit/src/lj_mcode.c +- vendor/luajit/src/lj_snap.c +- vendor/luajit/src/lj_record.c +- vendor/luajit/src/lj_crecord.c +- vendor/luajit/src/lj_ffrecord.c +- vendor/luajit/src/lj_asm.c +- vendor/luajit/src/lj_trace.c +- vendor/luajit/src/lj_gdbjit.c +- vendor/luajit/src/lj_ctype.c +- vendor/luajit/src/lj_cdata.c +- vendor/luajit/src/lj_cconv.c +- vendor/luajit/src/lj_ccall.c +- vendor/luajit/src/lj_ccallback.c +- vendor/luajit/src/lj_carith.c +- vendor/luajit/src/lj_clib.c +- vendor/luajit/src/lj_cparse.c +- vendor/luajit/src/lj_lib.c +- vendor/luajit/src/lj_alloc.c +- vendor/luajit/src/lib_aux.c +- vendor/luajit/src/lib_init.c +- +- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h" +- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h" +- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h" +- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h" +- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h" +- # "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua" +-) +-target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_LUA52COMPAT) +-target_include_directories(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" PUBLIC "vendor/luajit/src") +-if(WIN32) +- target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj") +-else() +- enable_language(ASM) +- target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s") +- target_link_libraries(luajit ${CMAKE_DL_LIBS}) +-endif() +-if(APPLE) +- if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64") +- target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_GC64) +- target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_GC64) +- endif() +-endif() +- + add_subdirectory(vendor/luabins) + + ## libaegisub +@@ -310,18 +106,18 @@ if(APPLE) + else() + target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h") + endif() +-target_link_libraries(libaegisub PRIVATE luajit luabins) ++target_link_libraries(libaegisub PRIVATE luajit-5.1 luabins) + + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config.h" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config_platform.json" +- COMMAND luajit-minilua "${PROJECT_SOURCE_DIR}/tools/respack.lua" manifest.respack default_config.cpp default_config.h ++ COMMAND luajit "${PROJECT_SOURCE_DIR}/tools/respack.lua" manifest.respack default_config.cpp default_config.h + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc" + ) + + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h" +- COMMAND luajit-minilua ../../tools/respack.lua manifest.respack "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h" ++ COMMAND luajit ../../tools/respack.lua manifest.respack "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h" + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/bitmaps + ) + +@@ -496,7 +292,7 @@ add_executable(Aegisub WIN32 + src/video_slider.cpp + src/visual_feature.cpp + ) +-target_link_libraries(Aegisub PRIVATE ${CMAKE_DL_LIBS} libaegisub luajit) ++target_link_libraries(Aegisub PRIVATE ${CMAKE_DL_LIBS} libaegisub luajit-5.1) + target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD) + target_include_directories(Aegisub PRIVATE "src/libresrc" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc") + if(APPLE) +diff --git a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt +index 1fe1d2031..e2761527b 100644 +--- a/vendor/luabins/CMakeLists.txt ++++ b/vendor/luabins/CMakeLists.txt +@@ -36,4 +36,4 @@ add_library(luabins STATIC + src/savebuffer.c + src/write.c + ) +-target_link_libraries(luabins PRIVATE luajit) +\ No newline at end of file ++target_link_libraries(luabins PRIVATE luajit-5.1) +\ No newline at end of file diff --git a/pkgs/applications/video/aegisub/update-ffms2.patch b/pkgs/applications/video/aegisub/update-ffms2.patch deleted file mode 100644 index affa46365cfb6..0000000000000 --- a/pkgs/applications/video/aegisub/update-ffms2.patch +++ /dev/null @@ -1,105 +0,0 @@ -commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37 -Author: Thomas Goyne <plorkyeran@aegisub.org> -Date: Wed Nov 21 16:41:05 2018 -0800 - - Update ffmpeg and ffms2 - -diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp -index 8bd68fbbf..f4ed6a2f2 100644 ---- a/src/video_provider_ffmpegsource.cpp -+++ b/src/video_provider_ffmpegsource.cpp -@@ -44,6 +44,23 @@ - #include <libaegisub/make_unique.h> - - namespace { -+typedef enum AGI_ColorSpaces { -+ AGI_CS_RGB = 0, -+ AGI_CS_BT709 = 1, -+ AGI_CS_UNSPECIFIED = 2, -+ AGI_CS_FCC = 4, -+ AGI_CS_BT470BG = 5, -+ AGI_CS_SMPTE170M = 6, -+ AGI_CS_SMPTE240M = 7, -+ AGI_CS_YCOCG = 8, -+ AGI_CS_BT2020_NCL = 9, -+ AGI_CS_BT2020_CL = 10, -+ AGI_CS_SMPTE2085 = 11, -+ AGI_CS_CHROMATICITY_DERIVED_NCL = 12, -+ AGI_CS_CHROMATICITY_DERIVED_CL = 13, -+ AGI_CS_ICTCP = 14 -+} AGI_ColorSpaces; -+ - /// @class FFmpegSourceVideoProvider - /// @brief Implements video loading through the FFMS library. - class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider { -@@ -78,7 +95,7 @@ public: - if (matrix == RealColorSpace) - FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr); - else if (matrix == "TV.601") -- FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr); -+ FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr); - else - return; - ColorSpace = matrix; -@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) { - std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV"; - - switch (cs) { -- case FFMS_CS_RGB: -+ case AGI_CS_RGB: - return "None"; -- case FFMS_CS_BT709: -+ case AGI_CS_BT709: - return str + ".709"; -- case FFMS_CS_FCC: -+ case AGI_CS_FCC: - return str + ".FCC"; -- case FFMS_CS_BT470BG: -- case FFMS_CS_SMPTE170M: -+ case AGI_CS_BT470BG: -+ case AGI_CS_SMPTE170M: - return str + ".601"; -- case FFMS_CS_SMPTE240M: -+ case AGI_CS_SMPTE240M: - return str + ".240M"; - default: - throw VideoOpenError("Unknown video color space"); -@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st - - // set thread count - int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt(); -+#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0) - if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF) - Threads = 1; -+#endif - - // set seekmode - // TODO: give this its own option? -@@ -235,18 +254,22 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st - else - DAR = double(Width) / Height; - -- CS = TempFrame->ColorSpace; -+ int VideoCS = CS = TempFrame->ColorSpace; - CR = TempFrame->ColorRange; - -- if (CS == FFMS_CS_UNSPECIFIED) -- CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG; -+ if (CS == AGI_CS_UNSPECIFIED) -+ CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG; - RealColorSpace = ColorSpace = colormatrix_description(CS, CR); - - #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0) -- if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) { -- if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo)) -+ if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) { -+ CS = AGI_CS_BT470BG; -+ ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR); -+ } -+ -+ if (CS != VideoCS) { -+ if (FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), &ErrInfo)) - throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer); -- ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR); - } - #endif diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 720df51a34ef5..85f2e4b8ad89a 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-A1c7YdBh2VOhw/xTvhNV50j9n+SELyRTHI5w+AeiWDs="; + sha256 = "sha256-B/bIGrSQmKZFh3PpsbwivR2QKLMHIypWLxWuufiFHw4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/applications/video/anime-downloader/default.nix new file mode 100644 index 0000000000000..eb69f4be8155d --- /dev/null +++ b/pkgs/applications/video/anime-downloader/default.nix @@ -0,0 +1,48 @@ +{ lib, python3, aria2, mpv, nodejs, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "anime-downloader"; + version = "5.0.14"; + + src = fetchFromGitHub { + owner = "anime-dl"; + repo = "anime-downloader"; + rev = version; + sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o="; + }; + + propagatedBuildInputs = [ + aria2 + mpv + nodejs + ] ++ (with python3.pkgs; [ + beautifulsoup4 + cfscrape + click + coloredlogs + fuzzywuzzy + jsbeautifier + pycryptodome + pySmartDL + pyqt5 + requests + requests-cache + selenium + tabulate + ]); + + doCheck = false; + # FIXME: checks must be disabled because they are lacking the qt env. + # They fail like this, even if built and wrapped with all Qt and runtime dependencies. + # Ref.: https://github.com/NixOS/nixpkgs/blob/634141959076a8ab69ca2cca0f266852256d79ee/pkgs/applications/misc/openlp/lib.nix#L20-L23 + + passthru.updateScript = ./update.sh; + + meta = with lib; { + homepage = "https://github.com/anime-dl/anime-downloader"; + description = "A simple but powerful anime downloader and streamer"; + license = licenses.unlicense; + platforms = platforms.linux; + maintainers = with maintainers; [ WeebSorceress ]; + }; +} diff --git a/pkgs/applications/video/anime-downloader/update.sh b/pkgs/applications/video/anime-downloader/update.sh new file mode 100755 index 0000000000000..292299298ad97 --- /dev/null +++ b/pkgs/applications/video/anime-downloader/update.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -eu -o pipefail + +version="$(curl --silent "https://api.github.com/repos/anime-dl/anime-downloader/releases" | jq '.[0].tag_name' --raw-output)" + +update-source-version anime-downloader "$version" diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 1f75997ce7bbf..4a19121f34ad8 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -39,26 +39,27 @@ with py.pkgs; buildPythonApplication rec { pname = "catt"; - version = "0.12.2"; - - disabled = python3.pythonOlder "3.4"; + version = "0.12.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BOETKTkcbLOu5SubiejswU7D47qWS13QZ7rU9x3jf5Y="; + hash = "sha256-Q9ePWRLwuuTG+oPKFg7xn1gj4uAVlXUxegWdyH3Yd90="; }; propagatedBuildInputs = [ click ifaddr PyChromecast + protobuf requests - youtube-dl + yt-dlp ]; doCheck = false; # attempts to access various URLs - pythonImportsCheck = [ "catt" ]; + pythonImportsCheck = [ + "catt" + ]; meta = with lib; { description = "Tool to send media from online sources to Chromecast devices"; diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 0e97eab1773e7..1600b1b4d8bba 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "clapper"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Rafostar"; repo = pname; rev = version; - sha256 = "sha256-ccvg8yxPCN7OYmJvq0SPY6iyiuFuWJyiu+mRoykEzqI="; + sha256 = "sha256-o68IdI20gSwWCPI0g/BhUGF5ro6srXMy0JD1EgmY5ck="; }; nativeBuildInputs = [ @@ -65,11 +65,6 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/postinstall.py ''; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - postInstall = '' cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/ cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/ diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix deleted file mode 100644 index ce63b9240306a..0000000000000 --- a/pkgs/applications/video/clickshare-csc1/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ lib -, stdenv -, fetchurl -, alsa-lib -, autoPatchelfHook -, binutils-unwrapped -, libav_0_8 -, libnotify -, libresample -, libusb1 -, qt4 -, rpmextract -, unzip -, xorg -, usersGroup ? "clickshare" # for udev access rules -}: - - -# This fetches the latest firmware version that -# contains a linux-compatible client binary. -# Barco no longer supports linux, so updates are unlikely: -# https://www.barco.com/de/support/clickshare-csc-1/knowledge-base/KB1191 - - -stdenv.mkDerivation rec { - pname = "clickshare-csc1"; - version = "01.07.00.033"; - src = fetchurl { - name = "clickshare-csc1-${version}.zip"; - url = "https://www.barco.com/services/website/de/TdeFiles/Download?FileNumber=R33050020&TdeType=3&MajorVersion=01&MinorVersion=07&PatchVersion=00&BuildVersion=033"; - sha256 = "0h4jqidqvk4xkaky5bizi7ilz4qzl2mh68401j21y3djnzx09br3"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - binutils-unwrapped - rpmextract - unzip - ]; - buildInputs = [ - alsa-lib - libav_0_8 - libnotify - libresample - libusb1 - qt4 - xorg.libX11 - xorg.libXdamage - xorg.libXfixes - xorg.libXinerama - xorg.libXtst - ]; - sourceRoot = "."; - - # The source consists of nested archives. - # We extract them archive by archive. - # If the filename contains version numbers, - # we use a wildcard and check that there - # is actually only one file matching. - postUnpack = - let - rpmArch = - if stdenv.hostPlatform.isx86_32 then "i386" else - if stdenv.hostPlatform.isx86_64 then "x86_64" else - throw "unsupported system: ${stdenv.hostPlatform.system}"; - in - '' - ls clickshare_baseunit_*.*_all.signed_release.ipk | wc --lines | xargs test 1 = - tar --verbose --extract --one-top-level=dir1 < clickshare_baseunit_*.*_all.signed_release.ipk - mkdir dir2 - ( cd dir2 ; ar xv ../dir1/firmware.ipk ) - tar --verbose --gzip --extract --one-top-level=dir3 --exclude='dev/*' < dir2/data.tar.gz - ls dir3/clickshare/clickshare-*-*.${rpmArch}.rpm | wc --lines | xargs test 1 = - mkdir dir4 - cd dir4 - rpmextract ../dir3/clickshare/clickshare-*-*.${rpmArch}.rpm - ''; - - installPhase = '' - runHook preInstall - mkdir --verbose --parents $out - mv --verbose --target-directory=. usr/* - rmdir --verbose usr - cp --verbose --recursive --target-directory=$out * - runHook postInstall - ''; - - # Default udev rule restricts access to the - # clickshare USB dongle to the `wheel` group. - # We replace it with the group - # stated in the package arguments. - # Also, we patch executable and icon paths in .desktop files. - preFixup = '' - substituteInPlace \ - $out/lib/udev/rules.d/99-clickshare.rules \ - --replace wheel ${usersGroup} - substituteInPlace \ - $out/share/applications/clickshare.desktop \ - --replace Exec= Exec=$out/bin/ \ - --replace =/usr =$out - substituteInPlace \ - $out/etc/xdg/autostart/clickshare-launcher.desktop \ - --replace =/usr =$out - ''; - - meta = { - homepage = "https://www.barco.com/de/support/clickshare-csc-1/drivers"; - downloadPage = "https://www.barco.com/de/Support/software/R33050020"; - platforms = [ "i686-linux" "x86_64-linux" ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.yarny ]; - description = "Linux driver/client for Barco ClickShare CSC-1"; - longDescription = '' - Barco ClickShare is a wireless presentation system - where a USB dongle transmits to a base station - that is connected with a beamer. - The USB dongle requires proprietary software that - captures the screen and sends it to the dongle. - This package provides the necessary software for Linux. - ''; - }; -} diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 7f57c79c5fe54..540339f05a561 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5"; }; + # Workaround build failure on -fno-common toolchains: + # ld: subtitles.o:src/coriander.h:110: multiple definition of + # `main_window'; main.o:src/coriander.h:110: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' cp ${automake}/share/automake-*/mkinstalldirs . ''; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index df435d03d09da..45f7d099056d5 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -1,13 +1,7 @@ { lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook -, zlib, libzen, libmediainfo, curl, libmms, glib +, zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib }: -let - # FileBot requires libcurl-gnutls.so to build - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - -in - stdenv.mkDerivation rec { pname = "filebot"; version = "4.9.6"; @@ -47,6 +41,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://filebot.net"; changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ gleber felschr ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/flirc/default.nix b/pkgs/applications/video/flirc/default.nix index 6285094c461a4..58de5ceab099a 100644 --- a/pkgs/applications/video/flirc/default.nix +++ b/pkgs/applications/video/flirc/default.nix @@ -39,6 +39,7 @@ mkDerivation rec { homepage = "https://flirc.tv/more/flirc-usb"; description = "Use any Remote with your Media Center"; maintainers = with maintainers; [ aanderse ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index de56865410ed5..a63671accec4e 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { }) ]; + # Workaround build failure on -fno-common toolchains: + # ld: mpris-interface.o:src/playlist.h:32: multiple definition of + # `plclose'; gui.o:src/playlist.h:32: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + meta = with lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 5d204e8297a51..ad01eab08a468 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -6,69 +6,68 @@ , cmake , extra-cmake-modules , ffmpeg-full -, kcodecs , kconfig , kcoreaddons , kfilemetadata , ki18n , kiconthemes , kio -, kio-extras , kirigami2 , kxmlgui +, kdoctools , mpv , pkg-config +, wrapQtAppsHook , qqc2-desktop-style , qtbase , qtquickcontrols2 -, qtwayland -, youtube-dl +, yt-dlp }: mkDerivation rec { pname = "haruna"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - sha256 = "sha256-pFrmTaRvsqxJw34VULzfjx2k56kJgkB96nJtai2D1wY="; + sha256 = "sha256-Lom9iQUKH3lQHrVK4dJzo+FG79xSCg0b4gY/KAevL6I="; domain = "invent.kde.org"; }; buildInputs = [ breeze-icons breeze-qt5 + qqc2-desktop-style + yt-dlp + ffmpeg-full - kcodecs kconfig kcoreaddons kfilemetadata ki18n kiconthemes kio - kio-extras kirigami2 kxmlgui + kdoctools mpv - qqc2-desktop-style qtbase qtquickcontrols2 - qtwayland - youtube-dl ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config + wrapQtAppsHook ]; meta = with lib; { - homepage = "https://github.com/g-fb/haruna"; + homepage = "https://invent.kde.org/multimedia/haruna"; description = "Open source video player built with Qt/QML and libmpv"; - license = with licenses; [ bsd3 cc-by-40 gpl3Plus wtfpl ]; + license = with licenses; [ bsd3 cc-by-40 cc-by-sa-40 cc0 gpl2Plus gpl3Plus wtfpl ]; maintainers = with maintainers; [ jojosch ]; }; } diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 9bee8715b98d0..d9a1e251e4d0c 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -1,4 +1,4 @@ -{ avahi-compat, cmake, fetchFromGitHub, flatbuffers, hidapi, lib, libcec +{ stdenv, avahi-compat, cmake, fetchFromGitHub, flatbuffers, hidapi, lib, libcec , libusb1, libX11, libxcb, libXrandr, mbedtls, mkDerivation, protobuf, python3 , qtbase, qtserialport, qtsvg, qtx11extras, wrapQtAppsHook }: @@ -41,6 +41,7 @@ mkDerivation rec { ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Open Source Ambilight solution"; homepage = "https://github.com/hyperion-project/hyperion.ng"; license = licenses.mit; diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix new file mode 100644 index 0000000000000..ad149b947e48e --- /dev/null +++ b/pkgs/applications/video/hypnotix/default.nix @@ -0,0 +1,87 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, cinnamon +, gettext +, gobject-introspection +, mpv +, python3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "hypnotix"; + version = "2.8"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "hypnotix"; + rev = version; + hash = "sha256-uj5Bn3K9SCKE4p1jylfQ8XnAwNnN4VXHLMLrwhKhzsk="; + }; + + patches = [ + (substituteAll { + src = ./libmpv-path.patch; + libmpv = "${lib.getLib mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + postPatch = '' + substituteInPlace usr/lib/hypnotix/hypnotix.py \ + --replace __DEB_VERSION__ ${version} \ + --replace /usr/share/hypnotix $out/share/hypnotix + ''; + + nativeBuildInputs = [ + gettext + gobject-introspection + python3.pkgs.wrapPython + wrapGAppsHook + ]; + + dontWrapGApps = true; + + buildInputs = [ + cinnamon.xapps + ]; + + pythonPath = with python3.pkgs; [ + imdbpy + pygobject3 + requests + setproctitle + unidecode + xapp + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r usr/lib $out + cp -r usr/share $out + + glib-compile-schemas $out/share/glib-2.0/schemas + + runHook postInstall + ''; + + preFixup = '' + buildPythonPath "$out $pythonPath" + makeWrapper ${python3.interpreter} $out/bin/hypnotix \ + --add-flags $out/lib/hypnotix/hypnotix.py \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ + ''${gappsWrapperArgs[@]} + ''; + + meta = { + description = "IPTV streaming application"; + homepage = "https://github.com/linuxmint/hypnotix"; + changelog = "https://github.com/linuxmint/hypnotix/blob/${src.rev}/debian/changelog"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/video/hypnotix/libmpv-path.patch b/pkgs/applications/video/hypnotix/libmpv-path.patch new file mode 100644 index 0000000000000..86337b4930afa --- /dev/null +++ b/pkgs/applications/video/hypnotix/libmpv-path.patch @@ -0,0 +1,18 @@ +diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py +index f42a3be..f1fc40b 100644 +--- a/usr/lib/hypnotix/mpv.py ++++ b/usr/lib/hypnotix/mpv.py +@@ -44,12 +44,7 @@ else: + # still better than segfaulting, we are setting LC_NUMERIC to "C". + locale.setlocale(locale.LC_NUMERIC, 'C') + +- sofile = ctypes.util.find_library('mpv') +- if sofile is None: +- raise OSError("Cannot find libmpv in the usual places. Depending on your distro, you may try installing an " +- "mpv-devel or mpv-libs package. If you have libmpv around but this script can't find it, consult " +- "the documentation for ctypes.util.find_library which this script uses to look up the library " +- "filename.") ++ sofile = '@libmpv@' + backend = CDLL(sofile) + fs_enc = sys.getfilesystemencoding() + diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 82d34d188ff64..0afd173debdb5 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -22,22 +22,18 @@ , qtwebchannel , qtwebengine , qtx11extras +, jellyfin-web }: mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-iqwOv95JFxQ1j/9B+oBFAp7mD1/1g2EJYvvUKbrDQes="; - }; - - jmpDist = fetchzip { - url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.3/dist.zip"; - sha256 = "sha256-P7WEYbVvpaVLwMgqC2e8QtMOaJclg0bX78J1fdGzcCU="; + sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0="; }; patches = [ @@ -81,9 +77,8 @@ mkDerivation rec { ]; preBuild = '' - # copy the webclient-files to the expected "dist" directory - mkdir -p dist - cp -a ${jmpDist}/* dist + # link the jellyfin-web files to the expected "dist" directory + ln -s ${jellyfin-web}/share/jellyfin-web dist ''; postInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 827824930cb20..da75adab7b51c 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -13,11 +13,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.0.2"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "yFFMsGbzMAKyXpD/vZelswYulTYe5WybjG5pD2RpLrk="; + sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix index 1088f560adf90..210429c777068 100644 --- a/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "certifi"; namespace = "script.module.certifi"; - version = "2020.12.05+matrix.1"; + version = "2022.5.18+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy"; + sha256 = "tk4Ven35sicLxrT7SO2yx5kQORjFP6niRuS9SMocJKY="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix index 01f16696faeec..e21613dce615c 100644 --- a/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/pkgs/applications/video/kodi/addons/idna/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "idna"; namespace = "script.module.idna"; - version = "2.10.0+matrix.1"; + version = "3.3.0+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7"; + sha256 = "gXW1BvM3CLKshVPaemjmzEoZekU0QjuxJY9zGbGwK18="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix new file mode 100644 index 0000000000000..c2885ba03a0a1 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -0,0 +1,32 @@ +{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: + +buildKodiAddon rec { + pname = "invidious"; + namespace = "plugin.video.invidious"; + version = "0.1.0+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM="; + }; + + propagatedBuildInputs = [ + requests + inputstream-adaptive + inputstreamhelper + ]; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.invidious"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/TheAssassin/kodi-invidious-plugin"; + description = "A privacy-friendly way of watching YouTube content"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/requests/default.nix b/pkgs/applications/video/kodi/addons/requests/default.nix index c5759fcc325b8..3361a03f5d285 100644 --- a/pkgs/applications/video/kodi/addons/requests/default.nix +++ b/pkgs/applications/video/kodi/addons/requests/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "requests"; namespace = "script.module.requests"; - version = "2.25.1+matrix.1"; + version = "2.27.1+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "00qhykizvspzfwgl7qz9cyxrazs54jgin40g49v5nzmjq3qf62hb"; + sha256 = "QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index de0fbb997654e..1becee357bee8 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -1,12 +1,13 @@ { lib, buildKodiAddon, fetchzip, addonUpdateScript }: + buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "1.26.4+matrix.1"; + version = "1.26.9+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1d2k6gbsnhdadcl1xc7igz4m71z2fcnpln5ppfjv455cmkk110vf"; + sha256 = "w2HXepAHLE4NAWTXOQgY3ifr3mlI/QYF6KAKqpAmO/g="; }; passthru = { diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 6bec6e25533f1..b01af67cd68e6 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -85,6 +85,7 @@ in buildFHSUserEnv { meta = { description = "Professional Non-Linear Video Editor"; homepage = "https://www.lwks.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ antonxy vojta001 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 60604a4b8abf2..a374d7b9b3288 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread ]; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Command line tool to make a copy from a video DVD for private use"; homepage = "https://sourceforge.net/projects/lxdvdrip"; license = lib.licenses.gpl2; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 2c15513d4d65e..c3d758268917c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -79,6 +79,7 @@ in mkDerivation { can always download the latest version from makemkv.com that will reset the expiration date. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 5da81eff50e65..bdaa216ffaa90 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -1,64 +1,134 @@ -{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch -, cairo, ffmpeg, sox, xdg-utils, texlive -, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub -, pbr, fetchPypi +{ lib +, fetchFromGitHub + +, cairo +, ffmpeg +, texlive + +, python3 }: -buildPythonApplication rec { + +let + # According to ManimCommunity documentation manim uses tex-packages packaged + # in a custom distribution called "manim-latex", + # + # https://community.chocolatey.org/packages/manim-latex#files + # + # which includes another cutom distribution called tinytex, for which the + # package list can be found at + # + # https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt + # + # these two combined add up to: + manim-tinytex = { + inherit (texlive) + + # tinytex + scheme-infraonly amsfonts amsmath atbegshi atveryend auxhook babel bibtex + bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex + etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec + framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def + grffile helvetic hycolor hyperref hyph-utf8 iftex inconsolata infwarerr + intcalc knuth-lib kvdefinekeys kvoptions kvsetkeys l3backend l3kernel + l3packages latex latex-amsmath-dev latex-bin latex-fonts latex-tools-dev + latexconfig latexmk letltxmacro lm lm-math ltxcmds lua-alt-getopt luahbtex + lualatex-math lualibs luaotfload luatex mdwtools metafont mfware natbib + pdfescape pdftex pdftexcmds plain psnfss refcount rerunfilecheck stringenc + tex tex-ini-files times tipa tools unicode-data unicode-math uniquecounter + url xcolor xetex xetexconfig xkeyval xunicode zapfding + + # manim-latex + standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e + fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super + babel-english gnu-freefont mathastext cbfonts-fd; + }; +in python3.pkgs.buildPythonApplication rec { pname = "manim"; - version = "0.1.10"; + format = "pyproject"; + version = "0.15.2"; + disabled = python3.pythonOlder "3.8"; - src = fetchPypi { - pname = "manimlib"; - inherit version; - sha256 = "0vg9b3rwypq5zir74pi0pmj47yqlcg7hrvscwrpjzjbqq2yihn49"; + src = fetchFromGitHub { + owner = "ManimCommunity"; + repo = pname; + rev = "v${version}"; + sha256 = "l5JiFWCMQbGnwRRtYzCHBXdVzWBrTNPdcIYaAt/wRNA="; }; - patches = [ ./remove-dependency-constraints.patch ]; + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; - nativeBuildInputs = [ pbr ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" \ + --replace 'cloup = "^0.13.0"' 'cloup = "*"' \ + --replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \ + ''; - propagatedBuildInputs = [ + buildInputs = [ cairo ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + click-default-group + cloup colour + grpcio + grpcio-tools + importlib-metadata + isosurfaces + jupyterlab + manimpango + mapbox-earcut + moderngl + moderngl-window + networkx numpy pillow - progressbar - scipy - tqdm - opencv pycairo pydub + pygments + pysrt + rich + scipy + screeninfo + skia-pathops + srt + tqdm + watchdog + ]; - cairo sox ffmpeg xdg-utils + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ + ffmpeg + (texlive.combine manim-tinytex) + ]) ]; - # Test with texlive to see whether it works but don't propagate - # because it's huge and optional - # TODO: Use smaller TexLive distribution - # Doesn't need everything but it's hard to figure out what it needs - checkInputs = [ cairo sox ffmpeg xdg-utils texlive.combined.scheme-full ]; - - # Simple test and complex test with LaTeX - checkPhase = '' - for scene in SquareToCircle OpeningManimExample - do - python3 manim.py example_scenes.py $scene -l - tail -n 20 files/Tex/*.log # Print potential LaTeX erorrs - ${file}/bin/file videos/example_scenes/480p15/$scene.mp4 \ - | tee | grep -F "ISO Media, MP4 Base Media v1 [ISO 14496-12:2003]" - done - ''; - disabled = pythonOlder "3.7"; + checkInputs = [ + python3.pkgs.pytest-xdist + python3.pkgs.pytestCheckHook + + ffmpeg + (texlive.combine manim-tinytex) + ]; + + # about 55 of ~600 tests failing mostly due to demand for display + disabledTests = import ./failing_tests.nix; + + pythonImportsCheck = [ "manim" ]; - meta = { - description = "Animation engine for explanatory math videos"; + meta = with lib; { + description = "Animation engine for explanatory math videos - Community version"; longDescription = '' Manim is an animation engine for explanatory math videos. It's used to create precise animations programmatically, as seen in the videos of - 3Blue1Brown on YouTube. + 3Blue1Brown on YouTube. This is the community maintained version of + manim. ''; - homepage = "https://github.com/3b1b/manim"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ johnazoidberg ]; + homepage = "https://github.com/ManimCommunity/manim"; + license = licenses.mit; + maintainers = with maintainers; [ friedelino ]; }; } diff --git a/pkgs/applications/video/manim/failing_tests.nix b/pkgs/applications/video/manim/failing_tests.nix new file mode 100644 index 0000000000000..a1f82a98dc16e --- /dev/null +++ b/pkgs/applications/video/manim/failing_tests.nix @@ -0,0 +1,74 @@ +# reason for failure: tests try to open display +[ + "test_background_color" + "test_scene_add_remove" + "test_Circle" + "test_wait_skip" + "test_basic_scene_with_default_values" + "test_dry_run_with_png_format" + "test_dry_run_with_png_format_skipped_animations" + "test_FixedMobjects3D" + "test_basic_scene_l_flag" + "test_n_flag" + "test_s_flag_opengl_renderer" + "test_s_flag_no_animations" + "test_image_output_for_static_scene" + "test_no_image_output_with_interactive_embed" + "test_no_default_image_output_with_non_static_scene" + "test_image_output_for_static_scene_with_write_to_movie" + "test_s_flag" + "test_r_flag" + "test_play_skip" + "test_write_to_movie_disables_window" + "test_a_flag" + "test_pixel_coords_to_space_coords" + "test_t_values" + "test_custom_folders" + "test_t_values[15]" + "test_t_values[30]" + "test_t_values[60]" + "test_dash_as_filename" + "test_images_are_created_when_png_format_set_for_opengl" + "test_t_values_with_skip_animations" + "test_static_wait_detection" + "test_non_static_wait_detection" + "test_frozen_frame" + "test_gif_format_output" + "test_animate_with_changed_custom_attribute" + "test_images_are_zero_padded_when_zero_pad_set_for_opengl" + "test_mp4_format_output" + "test_videos_not_created_when_png_format_set" + "test_images_are_created_when_png_format_set" + "test_images_are_zero_padded_when_zero_pad_set" + "test_webm_format_output" + "test_default_format_output_for_transparent_flag" + "test_mov_can_be_set_as_output_format" + "test_force_window_opengl_render_with_format" + "test_get_frame_with_preview_disabled" + "test_get_frame_with_preview_enabled" +] ++ + +# reason for failure: tests try to reach network +[ + "test_logging_to_file" + "test_plugin_function_like" + "test_plugin_no_all" + "test_plugin_with_all" +] ++ + +# failing with: +# E AssertionError: +# E Not equal to tolerance rtol=1e-07, atol=1.01 +# E Frame no -1. You can use --show_diff to visually show the difference. +# E Mismatched elements: 18525 / 1639680 (1.13%) +# E Max absolute difference: 255 +# E Max relative difference: 255. +[ + "test_Text2Color" +] ++ + +# failing with: +# TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif? +[ + "test_force_window_opengl_render_with_movies" +] diff --git a/pkgs/applications/video/manim/remove-dependency-constraints.patch b/pkgs/applications/video/manim/remove-dependency-constraints.patch deleted file mode 100644 index 4a7da45d0f57b..0000000000000 --- a/pkgs/applications/video/manim/remove-dependency-constraints.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git i/requirements.txt w/requirements.txt -index 556122ad..11fd49d5 100644 ---- i/requirements.txt -+++ w/requirements.txt -@@ -1,11 +1,10 @@ --argparse==1.4.0 --colour==0.1.5 --numpy==1.15.0 --Pillow==5.2.0 --progressbar==2.5 --scipy==1.1.0 --tqdm==4.24.0 --opencv-python==3.4.2.17 --pycairo==1.17.1; sys_platform == 'linux' --pycairo>=1.18.0; sys_platform == 'win32' --pydub==0.23.0 -+colour -+numpy -+Pillow -+progressbar -+scipy -+tqdm -+pycairo -+pycairo>=1.18.1; sys_platform == 'win32' -+pydub -+pyreadline==2.1; sys_platform == 'win32' diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix new file mode 100644 index 0000000000000..332f8ef78eead --- /dev/null +++ b/pkgs/applications/video/media-downloader/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qt5 +, ffmpeg-full +, aria2 +, yt-dlp +, python3 +}: + +stdenv.mkDerivation rec { + pname = "media-downloader"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "mhogomchungu"; + repo = pname; + rev = "${version}"; + sha256 = "sha256-EyfhomwBtdAt6HGRwnpiijm2D1LfaCAoG5qk3orDG98="; + }; + + nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; + + preFixup = '' + qtWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ ffmpeg-full aria2 yt-dlp python3 ]}" + ) + ''; + + meta = with lib; { + description = "A Qt/C++ GUI front end to youtube-dl"; + homepage = "https://github.com/mhogomchungu/media-downloader"; + license = licenses.gpl2Plus; + broken = stdenv.isDarwin; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 7f36fd232e971..5ad81bc0a7680 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; homepage = "https://mediathekview.de/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ moredread ]; platforms = platforms.all; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index d9a8a8436936a..7bd010cff1522 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 = "67.0.0"; + version = "68.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0gyjgp5iyr9kvgpgl064w025ji1w8dy0cnw4fmbp71wis7qp7yl1"; + sha256 = "0m09r0w98dja9y1yp1vq5hdh46lw0k60aa0xfkdy5zlva568cb7c"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix index 936f418191af9..4d8ffb831a674 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "obs-nvfbc"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitLab { owner = "fzwoch"; repo = "obs-nvfbc"; rev = "v${version}"; - sha256 = "sha256-Si+TGYWpNPtUUFT+M571lCYslPyeYX92MdYV9EGgcyQ="; + sha256 = "sha256-WoqtppgIcjE0n9atsvAZrXvBVi2rWCIIFDXTgblQK9I="; }; nativeBuildInputs = [ meson pkg-config ninja ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OBS Studio source plugin for NVIDIA FBC API"; + homepage = "https://gitlab.com/fzwoch/obs-nvfbc"; license = licenses.gpl2Only; maintainers = with maintainers; [ babbaj ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 1b97fa9b7c665..5406b7dfa8a85 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,19 +1,16 @@ { lib , fetchurl -, fetchpatch , pkg-config , gettext , itstool , python3 , wrapGAppsHook -, python3Packages , gst_all_1 , gtk3 , gobject-introspection , libpeas , librsvg , gnome -, gnome-desktop , libnotify , gsound , meson @@ -21,15 +18,15 @@ , gsettings-desktop-schemas }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pitivi"; - version = "2021.05"; + version = "2022.06"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z1aTxGxCqw2hSi5Zv89LyIBgS0HpzTqo0uvcYIJ7dcc="; + sha256 = "Uz0448bSEcK9DpXiuWsPCDO98NXUd6zgffYRWDUGyDg="; }; patches = [ @@ -37,13 +34,6 @@ python3Packages.buildPythonApplication rec { # and saves them to the generated binary. This would make the build-time # dependencies part of the closure so we remove it. ./prevent-closure-contamination.patch - - # Fix build with meson 0.61 - # https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/414 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c.patch"; - sha256 = "MC4naGnqhrYlFBFHZaSzbOzrqaNK5/Xv5jBmCu0fLQE="; - }) ]; nativeBuildInputs = [ @@ -61,9 +51,7 @@ python3Packages.buildPythonApplication rec { gtk3 libpeas librsvg - gnome-desktop gsound - gnome.adwaita-icon-theme gsettings-desktop-schemas libnotify ] ++ (with gst_all_1; [ @@ -77,14 +65,13 @@ python3Packages.buildPythonApplication rec { gst-devtools ]); - pythonPath = with python3Packages; [ + pythonPath = with python3.pkgs; [ pygobject3 gst-python - pyxdg numpy pycairo matplotlib - dbus-python + librosa ]; postPatch = '' diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index d7e1e03733c2a..decba42dd5f4e 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, pycurl, python-dateutil, configobj, sqlalchemy, sdnotify, flask }: +{ stdenv, lib, buildPythonApplication, fetchFromGitHub, pycurl, python-dateutil, configobj, sqlalchemy, sdnotify, flask }: buildPythonApplication rec { pname = "pyca"; @@ -21,6 +21,7 @@ buildPythonApplication rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "A fully functional Opencast capture agent written in Python"; homepage = "https://github.com/opencast/pyCA"; license = licenses.lgpl3; diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 5fc62912c24a4..dd2a7dadc2f75 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,15 +1,15 @@ { mkDerivation, lib, fetchbzr, python3, rtmpdump }: let - pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]); + pythonEnv = python3.withPackages (ps: with ps; [ m3u8 pyqt5_with_qtmultimedia ]); in mkDerivation { pname = "qarte"; - version = "4.15.1"; + version = "4.17.1"; src = fetchbzr { url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4"; - rev = "67"; - sha256 = "sha256:0ajvrvpyqyyxnq9nv69p3sr6c1kplphvrpph75k76yl0av94j2s3"; + rev = "74"; + sha256 = "sha256:18ky9qwfvbifd0xrbmnfm3cm2vyy5jgf9rrca2hby46sjf2745h4"; }; buildInputs = [ pythonEnv ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 395da881ea9f5..7459d08d59531 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -124,6 +124,7 @@ stdenv.mkDerivation rec { longDescription = "Browse Twitch.tv and watch streams in your videoplayer of choice"; homepage = "https://streamlink.github.io/streamlink-twitch-gui/"; downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ rileyinman ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 700730a57fc97..770fe2cea3ee2 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -34,6 +34,7 @@ , libmtp , liboggz , libopus +, libplacebo , libpulseaudio , libraw1394 , librsvg @@ -123,6 +124,7 @@ stdenv.mkDerivation rec { libmtp liboggz libopus + libplacebo libpulseaudio libraw1394 librsvg diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index aeea52a4ff5a0..2bb9437f1b06f 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -30,6 +30,10 @@ mkDerivation rec { ./ffmpeg-out-of-box.patch ]; + # Workaround build failure on -fno-common toolchains: + # ld: alsa_device.o:(.bss+0x8): multiple definition of `rc'; QvkAlsaDevice.o:(.bss+0x8): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' sed -i 's/lrelease-qt5/lrelease/g' vokoscreen.pro ''; diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 7cbc2b0f81590..9c07eb1a6368a 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q"; }; + # Workaround build failure on -fno-common toolchains: + # ld: char-coding.o:/build/w_scan-20170107/si_types.h:117: multiple definition of + # `service_t'; countries.o:/build/w_scan-20170107/si_types.h:117: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + meta = { description = "Small CLI utility to scan DVB and ATSC transmissions"; homepage = "http://wirbel.htpc-forum.de/w_scan/index_en.html"; diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix deleted file mode 100644 index 5a6c6ff524e3c..0000000000000 --- a/pkgs/applications/video/wxcam/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl -, pkg-config -, intltool -, libX11, libXv, libSM -, gtk, libglade -, wxGTK -, perlPackages -, xvidcore -, mjpegtools -, alsa-lib -, libv4l -, cimg }: - -stdenv.mkDerivation rec { - - pname = "wxcam"; - version = "1.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${pname}-${version}.tar.gz"; - sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859"; - }; - - buildInputs = with lib; - [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsa-lib libv4l cimg ]; - - NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg"; - - postUnpack = '' - sed -ie 's|/usr/share/|'"$out/share/"'|g' $sourceRoot/Makefile.in - ''; - - installPhase = '' - make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam" - ''; - - meta = with lib; { - description = "An open-source, wxGTK-based webcam app for Linux"; - longDescription = '' - wxCam is a webcam application for linux. It supports video recording - (avi uncompressed and Xvid formats), snapshot taking, and some special - commands for philips webcams, so you can also use it for astronomy purposes. - It supports both video4linux 1 and 2 drivers, - so it should work on a very large number of devices. - ''; - homepage = "http://wxcam.sourceforge.net/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 843cebe7d6ba6..82d98274f8ae5 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -27,7 +27,8 @@ edk2.mkDerivation projectDscPath { outputs = [ "out" "fd" ]; - buildInputs = [ util-linux nasm acpica-tools ]; + nativeBuildInputs = [ util-linux nasm acpica-tools ]; + strictDeps = true; hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; diff --git a/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch b/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch new file mode 100644 index 0000000000000..5a15686353a30 --- /dev/null +++ b/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch @@ -0,0 +1,12 @@ +diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui +index 430f879..68856fc 100644 +--- a/src/resources/ui/virt-viewer.ui ++++ b/src/resources/ui/virt-viewer.ui +@@ -137,7 +137,6 @@ + </child> + <child type="titlebar"> + <object class="GtkHeaderBar" id="header"> +- <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="show-close-button">True</property> + <child> diff --git a/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch b/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch new file mode 100644 index 0000000000000..012c37be64521 --- /dev/null +++ b/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch @@ -0,0 +1,15 @@ +diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c +index 2265f02..1d60d81 100644 +--- a/src/virt-viewer-display-spice.c ++++ b/src/virt-viewer-display-spice.c +@@ -317,8 +317,8 @@ virt_viewer_display_spice_new(VirtViewerSessionSpice *session, + gtk_container_add(GTK_CONTAINER(self), GTK_WIDGET(self->display)); + gtk_widget_show(GTK_WIDGET(self->display)); + g_object_set(self->display, +- "grab-keyboard", TRUE, +- "grab-mouse", TRUE, ++ "grab-keyboard", FALSE, ++ "grab-mouse", FALSE, + "resize-guest", FALSE, + "scaling", TRUE, + NULL); diff --git a/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch b/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch new file mode 100644 index 0000000000000..51a47bbbac6db --- /dev/null +++ b/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch @@ -0,0 +1,14 @@ +diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c +index fe740ce..d45fd4f 100644 +--- a/src/virt-viewer-window.c ++++ b/src/virt-viewer-window.c +@@ -1342,6 +1342,9 @@ virt_viewer_window_update_title(VirtViewerWindow *self) + grabhint, + g_get_application_name()); + } ++ } else if (g_str_has_prefix(self->subtitle, "appvm_")) { ++ /* Use name of the application as a title */ ++ title = g_strdup_printf(_("%s"), &self->subtitle[strlen("appvm_")]); + } else if (self->subtitle) { + /* translators: + * This is "<subtitle> - <appname>" diff --git a/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch b/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch new file mode 100644 index 0000000000000..3c517867aac7a --- /dev/null +++ b/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch @@ -0,0 +1,12 @@ +diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c +index b977b7b..36bce34 100644 +--- a/src/virt-viewer-app.c ++++ b/src/virt-viewer-app.c +@@ -976,6 +976,7 @@ virt_viewer_app_set_window_subtitle(VirtViewerApp *app, + *d = '%'; + } else + subtitle = g_strdup_printf("%s (%s)", title, desc); ++ subtitle = g_strdup_printf("%s", title); + g_free(desc); + } + diff --git a/pkgs/applications/virtualization/appvm/default.nix b/pkgs/applications/virtualization/appvm/default.nix new file mode 100644 index 0000000000000..27002bac405fb --- /dev/null +++ b/pkgs/applications/virtualization/appvm/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix +, virt-viewer +, fetchpatch +, makeWrapper }: + +let + # Upstream patches fail with newer virt-viewer. These are own ports to the + # newest virt-viewer version, see: + # https://github.com/jollheef/appvm/issues/28 + virt-manager-without-menu = virt-viewer.overrideAttrs(oldAttrs: { + patches = oldAttrs.patches ++ [ + ./0001-Remove-menu-bar.patch + ./0002-Do-not-grab-keyboard-mouse.patch + ./0003-Use-name-of-appvm-applications-as-a-title.patch + ./0004-Use-title-application-name-as-subtitle.patch + ]; + }); +in +buildGoModule rec { + pname = "appvm"; + version = "unstable-2021-12-20"; + + src = fetchFromGitHub { + owner = "jollheef"; + repo = pname; + rev = "17f17be7846d872e7e26d5cb6759a52ea4113587"; + sha256 = "sha256-FL5olOy1KufULyqI2dJeS0OnKzC3LfPWxnia2i4f4yY="; + }; + + vendorSha256 = "sha256-8eU+Mf5dxL/bAMMShXvj8I1Kdd4ysBTWvgYIXwLStPI="; + + buildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/appvm \ + --prefix PATH : "${lib.makeBinPath [ nix virt-manager-without-menu ]}" + ''; + + meta = with lib; { + description = "Nix-based app VMs"; + homepage = "https://code.dumpstack.io/tools/${pname}"; + maintainers = with maintainers; [ dump_stack cab404 onny ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/applications/virtualization/arion/default.nix index efe13868524b9..71de7d90ca7e6 100644 --- a/pkgs/applications/virtualization/arion/default.nix +++ b/pkgs/applications/virtualization/arion/default.nix @@ -53,7 +53,7 @@ let mv $out/bin/arion $out/libexec makeWrapper $out/libexec/arion $out/bin/arion \ --unset PYTHONPATH \ - --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]} \ + --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose_1 ]} \ ; ''; }; diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix index e059a254cb97e..074015bb34530 100644 --- a/pkgs/applications/virtualization/catatonit/default.nix +++ b/pkgs/applications/virtualization/catatonit/default.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + enableParallelBuilding = true; + strictDeps = true; + doInstallCheck = true; installCheckPhase = '' readelf -d $out/bin/catatonit | grep 'There is no dynamic section in this file.' diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 10f61bfd233cc..28300b9a50935 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "23.1"; + version = "25.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pyocmj5cr2vOfeyRG3mBU11I3iXndUh3VifRSlnjoE8="; + sha256 = "sha256-vYF0ReYUcWaMbJW920sJHqw6OwzlRS1c/zjG8COs3OI="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "1rx4d38d0ajdq3qs638gmagmj3f9j29i5mhrrzw039mggahjbksw"; + cargoSha256 = "sha256-l0nczPcncLhKw9yGmFozLzW5EOdeZcVGp0a84j4wN0w="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 980955fcda65a..6b6d1364f7533 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -4,26 +4,44 @@ , installShellFiles , lima , makeWrapper +, qemu +, testers +, colima }: buildGoModule rec { pname = "colima"; - version = "0.3.4"; + version = "0.4.4"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g7q2DmtyArtW7Ii2XF5umXQ0+BlCSa1Q7VNNuIuX65k="; + sha256 = "bSBaSS+rVkFqTSdyegdE/F0X5u7yvF/nHslAO3xgD6I="; + # We need the git revision + leaveDotGit = true; + postFetch = '' + git -C $out rev-parse --short HEAD > $out/.git-revision + rm -rf $out/.git + ''; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-Z4+qwoX04VnLsUIYRfOowFLgcaA9w8oGRl77jzFigIc="; + vendorSha256 = "sha256-jDzDwK7qA9lKP8CfkKzfooPDrHuHI4OpiLXmX9vOpOg="; + + CGO_ENABLED = 1; + + preConfigure = '' + ldflags="-s -w -X github.com/abiosoft/colima/config.appVersion=${version} \ + -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" + ''; + + subPackages = [ "cmd/colima" ]; postInstall = '' wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima ]} + --prefix PATH : ${lib.makeBinPath [ lima qemu ]} installShellCompletion --cmd colima \ --bash <($out/bin/colima completion bash) \ @@ -31,10 +49,15 @@ buildGoModule rec { --zsh <($out/bin/colima completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = colima; + command = "HOME=$(mktemp -d) colima version"; + }; + meta = with lib; { - description = "Container runtimes on MacOS with minimal setup"; + description = "Container runtimes with minimal setup"; homepage = "https://github.com/abiosoft/colima"; license = licenses.mit; - maintainers = with maintainers; [ aaschmid ]; + maintainers = with maintainers; [ aaschmid tricktron ]; }; } diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index fc195f81181a1..d49ece5048832 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HzLRwJwzvXhQOcmBp55I54sAnCKPeQw99H/XMOegOHo="; + sha256 = "sha256-KDAm+Djk1AaA3zXhxywT6HknT0tVCEZLS27nO9j/WgM="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; + enableParallelBuilding = true; + strictDeps = true; + passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index c1302ac2de492..8c4fbce8e1e9a 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.4"; + version = "1.6.6"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0="; + sha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index b6d238d599ee6..b234354f9fc26 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.23.2"; + version = "1.24.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U="; + sha256 = "sha256-/AoZKeUcYF1fyYtllXpB7GNWR/6SWEOy2ffDLYbTp9E="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 2d35b1c4a039a..c0c53b9c6ae16 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -11,6 +11,7 @@ , yajl , nixosTests , criu +, fetchpatch }: let @@ -48,6 +49,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Should dropped in next release after 1.4.5 + (fetchpatch { + name = "usrbin-paths.patch"; + url = "https://github.com/containers/crun/commit/dd29f7f7f713c49784ac30f7cdca33b2ef94d5b8.patch"; + sha256 = "sha256-kHHix8CUL+c8HbOe5qx4PeF1P19113U4bRZyleMUjqk="; + }) + ]; + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ] @@ -55,6 +65,7 @@ stdenv.mkDerivation rec { ++ lib.optional (lib.elem stdenv.hostPlatform.system criu.meta.platforms) criu; enableParallelBuilding = true; + strictDeps = true; # we need this before autoreconfHook does its thing in order to initialize # config.h with the correct values diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index e29de7a52fdd2..9a6bd0a0e3a58 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.2.15"; + version = "1.3.1"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-9rivXnHyEE1MoGY+CwUeDStLGPVq+4FvwPjV7Nblk60="; + sha256 = "sha256-7qPEtWDshe3bHUvbf35k31EnL2sQEXeDmMUGBPkiB9U="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index dbf4bb734d84e..09c8de64f2807 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,15 +1,9 @@ -{ lib -, buildGoPackage -, fetchFromGitHub -, makeWrapper -}: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "docker-slim"; version = "1.37.6"; - goPackagePath = "github.com/docker-slim/docker-slim"; - src = fetchFromGitHub { owner = "docker-slim"; repo = "docker-slim"; @@ -17,16 +11,17 @@ buildGoPackage rec { sha256 = "sha256-Jzi6JC6DRklZhNqmFx6eHx6qR8/fb/JuSpgwtPThcc4="; }; + vendorSha256 = null; + subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; ldflags = [ - "-s" "-w" - "-X ${goPackagePath}/pkg/version.appVersionTag=${version}" - "-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}" + "-s" + "-w" + "-X github.com/docker-slim/docker-slim/pkg/version.appVersionTag=${version}" + "-X github.com/docker-slim/docker-slim/pkg/version.appVersionRev=${src.rev}" ]; # docker-slim tries to create its state dir next to the binary (inside the nix diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 1b58b4ee9cf6a..583a3e50a1f59 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,22 +2,27 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.5.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-gb2XFIzYU1dZh8WPheb4073AOLdfT7CbBD89HxobY9Y="; + sha256 = "sha256-D3+qDWxg3e5/3UIMz8FZDuxmQHmTv0NJVT/otGYedtw="; }; - vendorSha256 = "sha256-2pWBMXVnmKE4D7JXaKOqtuCz7nsX2a/58lyLp58OTYI="; + vendorSha256 = "sha256-WxLQfu65Gr+ao/pM8B2uiS88sNT72Klhz7ZIrEadW5g="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; doCheck = false; installPhase = '' + runHook preInstall install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose + + mkdir -p $out/bin + ln -s $out/libexec/docker/cli-plugins/docker-compose $out/bin/docker-compose + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker/compose_1.nix index fd67aa554f043..1299d6f69ec79 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix @@ -2,7 +2,7 @@ , installShellFiles , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt -, dockerpty, docker, ipaddress, jsonschema, requests +, dockerpty, docker, jsonschema, requests , six, texttable, websocket-client, cached-property , enum34, functools32, paramiko, distro, python-dotenv }: @@ -22,7 +22,7 @@ buildPythonApplication rec { checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml colorama dockerpty docker - ipaddress jsonschema requests six texttable websocket-client + jsonschema requests six texttable websocket-client docopt cached-property paramiko distro python-dotenv ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname ++ lib.optional (pythonOlder "3.4") enum34 diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 125061bedaf2c..f21afbd55a81e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -13,7 +13,7 @@ rec { , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 + , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs , nixosTests @@ -136,7 +136,7 @@ rec { }); plugins = optionals buildxSupport [ docker-buildx ] - ++ optionals composeSupport [ docker-compose_2 ]; + ++ optionals composeSupport [ docker-compose ]; pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoPackage ((optionalAttrs (!clientOnly) { @@ -243,19 +243,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.15"; + version = "20.10.17"; rev = "v${version}"; - sha256 = "sha256-uzwnXDomho5/Px4Ou/zP8Vedo2J9hVfcaFzM9vWh2Mo="; + sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-+Eds5WI+Ujz/VxkWb1ToaGLk7wROTwWwJYpiZRIxAf0"; + sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I="; }; - runcRev = "v1.1.1"; - runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; - containerdRev = "v1.6.4"; - containerdSha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0="; + runcRev = "v1.1.2"; + runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8="; + containerdRev = "v1.6.6"; + containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix index 96722fe393f60..8253a2304da9b 100644 --- a/pkgs/applications/virtualization/docker/distribution.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "distribution"; - version = "2.7.1"; + version = "2.8.1"; rev = "v${version}"; goPackagePath = "github.com/docker/distribution"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "docker"; repo = "distribution"; inherit rev; - sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw"; + sha256 = "sha256-M8XVeIvD7LtWa9l+6ovwWu5IwFGYt0xDfcIwcU/KH/E="; }; meta = with lib; { diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index 75cf99caf861f..903eb132738ab 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Xen Subproject: Windows PV Driver"; homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.bsd3; }; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index a4cd8dacc449e..c442d978737e5 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Windows QEMU Drivers"; homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index ef8ec062e4d88..7a5cd39a18402 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -39,8 +39,9 @@ stdenv.mkDerivation { Certificate obtained from the VeriSign CA. ''; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = licenses.gpl2; }; -} + } diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 2c2cd90f1c26f..10668afd7eb43 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -72,7 +72,8 @@ stdenv.mkDerivation { description = "Windows SPICE Drivers"; homepage = "https://www.spice-space.org/"; license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 060cc4b4ebf60..ec8e1e84145b1 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Windows VirtIO Drivers"; homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; license = [ licenses.bsd3 ]; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 0ced37bb40f69..c6b9b4149fea4 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OqsLHxY7dZKN/zazeDASBt5UsQGieU5laIUeshtS55w="; + sha256 = "sha256-tTa/FQiF2qZ36OGORr5fqvKR5i6qo7OTBJFGWJMShQ0="; }; - vendorSha256 = "sha256-0Z+SAEHFJio+N7ATiviBkLPn6cNFlhE3Dsj8CxVtf7c="; + vendorSha256 = "sha256-wvb592mmxOeRSX8Rxx2m7tZ2S8wQTcQkL3b6z0F6OEQ="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix new file mode 100644 index 0000000000000..e6dbb84610fc2 --- /dev/null +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "nixpacks"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "railwayapp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-UxdK2e5VYcOEYdZn0oGRFIVGiwnPixiZ3rOnqJDSQO8="; + }; + + cargoSha256 = "sha256-dJdPs4BJ1R2ZbGmGmvBerLPVqUHn5b/fz9C0kEnxA6U="; + + # skip test due FHS dependency + doCheck = false; + + meta = with lib; { + description = "App source + Nix packages + Docker = Image Resources"; + homepage = "https://github.com/railwayapp/nixpacks"; + license = licenses.mit; + maintainers = [ maintainers.zoedsoupe ]; + }; +} diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 6018608a3f163..02c25dd86bd40 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook , bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which -, libdrm, udev +, libdrm, udev, util-linux , withX ? true }: stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.0.0"; + version = "12.0.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U="; + sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -25,21 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - # glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow - # Will be fixed in the release after 12.0.0 - (fetchpatch { - url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch"; - sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh"; - }) - ]; - - prePatch = '' - cd .. - ''; - postPatch = '' - cd open-vm-tools sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am @@ -51,6 +37,13 @@ stdenv.mkDerivation rec { # Make reboot work, shutdown is not in /sbin on NixOS sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c + + # Fix paths to fuse3 (we do not use fuse2 so that is not modified) + sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c + + substituteInPlace services/plugins/vix/foundryToolsDaemon.c \ + --replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \ + --replace "/bin/mount" "${util-linux}/bin/mount" ''; configureFlags = [ diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index bfd6ba4135b34..6b563dc8b8e54 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , pkg-config , fetchFromGitHub , buildGoModule @@ -11,25 +12,21 @@ }: buildGoModule rec { pname = "podman-tui"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - sha256 = "sha256-Xc6F87evQiv4jRbxxRBzJBeI8653HvlQL+UwcVWY0wk="; + sha256 = "sha256-2WugN5JdTkz3OOt3ggzT7HwMXy1jxn85RwF7409D8m8="; }; vendorSha256 = null; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - btrfs-progs - gpgme - libassuan - lvm2 - ]; + buildInputs = [ gpgme libassuan ] + ++ lib.optionals stdenv.isLinux [ btrfs-progs lvm2 ]; ldflags = [ "-s" "-w" ]; @@ -44,6 +41,5 @@ buildGoModule rec { description = "Podman Terminal UI"; license = licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; - platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 0c9ecf7e4d8ff..d663d0ec8b7b7 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-3MR4ZhkhMLAK3KHu7JEV9z1/wlyCkxfx1i267TGxwt8="; + sha256 = "sha256-+lwq4WTPeELjugTg9l1wvoe0VTqRK2lC1jaFIwXMrL0="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index c7a3620d644ed..985f7e469e3ea 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "A simple x86 firmware for booting Linux"; homepage = "https://github.com/bonzini/qboot"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ tstrobel ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix index d9a88bf545b38..f5998efea0e52 100644 --- a/pkgs/applications/virtualization/qemu/utils.nix +++ b/pkgs/applications/virtualization/qemu/utils.nix @@ -1,4 +1,4 @@ -{ stdenv, installShellFiles, qemu }: +{ stdenv, installShellFiles, qemu, removeReferencesTo }: stdenv.mkDerivation rec { pname = "qemu-utils"; @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = [ qemu ]; + disallowedRequisites = [ qemu ]; unpackPhase = "true"; installPhase = '' @@ -13,6 +14,7 @@ stdenv.mkDerivation rec { cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img" cp "${qemu}/bin/qemu-io" "$out/bin/qemu-io" cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd" + ${removeReferencesTo}/bin/remove-references-to -t ${qemu} $out/bin/* installManPage ${qemu}/share/man/man1/qemu-img.1.gz installManPage ${qemu}/share/man/man8/qemu-nbd.8.gz diff --git a/pkgs/applications/virtualization/railcar/cargo-lock.patch b/pkgs/applications/virtualization/railcar/cargo-lock.patch deleted file mode 100644 index bb9d5420f32a8..0000000000000 --- a/pkgs/applications/virtualization/railcar/cargo-lock.patch +++ /dev/null @@ -1,435 +0,0 @@ -From 97e1e2ca82c20317a6de1f345d2fb0adcde0b7fd Mon Sep 17 00:00:00 2001 -From: Katharina Fey <kookie@spacekookie.de> -Date: Mon, 10 Dec 2018 17:42:58 +0100 -Subject: [PATCH] Adding `Cargo.lock` for release `v1.0.4` - ---- - Cargo.lock | 416 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 416 insertions(+) - create mode 100644 Cargo.lock - -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..bf6aa0e ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,416 @@ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "backtrace" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "backtrace-sys" -+version = "0.1.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "bitflags" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "bitflags" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "caps" -+version = "0.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "enum_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "clap" -+version = "2.32.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "custom_derive" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "dtoa" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "enum_derive" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "error-chain" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "error-chain" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "lazy_static" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "libc" -+version = "0.2.45" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "log" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "nix" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "nix" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "oci" -+version = "0.1.0" -+dependencies = [ -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "prctl" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quote" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "railcar" -+version = "1.0.4" -+dependencies = [ -+ "caps 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "oci 0.1.0", -+ "prctl 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "seccomp-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_termios" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "scopeguard" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "seccomp-sys" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde" -+version = "0.9.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "serde_codegen_internals" -+version = "0.14.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "0.9.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde_json" -+version = "0.9.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "syn" -+version = "0.11.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "synom" -+version = "0.11.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "termion" -+version = "1.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "void" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winapi" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[metadata] -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -+"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a" -+"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0" -+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" -+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" -+"checksum caps 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c238ba41e8d1d354c8576228110585046ae379efd7af972932993d5c1d41c7d" -+"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16" -+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" -+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" -+"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" -+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" -+"checksum enum_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "406ac2a8c9eedf8af9ee1489bee9e50029278a6456c740f7454cf8a158abc816" -+"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" -+"checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46" -+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" -+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" -+"checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74" -+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" -+"checksum nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "921f61dc817b379d0834e45d5ec45beaacfae97082090a49c2cf30dcbc30206f" -+"checksum nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e49f6982987135c5e9620ab317623e723bd06738fd85377e8d55f57c8b6487" -+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" -+"checksum prctl 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52" -+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d" -+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -+"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395" -+"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" -+"checksum seccomp-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d4082b110d25cf281ddbf78dc56e1a65c929fd72ac6c2deb1a4c20a23999dfa" -+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" -+"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" -+"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" -+"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" -+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" -+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" -+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" -+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" -+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --- -2.17.2 - diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix deleted file mode 100644 index 3c7dc0a7d24e3..0000000000000 --- a/pkgs/applications/virtualization/railcar/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, libseccomp }: - -rustPlatform.buildRustPackage rec { - pname = "railcar"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "oracle"; - repo = "railcar"; - rev = "v${version}"; - sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9"; - }; - - # Submitted upstream https://github.com/oracle/railcar/pull/44 - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "1zsch6gpbw96j5wa68ksbk4x6nbsl7dbvdhdprljpcyrwwkhz47x"; - - buildInputs = [ libseccomp ]; - - meta = with lib; { - description = "Rust implementation of the Open Containers Initiative oci-runtime"; - homepage = "https://github.com/oracle/railcar"; - license = with licenses; [ asl20 /* or */ upl ]; - maintainers = [ maintainers.spacekookie ]; - }; -} diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index dbe434578963b..5649815a70798 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8="; + sha256 = "sha256-s0VRj/hjevtTZ9rUQsAsI2pg4ygahlrBIfFdETWy9W0="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index c6442b57a4219..c870abc302822 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.seabios.org"; license = licenses.lgpl3; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 99299ce31f9f5..272e10318ef6a 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -5,8 +5,6 @@ , spiceSupport ? true, spice-gtk ? null }: -with lib; - python3.pkgs.buildPythonApplication rec { pname = "virt-manager"; version = "4.0.0"; @@ -29,17 +27,12 @@ python3.pkgs.buildPythonApplication rec { libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 - ] ++ optional spiceSupport spice-gtk; + ] ++ lib.optional spiceSupport spice-gtk; propagatedBuildInputs = with python3.pkgs; [ - pygobject3 ipaddress libvirt libxml2 requests cdrtools + pygobject3 libvirt libxml2 requests cdrtools ]; - prePatch = '' - sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py - sed -i "/'install_egg_info'/d" setup.py - ''; - patches = [ # due to a recent change in setuptools-61, "packages=[]" needs to be included # this patch can hopefully be removed, once virt-manager has an upstream version bump @@ -50,6 +43,11 @@ python3.pkgs.buildPythonApplication rec { }) ]; + postPatch = '' + sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py + sed -i "/'install_egg_info'/d" setup.py + ''; + postConfigure = '' ${python3.interpreter} setup.py configure --prefix=$out ''; @@ -63,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") # these are called from virt-install in initrdinject.py - gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}") makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 8ff90a4150dbb..54c0bea359224 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A top-like utility for showing stats of virtualized domains"; homepage = "https://people.redhat.com/~rjones/virt-top/"; license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9424628d28779..af2c4a0070adc 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -3,6 +3,7 @@ , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib +, fetchpatch # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin @@ -23,14 +24,14 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.30"; + version = "6.1.34"; in stdenv.mkDerivation { pname = "virtualbox"; inherit version; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef"; + sha256 = "9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49"; }; outputs = [ "out" "modsrc" ]; @@ -62,8 +63,8 @@ in stdenv.mkDerivation { ${optionalString (!headless) '' -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ ''} -i configure - ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 - ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 + ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 + ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e ' ${optionalString pulseSupport @@ -97,6 +98,15 @@ in stdenv.mkDerivation { ./qtx11extras.patch # https://github.com/NixOS/nixpkgs/issues/123851 ./fix-audio-driver-loading.patch + # NOTE: both patches below should be removed when updating to 6.1.35 + # https://www.virtualbox.org/ticket/20914#comment:15 + (fetchpatch { + url = "https://www.virtualbox.org/raw-attachment/ticket/20914/vbox-linux-5.19.patch"; + hash = "sha512-NNiMf8kUuM/PimrQCOacYLkrf7UFPh6ZdPsXKyLlsqWfWQXkG92Fv3qZXvg8weE1Z/SBsFTuHICEI4b4l1wZFw=="; + extraPrefix = "/"; + }) + # https://www.virtualbox.org/ticket/20904#comment:22 + ./ffreestanding.patch ]; postPatch = '' @@ -225,6 +235,10 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode + ]; license = licenses.gpl2; homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander ]; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index dd1adcd772948..24e66ef7c7531 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "a5ee3e693a0470a77735556a77a09aa83bfc48181998b9b21b1af82ef1d11c2a"; + let value = "d7856f0688b6d2ed1e8bff0b367efa952068b03fa5a3a29b46db08cfd5d9a810"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/ffreestanding.patch b/pkgs/applications/virtualization/virtualbox/ffreestanding.patch new file mode 100644 index 0000000000000..0e22aa60cde4f --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/ffreestanding.patch @@ -0,0 +1,20 @@ +diff --git a/Config.kmk b/Config.kmk +index 3df197404..4c6bd76bb 100644 +--- a/Config.kmk ++++ b/Config.kmk +@@ -4503,11 +4504,14 @@ ifeq ($(VBOX_LDR_FMT),elf) + TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) + TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \ + $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ +- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) ++ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) + TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \ + $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ + $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \ + -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) ++ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++. ++TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding ++ endif + TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding + TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables + TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index fc37456919d08..538ebfa78cf8e 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "d324d2d09d8dd00b1eb3ef3d80ab2e1726998421d13adc0d2a90e05d355aaa5c"; + sha256 = "88f86fa0e6970b6a7c80d714b7a91a8c425ff8ef53a3e73fc80781191a87257b"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -45,26 +45,15 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ]; unpackPhase = '' - ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' - isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run - chmod 755 ./VBoxLinuxAdditions.run - # An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is - sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run - ./VBoxLinuxAdditions.run --noexec --keep - '' - else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions") - } + isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run + chmod 755 ./VBoxLinuxAdditions.run + # An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is + sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run + ./VBoxLinuxAdditions.run --noexec --keep # Unpack files cd install - ${if stdenv.hostPlatform.system == "i686-linux" then '' - tar xfvj VBoxGuestAdditions-x86.tar.bz2 - '' - else if stdenv.hostPlatform.system == "x86_64-linux" then '' - tar xfvj VBoxGuestAdditions-amd64.tar.bz2 - '' - else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions") - } + tar xfvj VBoxGuestAdditions-${if stdenv.hostPlatform.is32bit then "x86" else "amd64"}.tar.bz2 ''; buildPhase = '' @@ -155,9 +144,10 @@ in stdenv.mkDerivation rec { This add-on provides support for dynamic resizing of the X Display, shared host/guest clipboard support and guest OpenGL support. ''; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = "GPL"; maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.linux; - broken = kernel.kernelAtLeast "5.17"; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = kernel.kernelAtLeast (if stdenv.hostPlatform.is32bit then "5.10" else "5.17"); }; } diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 58cd4092a95d5..0863eae3bb048 100755 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -158,6 +158,8 @@ stdenv.mkDerivation rec { cp -r $unpacked/sbin/* $out/bin/ cp -r $unpacked/lib/libconf $out/lib/vmware/ + rm $out/lib/vmware/libconf/etc/fonts/fonts.conf + cp -r $unpacked/lib/bin $out/lib/vmware/ cp -r $unpacked/lib/lib $out/lib/vmware/ cp -r $unpacked/lib/scripts $out/lib/vmware/ @@ -334,6 +336,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Industry standard desktop hypervisor for x86-64 architecture"; homepage = "https://www.vmware.com/products/workstation-pro.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ deinferno ]; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index c85e70116682e..cde71d2b87fa4 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -252,7 +252,7 @@ stdenv.mkDerivation (rec { + "\nIncludes:\n" + withXenfiles (name: x: "* ${name}: ${x.meta.description or "(No description)"}."); platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ eelco tstrobel oxij ]; + maintainers = with lib.maintainers; [ eelco oxij ]; license = lib.licenses.gpl2; # https://xenbits.xen.org/docs/unstable/support-matrix.html knownVulnerabilities = lib.optionals (lib.versionOlder version "4.13") [ diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 90b559e7d44ca..b19f17275ad6f 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, fetchpatch +, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobject-introspection , which, dbus, nettools, git, doxygen @@ -27,6 +28,21 @@ stdenv.mkDerivation rec { sha256 = "1i7ajmgbsax4lzpgnmkyv35x8vxqi0j84a14k6zys4blx94m9yjf"; }; + patches = [ + # Pull upstream fix for -fno-common toolchain support: + # https://github.com/awesomeWM/awesome/pull/3065 + (fetchpatch { + name = "fno-common-prerequisite.patch"; + url = "https://github.com/awesomeWM/awesome/commit/c5202a48708585cc33528065af8d1b1d28b1a6e0.patch"; + sha256 = "0sv36xf0ibjcm63gn9k3bl039sqavb2b5i6d65il4bdclkc0n08b"; + }) + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch"; + sha256 = "1n3y4wnjra8blss7642jgpxnm9n92zhhjj541bb9i60m4b7bgfzz"; + }) + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index e7c0eecbf82e8..53807e65a3cb4 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiling window manager based on binary space partitioning"; homepage = "https://github.com/baskerville/bspwm"; - maintainers = with maintainers; [ meisternu epitrochoid ]; + maintainers = with maintainers; [ meisternu ]; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix deleted file mode 100644 index a837c435204a0..0000000000000 --- a/pkgs/applications/window-managers/btops/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "btops"; - version = "0.1.0"; - - goPackagePath = "github.com/cmschuetz/btops"; - - src = fetchFromGitHub { - owner = "cmschuetz"; - repo = "btops"; - rev = version; - sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY="; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "bspwm desktop management that supports dymanic appending, removing, and renaming"; - homepage = "https://github.com/cmschuetz/btops"; - maintainers = with maintainers; [ mnacamura ]; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/btops/deps.nix b/pkgs/applications/window-managers/btops/deps.nix deleted file mode 100644 index a893d40e21074..0000000000000 --- a/pkgs/applications/window-managers/btops/deps.nix +++ /dev/null @@ -1,120 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"; - sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"; - sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "63644898a8da0bc22138abf860edaf5277b6102e"; - sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4"; - sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"; - sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877"; - sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 37a4f7c943616..053b01cb2258a 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -16,15 +16,16 @@ , libsndfile , pango , perl +, gitUpdater }: stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.24"; + version = "1.0.25"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - sha256 = "1anmwfjyynwl0ylkyksa7bnsqzf58l1yccjzp3kbwq6nw1gs7dbv"; + hash = "sha256-rUtDaBa4vvC3gO7QSkFrphWuVOmbtkH+pRujQDaUOek="; }; nativeBuildInputs = [ @@ -52,6 +53,12 @@ stdenv.mkDerivation rec { substituteInPlace scripts/e_gen_menu --replace "/usr/local:" "/run/current-system/sw:/usr/local:" ''; + passthru.updateScript = gitUpdater { + inherit pname version; + url = "https://git.enlightenment.org/e16/e16"; + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://www.enlightenment.org/e16"; description = "Enlightenment DR16 window manager"; diff --git a/pkgs/applications/window-managers/eww/Cargo.lock.patch b/pkgs/applications/window-managers/eww/Cargo.lock.patch new file mode 100644 index 0000000000000..50241230bb42d --- /dev/null +++ b/pkgs/applications/window-managers/eww/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 9ae7ab9..c810728 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -403,7 +403,7 @@ dependencies = [ + + [[package]] + name = "eww" +-version = "0.2.0" ++version = "0.3.0" + dependencies = [ + "anyhow", + "bincode", diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index e593a95a15193..fe914f5a98234 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -10,16 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "elkowar"; repo = pname; rev = "v${version}"; - sha256 = "050zc3w1z9f2vg6sz86mdxf345gd3s3jf09gf4y8y1mqkzs86b8x"; + sha256 = "055il2b3k8x6mrrjin6vkajpksc40phcp4j1iq0pi8v3j7zsfk1a"; }; - cargoSha256 = "sha256-LejnTVv9rhL9CVW1fgj2gFv4amHQeziu5uaH2ae8AAw="; + cargoSha256 = "sha256-3hGA730g8E4rwQ9V0wSLUcAEmockXi+spwp50cgf0Mw="; + + cargoPatches = [ ./Cargo.lock.patch ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 1a87f29f67cd9..33a313eb8eec5 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { --replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS="-lX11"; meta = with lib; { diff --git a/pkgs/applications/window-managers/hyprland/default.nix b/pkgs/applications/window-managers/hyprland/default.nix new file mode 100644 index 0000000000000..50b52a01d6049 --- /dev/null +++ b/pkgs/applications/window-managers/hyprland/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libdrm +, libinput +, libxcb +, libxkbcommon +, mesa +, pango +, wayland +, wayland-protocols +, wayland-scanner +, wlroots +, xcbutilwm +}: + +stdenv.mkDerivation rec { + pname = "hyprland"; + version = "0.6.1beta"; + + # When updating Hyprland, the overridden wlroots commit must be bumped to match the commit upstream uses. + src = fetchFromGitHub { + owner = "hyprwm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0Msqe2ErAJvnO1zHoB2k6TkDhTYnHRGkvJrfSG12dTU="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wayland-scanner + ]; + + buildInputs = [ + libdrm + libinput + libxcb + libxkbcommon + mesa + pango + wayland + wayland-protocols + wlroots + xcbutilwm + ]; + + # build with system wlroots + postPatch = '' + sed -Ei 's/"\.\.\/wlroots\/include\/([a-zA-Z0-9./_-]+)"/<\1>/g' src/includes.hpp + ''; + + preConfigure = '' + make protocols + ''; + + postBuild = '' + pushd ../hyprctl + $CXX -std=c++20 -w ./main.cpp -o ./hyprctl + popd + ''; + + installPhase = '' + mkdir -p $out/bin + install -m755 ./Hyprland $out/bin + install -m755 ../hyprctl/hyprctl $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/vaxerski/Hyprland"; + description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ wozeparrot ]; + mainProgram = "Hyprland"; + }; +} diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/applications/window-managers/i3/i3-resurrect.nix index a765d2e298ed2..a84d97504bbb1 100644 --- a/pkgs/applications/window-managers/i3/i3-resurrect.nix +++ b/pkgs/applications/window-managers/i3/i3-resurrect.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "i3-resurrect"; - version = "1.4.3"; + version = "1.4.5"; src = fetchPypi { inherit pname version; - sha256 = "0h181frdwpqfj9agw43qgicdvzv1i7xwky0vs0ksd8h18qxqp4hr"; + sha256 = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; }; propagatedBuildInputs = [ click psutil xprop natsort i3ipc xdotool importlib-metadata ]; diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix index 4018a34b571a8..47875ec47c320 100644 --- a/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -1,4 +1,4 @@ -{ i3lock-color, lib, stdenv, fetchFromGitHub }: +{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch }: i3lock-color.overrideAttrs (oldAttrs : rec { pname = "i3lock-blur"; @@ -11,6 +11,16 @@ i3lock-color.overrideAttrs (oldAttrs : rec { sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0="; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain + # support: https://github.com/karulont/i3lock-blur/pull/22 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/karulont/i3lock-blur/commit/ec8fe0e7f7d78bf445602ed517efd5c324bb32f7.patch"; + sha256 = "sha256-0hXUr+ZEB1tpI3xw80/hGzKyeGuna4CQmEvK6t0VBqU="; + }) + ]; + meta = with lib; { description = "An improved screenlocker based upon XCB and PAM with background blurring filter"; homepage = "https://github.com/karulont/i3lock-blur/"; diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/applications/window-managers/i3/rounded.nix new file mode 100644 index 0000000000000..6ab3c29387f50 --- /dev/null +++ b/pkgs/applications/window-managers/i3/rounded.nix @@ -0,0 +1,21 @@ +{ fetchFromGitHub, lib, i3 }: + +i3.overrideAttrs (oldAttrs: rec { + pname = "i3-rounded"; + version = "unstable-2021-10-03"; + + src = fetchFromGitHub { + owner = "LinoBigatti"; + repo = "i3-rounded"; + rev = "524c9f7b50f8c540b2ae3480b242c30d8775f98e"; + sha256 = "0y7m1s1y8f9vgkp7byi33js8n4rigiykd71s936i5d4rwlzrxiwm"; + }; + + meta = with lib; { + description = "A fork of i3-gaps that adds rounding to window corners"; + homepage = "https://github.com/LinoBigatti/i3-rounded"; + maintainers = with maintainers; [ marsupialgutz ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index c3d8d96bba4e1..ddc4383fbd73c 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.10"; + version = "0.22.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HtPgl52ysE/CVX706YeKBFc6CgGpHzvHwZoS+DzHADY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-9Fp5k14QkV1CwLSL1nUUu6NYIpjfvI9vNJRYNqvyr3M="; }; - cargoSha256 = "sha256-ini0AIYwvTskNFMSC+Gy23ohL75PTET95e1mjpjCsWE="; + cargoSha256 = "sha256-MzosatZ4yPHAdANqOBPVW2wpjnojLo9B9N9o4DtU0Iw="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 8a9b72265b999..49894bd0daa20 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,41 +1,79 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext -, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp -, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, expat +, fontconfig +, freetype +, gettext +, libX11 +, libXau +, libXdmcp +, libXext +, libXft +, libXinerama +, libXmu +, libXpm +, libjpeg +, libpng +, librsvg +, pango +, pkg-config +, which +, xorg +, xorgproto +, gitUpdater +}: stdenv.mkDerivation rec { pname = "jwm"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "v${version}"; - sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM="; + sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs="; }; - nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; + nativeBuildInputs = [ + autoconf + automake + gettext + pkg-config + which + ]; buildInputs = [ + expat + fontconfig + freetype libX11 - libXext - libXinerama - libXpm - libXft - xorg.libXrender libXau libXdmcp + libXext + libXft + libXinerama libXmu - libpng + libXpm libjpeg - expat - xorgproto + libpng librsvg - freetype - fontconfig + pango + xorg.libXrender + xorgproto ]; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + enableParallelBuilding = true; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + meta = { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 2aade36074514..2fbc37d8e7eb7 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = "https://github.com/qnikst/kbdd"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.wedens ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 20f4c33ae60e1..c89e140f94e5d 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, libX11, libXinerama }: let rpathLibs = [ libXinerama libX11 ]; @@ -28,11 +28,12 @@ rustPlatform.buildRustPackage rec { dontPatchELF = true; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A tiling window manager for the adventurer"; homepage = "https://github.com/leftwm/leftwm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ mschneider ]; + maintainers = with maintainers; [ ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG"; }; } diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 275db56dadaea..fc25171076709 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { xorgproto ]; + # Workaround build failure on -fno-common toolchains: + # ld: workspaces.o:src/keyboard.h:93: multiple definition of + # `NumLockMask'; client.o:src/keyboard.h:93: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + meta = with lib; { homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/"; description = "A really minimalistic X window manager"; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index d0bec27e215af..93636ae36b01a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -52,6 +52,7 @@ let setuptools python-dateutil dbus-python + dbus-next mpd2 psutil pyxdg diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/applications/window-managers/shod/default.nix new file mode 100644 index 0000000000000..f9e6216a86ab1 --- /dev/null +++ b/pkgs/applications/window-managers/shod/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, writeText +, fontconfig +, libX11 +, libXft +, libXinerama +, libXpm +, libXrender +, conf ? null +}: + +stdenv.mkDerivation rec { + pname = "shod"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "shod"; + rev = "v${version}"; + sha256 = "sha256-jrPuI3ADppqaJ2y9GksiJZZd4LtN1P5yjWwlf9VuYDc="; + }; + + buildInputs = [ + fontconfig + libX11 + libXft + libXinerama + libXpm + libXrender + ]; + + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} config.h"; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A mouse-based window manager that can tile windows inside floating containers"; + longDescription = '' + shod is a multi-monitor floating reparenting X11 window manager that + supports tiled and tabbed containers. shod sets no keybindings, reads no + configuration, and works only via mouse with a given key modifier (Alt by + default) and by responding to client messages sent by the shodc utility + (shod's remote controller). + ''; + homepage = "https://github.com/phillbush/shod"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index a221eb7a8e65b..499713f966aaf 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -62,10 +62,7 @@ grimshot = stdenv.mkDerivation rec { homepage = "https://github.com/swaywm/sway/tree/master/contrib"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ - sway-unwrapped.meta.maintainers - evils - ]; + maintainers = sway-unwrapped.meta.maintainers ++ (with maintainers; [ evils ]); }; }; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 1b66257513457..61925e4ed0be3 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -90,6 +90,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/swaywm/sway/releases/tag/${version}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ma27 ]; + maintainers = with maintainers; [ primeos synthetica ]; }; } diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 4b2909eac2160..97e3febc7b940 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols +, wayland, wayland-protocols, runtimeShell , systemdSupport ? stdenv.isLinux, systemd }: @@ -22,7 +22,13 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; - postPatch = "substituteInPlace main.c --replace '%lu' '%zu'"; + # Remove the `%zu` patch for the next release after 1.7.1. + # https://github.com/swaywm/swayidle/commit/e81d40fca7533f73319e76e42fa9694b21cc9e6e + postPatch = '' + substituteInPlace main.c \ + --replace '%lu' '%zu' \ + --replace '"sh"' '"${runtimeShell}"' + ''; meta = with lib; { description = "Idle management daemon for Wayland"; diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 8ca1dd7787756..2eb817b9b1f8d 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -46,6 +46,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/Big-B/swaylock-fancy"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 1eb9693379e62..42384fa06ae20 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -37,7 +37,7 @@ in symlinkJoin { paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; - strictDeps = true; + strictDeps = false; nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 043e2b02a7fba..eef1a14639bb3 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner, python3 +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, wayland-scanner, python3 , wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw"; }; + patches = [ + # Fix race condition in build system + (fetchpatch { + url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/0d3e438d080433ed5d203c876e7de6c7f8a14f98.patch"; + sha256 = "sha256-d9NG1vUIuL4jpXqCo0myz/97JuFYesH+8kJnegQXeMU="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ]; buildInputs = [ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm |